require and use Mercurial 1.6 API

diff --git a/lib/vstorage/__init__.py b/lib/vstorage/__init__.py
index be7b6b3..6234dc7 100644 (file)
--- 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
 import mercurial.hg
 import mercurial.revlog
 import mercurial.util

-from mercurial.context import workingctx

 
 from vstorage.hgui import SilentUI
 
 
 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:
             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:
             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
             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):
         self._commit([repo_file], text, user)
 
     def page_text(self, title, revision=None):

diff --git a/requirements.txt b/requirements.txt
index 70cbcae..7cca9db 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 ## Python libraries
 lxml>=2.2
 ## Python libraries
 lxml>=2.2

-mercurial>=1.3.1
+mercurial>=1.6

 PyYAML>=3.0
 PIL>=1.1
 
 PyYAML>=3.0
 PIL>=1.1