Mercurial > hg
diff hgext/phabricator.py @ 42618:c17e6a3e7356
phabricator: handle local:commits time being string or int
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.
Differential Revision: https://phab.mercurial-scm.org/D6650
author | Ian Moody <moz-ian@perix.co.uk> |
---|---|
date | Tue, 16 Jul 2019 19:18:16 +0100 |
parents | c19d259fd6ad |
children | e26c2440a030 |
line wrap: on
line diff
--- a/hgext/phabricator.py Tue Jul 16 18:38:38 2019 +0100 +++ b/hgext/phabricator.py Tue Jul 16 19:18:16 2019 +0100 @@ -950,7 +950,7 @@ meta[b'user'] = b'%s <%s>' % (commit[b'author'], commit[b'authorEmail']) if b'time' in commit: - meta[b'date'] = b'%d 0' % commit[b'time'] + meta[b'date'] = b'%d 0' % int(commit[b'time']) if b'branch' in commit: meta[b'branch'] = commit[b'branch'] node = commit.get(b'commit', commit.get(b'rev'))