# HG changeset patch # User Ian Moody # Date 1555951561 -3600 # Node ID 289d82a070e9ed463dbcb089964de804aee0459d # Parent 90d48c1c62242585849a53539588b0285b5bce9b phabricator: use templatefilters.json in writediffproperties Instead of json.dumps, since it makes the code simpler and more readable. This would have been the better option for 8fd19a7b4ed6 but I wasn't aware of it at the time. Differential Revision: https://phab.mercurial-scm.org/D6295 diff -r 90d48c1c6224 -r 289d82a070e9 hgext/phabricator.py --- a/hgext/phabricator.py Sun Apr 21 09:34:16 2019 -0700 +++ b/hgext/phabricator.py Mon Apr 22 17:46:01 2019 +0100 @@ -65,6 +65,7 @@ scmutil, smartset, tags, + templatefilters, templateutil, url as urlmod, util, @@ -380,11 +381,11 @@ params = { b'diff_id': diff[b'id'], b'name': b'hg:meta', - b'data': json.dumps({ - u'user': encoding.unifromlocal(ctx.user()), - u'date': u'{:.0f} {}'.format(*ctx.date()), - u'node': encoding.unifromlocal(ctx.hex()), - u'parent': encoding.unifromlocal(ctx.p1().hex()), + b'data': templatefilters.json({ + b'user': ctx.user(), + b'date': b'%d %d' % ctx.date(), + b'node': ctx.hex(), + b'parent': ctx.p1().hex(), }), } callconduit(ctx.repo(), b'differential.setdiffproperty', params) @@ -392,12 +393,11 @@ params = { b'diff_id': diff[b'id'], b'name': b'local:commits', - b'data': json.dumps({ - encoding.unifromlocal(ctx.hex()): { - u'author': encoding.unifromlocal(stringutil.person(ctx.user())), - u'authorEmail': encoding.unifromlocal( - stringutil.email(ctx.user())), - u'time': u'{:.0f}'.format(ctx.date()[0]), + b'data': templatefilters.json({ + ctx.hex(): { + b'author': stringutil.person(ctx.user()), + b'authorEmail': stringutil.email(ctx.user()), + b'time': b'%d' % ctx.date()[0], }, }), }