# HG changeset patch # User Benoit Boissinot # Date 1134665410 -3600 # Node ID 6bb3463b124bfd950323fb4a91395ea55fab8030 # Parent a679a364436ada124b787f9d65932c74fceed0fa if a filename contains spaces, patch adds quote around it diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -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"""