This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6650

phabricator: handle local:commits time being string or int
ClosedPublic

Authored by Kwan on Jul 16 2019, 2:23 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc17e6a3e7356: phabricator: handle local:commits time being string or int
rHGc9be100eb7b6: phabricator: handle local:commits time being string or int
Summary

When setting local:commits arcanist has different behaviour depending on
whether the repo is git or hg. With hg it sets the time as a number, since it
calls PHP's strtotime on the value, but with git it sets it as a string.
Normally this wouldn't be an issue since phabread wouldn't be interacting with
Phabricator Revisions for git repos, but Mozilla has a secondary workflow for
git users that uses the git-cinnabar tool to interact with their hg repos. When
a git-cinnabar user uses the moz-phab tool to submit patches for mozilla-central
it makes use of Mozilla's fork of arcanist, which works with their local git
version of m-c, and thus sets the local:commit time as a string, and then
translates the commit hashes.

Currently when encountering such DREVS phabread dies with "TypeError: %d format:
a number is required, not str".

phabsend also used to set it as a string but wouldn't have encountered the
issue with its own DREVs since it would read hg:meta first.

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.Jul 16 2019, 2:23 PM

I'm not sure if the test is actually needed, so feel free to drop it/ask me to.

Kwan added inline comments.Jul 16 2019, 2:35 PM
hgext/phabricator.py
953

I went for int() over switching to %s because if time is ever a float we'd end up with # Date 1562019844.0 0 in the patch header.

Kwan added a commit: rHGc9be100eb7b6: phabricator: handle local:commits time being string or int.Jul 17 2019, 7:07 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc9be100eb7b6: phabricator: handle local:commits time being string or int (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 (57 lines)

Diff 15947

hgext/phabricator.py

if not meta: if not meta:
if props.get(b'local:commits'): if props.get(b'local:commits'):
commit = sorted(props[b'local:commits'].values())[0] commit = sorted(props[b'local:commits'].values())[0]
meta = {} meta = {}
if b'author' in commit and b'authorEmail' in commit: if b'author' in commit and b'authorEmail' in commit:
meta[b'user'] = b'%s <%s>' % (commit[b'author'], meta[b'user'] = b'%s <%s>' % (commit[b'author'],
commit[b'authorEmail']) commit[b'authorEmail'])
if b'time' in commit: if b'time' in commit:
meta[b'date'] = b'%d 0' % commit[b'time'] meta[b'date'] = b'%d 0' % int(commit[b'time'])
KwanAuthorUnsubmitted
Done

I went for int() over switching to %s because if time is ever a float we'd end up with # Date 1562019844.0 0 in the patch header.

Kwan: I went for `int()` over switching to `%s` because if time is ever a float we'd end up with `#…
if b'branch' in commit: if b'branch' in commit:
meta[b'branch'] = commit[b'branch'] meta[b'branch'] = commit[b'branch']
node = commit.get(b'commit', commit.get(b'rev')) node = commit.get(b'commit', commit.get(b'rev'))
if node: if node:
meta[b'node'] = node meta[b'node'] = node
if len(commit.get(b'parents', ())) >= 1: if len(commit.get(b'parents', ())) >= 1:
meta[b'parent'] = commit[b'parents'][0] meta[b'parent'] = commit[b'parents'][0]
else: else:

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
Phabreading a DREV with a local:commits time as a string: Phabreading a DREV with a local:commits time as a string:
BROKEN: shouldn't error
$ hg phabread --test-vcr "$VCR/phabread-str-time.json" D1285 $ hg phabread --test-vcr "$VCR/phabread-str-time.json" D1285
** unknown exception encountered, please report by visiting # HG changeset patch
** https://mercurial-scm.org/wiki/BugTracker # User test <test>
** Python * (glob) # Date 1562019844 0
** Mercurial Distributed SCM (version *) (glob) # Branch default
** Extensions loaded: phabricator # Node ID da5c8c6bf23a36b6e3af011bc3734460692c23ce
Traceback (most recent call last): # Parent 1f634396406d03e565ed645370e5fecd062cf215
File "*/install/bin/hg", line *, in <module> (glob) test string time
dispatch.run()
File "*/install/lib/python/mercurial/dispatch.py", line *, in run (glob) Differential Revision: https://phab.mercurial-scm.org/D1285
status = dispatch(req) diff --git a/test b/test
File "*/install/lib/python/mercurial/dispatch.py", line *, in dispatch (glob) new file mode 100644
ret = _runcatch(req) or 0 --- /dev/null
File "*/install/lib/python/mercurial/dispatch.py", line *, in _runcatch (glob) +++ b/test
return _callcatch(ui, _runcatchfunc) @@ * @@ (glob)
File "*/install/lib/python/mercurial/dispatch.py", line *, in _callcatch (glob) +test
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 phabread (glob)
readpatch(repo, drevs, ui.write)
File "*/install/lib/python/hgext/phabricator.py", line *, in readpatch (glob)
meta = getdiffmeta(diffs[b'%d' % diffid])
File "*/install/lib/python/hgext/phabricator.py", line *, in getdiffmeta (glob)
meta[b'date'] = b'%d 0' % commit[b'time']
TypeError: %d format: a number is required, not str
[1]
$ cd .. $ cd ..