Changeset 778:69da34d8b14f in hatta-dev for hatta.py

Timestamp:

07/13/10 19:55:20 (23 months ago)

Author:

Radomir Dopieralski <hatta-dev@…>

Branch:

default

Message:

Fix AttributeError issue with Mercurial 1.6

File:

• hatta.py (modified) (2 diffs)

hatta.py

@@ -491 +491 @@
         changectx = self._changectx()
         try:
+            # Mercurial 1.5 and earlier have .add() on the repo
+            add = self.repo.add
+        except AttributeError:
+            # Mercurial 1.6
+            add = self.repo[None].add
+        try:
             filectx_tip = changectx[repo_file]
             current_page_rev = filectx_tip.filerev()
         except mercurial.revlog.LookupError:
-            self.repo.add([repo_file])
+            add([repo_file])
             current_page_rev = -1
         if parent is not None and current_page_rev != parent:
@@ -559 +565 @@
         self._check_path(file_path)
         try:
+            # Mercurial 1.5 and earlier have .remove() on the repo
+            remove = self.repo.remove
+        except AttributeError:
+            # Mercurial 1.6
+            remove = self.repo[None].remove
+        try:
             os.unlink(file_path)
         except OSError:
             pass
-        self.repo.remove([repo_file])
+        remove([repo_file])
         self._commit([repo_file], text, user)