( )⚙ D11665 formatting: format with newer black version

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11665

formatting: format with newer black version
AbandonedPublic

Authored by martinvonz on Oct 14 2021, 4:11 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Summary

My black was upgraded from 20.8b1-4 to 21.4b2-3 today, which made
test-check-format.t fail. I don't know if we have specified a
particular version we're supposed to use. I also haven't tried to
downgrade black to see if the old version will complain about the new
format.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Oct 14 2021, 4:11 PM
pulkit accepted this revision.Oct 15 2021, 8:41 AM
This revision is now accepted and ready to land.Oct 15 2021, 8:41 AM
pulkit added inline comments.Oct 15 2021, 9:08 AM
mercurial/localrepo.py
363

Hmm, I see it is reported as Invalid Syntax on Python 2.

martinvonz abandoned this revision.Oct 15 2021, 10:38 AM
martinvonz added inline comments.
mercurial/localrepo.py
363

Hmm, I see it is reported as Invalid Syntax on Python 2.

I guess they made the not-so-radical decision to drop support for Python 2. I'll drop this patch then I'll just add the failure to my mental list of test failures to ignore. It sounds like we're pretty close to dropping support for Python 2 now anyway.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (12 lines)

Diff 30810

mercurial/localrepo.py

def getbundle( def getbundle(
self, self,
source, source,
heads=None, heads=None,
common=None, common=None,
bundlecaps=None, bundlecaps=None,
remote_sidedata=None, remote_sidedata=None,
**kwargs **kwargs,
pulkitUnsubmitted
Not Done

Hmm, I see it is reported as Invalid Syntax on Python 2.

pulkit: Hmm, I see it is reported as `Invalid Syntax` on Python 2.
martinvonzAuthorUnsubmitted
Done

Hmm, I see it is reported as Invalid Syntax on Python 2.

I guess they made the not-so-radical decision to drop support for Python 2. I'll drop this patch then I'll just add the failure to my mental list of test failures to ignore. It sounds like we're pretty close to dropping support for Python 2 now anyway.

martinvonz: > Hmm, I see it is reported as Invalid Syntax on Python 2. I guess they made the not-so…
): ):
chunks = exchange.getbundlechunks( chunks = exchange.getbundlechunks(
self._repo, self._repo,
source, source,
heads=heads, heads=heads,
common=common, common=common,
bundlecaps=bundlecaps, bundlecaps=bundlecaps,
remote_sidedata=remote_sidedata, remote_sidedata=remote_sidedata,
**kwargs **kwargs,
)[1] )[1]
cb = util.chunkbuffer(chunks) cb = util.chunkbuffer(chunks)
if exchange.bundle2requested(bundlecaps): if exchange.bundle2requested(bundlecaps):
# When requesting a bundle2, getbundle returns a stream to make the # When requesting a bundle2, getbundle returns a stream to make the
# wire level function happier. We need to build a proper object # wire level function happier. We need to build a proper object
# from it in local peer. # from it in local peer.
return bundle2.getunbundler(self.ui, cb) return bundle2.getunbundler(self.ui, cb)
for name, (old, new) in sorted( for name, (old, new) in sorted(
tr.changes[b'bookmarks'].items() tr.changes[b'bookmarks'].items()
): ):
args = tr.hookargs.copy() args = tr.hookargs.copy()
args.update(bookmarks.preparehookargs(name, old, new)) args.update(bookmarks.preparehookargs(name, old, new))
repo.hook( repo.hook(
b'pretxnclose-bookmark', b'pretxnclose-bookmark',
throw=True, throw=True,
**pycompat.strkwargs(args) **pycompat.strkwargs(args),
) )
if hook.hashook(repo.ui, b'pretxnclose-phase'): if hook.hashook(repo.ui, b'pretxnclose-phase'):
cl = repo.unfiltered().changelog cl = repo.unfiltered().changelog
for revs, (old, new) in tr.changes[b'phases']: for revs, (old, new) in tr.changes[b'phases']:
for rev in revs: for rev in revs:
args = tr.hookargs.copy() args = tr.hookargs.copy()
node = hex(cl.node(rev)) node = hex(cl.node(rev))
args.update(phases.preparehookargs(node, old, new)) args.update(phases.preparehookargs(node, old, new))
repo.hook( repo.hook(
b'pretxnclose-phase', b'pretxnclose-phase',
throw=True, throw=True,
**pycompat.strkwargs(args) **pycompat.strkwargs(args),
) )
repo.hook( repo.hook(
b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs) b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs)
) )
def releasefn(tr, success): def releasefn(tr, success):
repo = reporef() repo = reporef()
if hook.hashook(repo.ui, b'txnclose-bookmark'): if hook.hashook(repo.ui, b'txnclose-bookmark'):
bmchanges = sorted(tr.changes[b'bookmarks'].items()) bmchanges = sorted(tr.changes[b'bookmarks'].items())
for name, (old, new) in bmchanges: for name, (old, new) in bmchanges:
args = tr.hookargs.copy() args = tr.hookargs.copy()
args.update(bookmarks.preparehookargs(name, old, new)) args.update(bookmarks.preparehookargs(name, old, new))
repo.hook( repo.hook(
b'txnclose-bookmark', b'txnclose-bookmark',
throw=False, throw=False,
**pycompat.strkwargs(args) **pycompat.strkwargs(args),
) )
if hook.hashook(repo.ui, b'txnclose-phase'): if hook.hashook(repo.ui, b'txnclose-phase'):
cl = repo.unfiltered().changelog cl = repo.unfiltered().changelog
phasemv = sorted( phasemv = sorted(
tr.changes[b'phases'], key=lambda r: r[0][0] tr.changes[b'phases'], key=lambda r: r[0][0]
) )
for revs, (old, new) in phasemv: for revs, (old, new) in phasemv:
for rev in revs: for rev in revs:
args = tr.hookargs.copy() args = tr.hookargs.copy()
node = hex(cl.node(rev)) node = hex(cl.node(rev))
args.update(phases.preparehookargs(node, old, new)) args.update(phases.preparehookargs(node, old, new))
repo.hook( repo.hook(
b'txnclose-phase', b'txnclose-phase',
throw=False, throw=False,
**pycompat.strkwargs(args) **pycompat.strkwargs(args),
) )
repo.hook( repo.hook(
b'txnclose', throw=False, **pycompat.strkwargs(hookargs) b'txnclose', throw=False, **pycompat.strkwargs(hookargs)
) )
repo = reporef() repo = reporef()
assert repo is not None # help pytype assert repo is not None # help pytype