Merge with crew

This commit is contained in:
Matt Mackall 2005-12-16 11:13:08 -06:00
commit 2df834f9a4

View File

@ -525,7 +525,10 @@ else:
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"""