mercurial/subrepo.py
changeset 48913 f254fc73d956
parent 48875 6000f5b25c9b
child 48946 642e31cb55f0
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']