| changeset 4646 | 196d90bf5c15 |
| parent 4640 | 178778ca648f |
| child 4648 | 8e503fa54d2d |
| 4645:0de7e6e27fe4 | 4646:196d90bf5c15 |
|---|---|
1480 if pf == '-': |
1480 if pf == '-': |
1481 ui.status(_("applying patch from stdin\n")) |
1481 ui.status(_("applying patch from stdin\n")) |
1482 tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, sys.stdin) |
1482 tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, sys.stdin) |
1483 else: |
1483 else: |
1484 ui.status(_("applying %s\n") % p) |
1484 ui.status(_("applying %s\n") % p) |
1485 tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, file(pf)) |
1485 tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, file(pf, 'rb')) |
1486 |
1486 |
1487 if tmpname is None: |
1487 if tmpname is None: |
1488 raise util.Abort(_('no diffs found')) |
1488 raise util.Abort(_('no diffs found')) |
1489 |
1489 |
1490 try: |
1490 try: |