Mercurial > public > mercurial-scm > hg

comparison mercurial/ui.py @ 36732:723e87c8c059

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: fix type of ui.configitems(ignoresub=True) result
author Yuya Nishihara <yuya@tcha.org>
date Sun, 04 Mar 2018 16:01:18 -0500
parents 8988c34bd018
children e3732c3ab92d
comparison
equal deleted inserted replaced
36731:8988c34bd018 36732:723e87c8c059
733 if ignoresub: 733 if ignoresub:
734 newitems = {} 734 newitems = {}
735 for k, v in items: 735 for k, v in items:
736 if ':' not in k: 736 if ':' not in k:
737 newitems[k] = v 737 newitems[k] = v
738 items = newitems.items() 738 items = list(newitems.iteritems())
739 if self.debugflag and not untrusted and self._reportuntrusted: 739 if self.debugflag and not untrusted and self._reportuntrusted:
740 for k, v in self._ucfg.items(section): 740 for k, v in self._ucfg.items(section):
741 if self._tcfg.get(section, k) != v: 741 if self._tcfg.get(section, k) != v:
742 self.debug("ignoring untrusted configuration option " 742 self.debug("ignoring untrusted configuration option "
743 "%s.%s = %s\n" % (section, k, v)) 743 "%s.%s = %s\n" % (section, k, v))