This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6297

phabricator: include branch in the diffproperty metadata
ClosedPublic

Authored by Kwan on Apr 22 2019, 11:52 AM.

Details

Reviewers
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd49ab47be8a6: phabricator: include branch in the diffproperty metadata
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

Kwan created this revision.Apr 22 2019, 11:52 AM
pulkit added a subscriber: pulkit.Apr 22 2019, 12:03 PM

wow, does it work?

Kwan added a comment.Apr 22 2019, 2:03 PM
In D6297#91618, @pulkit wrote:

wow, does it work?

For future posterity, since I already replied to pulkit on IRC, this won't make Phab display the branch in the web UI anywhere (still need to use creatediff API for that), but D6302 makes phabread use this to include the branch in its hg importable output.

indygreg accepted this revision.Apr 24 2019, 10:12 PM
This revision is now accepted and ready to land.Apr 24 2019, 10:12 PM
pulkit accepted this revision.Apr 25 2019, 1:37 PM
In D6297#91657, @Kwan wrote:
In D6297#91618, @pulkit wrote:

wow, does it work?

For future posterity, since I already replied to pulkit on IRC, this won't make Phab display the branch in the web UI anywhere (still need to use creatediff API for that), but D6302 makes phabread use this to include the branch in its hg importable output.

I have amended the commit to include the above info in commit description.

Closed by commit rHGd49ab47be8a6: phabricator: include branch in the diffproperty metadata (authored by Kwan). · Explain WhyApr 25 2019, 2:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (2 lines)

Diff 14920

hgext/phabricator.py

def writediffproperties(ctx, diff): def writediffproperties(ctx, diff):
"""write metadata to diff so patches could be applied losslessly""" """write metadata to diff so patches could be applied losslessly"""
params = { params = {
b'diff_id': diff[b'id'], b'diff_id': diff[b'id'],
b'name': b'hg:meta', b'name': b'hg:meta',
b'data': templatefilters.json({ b'data': templatefilters.json({
b'user': ctx.user(), b'user': ctx.user(),
b'date': b'%d %d' % ctx.date(), b'date': b'%d %d' % ctx.date(),
b'branch': ctx.branch(),
b'node': ctx.hex(), b'node': ctx.hex(),
b'parent': ctx.p1().hex(), b'parent': ctx.p1().hex(),
}), }),
} }
callconduit(ctx.repo(), b'differential.setdiffproperty', params) callconduit(ctx.repo(), b'differential.setdiffproperty', params)
params = { params = {
b'diff_id': diff[b'id'], b'diff_id': diff[b'id'],
b'name': b'local:commits', b'name': b'local:commits',
b'data': templatefilters.json({ b'data': templatefilters.json({
ctx.hex(): { ctx.hex(): {
b'author': stringutil.person(ctx.user()), b'author': stringutil.person(ctx.user()),
b'authorEmail': stringutil.email(ctx.user()), b'authorEmail': stringutil.email(ctx.user()),
b'time': int(ctx.date()[0]), b'time': int(ctx.date()[0]),
b'branch': ctx.branch(),
}, },
}), }),
} }
callconduit(ctx.repo(), b'differential.setdiffproperty', params) callconduit(ctx.repo(), b'differential.setdiffproperty', params)
def createdifferentialrevision(ctx, revid=None, parentrevid=None, oldnode=None, def createdifferentialrevision(ctx, revid=None, parentrevid=None, oldnode=None,
olddiff=None, actions=None): olddiff=None, actions=None):
"""create or update a Differential Revision """create or update a Differential Revision