Changeset 1666 in tailor

Timestamp:

03/27/09 11:26:03 (4 years ago)

Author:

lele@…

Hash name:

20090327102603-97f81-306859d2ffafa9d11b571c32fa33b962b2f8791d

Message:

Fix hg (in)compatibility of the week
This allows Mercurial 1.1 to delete files. This patch was first found
at  https://bugzilla.redhat.com/show_bug.cgi?id=478841, the "reverted
patch" by Dan Horak, 2009-01-07 12:32 EDT: hopefully this version
works also for older Mercurial versions.
Thanks to Chad Burrus for making me aware of the problem.

File:

• vcpx/repository/hg.py (modified) (2 diffs)

vcpx/repository/hg.py

@@ -642 +642 @@
 
         files = []
-        for src, path in self._getRepo().dirstate.walk([subdir]):
+        try:
+            # hg >= 1.1
+            # def walk(self, match, unknown, ignored)
+
+            from mercurial import match
+
+            def get_paths():
+                matcher = match.exact(self.repository.basedir,
+                                      self.repository.basedir,
+                                      [subdir])
+                walk = self._getRepo().dirstate.walk
+                for path in walk(matcher, True, False):
+                    yield path
+        except ImportError:
+            # hg < 1.1
+            # def walk(self, files=None, match=util.always, badmatch=None)
+
+            def get_paths():
+                walk = self._getRepo().dirstate.walk
+                for src, path in walk([subdir]):
+                    yield path
+
+        for path in get_paths():
             # If subdir is a plain file, just return
             if path == subdir:
@@ -651 +673 @@
                 tl = join(nt, tl)
             files.append(tl)
+
         return files