This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4677

py3: encode the name to bytes before using in revsetpredicate()
ClosedPublic

Authored by pulkit on Sep 20 2018, 11:50 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG65b39c556c6d: py3: encode the name to bytes before using in revsetpredicate()
Summary

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

pulkit created this revision.Sep 20 2018, 11:50 AM
indygreg added a subscriber: indygreg.Sep 20 2018, 3:41 PM
indygreg added inline comments.
tests/test-extension.t
108

name will already be bytes on Python 2. But, .encode() will still work because Python 2 has an encode() on bytes. So I think this is fine. If this weren't test code, I would have a different opinion.

Closed by commit rHG65b39c556c6d: py3: encode the name to bytes before using in revsetpredicate() (authored by pulkit). · Explain WhySep 20 2018, 3:42 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-extension.t (3 lines)

Diff 11233

tests/test-extension.t

> print("1) %s imported" % name) > print("1) %s imported" % name)
> def uisetup(ui): > def uisetup(ui):
> print("2) %s uisetup" % name) > print("2) %s uisetup" % name)
> def extsetup(): > def extsetup():
> print("3) %s extsetup" % name) > print("3) %s extsetup" % name)
> def reposetup(ui, repo): > def reposetup(ui, repo):
> print("4) %s reposetup" % name) > print("4) %s reposetup" % name)
> >
> bytesname = name.encode('utf-8')
indygregUnsubmitted
Not Done

name will already be bytes on Python 2. But, .encode() will still work because Python 2 has an encode() on bytes. So I think this is fine. If this weren't test code, I would have a different opinion.

indygreg: `name` will already be bytes on Python 2. But, `.encode()` will still work because Python 2 has…
> # custom predicate to check registration of functions at loading > # custom predicate to check registration of functions at loading
> from mercurial import ( > from mercurial import (
> registrar, > registrar,
> smartset, > smartset,
> ) > )
> revsetpredicate = registrar.revsetpredicate() > revsetpredicate = registrar.revsetpredicate()
> @revsetpredicate(name, safe=True) # safe=True for query via hgweb > @revsetpredicate(bytesname, safe=True) # safe=True for query via hgweb
> def custompredicate(repo, subset, x): > def custompredicate(repo, subset, x):
> return smartset.baseset([r for r in subset if r in {0}]) > return smartset.baseset([r for r in subset if r in {0}])
> EOF > EOF
$ cp foo.py bar.py $ cp foo.py bar.py
$ echo 'foo = foo.py' >> $HGRCPATH $ echo 'foo = foo.py' >> $HGRCPATH
$ echo 'bar = bar.py' >> $HGRCPATH $ echo 'bar = bar.py' >> $HGRCPATH