##// END OF EJS Templates
subrepo: add auto-pull for merge
Matt Mackall -
r9507:5987183d default
parent child Browse files
Show More
@@ -168,7 +168,7 b' class hgsubrepo(object):'
168 self._repo.ui.note(_('removing subrepo %s\n') % self._path)
168 self._repo.ui.note(_('removing subrepo %s\n') % self._path)
169 hg.clean(self._repo, node.nullid, False)
169 hg.clean(self._repo, node.nullid, False)
170
170
171 def get(self, state):
171 def _get(self, state):
172 source, revision = state
172 source, revision = state
173 try:
173 try:
174 self._repo.lookup(revision)
174 self._repo.lookup(revision)
@@ -179,9 +179,13 b' class hgsubrepo(object):'
179 other = hg.repository(self._repo.ui, srcurl)
179 other = hg.repository(self._repo.ui, srcurl)
180 self._repo.pull(other)
180 self._repo.pull(other)
181
181
182 def get(self, state):
183 self._get(state)
184 source, revision = state
182 hg.clean(self._repo, revision, False)
185 hg.clean(self._repo, revision, False)
183
186
184 def merge(self, state):
187 def merge(self, state):
188 self._get(state)
185 hg.merge(self._repo, state[1], remind=False)
189 hg.merge(self._repo, state[1], remind=False)
186
190
187 def push(self, force):
191 def push(self, force):
General Comments 0
You need to be logged in to leave comments. Login now