equal
deleted
inserted
replaced
240 if line.startswith('patching file '): |
240 if line.startswith('patching file '): |
241 pf = util.parse_patch_output(line) |
241 pf = util.parse_patch_output(line) |
242 files.setdefault(pf, (None, None)) |
242 files.setdefault(pf, (None, None)) |
243 code = fp.close() |
243 code = fp.close() |
244 if code: |
244 if code: |
245 raise util.Abort(_("patch command failed: %s") % explain_exit(code)[0]) |
245 raise util.Abort(_("patch command failed: %s") % |
|
246 util.explain_exit(code)[0]) |
246 |
247 |
247 for gp in gitpatches: |
248 for gp in gitpatches: |
248 files[gp.path] = (gp.op, gp) |
249 files[gp.path] = (gp.op, gp) |
249 |
250 |
250 return files |
251 return files |