This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2163

py3: use raw string for key in **kwargs
ClosedPublic

Authored by indygreg on Feb 11 2018, 9:35 PM.

Details

Reviewers
pulkit
durin42
Group Reviewers
hg-reviewers
Commits
rHGb587a889b97e: py3: use raw string for key in **kwargs
Summary

Otherwise Python 3 is unhappy. We only set a single key here.
So I don't think pycompat.strkwargs() is necessary.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Feb 11 2018, 9:35 PM
pulkit accepted this revision.Feb 12 2018, 2:37 AM
pulkit added a subscriber: pulkit.

This should be # skip-blame.

durin42 accepted this revision.Feb 12 2018, 9:30 PM
This revision is now accepted and ready to land.Feb 12 2018, 9:30 PM
Closed by commit rHGb587a889b97e: py3: use raw string for key in **kwargs (authored by indygreg). · Explain WhyFeb 12 2018, 9:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bundle2.py (2 lines)

Diff 5587

mercurial/bundle2.py

"bundle contains tree manifests, but local repo is " "bundle contains tree manifests, but local repo is "
"non-empty and does not use tree manifests")) "non-empty and does not use tree manifests"))
op.repo.requirements.add('treemanifest') op.repo.requirements.add('treemanifest')
op.repo._applyopenerreqs() op.repo._applyopenerreqs()
op.repo._writerequirements() op.repo._writerequirements()
extrakwargs = {} extrakwargs = {}
targetphase = inpart.params.get('targetphase') targetphase = inpart.params.get('targetphase')
if targetphase is not None: if targetphase is not None:
extrakwargs['targetphase'] = int(targetphase) extrakwargs[r'targetphase'] = int(targetphase)
ret = _processchangegroup(op, cg, tr, 'bundle2', 'bundle2', ret = _processchangegroup(op, cg, tr, 'bundle2', 'bundle2',
expectedtotal=nbchangesets, **extrakwargs) expectedtotal=nbchangesets, **extrakwargs)
if op.reply is not None: if op.reply is not None:
# This is definitely not the final form of this # This is definitely not the final form of this
# return. But one need to start somewhere. # return. But one need to start somewhere.
part = op.reply.newpart('reply:changegroup', mandatory=False) part = op.reply.newpart('reply:changegroup', mandatory=False)
part.addparam( part.addparam(
'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False) 'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False)