Changeset 284 in tailor

Timestamp:

05/07/05 02:56:07 (8 years ago)

Author:

lele@…

Hash name:

20050507005607-97f81-27ebc103c6976c2743700f41ca559d5de7c893ec

Message:

Do not relay on --last=1, but rather get changes of exactly the same patch
Maybe I'm just paranoid, but it seems safer to not assume --last=1 gives
back the right patch, and explicitly ask for the same patch just pulled.

File:

• vcpx/darcs.py (modified) (1 diff)

vcpx/darcs.py

@@ -197 +197 @@
         """
 
+        patchname=shrepr(changeset.revision)
+        
         c = SystemCommand(working_dir=root,
                           command="darcs pull --all --patches=%(patch)s")
-        output = c(output=True, patch=shrepr(changeset.revision))
+        output = c(output=True, patch=patchname)
         if c.exit_status:
             raise ChangesetApplicationFailure("'darcs pull' returned status %d saying \"%s\"" % (c.exit_status, output.getvalue().strip()))
 
         c = SystemCommand(working_dir=root,
-                          command="darcs changes --last=1 --xml-output --summ")
-        last = changesets_from_darcschanges(c(output=True))
-        changeset.entries.extend(last[0].entries)
+                          command="darcs changes --patches=%(patch)s"
+                                  " --xml-output --summ")
+        last = changesets_from_darcschanges(c(output=True, patch=patchname))
+        if last:
+            changeset.entries.extend(last[0].entries)
 
     def _checkoutUpstreamRevision(self, basedir, repository, module, revision,