mercurial/subrepo.py
changeset 43106 d783f945a701
parent 43085 eef9a2d67051
child 43117 8ff1ecfadcd1
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']