Mercurial > hg > pyhgsh
diff mercurial/commands.py @ 2175:b2ae81a7df29
Make hg update more verbose by default (issue12)
(including small changes to revert and backout to not show these stats
with the exception of backout --merge)
Show update stats (unless -q), e.g.:
K files updated, L files merged, M files removed, N files unresolved
Inform the user what to do after a merge:
(branch merge, don't forget to commit)
Inform the user what to do if a branch merge failed:
There are unresolved merges, you can redo the full merge using:
hg update -C X
hg merge Y
Inform the user what to do if a working directory merge failed:
There are unresolved merges with locally modified files.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 02 May 2006 18:44:02 +0200 |
| parents | f5c2c6e69fd7 |
| children | 520dd3d28e9b |
line wrap: on
line diff
--- a/mercurial/commands.py Mon May 01 19:17:34 2006 +0200 +++ b/mercurial/commands.py Tue May 02 18:44:02 2006 +0200 @@ -956,7 +956,7 @@ raise util.Abort(_('cannot back out a change with no parents')) if p2 != nullid: raise util.Abort(_('cannot back out a merge')) - repo.update(node, force=True) + repo.update(node, force=True, show_stats=False) revert_opts = opts.copy() revert_opts['rev'] = hex(parent) revert(ui, repo, **revert_opts) @@ -2518,7 +2518,8 @@ update[abs] = True repo.dirstate.forget(forget[0]) - r = repo.update(node, False, True, update.has_key, False, wlock=wlock) + r = repo.update(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')