This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6869

py3: pass a bytestring into querydrev instead of a string that'll TypeError
ClosedPublic

Authored by Kwan on Sep 17 2019, 7:23 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6fb281f39c25: py3: pass a bytestring into querydrev instead of a string that'll TypeError
Summary

This was a regression I introduced in c19d259fd6ad. When the string gets to
the memoryview in _tokenize under py3 it'll die.

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

Kwan created this revision.Sep 17 2019, 7:23 PM

For stable

Kwan added a commit: rHG6fb281f39c25: py3: pass a bytestring into querydrev instead of a string that'll TypeError.Sep 18 2019, 12:08 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6fb281f39c25: py3: pass a bytestring into querydrev instead of a string that'll TypeError (authored by Kwan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (2 lines)
Mtests/test-phabricator.t (52 lines)

Diff 16582

hgext/phabricator.py

m = _differentialrevisiondescre.search(ctx.description()) m = _differentialrevisiondescre.search(ctx.description())
if not m or int(m.group(r'id')) != newrevid: if not m or int(m.group(r'id')) != newrevid:
tagname = b'D%d' % newrevid tagname = b'D%d' % newrevid
tags.tag(repo, tagname, ctx.node(), message=None, user=None, tags.tag(repo, tagname, ctx.node(), message=None, user=None,
date=None, local=True) date=None, local=True)
else: else:
# Nothing changed. But still set "newrevphid" so the next revision # Nothing changed. But still set "newrevphid" so the next revision
# could depend on this one and "newrevid" for the summary line. # could depend on this one and "newrevid" for the summary line.
newrevphid = querydrev(repo, str(revid))[0][b'phid'] newrevphid = querydrev(repo, b'%d' % revid)[0][b'phid']
newrevid = revid newrevid = revid
action = b'skipped' action = b'skipped'
actiondesc = ui.label( actiondesc = ui.label(
{b'created': _(b'created'), {b'created': _(b'created'),
b'skipped': _(b'skipped'), b'skipped': _(b'skipped'),
b'updated': _(b'updated')}[action], b'updated': _(b'updated')}[action],
b'phabricator.action.%s' % action) b'phabricator.action.%s' % action)

tests/test-phabricator.t

saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a7ee4bac036a-8009b5a0-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a7ee4bac036a-8009b5a0-phabsend.hg
$ echo comment2 >> comment $ echo comment2 >> comment
$ hg ci --amend $ hg ci --amend
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/81fce7de1b7d-05339e5b-amend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/81fce7de1b7d-05339e5b-amend.hg
$ hg phabsend -r . -m "Address review comments" --test-vcr "$VCR/phabsend-comment-updated.json" $ hg phabsend -r . -m "Address review comments" --test-vcr "$VCR/phabsend-comment-updated.json"
D1253 - updated - 1acd4b60af38: create comment for phabricator test D1253 - updated - 1acd4b60af38: create comment for phabricator test
Phabsending a skipped commit: Phabsending a skipped commit:
#if no-py3
$ hg phabsend --no-amend -r . --test-vcr "$VCR/phabsend-skipped.json" $ hg phabsend --no-amend -r . --test-vcr "$VCR/phabsend-skipped.json"
D1253 - skipped - 1acd4b60af38: create comment for phabricator test D1253 - skipped - 1acd4b60af38: create comment for phabricator test
#endif
BROKEN: shouldn't error under py3
#if py3
$ hg phabsend --no-amend -r . --test-vcr "$VCR/phabsend-skipped.json"
** unknown exception encountered, please report by visiting
** https://mercurial-scm.org/wiki/BugTracker
** Python 3* (glob)
** Mercurial Distributed SCM (version *) (glob)
** Extensions loaded: phabricator
Traceback (most recent call last):
File "*/install/bin/hg", line *, in <module> (glob)
dispatch.run()
File "*/install/lib/python/mercurial/dispatch.py", line *, in run (glob)
status = dispatch(req)
File "*/install/lib/python/mercurial/dispatch.py", line *, in dispatch (glob)
ret = _runcatch(req) or 0
File "*/install/lib/python/mercurial/dispatch.py", line *, in _runcatch (glob)
return _callcatch(ui, _runcatchfunc)
File "*/install/lib/python/mercurial/dispatch.py", line *, in _callcatch (glob)
return scmutil.callcatch(ui, func)
File "*/install/lib/python/mercurial/scmutil.py", line *, in callcatch (glob)
return func()
File "*/install/lib/python/mercurial/dispatch.py", line *, in _runcatchfunc (glob)
return _dispatch(req)
File "*/install/lib/python/mercurial/dispatch.py", line *, in _dispatch (glob)
cmdpats, cmdoptions)
File "*/install/lib/python/mercurial/dispatch.py", line *, in runcommand (glob)
ret = _runcommand(ui, options, cmd, d)
File "*/install/lib/python/mercurial/dispatch.py", line *, in _runcommand (glob)
return cmdfunc()
File "*/install/lib/python/mercurial/dispatch.py", line *, in <lambda> (glob)
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "*/install/lib/python/mercurial/util.py", line *, in check (glob)
return func(*args, **kwargs)
File "*/install/lib/python/hgext/phabricator.py", line *, in inner (glob)
return fn(*args, **kwargs)
File "*/install/lib/python/hgext/phabricator.py", line *, in phabsend (glob)
newrevphid = querydrev(repo, str(revid))[0][b'phid']
File "*/install/lib/python/hgext/phabricator.py", line *, in querydrev (glob)
tree = _parse(spec)
File "*/install/lib/python/hgext/phabricator.py", line *, in _parse (glob)
tree, pos = parser.parser(_elements).parse(_tokenize(text))
File "*/install/lib/python/mercurial/parser.py", line *, in parse (glob)
self._advance()
File "*/install/lib/python/mercurial/parser.py", line *, in _advance (glob)
self.current = next(self._iter, None)
File "*/install/lib/python/hgext/phabricator.py", line *, in _tokenize (glob)
view = memoryview(text) # zero-copy slice
TypeError: memoryview: a bytes-like object is required, not 'str'
[1]
#endif
Phabreading a DREV with a local:commits time as a string: Phabreading a DREV with a local:commits time as a string:
$ hg phabread --test-vcr "$VCR/phabread-str-time.json" D1285 $ hg phabread --test-vcr "$VCR/phabread-str-time.json" D1285
# HG changeset patch # HG changeset patch
# User test <test> # User test <test>
# Date 1562019844 0 # Date 1562019844 0
# Branch default # Branch default
# Node ID da5c8c6bf23a36b6e3af011bc3734460692c23ce # Node ID da5c8c6bf23a36b6e3af011bc3734460692c23ce