Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/i18n.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 | fbf2b10011aa |
children | 345bac2bc4ec |
line wrap: on
line source
""" i18n.py - internationalization support for mercurial Copyright 2005 Matt Mackall <mpm@selenic.com> This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. """ # the import from gettext is _really_ slow # for now we use a dummy function gettext = lambda x: x #import gettext #t = gettext.translation('hg', '/usr/share/locale', fallback=1) #gettext = t.gettext