Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: only attempt pulling from git's origin stable
authorEric Eisner <ede@mit.edu>
Wed, 23 Feb 2011 10:59:36 -0500
branchstable
changeset 13466 f2295f7cd468
parent 13465 fa88fabc1d66
child 13467 31aa2e5b0750
subrepo: only attempt pulling from git's origin git fetch does not accept repository URLs as arguments, and the intended logic of this code was not actually doing anything.
mercurial/subrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/subrepo.py	Wed Feb 23 10:17:44 2011 -0500
+++ b/mercurial/subrepo.py	Wed Feb 23 10:59:36 2011 -0500
@@ -764,12 +764,8 @@
         if self._githavelocally(revision):
             return
         self._ui.status(_('pulling subrepo %s\n') % self._relpath)
-        # first try from origin
+        # try only origin: the originally cloned repo
         self._gitcommand(['fetch'])
-        if self._githavelocally(revision):
-            return
-        # then try from known subrepo source
-        self._gitcommand(['fetch', self._abssource(source)])
         if not self._githavelocally(revision):
             raise util.Abort(_("revision %s does not exist in subrepo %s\n") %
                                (revision, self._relpath))
Mercurial