Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 48913:f254fc73d956

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
global: bulk replace simple pycompat.iteritems(x) with x.items() pycompat.iteritems() just calls .items(). This commit applies a regular expression search and replace to convert simple instances of pycompat.iteritems() with .items(). There are still a handful of calls to pycompat.iteritems() remaining. But these all have more complicated expressions that I wasn't comfortable performing an automated replace on. In addition, some simple replacements were withheld because they broke pytype. These will be handled by their own changesets. Differential Revision: https://phab.mercurial-scm.org/D12318
author Gregory Szorc <gregory.szorc@gmail.com>
date Thu, 03 Mar 2022 18:28:30 -0800
parents 6000f5b25c9b
children 642e31cb55f0
comparison
equal deleted inserted replaced
48912:a0674e916fb6 48913:f254fc73d956
1768 branch2rev, rev2branch = self._gitbranchmap() 1768 branch2rev, rev2branch = self._gitbranchmap()
1769 if self._state[1] in rev2branch: 1769 if self._state[1] in rev2branch:
1770 for b in rev2branch[self._state[1]]: 1770 for b in rev2branch[self._state[1]]:
1771 if b.startswith(b'refs/remotes/origin/'): 1771 if b.startswith(b'refs/remotes/origin/'):
1772 return True 1772 return True
1773 for b, revision in pycompat.iteritems(branch2rev): 1773 for b, revision in branch2rev.items():
1774 if b.startswith(b'refs/remotes/origin/'): 1774 if b.startswith(b'refs/remotes/origin/'):
1775 if self._gitisancestor(self._state[1], revision): 1775 if self._gitisancestor(self._state[1], revision):
1776 return True 1776 return True
1777 # otherwise, try to push the currently checked out branch 1777 # otherwise, try to push the currently checked out branch
1778 cmd = [b'push'] 1778 cmd = [b'push']