Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 22305:bdc0e04df243

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 27 Aug 2014 18:35:34 +0200
parents 650b5b6e75ed 0c838e7459a5
children 45e02cfad4bd
comparison
equal deleted inserted replaced
22304:5678b0e3608f 22305:bdc0e04df243
649 if p1 != parents[0]: 649 if p1 != parents[0]:
650 p1 = parents[0] 650 p1 = parents[0]
651 p2 = repo[nullid] 651 p2 = repo[nullid]
652 except error.RepoError: 652 except error.RepoError:
653 p1, p2 = parents 653 p1, p2 = parents
654 if p2.node() == nullid:
655 ui.warn(_("warning: import the patch as a normal revision\n"
656 "(use --exact to import the patch as a merge)\n"))
654 else: 657 else:
655 p1, p2 = parents 658 p1, p2 = parents
656 659
657 n = None 660 n = None
658 if update: 661 if update:
909 if self.ui.debugflag and ctx.phase(): 912 if self.ui.debugflag and ctx.phase():
910 # i18n: column positioning for "hg log" 913 # i18n: column positioning for "hg log"
911 self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), 914 self.ui.write(_("phase: %s\n") % _(ctx.phasestr()),
912 label='log.phase') 915 label='log.phase')
913 for parent in parents: 916 for parent in parents:
917 label = 'log.parent changeset.%s' % self.repo[parent[0]].phasestr()
914 # i18n: column positioning for "hg log" 918 # i18n: column positioning for "hg log"
915 self.ui.write(_("parent: %d:%s\n") % parent, 919 self.ui.write(_("parent: %d:%s\n") % parent,
916 label='log.parent changeset.%s' % ctx.phasestr()) 920 label=label)
917 921
918 if self.ui.debugflag: 922 if self.ui.debugflag:
919 mnode = ctx.manifestnode() 923 mnode = ctx.manifestnode()
920 # i18n: column positioning for "hg log" 924 # i18n: column positioning for "hg log"
921 self.ui.write(_("manifest: %d:%s\n") % 925 self.ui.write(_("manifest: %d:%s\n") %