Show More
@@ -1139,7 +1139,12 b' def import_(ui, repo, patch1, *patches, ' | |||
|
1139 | 1139 | strip = opts["strip"] |
|
1140 | 1140 | |
|
1141 | 1141 | mailre = re.compile(r'(?:From |[\w-]+:)') |
|
1142 | diffre = re.compile(r'(?:diff -|--- .*\s+\w+ \w+ +\d+ \d+:\d+:\d+ \d+)') | |
|
1142 | ||
|
1143 | # attempt to detect the start of a patch | |
|
1144 | # (this heuristic is borrowed from quilt) | |
|
1145 | diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' + | |
|
1146 | 'retrieving revision [0-9]+(\.[0-9]+)*$|' + | |
|
1147 | '(---|\*\*\*)[ \t])') | |
|
1143 | 1148 | |
|
1144 | 1149 | for patch in patches: |
|
1145 | 1150 | ui.status("applying %s\n" % patch) |
General Comments 0
You need to be logged in to leave comments.
Login now