Upgrade Mercurial.

diff --git a/apps/catalogue/migrations/0003_from_hg.py b/apps/catalogue/migrations/0003_from_hg.py
index 1816af9..d836067 100644 (file)
--- a/apps/catalogue/migrations/0003_from_hg.py
+++ b/apps/catalogue/migrations/0003_from_hg.py
@@ -7,7 +7,6 @@ import re
 import urllib
 
 from django.db import models
 import urllib
 
 from django.db import models

-from mercurial import hg, ui

 from south.db import db
 from south.v2 import DataMigration
 
 from south.db import db
 from south.v2 import DataMigration
 


@@ -160,6 +159,8 @@ class Migration(DataMigration):
         except:
             print 'repository not configured, skipping'
         else:
         except:
             print 'repository not configured, skipping'
         else:

+            from mercurial import hg, ui
+

             print 'migrate from', hg_path
             repo = hg.repository(ui.ui(), hg_path)
             tip = repo['tip']
             print 'migrate from', hg_path
             repo = hg.repository(ui.ui(), hg_path)
             tip = repo['tip']

diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py
index f4cb519..cf8d75d 100644 (file)
--- a/apps/dvcs/models.py
+++ b/apps/dvcs/models.py
@@ -7,7 +7,7 @@ from django.core.files.storage import FileSystemStorage
 from django.db import models, transaction
 from django.db.models.base import ModelBase
 from django.utils.translation import ugettext_lazy as _
 from django.db import models, transaction
 from django.db.models.base import ModelBase
 from django.utils.translation import ugettext_lazy as _

-from mercurial import mdiff, simplemerge
+from mercurial import simplemerge

 
 from django.conf import settings
 from dvcs.signals import post_commit, post_publishable
 
 from django.conf import settings
 from dvcs.signals import post_commit, post_publishable

diff --git a/requirements.txt b/requirements.txt
index 9eb392b..e741a1b 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 
 ## Python libraries
 lxml>=2.2.2
 
 ## Python libraries
 lxml>=2.2.2

-mercurial>=1.6,<1.7
+Mercurial>=2.6,<2.7

 PyYAML>=3.0
 Pillow
 oauth2
 PyYAML>=3.0
 Pillow
 oauth2