Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 43106:d783f945a701

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: finish porting iteritems() to pycompat and remove source transformer This commit finishes porting .iteritems() to pycompat.iteritems() for the mercurial package. The translation of .iteritems() to .items() was the last conversion performed by the source transformer. With the porting to pycompat complete, we no longer have a need for the source transformer. So the source transformer has been removed. Good riddance! The code base is now compatible with Python 2 and Python 3. For the record, as the person who introduced the source transformer, it brings me joy to delete it. It accomplished its goal to facilitate a port to Python 3 without overly burdening people on some painful low-level differences between Python 2 and 3. It is unfortunate we still have to wallpaper over many differences with the pycompat shim. But it is what it is. Differential Revision: https://phab.mercurial-scm.org/D7015
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 07 Oct 2019 00:04:04 -0400
parents eef9a2d67051
children 8ff1ecfadcd1
comparison
equal deleted inserted replaced
43105:649d3ac37a12 43106:d783f945a701
1738 branch2rev, rev2branch = self._gitbranchmap() 1738 branch2rev, rev2branch = self._gitbranchmap()
1739 if self._state[1] in rev2branch: 1739 if self._state[1] in rev2branch:
1740 for b in rev2branch[self._state[1]]: 1740 for b in rev2branch[self._state[1]]:
1741 if b.startswith(b'refs/remotes/origin/'): 1741 if b.startswith(b'refs/remotes/origin/'):
1742 return True 1742 return True
1743 for b, revision in branch2rev.iteritems(): 1743 for b, revision in pycompat.iteritems(branch2rev):
1744 if b.startswith(b'refs/remotes/origin/'): 1744 if b.startswith(b'refs/remotes/origin/'):
1745 if self._gitisancestor(self._state[1], revision): 1745 if self._gitisancestor(self._state[1], revision):
1746 return True 1746 return True
1747 # otherwise, try to push the currently checked out branch 1747 # otherwise, try to push the currently checked out branch
1748 cmd = [b'push'] 1748 cmd = [b'push']