D4217: changegroup: invert conditional and dedent

[indygreg (Gregory Szorc)]

indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I don't like else-less blocks that are indented for no reason.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D4217

AFFECTED FILES
  mercurial/changegroup.py

CHANGE DETAILS

diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
--- a/mercurial/changegroup.py
+++ b/mercurial/changegroup.py
@@ -1282,25 +1282,27 @@
             filenodes = [n for n in linkrevnodes
                          if flr(frev(n)) not in commonrevs]
 
-            if filenodes:
-                if self._ellipses:
-                    revs = _sortnodesellipsis(filerevlog, filenodes,
-                                              cl, lookupfilelog)
-                else:
-                    revs = _sortnodesnormal(filerevlog, filenodes,
-                                            self._reorder)
+            if not filenodes:
+                continue
 
-                progress.update(i + 1, item=fname)
+            if self._ellipses:
+                revs = _sortnodesellipsis(filerevlog, filenodes,
+                                          cl, lookupfilelog)
+            else:
+                revs = _sortnodesnormal(filerevlog, filenodes,
+                                        self._reorder)
 
-                deltas = deltagroup(
-                    self._repo, revs, filerevlog, False, lookupfilelog,
-                    self._forcedeltaparentprev,
-                    ellipses=self._ellipses,
-                    clrevtolocalrev=clrevtolocalrev,
-                    fullclnodes=self._fullclnodes,
-                    precomputedellipsis=self._precomputedellipsis)
+            progress.update(i + 1, item=fname)
 
-                yield fname, deltas
+            deltas = deltagroup(
+                self._repo, revs, filerevlog, False, lookupfilelog,
+                self._forcedeltaparentprev,
+                ellipses=self._ellipses,
+                clrevtolocalrev=clrevtolocalrev,
+                fullclnodes=self._fullclnodes,
+                precomputedellipsis=self._precomputedellipsis)
+
+            yield fname, deltas
 
         progress.complete()
 



To: indygreg, #hg-reviewers
Cc: mercurial-devel