Changeset 852 in tailor

Timestamp:

09/27/05 23:01:30 (8 years ago)

Author:

lele@…

Hash name:

20050927210130-97f81-631fb1bfd4a04fd079182d4588b1a98ba4e576ca

Message:

Under hg, the rename must walk over old directory contents

Location:

vcpx

Files:

• hg.py (modified) (2 diffs)
• hglib.py (modified) (1 diff)

vcpx/hg.py

@@ -89 +89 @@
 
         from os.path import join, isdir
-        from os import walk
-        from dualwd import IGNORED_METADIRS
 
         cmd = self.repository.command("rename", "--after")
@@ -96 +94 @@
         if isdir(join(self.basedir, newname)):
             # Given lack of support for directories in current HG,
-            # loop over all files under the new directory and
-            # do a copy on them.
-            skip = len(self.basedir)+len(newname)+2
-            for dir, subdirs, files in walk(join(self.basedir, newname)):
-                prefix = dir[skip:]
-
-                for excd in IGNORED_METADIRS:
-                    if excd in subdirs:
-                        subdirs.remove(excd)
-
-                for f in files:
-                    copy.execute(join(oldname, prefix, f),
-                                 join(newname, prefix, f))
+            # loop over all files presented by "hg manifest" under the
+            # old directory and do a copy on them.
+            cmd = self.repository.command("manifest")
+            manifest = ExternalCommand(cwd=self.basedir, command=cmd)
+            output = manifest.execute(stdout=PIPE)[0]
+            for row in output:
+                sha, mode, oldpath = row[:-1].split(' ')
+                if oldpath.startswith(oldname):
+                    tail = oldpath[len(oldname)+2:]
+                    copy.execute(oldpath, join(newname, tail))
                     if copy.exit_status:
                         raise ChangesetReplayFailure("Could not rename %r "

vcpx/hglib.py

@@ -68 +68 @@
         """Rename an entry"""
 
-        from os.path import join, isdir
-        from os import walk
-        from dualwd import IGNORED_METADIRS
+        from os.path import join, isdir, normpath
 
         if isdir(join(self.basedir, newname)):
             # Given lack of support for directories in current HG,
-            # loop over all files under the new directory and
+            # loop over all files under the old directory and
             # do a copy on them.
-            skip = len(self.basedir)+len(newname)+2
-            for dir, subdirs, files in walk(join(self.basedir, newname)):
-                prefix = dir[skip:]
-
-                for excd in IGNORED_METADIRS:
-                    if excd in subdirs:
-                        subdirs.remove(excd)
-
-                for f in files:
-                    self._hg.copy(join(oldname, prefix, f),
-                                  join(newname, prefix, f))
-                    self._hg.remove([join(oldname, prefix, f)])
+            for src, oldpath in self._hg.dirstate.walk(oldname):
+                tail = oldpath[len(oldname)+2:]
+                self._hg.copy(oldpath, join(newname, tail))
+                self._hg.remove([oldpath])
         else:
             self._hg.copy(oldname, newname)