##// END OF EJS Templates
patch: second line of a context diff starts with '--- ', not '+++ '
Benoit Boissinot -
r10736:a528a104 stable
parent child Browse files
Show More
@@ -178,8 +178,8 b' def extract(ui, fileobj):'
178 # (this heuristic is borrowed from quilt)
178 # (this heuristic is borrowed from quilt)
179 diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |'
179 diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |'
180 r'retrieving revision [0-9]+(\.[0-9]+)*$|'
180 r'retrieving revision [0-9]+(\.[0-9]+)*$|'
181 r'(---|\*\*\*)[ \t].*?'
181 r'---[ \t].*?^\+\+\+[ \t]|'
182 r'^(\+\+\+|\*\*\*)[ \t])', re.MULTILINE|re.DOTALL)
182 r'\*\*\*[ \t].*?^---[ \t])', re.MULTILINE|re.DOTALL)
183
183
184 fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
184 fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
185 tmpfp = os.fdopen(fd, 'w')
185 tmpfp = os.fdopen(fd, 'w')
General Comments 0
You need to be logged in to leave comments. Login now