From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Thu, 18 Jul 2013 09:11:44 +0000 (+0200)
Subject: Upgrade Mercurial.
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/7117aeaf787597967675e45dec919e8b0506844d?ds=inline

Upgrade Mercurial.
---

diff --git a/apps/catalogue/migrations/0003_from_hg.py b/apps/catalogue/migrations/0003_from_hg.py
index 1816af90..d8360676 100644
--- 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
-from mercurial import hg, ui
 from south.db import db
 from south.v2 import DataMigration
 
@@ -160,6 +159,8 @@ class Migration(DataMigration):
         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']
diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py
index f4cb5197..cf8d75dc 100644
--- 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 mercurial import mdiff, simplemerge
+from mercurial import simplemerge
 
 from django.conf import settings
 from dvcs.signals import post_commit, post_publishable
diff --git a/requirements.txt b/requirements.txt
index 9eb392b8..e741a1b2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 
 ## Python libraries
 lxml>=2.2.2
-mercurial>=1.6,<1.7
+Mercurial>=2.6,<2.7
 PyYAML>=3.0
 Pillow
 oauth2