Changeset 1498 in tailor

Timestamp:

05/17/08 17:16:54 (5 years ago)

Author:

lele@…

Hash name:

20080517151654-97f81-96c224ffd0fe38351643cf205778bc1eaf958f17

Message:

Use the newer 'darcs pull --xml-output'
Now that "darcs pull" accepts the "--xml-output" option, use that
instead of re-computing the patch hash from the normal "pull" output.

File:

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

vcpx/repository/darcs/source.py

@@ -298 +298 @@
         """
 
-        cmd = self.repository.command("pull", "--dry-run")
+        # Use the newer pull --xml-output, if possible
+        cmd = self.repository.command("pull", "--dry-run", "--xml-output")
         pull = ExternalCommand(cwd=self.repository.basedir, command=cmd)
         output = pull.execute(self.repository.repository,
                               stdout=PIPE, stderr=STDOUT, TZ='UTC0')[0]
-
-        if pull.exit_status:
-            raise GetUpstreamChangesetsFailure(
-                "%s returned status %d saying\n%s" %
-                (str(pull), pull.exit_status, output.read()))
-
-        return self._parseDarcsPull(output)
-
+        if pull.exit_status and "unrecognized option `--xml-output'" in output:
+            # No way, fall back to old behaviour, that will possibly fail,
+            # on patches recorded before 2003-11-01... :-|
+            cmd = self.repository.command("pull", "--dry-run")
+            pull = ExternalCommand(cwd=self.repository.basedir, command=cmd)
+            output = pull.execute(self.repository.repository,
+                                  stdout=PIPE, stderr=STDOUT, TZ='UTC0')[0]
+
+            if pull.exit_status:
+                raise GetUpstreamChangesetsFailure(
+                    "%s returned status %d saying\n%s" %
+                    (str(pull), pull.exit_status, output.read()))
+
+            return self._parseDarcsPull(output)
+        else:
+            # Skip initial verbosity, as well as the one at end
+            from cStringIO import StringIO
+
+            output.readline() # Would pull from "/home/lele/wip/darcs-2.0"...
+            output.readline() # Would pull the following changes:
+            xml = StringIO(''.join(output.readlines()[:-2]))
+            xml.seek(0)
+            badchars = self.repository.replace_badchars
+            return changesets_from_darcschanges(xml, replace_badchars=badchars)
 
     def _parseDarcsPull(self, output):