Changeset 1282 in tailor

Timestamp:

09/12/06 23:21:44 (7 years ago)

Author:

lele@…

Hash name:

20060912212144-97f81-be2c97c450f865310b3d1c19fed82f068a756294

Message:

UNDO: Fix ticket #75, at least with DisjunctWorkingDirectories
While fixing it with shared basedirs is a tricky business, with disjunct
basedirs it's very simple: first replay the changeset on the target, then
execute rsync to copy updated files.

Location:

vcpx

Files:

• repository/cvsps.py (modified) (1 diff)
• repository/svn.py (modified) (1 diff)
• dualwd.py (modified) (1 diff)
• repository/bzr.py (modified) (2 diffs)

vcpx/repository/cvsps.py

@@ -745 +745 @@
         """
 
-        from os import rename
-        from os.path import join
-
-        if not self.shared_basedirs:
-            oldpath = join(self.repository.basedir, oldname)
-            newpath = join(self.repository.basedir, newname)
-            try:
-                rename(oldpath, newpath)
-            except OSError:
-                raise ChangesetApplicationFailure(
-                    'Cannot rename "%s" to "%s"' % (oldpath, newpath))
-
         self._removePathnames([oldname])
         self._addPathnames([newname])

vcpx/repository/svn.py

@@ -615 +615 @@
         # --force in case the file has been changed and moved in one revision
         cmd = self.repository.command("mv", "--quiet", "--force")
-
-        if self.shared_basedirs:
-            # Subversion does not seem to allow
-            #   $ mv a.txt b.txt
-            #   $ svn mv a.txt b.txt
-            # Here we are in this situation, since upstream VCS already
-            # moved the item.
-            # It may be better to let subversion do the move itself. For one
-            # thing, svn's cp+rm is different from rm+add (cp preserves
-            # history).
-            # This does not happen when using disjunct basedirs, since tailor
-            # replayes the changeset on untouched sources
-            unmoved = False
-            oldpath = join(self.repository.basedir, oldname)
-            newpath = join(self.repository.basedir, newname)
-            if not exists(oldpath):
-                try:
-                    rename(newpath, oldpath)
-                except OSError:
-                    raise ChangesetApplicationFailure(
-                        'Cannot rename "%s" back to "%s"' % (newpath, oldpath))
-                unmoved = True
+        # Subversion does not seem to allow
+        #   $ mv a.txt b.txt
+        #   $ svn mv a.txt b.txt
+        # Here we are in this situation, since upstream VCS already
+        # moved the item.
+        # It may be better to let subversion do the move itself. For one thing,
+        # svn's cp+rm is different from rm+add (cp preserves history).
+        unmoved = False
+        oldpath = join(self.repository.basedir, oldname)
+        newpath = join(self.repository.basedir, newname)
+        if not exists(oldpath):
+            try:
+                rename(newpath, oldpath)
+            except OSError:
+                self.log.critical('Cannot rename %r back to %r',
+                                  newpath, oldpath)
+                raise
+            unmoved = True
         move = ExternalCommand(cwd=self.repository.basedir, command=cmd)
         out, err = move.execute(oldname, newname, stdout=PIPE, stderr=PIPE)
         if move.exit_status:
-            if self.shared_basedirs and unmoved:
+            if unmoved:
                 rename(oldpath, newpath)
             raise ChangesetApplicationFailure("%s returned status %d saying\n%s"

vcpx/dualwd.py

@@ -103 +103 @@
 
     def replayChangeset(self, changeset):
-        self.target.replayChangeset(changeset)
         if not self.shared_basedirs:
             self._syncTargetWithSource()
+        self.target.replayChangeset(changeset)
 
     def _syncTargetWithSource(self):

vcpx/repository/bzr.py

@@ -304 +304 @@
         from os.path import join, exists
 
-        if self.shared_basedirs:
-            # bzr does the rename itself as well
-            unmoved = False
-            oldpath = join(self.repository.basedir, oldname)
-            newpath = join(self.repository.basedir, newname)
-            if not exists(oldpath):
-                try:
-                    rename(newpath, oldpath)
-                except OSError:
-                    raise ChangesetApplicationFailure(
-                        'Cannot rename "%s" back to "%s"' % (newpath, oldpath))
-                unmoved = True
+        # bzr does the rename itself as well
+        unmoved = False
+        oldpath = join(self.repository.basedir, oldname)
+        newpath = join(self.repository.basedir, newname)
+        if not exists(oldpath):
+            try:
+                rename(newpath, oldpath)
+            except OSError:
+                self.log.critical('Cannot rename %r back to %r',
+                                  newpath, oldpath)
+                raise
+            unmoved = True
 
         self.log.info('Renaming %r to %r...', oldname, newname)
@@ -321 +321 @@
             self._working_tree.rename_one(oldname, newname)
         except:
-            if self.shared_basedirs and unmoved:
+            if unmoved:
                 rename(oldpath, newpath)
             raise