From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Fri, 20 Aug 2010 10:10:24 +0000 (+0200)
Subject: require and use Mercurial 1.6 API
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/b13038d172d0ac2bb1582452e55b43e727805031?ds=sidebyside

require and use Mercurial 1.6 API
---

diff --git a/lib/vstorage/__init__.py b/lib/vstorage/__init__.py
index be7b6b3f..6234dc7e 100644
--- a/lib/vstorage/__init__.py
+++ b/lib/vstorage/__init__.py
@@ -20,7 +20,6 @@ os.environ['HGMERGE'] = "internal:merge"
 import mercurial.hg
 import mercurial.revlog
 import mercurial.util
-from mercurial.context import workingctx
 
 from vstorage.hgui import SilentUI
 
@@ -220,7 +219,7 @@ class VersionedStorage(object):
             filectx_tip = changectx[repo_file]
             current_page_rev = filectx_tip.filerev()
         except mercurial.revlog.LookupError:
-            workingctx(self.repo).add([repo_file])
+            self.repo[None].add([repo_file])
             current_page_rev = -1
 
         if parent is not None and current_page_rev != parent:
@@ -272,7 +271,7 @@ class VersionedStorage(object):
             os.unlink(file_path)
         except OSError:
             pass
-        workingctx(self.repo).remove([repo_file])
+        self.repo[None].remove([repo_file])
         self._commit([repo_file], text, user)
 
     def page_text(self, title, revision=None):
diff --git a/requirements.txt b/requirements.txt
index 70cbcae5..7cca9db5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 ## Python libraries
 lxml>=2.2
-mercurial>=1.3.1
+mercurial>=1.6
 PyYAML>=3.0
 PIL>=1.1