Show More
@@ -713,7 +713,12 b' class gitsubrepo(object):' | |||||
713 | if self._githavelocally(revision): |
|
713 | if self._githavelocally(revision): | |
714 | return |
|
714 | return | |
715 | self._ui.status(_('pulling subrepo %s\n') % self._relpath) |
|
715 | self._ui.status(_('pulling subrepo %s\n') % self._relpath) | |
716 | self._gitcommand(['fetch', '--all', '-q']) |
|
716 | # first try from origin | |
|
717 | self._gitcommand(['fetch']) | |||
|
718 | if self._githavelocally(revision): | |||
|
719 | return | |||
|
720 | # then try from known subrepo source | |||
|
721 | self._gitcommand(['fetch', source]) | |||
717 | if not self._githavelocally(revision): |
|
722 | if not self._githavelocally(revision): | |
718 | raise util.Abort(_("revision %s does not exist in subrepo %s\n") % |
|
723 | raise util.Abort(_("revision %s does not exist in subrepo %s\n") % | |
719 | (revision, self._path)) |
|
724 | (revision, self._path)) | |
@@ -833,7 +838,7 b' class gitsubrepo(object):' | |||||
833 | return False |
|
838 | return False | |
834 | self._ui.status(_('pushing branch %s of subrepo %s\n') % |
|
839 | self._ui.status(_('pushing branch %s of subrepo %s\n') % | |
835 | (current, self._relpath)) |
|
840 | (current, self._relpath)) | |
836 |
self._gitcommand(cmd + ['origin', current |
|
841 | self._gitcommand(cmd + ['origin', current]) | |
837 | return True |
|
842 | return True | |
838 | else: |
|
843 | else: | |
839 | self._ui.warn(_('no branch checked out in subrepo %s\n' |
|
844 | self._ui.warn(_('no branch checked out in subrepo %s\n' |
General Comments 0
You need to be logged in to leave comments.
Login now