Merge with crew
authorMatt Mackall <mpm@selenic.com>
Fri, 16 Dec 2005 11:13:08 -0600
changeset 1594 a329e0fda2ae
parent 1592 347c44611348 (current diff)
parent 1593 6bb3463b124b (diff)
child 1595 dca956c9767d
Merge with crew
mercurial/util.py
--- a/mercurial/util.py	Fri Dec 16 11:12:08 2005 -0600
+++ b/mercurial/util.py	Fri Dec 16 11:13:08 2005 -0600
@@ -525,7 +525,10 @@
 
     def parse_patch_output(output_line):
         """parses the output produced by patch and returns the file name"""
-        return output_line[14:]
+        pf = output_line[14:]
+        if pf.startswith("'") and pf.endswith("'") and pf.find(" ") >= 0:
+            pf = pf[1:-1] # Remove the quotes
+        return pf
 
     def is_exec(f, last):
         """check whether a file is executable"""