Changeset 1281 in tailor for vcpx/repository/bzr.py

Timestamp:

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

Author:

lele@…

Hash name:

20060912212144-97f81-128949db7c687813c001a633914bfa21c5455f53

Message:

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.

File:

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

vcpx/repository/bzr.py

@@ -304 +304 @@
         from os.path import join, exists
 
-        # 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
+        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
 
         self.log.info('Renaming %r to %r...', oldname, newname)
@@ -321 +321 @@
             self._working_tree.rename_one(oldname, newname)
         except:
-            if unmoved:
+            if self.shared_basedirs and unmoved:
                 rename(oldpath, newpath)
             raise