Mercurial > hg
comparison mercurial/changegroup.py @ 44452:9d2b2df2c2ba
cleanup: run pyupgrade on our source tree to clean up varying things
Built with:
hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**" - hgext/fsmonitor/pywatchman/**' | xargs pyupgrade --keep-percent-format --keep-extraneous-parens
and then blackened. pyupgrade comes from
https://github.com/asottile/pyupgrade with a patch to let me preserve
extraneous parens (which we use for marking strings that shouldn't be
translated), and lets us clean up a bunch of idioms that have cruftily
accumulated over the years.
# skip-blame no-op automated code cleanups
Differential Revision: https://phab.mercurial-scm.org/D8255
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 06 Mar 2020 13:27:41 -0500 |
parents | a0ec05d93c8e |
children | c93dd9d9f1e6 |
comparison
equal
deleted
inserted
replaced
44449:ff72bd52d56a | 44452:9d2b2df2c2ba |
---|---|
991 (self._repo.manifestlog[n].read(), lr) | 991 (self._repo.manifestlog[n].read(), lr) |
992 for (n, lr) in pycompat.iteritems(manifests) | 992 for (n, lr) in pycompat.iteritems(manifests) |
993 ] | 993 ] |
994 | 994 |
995 manifests.clear() | 995 manifests.clear() |
996 clrevs = set(cl.rev(x) for x in clnodes) | 996 clrevs = {cl.rev(x) for x in clnodes} |
997 | 997 |
998 it = self.generatefiles( | 998 it = self.generatefiles( |
999 changedfiles, | 999 changedfiles, |
1000 commonrevs, | 1000 commonrevs, |
1001 source, | 1001 source, |
1280 | 1280 |
1281 def normallinknodes(store, fname): | 1281 def normallinknodes(store, fname): |
1282 flinkrev = store.linkrev | 1282 flinkrev = store.linkrev |
1283 fnode = store.node | 1283 fnode = store.node |
1284 revs = ((r, flinkrev(r)) for r in store) | 1284 revs = ((r, flinkrev(r)) for r in store) |
1285 return dict( | 1285 return {fnode(r): cln(lr) for r, lr in revs if lr in clrevs} |
1286 (fnode(r), cln(lr)) for r, lr in revs if lr in clrevs | |
1287 ) | |
1288 | 1286 |
1289 clrevtolocalrev = {} | 1287 clrevtolocalrev = {} |
1290 | 1288 |
1291 if self._isshallow: | 1289 if self._isshallow: |
1292 # In a shallow clone, the linknodes callback needs to also include | 1290 # In a shallow clone, the linknodes callback needs to also include |