##// END OF EJS Templates
Merge with crew
Matt Mackall -
r1594:a329e0fd merge default
parent child Browse files
Show More
@@ -525,7 +525,10 b' else:'
525
525
526 def parse_patch_output(output_line):
526 def parse_patch_output(output_line):
527 """parses the output produced by patch and returns the file name"""
527 """parses the output produced by patch and returns the file name"""
528 return output_line[14:]
528 pf = output_line[14:]
529 if pf.startswith("'") and pf.endswith("'") and pf.find(" ") >= 0:
530 pf = pf[1:-1] # Remove the quotes
531 return pf
529
532
530 def is_exec(f, last):
533 def is_exec(f, last):
531 """check whether a file is executable"""
534 """check whether a file is executable"""
General Comments 0
You need to be logged in to leave comments. Login now