Changeset 1591 in tailor

Timestamp:

06/01/08 03:36:32 (5 years ago)

Author:

lele@…

Hash name:

20080601013632-97f81-5095b92dcb121ce2ad1ce10b2d63947cde9f7289

Message:

No need to skip verbosity from (future) darcs pull --xml-output
I sent a refiniment patch to the darcs developers that removes bogus
verbosity when --xml-output is specified.

File:

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

vcpx/repository/darcs/source.py

@@ -376 +376 @@
             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)
+            # My initial implementation of --xml-output on darcs pull
+            # wasn't perfect, as it was printing useless verbosity before
+            # and after the actual xml. Around 2.0.0+275 I removed that...
+
+            line = output.readline() # Would pull from "/home/lele/wip/darcs-2.0"...
+            if line.startswith('Would pull from '):
+                # Skip the first two lines and drop the last two as well
+                output.readline() # Would pull the following changes:
+                xml = StringIO(''.join(output.readlines()[:-2]))
+                xml.seek(0)
+            else:
+                output.seek(0)
+                xml = output
+
             badchars = self.repository.replace_badchars