facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

Fortify the recognition of a diff header.

Browse Source
This commit is contained in:
bos@serpentine.internal.keyresearch.com 2005-09-01 09:35:42 -07:00
parent 64dcff79fa
commit 887d7f3fac
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mercurial/commands.py
View File

@ -1009,7 +1009,8 @@ def import_(ui, repo, patch1, *patches, **opts):
d = opts["base"]
strip = opts["strip"]
mailre = re.compile(r'(From |[\w-]+:)')
mailre = re.compile(r'(?:From |[\w-]+:)')
diffre = re.compile(r'(?:diff -|--- .*\s+\w+ \w+ +\d+ \d+:\d+:\d+ \d+)')
for patch in patches:
ui.status("applying %s\n" % patch)
@ -1024,7 +1025,7 @@ def import_(ui, repo, patch1, *patches, **opts):
if len(line) > 35: line = line[:32] + '...'
raise util.Abort('first line looks like a '
'mail header: ' + line)
if line.startswith("--- ") or line.startswith("diff -r"):
if diffre.match(line):
break
elif hgpatch:
# parse values when importing the result of an hg export