Changeset 1518 in tailor

Timestamp:

05/21/08 02:34:26 (5 years ago)

Author:

lele@…

Hash name:

20080521003426-97f81-edb50a6ab354ba11d9308630b0010e147c9d336d

Message:

Don't raise an error when bzr do not find anything to apply
This happens on tailor restarts, when the patch is already applied but
not yet committed on the target.
Also, added a note about working_tree.update() not returning a
conflict flag, even when the conflict actually happened.

File:

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

vcpx/repository/bzr.py

@@ -185 +185 @@
         parent_branch = BzrDir.open(self.repository.repository).open_branch()
         self._working_tree.lock_write()
-        self.log.info('Updating to %r', changeset.revision)
         try:
             count = self._working_tree.pull(parent_branch,
                                             stop_revision=changeset.revision)
+            # XXX: this does not seem to return a true value on conflicts!
             conflicts = self._working_tree.update()
         finally:
             self._working_tree.unlock()
-        self.log.debug("%s updated to %s",
-                       ', '.join([e.name for e in changeset.entries]),
-                       changeset.revision)
         try:
             pulled_revnos = count.new_revno - count.old_revno
@@ -200 +197 @@
             # Prior to 0.15 pull returned a simple integer instead of a result object
             pulled_revnos = count
-        if (pulled_revnos != 1) or conflicts:
-            raise ChangesetApplicationFailure('unknown reason')
-        return [] # No conflict handling yet
+        self.log.info('Updated to %r, applied %d changesets', changeset.revision, count)
+        if conflicts:
+            # No conflict handling yet
+            raise ChangesetApplicationFailure('Unsupported: conflicts')
+        return []
 
     def _checkoutUpstreamRevision(self, revision):