D4197: changegroup: invert conditional and dedent
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Thu Aug 9 18:52:32 UTC 2018
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
I don't like seeing code that visually resembles the pyramid of
doom.
REPOSITORY
rHG Mercurial
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
More information about the Mercurial-devel
mailing list