Mercurial > public > mercurial-scm > hg

diff mercurial/subrepo.py @ 9508:e2fd9b62349b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Wed, 30 Sep 2009 21:42:51 -0500
parents 3f650f6aa130 5987183d6e59
children a22cdd5e56b7
line wrap: on
line diff
--- a/mercurial/subrepo.py	Thu Oct 01 00:00:18 2009 +0200
+++ b/mercurial/subrepo.py	Wed Sep 30 21:42:51 2009 -0500
@@ -167,7 +167,7 @@
         self._repo.ui.note(_('removing subrepo %s\n') % self._path)
         hg.clean(self._repo, node.nullid, False)
 
-    def get(self, state):
+    def _get(self, state):
         source, revision = state
         try:
             self._repo.lookup(revision)
@@ -178,9 +178,13 @@
             other = hg.repository(self._repo.ui, srcurl)
             self._repo.pull(other)
 
+    def get(self, state):
+        self._get(state)
+        source, revision = state
         hg.clean(self._repo, revision, False)
 
     def merge(self, state):
+        self._get(state)
         hg.merge(self._repo, state[1], remind=False)
 
     def push(self, force):