changeset 1594:a329e0fda2ae

Merge with crew
author Matt Mackall <mpm@selenic.com>
date Fri, 16 Dec 2005 11:13:08 -0600
parents 347c44611348 (current diff) 6bb3463b124b (diff)
children dca956c9767d
files mercurial/util.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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"""