This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7056

phabricator: include bookmark in diff metadata
AbandonedPublic

Authored by Kwan on Oct 10 2019, 5:53 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

While arcanist does this I could see us leaving it out for a couple reasons:

  1. arcanist only operates on the current stack, so can use the actual active bookmark, whereas phabsend works with any commits, so if there are multiple bookmarks it'll just pick the first one arbitrarily
  2. some users might not like the disclosure

Diff Detail

Repository
rHG Mercurial
Branch
creatediff (bookmark) on default (branch)
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Kwan created this revision.Oct 10 2019, 5:53 PM
Kwan updated this revision to Diff 17086.Oct 11 2019, 1:55 PM

Fix some test-check-code issues, and one test-check-pyflakes unused local.

Kwan updated this revision to Diff 17106.Oct 12 2019, 9:46 AM

I'd missed out the attrs key conversion needed on py3.

durin42 added a subscriber: durin42.Oct 16 2019, 4:43 PM

Yeah, the bookmark-name disclosure seems like something that should be optional? Maybe put this behind a flag?

durin42 added a comment.Oct 16 2019, 4:44 PM

(or a config knob)

Kwan abandoned this revision.Oct 23 2019, 5:20 PM

I'm not that bothered about this so going to abandon it for now, can always revisit it later.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (2 lines)

Diff 17106

hgext/phabricator.py

pdiff.addchange(movedchange) pdiff.addchange(movedchange)
def creatediff(ctx): def creatediff(ctx):
"""create a Differential Diff""" """create a Differential Diff"""
repo = ctx.repo() repo = ctx.repo()
repophid = getrepophid(repo) repophid = getrepophid(repo)
# Create a "Differential Diff" via "differential.creatediff" API # Create a "Differential Diff" via "differential.creatediff" API
bookmark = ctx.bookmarks()[0] if ctx.bookmarks() else None
pdiff = phabdiff( pdiff = phabdiff(
sourceControlBaseRevision=b'%s' % ctx.p1().hex(), sourceControlBaseRevision=b'%s' % ctx.p1().hex(),
branch=b'%s' % ctx.branch(), branch=b'%s' % ctx.branch(),
bookmark=bookmark,
) )
modified, added, removed, _d, _u, _i, _c = ctx.p1().status(ctx) modified, added, removed, _d, _u, _i, _c = ctx.p1().status(ctx)
# addadded will remove moved files from removed, so addremoved won't get # addadded will remove moved files from removed, so addremoved won't get
# them # them
addadded(pdiff, ctx, added, removed) addadded(pdiff, ctx, added, removed)
addmodified(pdiff, ctx, modified) addmodified(pdiff, ctx, modified)
addremoved(pdiff, ctx, removed) addremoved(pdiff, ctx, removed)
if repophid: if repophid: