subrepo: remove unnecessary else clause in hgsubrepo._get
This revision has no behaviour change. It simply removes an unnecessary else
that follows an if / return block. The change looks big because a big chunk of
code has been unindented one level.
--- a/mercurial/subrepo.py Sun Nov 24 02:10:14 2013 +0100
+++ b/mercurial/subrepo.py Sun Nov 24 02:13:00 2013 +0100
@@ -703,32 +703,31 @@
source, revision, kind = state
if revision in self._repo.unfiltered():
return
+ self._repo._subsource = source
+ srcurl = _abssource(self._repo)
+ other = hg.peer(self._repo, {}, srcurl)
+ if len(self._repo) == 0:
+ self._repo.ui.status(_('cloning subrepo %s from %s\n')
+ % (subrelpath(self), srcurl))
+ parentrepo = self._repo._subparent
+ shutil.rmtree(self._repo.path)
+ other, cloned = hg.clone(self._repo._subparent.baseui, {},
+ other, self._repo.root,
+ update=False)
+ self._repo = cloned.local()
+ self._initrepo(parentrepo, source, create=True)
+ self._cachestorehash(srcurl)
else:
- self._repo._subsource = source
- srcurl = _abssource(self._repo)
- other = hg.peer(self._repo, {}, srcurl)
- if len(self._repo) == 0:
- self._repo.ui.status(_('cloning subrepo %s from %s\n')
- % (subrelpath(self), srcurl))
- parentrepo = self._repo._subparent
- shutil.rmtree(self._repo.path)
- other, cloned = hg.clone(self._repo._subparent.baseui, {},
- other, self._repo.root,
- update=False)
- self._repo = cloned.local()
- self._initrepo(parentrepo, source, create=True)
+ self._repo.ui.status(_('pulling subrepo %s from %s\n')
+ % (subrelpath(self), srcurl))
+ cleansub = self.storeclean(srcurl)
+ remotebookmarks = other.listkeys('bookmarks')
+ self._repo.pull(other)
+ bookmarks.updatefromremote(self._repo.ui, self._repo,
+ remotebookmarks, srcurl)
+ if cleansub:
+ # keep the repo clean after pull
self._cachestorehash(srcurl)
- else:
- self._repo.ui.status(_('pulling subrepo %s from %s\n')
- % (subrelpath(self), srcurl))
- cleansub = self.storeclean(srcurl)
- remotebookmarks = other.listkeys('bookmarks')
- self._repo.pull(other)
- bookmarks.updatefromremote(self._repo.ui, self._repo,
- remotebookmarks, srcurl)
- if cleansub:
- # keep the repo clean after pull
- self._cachestorehash(srcurl)
@annotatesubrepoerror
def get(self, state, overwrite=False):