This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2367

narrowcommands: add some missing strkwargs calls for py3
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG5dbeddbf164a: narrowcommands: add some missing strkwargs calls for py3
Summary
  1. skip-blame because it's just r prefixes

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Feb 21 2018, 12:42 PM
pulkit added a subscriber: pulkit.Feb 21 2018, 12:56 PM
pulkit added inline comments.
hgext/narrow/narrowcommands.py
145

What about adding r'' prefixes to prevent the the function calls which iterate over all the keys and encode/decode them?

indygreg requested changes to this revision.Feb 21 2018, 10:12 PM
indygreg added a subscriber: indygreg.

Let's do what @pulkit said.

This revision now requires changes to proceed.Feb 21 2018, 10:12 PM
durin42 edited the summary of this revision. (Show Details)Feb 21 2018, 10:24 PM
durin42 updated this revision to Diff 5980.
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 rHG5dbeddbf164a: narrowcommands: add some missing strkwargs calls for py3 (authored by durin42). · Explain WhyFeb 21 2018, 10:52 PM
This revision was automatically updated to reflect the committed changes.
pulkit added a comment.Feb 22 2018, 9:48 AM

This one got pushed with a wrong commit message.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowcommands.py (8 lines)

Diff 5980

hgext/narrow/narrowcommands.py

with wrappedextraprepare: with wrappedextraprepare:
return orig(ui, repo, *args, **opts) return orig(ui, repo, *args, **opts)
def archivenarrowcmd(orig, ui, repo, *args, **opts): def archivenarrowcmd(orig, ui, repo, *args, **opts):
"""Wraps archive command to narrow the default includes.""" """Wraps archive command to narrow the default includes."""
if narrowrepo.REQUIREMENT in repo.requirements: if narrowrepo.REQUIREMENT in repo.requirements:
repo_includes, repo_excludes = repo.narrowpats repo_includes, repo_excludes = repo.narrowpats
includes = set(opts.get('include', [])) includes = set(opts.get(r'include', []))
excludes = set(opts.get('exclude', [])) excludes = set(opts.get(r'exclude', []))
includes, excludes, unused_invalid = narrowspec.restrictpatterns( includes, excludes, unused_invalid = narrowspec.restrictpatterns(
includes, excludes, repo_includes, repo_excludes) includes, excludes, repo_includes, repo_excludes)
if includes: if includes:
opts['include'] = includes opts[r'include'] = includes
if excludes: if excludes:
opts['exclude'] = excludes opts[r'exclude'] = excludes
return orig(ui, repo, *args, **opts) return orig(ui, repo, *args, **opts)
pulkitUnsubmitted
Not Done

What about adding r'' prefixes to prevent the the function calls which iterate over all the keys and encode/decode them?

pulkit: What about adding r'' prefixes to prevent the the function calls which iterate over all the…
def pullbundle2extraprepare(orig, pullop, kwargs): def pullbundle2extraprepare(orig, pullop, kwargs):
repo = pullop.repo repo = pullop.repo
if narrowrepo.REQUIREMENT not in repo.requirements: if narrowrepo.REQUIREMENT not in repo.requirements:
return orig(pullop, kwargs) return orig(pullop, kwargs)
if narrowbundle2.NARROWCAP not in pullop.remotebundle2caps: if narrowbundle2.NARROWCAP not in pullop.remotebundle2caps:
raise error.Abort(_("server doesn't support narrow clones")) raise error.Abort(_("server doesn't support narrow clones"))