Show More
@@ -994,7 +994,7 b' def scangitpatch(lr, firstline):' | |||||
994 | fp.seek(pos) |
|
994 | fp.seek(pos) | |
995 | return gitpatches |
|
995 | return gitpatches | |
996 |
|
996 | |||
997 |
def iterhunks( |
|
997 | def iterhunks(fp): | |
998 | """Read a patch and yield the following events: |
|
998 | """Read a patch and yield the following events: | |
999 | - ("file", afile, bfile, firsthunk): select a new target file. |
|
999 | - ("file", afile, bfile, firsthunk): select a new target file. | |
1000 | - ("hunk", hunk): a new hunk is ready to be applied, follows a |
|
1000 | - ("hunk", hunk): a new hunk is ready to be applied, follows a | |
@@ -1114,7 +1114,7 b' def _applydiff(ui, fp, patcher, copyfn, ' | |||||
1114 | cwd = os.getcwd() |
|
1114 | cwd = os.getcwd() | |
1115 | opener = scmutil.opener(cwd) |
|
1115 | opener = scmutil.opener(cwd) | |
1116 |
|
1116 | |||
1117 |
for state, values in iterhunks( |
|
1117 | for state, values in iterhunks(fp): | |
1118 | if state == 'hunk': |
|
1118 | if state == 'hunk': | |
1119 | if not current_file: |
|
1119 | if not current_file: | |
1120 | continue |
|
1120 | continue |
General Comments 0
You need to be logged in to leave comments.
Login now