This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2366

narrowwirepeer: add some strkwargs to fix a crash on py3
ClosedPublic

Authored by durin42 on Feb 21 2018, 12:41 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG87e950a070e6: narrowwirepeer: add some strkwargs to fix a crash on py3
Summary
  1. skip-blame because it's just some r prefixes

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

durin42 created this revision.Feb 21 2018, 12:41 PM
pulkit added a subscriber: pulkit.Feb 21 2018, 12:54 PM
pulkit added inline comments.
hgext/narrow/narrowwirepeer.py
50

I think better would be to add r'' prefixes as in above two lines as that will save a call to strkwargs.

indygreg requested changes to this revision.Feb 21 2018, 10:08 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
hgext/narrow/narrowwirepeer.py
50

I agree.

This revision now requires changes to proceed.Feb 21 2018, 10:08 PM
durin42 marked 2 inline comments as done.Feb 21 2018, 10:24 PM
durin42 edited the summary of this revision. (Show Details)
durin42 updated this revision to Diff 5979.
indygreg accepted this revision.Feb 21 2018, 10:51 PM
This revision is now accepted and ready to land.Feb 21 2018, 10:51 PM
Closed by commit rHG87e950a070e6: narrowwirepeer: add some strkwargs to fix a crash on py3 (authored by durin42). · Explain WhyFeb 21 2018, 10:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowwirepeer.py (4 lines)

Diff 5982

hgext/narrow/narrowwirepeer.py

def reposetup(repo): def reposetup(repo):
def wirereposetup(ui, peer): def wirereposetup(ui, peer):
def wrapped(orig, cmd, *args, **kwargs): def wrapped(orig, cmd, *args, **kwargs):
if cmd == 'unbundle': if cmd == 'unbundle':
# TODO: don't blindly add include/exclude wireproto # TODO: don't blindly add include/exclude wireproto
# arguments to unbundle. # arguments to unbundle.
include, exclude = repo.narrowpats include, exclude = repo.narrowpats
kwargs["includepats"] = ','.join(include) kwargs[r"includepats"] = ','.join(include)
kwargs["excludepats"] = ','.join(exclude) kwargs[r"excludepats"] = ','.join(exclude)
return orig(cmd, *args, **kwargs) return orig(cmd, *args, **kwargs)
pulkitUnsubmitted
Done

I think better would be to add r'' prefixes as in above two lines as that will save a call to strkwargs.

pulkit: I think better would be to add r'' prefixes as in above two lines as that will save a call to…
indygregUnsubmitted
Done

I agree.

indygreg: I agree.
extensions.wrapfunction(peer, '_calltwowaystream', wrapped) extensions.wrapfunction(peer, '_calltwowaystream', wrapped)
hg.wirepeersetupfuncs.append(wirereposetup) hg.wirepeersetupfuncs.append(wirereposetup)