Mercurial > hg
comparison hgext/largefiles/overrides.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 | 84a0102c05c7 |
children | b7808443ed6a |
comparison
equal
deleted
inserted
replaced
44449:ff72bd52d56a | 44452:9d2b2df2c2ba |
---|---|
1562 | 1562 |
1563 @eh.wrapcommand(b'rollback') | 1563 @eh.wrapcommand(b'rollback') |
1564 def overriderollback(orig, ui, repo, **opts): | 1564 def overriderollback(orig, ui, repo, **opts): |
1565 with repo.wlock(): | 1565 with repo.wlock(): |
1566 before = repo.dirstate.parents() | 1566 before = repo.dirstate.parents() |
1567 orphans = set( | 1567 orphans = { |
1568 f | 1568 f |
1569 for f in repo.dirstate | 1569 for f in repo.dirstate |
1570 if lfutil.isstandin(f) and repo.dirstate[f] != b'r' | 1570 if lfutil.isstandin(f) and repo.dirstate[f] != b'r' |
1571 ) | 1571 } |
1572 result = orig(ui, repo, **opts) | 1572 result = orig(ui, repo, **opts) |
1573 after = repo.dirstate.parents() | 1573 after = repo.dirstate.parents() |
1574 if before == after: | 1574 if before == after: |
1575 return result # no need to restore standins | 1575 return result # no need to restore standins |
1576 | 1576 |