equal
deleted
inserted
replaced
919 parent = p |
919 parent = p |
920 else: |
920 else: |
921 if opts['parent']: |
921 if opts['parent']: |
922 raise util.Abort(_('cannot use --parent on non-merge changeset')) |
922 raise util.Abort(_('cannot use --parent on non-merge changeset')) |
923 parent = p1 |
923 parent = p1 |
924 repo.update(node, force=True, show_stats=False) |
924 hg.update(repo, node, force=True, show_stats=False) |
925 revert_opts = opts.copy() |
925 revert_opts = opts.copy() |
926 revert_opts['rev'] = hex(parent) |
926 revert_opts['rev'] = hex(parent) |
927 revert(ui, repo, **revert_opts) |
927 revert(ui, repo, **revert_opts) |
928 commit_opts = opts.copy() |
928 commit_opts = opts.copy() |
929 commit_opts['addremove'] = False |
929 commit_opts['addremove'] = False |
2540 else: |
2540 else: |
2541 handle(remove, False) |
2541 handle(remove, False) |
2542 |
2542 |
2543 if not opts.get('dry_run'): |
2543 if not opts.get('dry_run'): |
2544 repo.dirstate.forget(forget[0]) |
2544 repo.dirstate.forget(forget[0]) |
2545 r = repo.update(node, False, True, update.has_key, False, wlock=wlock, |
2545 r = hg.update(repo, node, False, True, update.has_key, False, |
2546 show_stats=False) |
2546 wlock=wlock, show_stats=False) |
2547 repo.dirstate.update(add[0], 'a') |
2547 repo.dirstate.update(add[0], 'a') |
2548 repo.dirstate.update(undelete[0], 'n') |
2548 repo.dirstate.update(undelete[0], 'n') |
2549 repo.dirstate.update(remove[0], 'r') |
2549 repo.dirstate.update(remove[0], 'r') |
2550 return r |
2550 return r |
2551 |
2551 |
2865 else: |
2865 else: |
2866 ui.warn(_("branch %s not found\n") % (branch)) |
2866 ui.warn(_("branch %s not found\n") % (branch)) |
2867 return 1 |
2867 return 1 |
2868 else: |
2868 else: |
2869 node = node and repo.lookup(node) or repo.changelog.tip() |
2869 node = node and repo.lookup(node) or repo.changelog.tip() |
2870 return repo.update(node, allow=merge, force=clean, forcemerge=force) |
2870 return hg.update(repo, node, allow=merge, force=clean, forcemerge=force) |
2871 |
2871 |
2872 def verify(ui, repo): |
2872 def verify(ui, repo): |
2873 """verify the integrity of the repository |
2873 """verify the integrity of the repository |
2874 |
2874 |
2875 Verify the integrity of the current repository. |
2875 Verify the integrity of the current repository. |