Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 33312:b5612dbe72a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
summary: don't reimplment mergestate.unresolved()
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2015 09:37:12 -0800
parents a5e1393f61a2
children 4a70985805c6
comparison
equal deleted inserted replaced
33311:f8f716da90fa 33312:b5612dbe72a3
4774 s = ' '.join(e.recordtypes) 4774 s = ' '.join(e.recordtypes)
4775 ui.warn( 4775 ui.warn(
4776 _('warning: merge state has unsupported record types: %s\n') % s) 4776 _('warning: merge state has unsupported record types: %s\n') % s)
4777 unresolved = 0 4777 unresolved = 0
4778 else: 4778 else:
4779 unresolved = [f for f in ms if ms[f] == 'u'] 4779 unresolved = list(ms.unresolved())
4780 4780
4781 for p in parents: 4781 for p in parents:
4782 # label with log.changeset (instead of log.parent) since this 4782 # label with log.changeset (instead of log.parent) since this
4783 # shows a working directory parent *changeset*: 4783 # shows a working directory parent *changeset*:
4784 # i18n: column positioning for "hg summary" 4784 # i18n: column positioning for "hg summary"