Mercurial > hg-stable
diff mercurial/destutil.py @ 28683:d0210a35c81a
destutil: make messages at updating to the closed head usual form
This patch makes messages at updating to the closed head usual form
for Mercurial as below:
one line description of the problem with no period
(a suggestion about how to move forward or get more info)
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Tue, 29 Mar 2016 23:59:32 +0900 |
parents | 3f9e25a42e69 |
children | 1ace17e1e160 |
line wrap: on
line diff
--- a/mercurial/destutil.py Tue Mar 29 16:41:32 2016 +0530 +++ b/mercurial/destutil.py Tue Mar 29 23:59:32 2016 +0900 @@ -397,16 +397,16 @@ # ========= ========== otherheads = repo.revs('%ln - parents()', heads) if repo['.'].closesbranch(): - ui.status(_('updated to a closed branch head, ' - 'because all descendant heads are closed.\n' - 'beware of re-opening closed head ' - 'by subsequent commit here.\n')) + ui.status(_('no open descendant heads on branch "%s", ' + 'updating to a closed head\n') % + (currentbranch)) if otherheads: - ui.status(_('%i other heads for branch "%s"\n') % - (len(otherheads), currentbranch)) + ui.status(_('(committing will reopen the head, ' + 'use `hg heads .` to see %i other heads)\n') % + (len(otherheads))) else: - ui.status(_('all heads for branch "%s" are closed.\n') % - currentbranch) + ui.status(_('(committing will reopen branch "%s")\n') % + (currentbranch)) elif otherheads: ui.status(_('%i other heads for branch "%s"\n') % (len(otherheads), currentbranch))