Mercurial > hg

changeset 9507:5987183d6e59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: add auto-pull for merge
author Matt Mackall <mpm@selenic.com>
date Wed, 30 Sep 2009 18:47:33 -0500
parents 49b62395e910
children e2fd9b62349b 0d3c1aa9d5de
files mercurial/subrepo.py
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Wed Sep 30 16:08:11 2009 -0400
+++ b/mercurial/subrepo.py	Wed Sep 30 18:47:33 2009 -0500
@@ -168,7 +168,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)
@@ -179,9 +179,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):