Changeset 1470 in tailor

Timestamp:

03/21/08 02:50:09 (5 years ago)

Author:

Miklos Vajna <vmiklos@…>

Hash name:

20080321015009-8c5d4-0ee723243fc226e79648ba53b82abf7e869dec56

Message:

git target: rename() won't work for rename(a/b, a)

so do it manually

File:

• vcpx/repository/git/target.py (modified) (1 diff)

vcpx/repository/git/target.py

@@ -223 +223 @@
         # moved the item.
 
-        from os import rename
-        from os.path import join
+        from os import mkdir, rename, rmdir
+        from os.path import join, exists
 
         oldpath = join(self.repository.basedir, oldname)
         newpath = join(self.repository.basedir, newname)
 
-        rename(newpath, oldpath)
-        self.repository.runCommand(['mv', oldname, newname])
+        # rename() won't work for rename(a/b, a)
+        if newpath.startswith(oldpath):
+            oldpathtmp = oldpath+"-TAILOR-HACKED-TEMP-NAME"
+            oldnametmp = oldname+"-TAILOR-HACKED-TEMP-NAME"
+            if exists(oldpathtmp):
+                rename(oldpathtmp, oldpath)
+            rename(newpath, oldpathtmp)
+            rmdir(oldpath)
+            rename(oldpathtmp, oldpath)
+            mkdir(oldpathtmp)
+            self.repository.runCommand(['mv', oldname, newname.replace(oldname, oldnametmp, 1)])
+            self.repository.runCommand(['mv', oldnametmp, oldname])
+        else:
+            rename(newpath, oldpath)
+            self.repository.runCommand(['mv', oldname, newname])
 
     def _prepareTargetRepository(self):