equal
deleted
inserted
replaced
1130 try: |
1130 try: |
1131 current_file, missing = selectfile(afile, bfile, |
1131 current_file, missing = selectfile(afile, bfile, |
1132 first_hunk, strip) |
1132 first_hunk, strip) |
1133 current_file = patcher(ui, current_file, opener, |
1133 current_file = patcher(ui, current_file, opener, |
1134 missing=missing, eolmode=eolmode) |
1134 missing=missing, eolmode=eolmode) |
1135 except PatchError, err: |
1135 except PatchError, inst: |
1136 ui.warn(str(err) + '\n') |
1136 ui.warn(str(inst) + '\n') |
1137 current_file = None |
1137 current_file = None |
1138 rejects += 1 |
1138 rejects += 1 |
1139 continue |
1139 continue |
1140 elif state == 'git': |
1140 elif state == 'git': |
1141 for gp in values: |
1141 for gp in values: |