Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 11164:e84600b0d81b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: inform the commiter when resurrecting a closed changeset
author Gilles Moris <gilles.moris@free.fr>
date Mon, 10 May 2010 08:53:06 +0200
parents acd61dc44a39
children e8915e19205a
comparison
equal deleted inserted replaced
11163:acd61dc44a39 11164:e84600b0d81b
742 pass 742 pass
743 elif (parents == (nullrev, nullrev) or 743 elif (parents == (nullrev, nullrev) or
744 len(cl.heads(cl.node(parents[0]))) > 1 and 744 len(cl.heads(cl.node(parents[0]))) > 1 and
745 (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)): 745 (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)):
746 ui.status(_('created new head\n')) 746 ui.status(_('created new head\n'))
747
748 if not opts.get('close_branch'):
749 for r in parents:
750 if repo[r].extra().get('close'):
751 ui.status(_('reopening closed branch head %d\n') % r)
747 752
748 if ui.debugflag: 753 if ui.debugflag:
749 ui.write(_('committed changeset %d:%s\n') % (rev, hex(node))) 754 ui.write(_('committed changeset %d:%s\n') % (rev, hex(node)))
750 elif ui.verbose: 755 elif ui.verbose:
751 ui.write(_('committed changeset %d:%s\n') % (rev, short(node))) 756 ui.write(_('committed changeset %d:%s\n') % (rev, short(node)))