# HG changeset patch # User Boris Feld # Date 2018-09-27 20:54:37 # Node ID 1c3f1491965fbd124fa288983ee926cc6b42c776 # Parent d9ba836fc2346c7224be43355694bce97ec13054 scmutil: expand long "one-liner" When a one-liner gets 3 lines longs, it loses its expressivity benefits. We expand it into a simple for loop. This makes future changes of the code in that area clearer. diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py --- a/mercurial/scmutil.py +++ b/mercurial/scmutil.py @@ -968,9 +968,11 @@ def cleanupnodes(repo, replacements, ope isobs = unfi.obsstore.successors.__contains__ torev = unfi.changelog.rev sortfunc = lambda ns: torev(ns[0]) - rels = [(unfi[n], tuple(unfi[m] for m in s)) - for n, s in sorted(replacements.items(), key=sortfunc) - if s or not isobs(n)] + rels = [] + for n, s in sorted(replacements.items(), key=sortfunc): + if s or not isobs(n): + rel = (unfi[n], tuple(unfi[m] for m in s)) + rels.append(rel) if rels: obsolete.createmarkers(repo, rels, operation=operation, metadata=metadata)