| changeset 4440 | eff2eefdb65a |
| parent 4438 | 3900f684a150 |
| child 4442 | af8db3b42a4a |
| 4439:871ff96a86cc | 4440:eff2eefdb65a |
|---|---|
1514 for p in patches: |
1514 for p in patches: |
1515 pf = os.path.join(d, p) |
1515 pf = os.path.join(d, p) |
1516 |
1516 |
1517 if pf == '-': |
1517 if pf == '-': |
1518 ui.status(_("applying patch from stdin\n")) |
1518 ui.status(_("applying patch from stdin\n")) |
1519 tmpname, message, user, date, nodeid, p1, p2 = patch.extract(ui, sys.stdin) |
1519 tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, sys.stdin) |
1520 else: |
1520 else: |
1521 ui.status(_("applying %s\n") % p) |
1521 ui.status(_("applying %s\n") % p) |
1522 tmpname, message, user, date, nodeid, p1, p2 = patch.extract(ui, file(pf)) |
1522 tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, file(pf)) |
1523 |
1523 |
1524 if tmpname is None: |
1524 if tmpname is None: |
1525 raise util.Abort(_('no diffs found')) |
1525 raise util.Abort(_('no diffs found')) |
1526 |
1526 |
1527 try: |
1527 try: |