Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 33413:a339027902c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
summary: fix type of empty unresolved list It was okay because tested as a boolean prior to calling len(), but looked incorrect.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 07 Jul 2017 23:13:04 +0900
parents 4a70985805c6
children 0407a51b9d8c
comparison
equal deleted inserted replaced
33412:a42369e04aee 33413:a339027902c4
4771 ms = mergemod.mergestate.read(repo) 4771 ms = mergemod.mergestate.read(repo)
4772 except error.UnsupportedMergeRecords as e: 4772 except error.UnsupportedMergeRecords as e:
4773 s = ' '.join(e.recordtypes) 4773 s = ' '.join(e.recordtypes)
4774 ui.warn( 4774 ui.warn(
4775 _('warning: merge state has unsupported record types: %s\n') % s) 4775 _('warning: merge state has unsupported record types: %s\n') % s)
4776 unresolved = 0 4776 unresolved = []
4777 else: 4777 else:
4778 unresolved = list(ms.unresolved()) 4778 unresolved = list(ms.unresolved())
4779 4779
4780 for p in parents: 4780 for p in parents:
4781 # label with log.changeset (instead of log.parent) since this 4781 # label with log.changeset (instead of log.parent) since this