Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 2775:b550cd82f92a
Move merge code to its own module
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 03 Aug 2006 15:24:41 -0500 |
| parents | 71029a3247cb |
| children | 557ea210fd9f |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Aug 03 13:07:57 2006 -0500 +++ b/mercurial/commands.py Thu Aug 03 15:24:41 2006 -0500 @@ -921,7 +921,7 @@ if opts['parent']: raise util.Abort(_('cannot use --parent on non-merge changeset')) parent = p1 - repo.update(node, force=True, show_stats=False) + hg.update(repo, node, force=True, show_stats=False) revert_opts = opts.copy() revert_opts['rev'] = hex(parent) revert(ui, repo, **revert_opts) @@ -2542,8 +2542,8 @@ if not opts.get('dry_run'): repo.dirstate.forget(forget[0]) - r = repo.update(node, False, True, update.has_key, False, wlock=wlock, - show_stats=False) + r = hg.update(repo, node, False, True, update.has_key, False, + wlock=wlock, show_stats=False) repo.dirstate.update(add[0], 'a') repo.dirstate.update(undelete[0], 'n') repo.dirstate.update(remove[0], 'r') @@ -2867,7 +2867,7 @@ return 1 else: node = node and repo.lookup(node) or repo.changelog.tip() - return repo.update(node, allow=merge, force=clean, forcemerge=force) + return hg.update(repo, node, allow=merge, force=clean, forcemerge=force) def verify(ui, repo): """verify the integrity of the repository