Patchwork [2,of,3,[STABLE,V2] ] subrepo: remove unnecessary else clause in hgsubrepo._get

login
register
mail settings
Submitter Angel Ezquerra
Date Jan. 22, 2014, 7:17 a.m.
Message ID <f6fea99f0271185fe272.1390375060@Angel-PC.localdomain>
Download mbox | patch
Permalink /patch/3398/
State Accepted
Commit c5aef7a6660769d989344c12299ed773b71dc7bf
Headers show

Comments

Angel Ezquerra - Jan. 22, 2014, 7:17 a.m.
# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1385255580 -3600
#      Sun Nov 24 02:13:00 2013 +0100
# Branch stable
# Node ID f6fea99f0271185fe272cc5d0366ca537f6c45b6
# Parent  dec38ad2a0cb5bf3fb55e38cdfbf1a73126589a1
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.

Patch

# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1385255580 -3600
#      Sun Nov 24 02:13:00 2013 +0100
# Branch stable
# Node ID f6fea99f0271185fe272cc5d0366ca537f6c45b6
# Parent  dec38ad2a0cb5bf3fb55e38cdfbf1a73126589a1
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.

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -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):