This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd56a6b78de3b: changegroup: invert conditional and dedent 
(authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4197?vs=10164&id=10186

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

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
@@ -1048,20 +1048,24 @@
             dir, nodes = tmfnodes.popitem()
             store = dirlog(dir)
             prunednodes = self._prune(store, nodes, commonrevs)
-            if not dir or prunednodes:
-                lookupfn = makelookupmflinknode(dir, nodes)
+
+            if dir and not prunednodes:
+                continue
+
+            lookupfn = makelookupmflinknode(dir, nodes)
 
-                if self._ellipses:
-                    revs = _sortnodesellipsis(store, prunednodes, cl,
-                                              lookupfn)
-                else:
-                    revs = _sortnodesnormal(store, prunednodes,
-                                            self._reorder)
+            if self._ellipses:
+                revs = _sortnodesellipsis(store, prunednodes, cl,
+                                          lookupfn)
+            else:
+                revs = _sortnodesnormal(store, prunednodes,
+                                        self._reorder)
 
-                for x in self._packmanifests(dir, store, revs, lookupfn,
-                                             clrevtolocalrev):
-                    size += len(x)
-                    yield x
+            for x in self._packmanifests(dir, store, revs, lookupfn,
+                                         clrevtolocalrev):
+                size += len(x)
+                yield x
+
         self._verbosenote(_('%8.i (manifests)\n') % size)
         yield self._manifestsend
 



To: indygreg, #hg-reviewers
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to