# HG changeset patch
# User Eric Eisner <ede@mit.edu>
# Date 1298476776 18000
# Node ID f2295f7cd468f56e4ae43a3dad50c59fe4f42dfe
# Parent  fa88fabc1d66611a23417f7477787c71799614d0
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.

diff -r fa88fabc1d66 -r f2295f7cd468 mercurial/subrepo.py
--- 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))