This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1482

py3: use byteskwargs in sparse.py
ClosedPublic

Authored by indygreg on Nov 21 2017, 2:53 AM.

Details

Reviewers
pulkit
yuja
Group Reviewers
hg-reviewers
Commits
rHGd8d06a930d60: py3: use byteskwargs in sparse.py
Summary

This removes several dozen failures in Python 3.

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.Nov 21 2017, 2:53 AM
pulkit accepted this revision.Nov 21 2017, 9:19 AM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
hgext/sparse.py
140

This opts also needs similar handling but can be done in a separate patch maybe.

yuja accepted this revision.Dec 1 2017, 9:32 PM
This revision is now accepted and ready to land.Dec 1 2017, 9:32 PM
Closed by commit rHGd8d06a930d60: py3: use byteskwargs in sparse.py (authored by indygreg). · Explain WhyDec 1 2017, 10:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/sparse.py (2 lines)

Diff 4075

hgext/sparse.py

from mercurial import ( from mercurial import (
cmdutil, cmdutil,
commands, commands,
dirstate, dirstate,
error, error,
extensions, extensions,
hg, hg,
match as matchmod, match as matchmod,
pycompat,
registrar, registrar,
sparse, sparse,
util, util,
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
sparsematch = sparse.matcher(repo) sparsematch = sparse.matcher(repo)
def ctxmatch(rev): def ctxmatch(rev):
ctx = repo[rev] ctx = repo[rev]
return any(f for f in ctx.files() if sparsematch(f)) return any(f for f in ctx.files() if sparsematch(f))
revs = revs.filter(ctxmatch) revs = revs.filter(ctxmatch)
return revs return revs
extensions.wrapfunction(cmdutil, '_logrevs', _logrevs) extensions.wrapfunction(cmdutil, '_logrevs', _logrevs)
def _clonesparsecmd(orig, ui, repo, *args, **opts): def _clonesparsecmd(orig, ui, repo, *args, **opts):
pulkitUnsubmitted
Not Done

This opts also needs similar handling but can be done in a separate patch maybe.

pulkit: This opts also needs similar handling but can be done in a separate patch maybe.
include_pat = opts.get('include') include_pat = opts.get('include')
exclude_pat = opts.get('exclude') exclude_pat = opts.get('exclude')
enableprofile_pat = opts.get('enable_profile') enableprofile_pat = opts.get('enable_profile')
include = exclude = enableprofile = False include = exclude = enableprofile = False
if include_pat: if include_pat:
pat = include_pat pat = include_pat
include = True include = True
if exclude_pat: if exclude_pat:
in bulk. Like the --include, --exclude and --enable-profile switches, the in bulk. Like the --include, --exclude and --enable-profile switches, the
changes are applied immediately. changes are applied immediately.
--clear-rules removes all local include and exclude rules, while leaving --clear-rules removes all local include and exclude rules, while leaving
any enabled profiles in place. any enabled profiles in place.
Returns 0 if editing the sparse checkout succeeds. Returns 0 if editing the sparse checkout succeeds.
""" """
opts = pycompat.byteskwargs(opts)
include = opts.get('include') include = opts.get('include')
exclude = opts.get('exclude') exclude = opts.get('exclude')
force = opts.get('force') force = opts.get('force')
enableprofile = opts.get('enable_profile') enableprofile = opts.get('enable_profile')
disableprofile = opts.get('disable_profile') disableprofile = opts.get('disable_profile')
importrules = opts.get('import_rules') importrules = opts.get('import_rules')
clearrules = opts.get('clear_rules') clearrules = opts.get('clear_rules')
delete = opts.get('delete') delete = opts.get('delete')