equal
deleted
inserted
replaced
954 parent, p2 = repo.changelog.parents(node) |
954 parent, p2 = repo.changelog.parents(node) |
955 if parent == nullid: |
955 if parent == nullid: |
956 raise util.Abort(_('cannot back out a change with no parents')) |
956 raise util.Abort(_('cannot back out a change with no parents')) |
957 if p2 != nullid: |
957 if p2 != nullid: |
958 raise util.Abort(_('cannot back out a merge')) |
958 raise util.Abort(_('cannot back out a merge')) |
959 repo.update(node, force=True) |
959 repo.update(node, force=True, show_stats=False) |
960 revert_opts = opts.copy() |
960 revert_opts = opts.copy() |
961 revert_opts['rev'] = hex(parent) |
961 revert_opts['rev'] = hex(parent) |
962 revert(ui, repo, **revert_opts) |
962 revert(ui, repo, **revert_opts) |
963 commit_opts = opts.copy() |
963 commit_opts = opts.copy() |
964 commit_opts['addremove'] = False |
964 commit_opts['addremove'] = False |
2516 if not in_mf: |
2516 if not in_mf: |
2517 handle(remove, False) |
2517 handle(remove, False) |
2518 update[abs] = True |
2518 update[abs] = True |
2519 |
2519 |
2520 repo.dirstate.forget(forget[0]) |
2520 repo.dirstate.forget(forget[0]) |
2521 r = repo.update(node, False, True, update.has_key, False, wlock=wlock) |
2521 r = repo.update(node, False, True, update.has_key, False, wlock=wlock, |
|
2522 show_stats=False) |
2522 repo.dirstate.update(add[0], 'a') |
2523 repo.dirstate.update(add[0], 'a') |
2523 repo.dirstate.update(undelete[0], 'n') |
2524 repo.dirstate.update(undelete[0], 'n') |
2524 repo.dirstate.update(remove[0], 'r') |
2525 repo.dirstate.update(remove[0], 'r') |
2525 return r |
2526 return r |
2526 |
2527 |