| Alphare |
| hg-reviewers |
No visible changes here, until an option to enable it is added to phabsend.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/phabricator.py (37 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| b'diff_id': diffid, | b'diff_id': diffid, | ||||
| b'name': b'local:commits', | b'name': b'local:commits', | ||||
| b'data': templatefilters.json(commits), | b'data': templatefilters.json(commits), | ||||
| } | } | ||||
| callconduit(basectx.repo().ui, b'differential.setdiffproperty', params) | callconduit(basectx.repo().ui, b'differential.setdiffproperty', params) | ||||
| def createdifferentialrevision( | def createdifferentialrevision( | ||||
| ctx, | ctxs, | ||||
| revid=None, | revid=None, | ||||
| parentrevphid=None, | parentrevphid=None, | ||||
| oldbasenode=None, | |||||
| oldnode=None, | oldnode=None, | ||||
| olddiff=None, | olddiff=None, | ||||
| actions=None, | actions=None, | ||||
| comment=None, | comment=None, | ||||
| ): | ): | ||||
| """create or update a Differential Revision | """create or update a Differential Revision | ||||
| If revid is None, create a new Differential Revision, otherwise update | If revid is None, create a new Differential Revision, otherwise update | ||||
| revid. If parentrevphid is not None, set it as a dependency. | revid. If parentrevphid is not None, set it as a dependency. | ||||
| If there is a single commit for the new Differential Revision, ``ctxs`` will | |||||
| be a list of that single context. Otherwise, it is a list that covers the | |||||
| range of changes for the differential, where ``ctxs[0]`` is the first change | |||||
| to include and ``ctxs[-1]`` is the last. | |||||
| If oldnode is not None, check if the patch content (without commit message | If oldnode is not None, check if the patch content (without commit message | ||||
| and metadata) has changed before creating another diff. | and metadata) has changed before creating another diff. For a Revision with | ||||
| a single commit, ``oldbasenode`` and ``oldnode`` have the same value. For a | |||||
| Revision covering multiple commits, ``oldbasenode`` corresponds to | |||||
| ``ctxs[0]`` the previous time this Revision was posted, and ``oldnode`` | |||||
| corresponds to ``ctxs[-1]``. | |||||
| If actions is not None, they will be appended to the transaction. | If actions is not None, they will be appended to the transaction. | ||||
| """ | """ | ||||
| basectx = ctx | ctx = ctxs[-1] | ||||
| basectx = ctxs[0] | |||||
| repo = ctx.repo() | repo = ctx.repo() | ||||
| if oldnode: | if oldnode: | ||||
| diffopts = mdiff.diffopts(git=True, context=32767) | diffopts = mdiff.diffopts(git=True, context=32767) | ||||
| oldctx = repo.unfiltered()[oldnode] | unfi = repo.unfiltered() | ||||
| oldbasectx = oldctx | oldctx = unfi[oldnode] | ||||
| oldbasectx = unfi[oldbasenode] | |||||
| neednewdiff = getdiff(basectx, ctx, diffopts) != getdiff( | neednewdiff = getdiff(basectx, ctx, diffopts) != getdiff( | ||||
| oldbasectx, oldctx, diffopts | oldbasectx, oldctx, diffopts | ||||
| ) | ) | ||||
| else: | else: | ||||
| neednewdiff = True | neednewdiff = True | ||||
| transactions = [] | transactions = [] | ||||
| if neednewdiff: | if neednewdiff: | ||||
| diff = creatediff(basectx, ctx) | diff = creatediff(basectx, ctx) | ||||
| transactions.append({b'type': b'update', b'value': diff[b'phid']}) | transactions.append({b'type': b'update', b'value': diff[b'phid']}) | ||||
| if comment: | if comment: | ||||
| transactions.append({b'type': b'comment', b'value': comment}) | transactions.append({b'type': b'comment', b'value': comment}) | ||||
| else: | else: | ||||
| # Even if we don't need to upload a new diff because the patch content | # Even if we don't need to upload a new diff because the patch content | ||||
| # does not change. We might still need to update its metadata so | # does not change. We might still need to update its metadata so | ||||
| # pushers could know the correct node metadata. | # pushers could know the correct node metadata. | ||||
| assert olddiff | assert olddiff | ||||
| diff = olddiff | diff = olddiff | ||||
| writediffproperties([ctx], diff) | writediffproperties(ctxs, diff) | ||||
| # Set the parent Revision every time, so commit re-ordering is picked-up | # Set the parent Revision every time, so commit re-ordering is picked-up | ||||
| if parentrevphid: | if parentrevphid: | ||||
| transactions.append( | transactions.append( | ||||
| {b'type': b'parents.set', b'value': [parentrevphid]} | {b'type': b'parents.set', b'value': [parentrevphid]} | ||||
| ) | ) | ||||
| if actions: | if actions: | ||||
| transactions += actions | transactions += actions | ||||
| # When folding multiple local commits into a single review, arcanist will | # When folding multiple local commits into a single review, arcanist will | ||||
| # take the summary line of the first commit as the title, and then | # take the summary line of the first commit as the title, and then | ||||
| # concatenate the rest of the remaining messages (including each of their | # concatenate the rest of the remaining messages (including each of their | ||||
| # first lines) to the rest of the first commit message (each separated by | # first lines) to the rest of the first commit message (each separated by | ||||
| # an empty line), and use that as the summary field. Do the same here. | # an empty line), and use that as the summary field. Do the same here. | ||||
| # For commits with only a one line message, there is no summary field, as | # For commits with only a one line message, there is no summary field, as | ||||
| # this gets assigned to the title. | # this gets assigned to the title. | ||||
| fields = util.sortdict() # sorted for stable wire protocol in tests | fields = util.sortdict() # sorted for stable wire protocol in tests | ||||
| for i, _ctx in enumerate([ctx]): | for i, _ctx in enumerate(ctxs): | ||||
| # Parse commit message and update related fields. | # Parse commit message and update related fields. | ||||
| desc = _ctx.description() | desc = _ctx.description() | ||||
| info = callconduit( | info = callconduit( | ||||
| repo.ui, b'differential.parsecommitmessage', {b'corpus': desc} | repo.ui, b'differential.parsecommitmessage', {b'corpus': desc} | ||||
| ) | ) | ||||
| for k in [b'title', b'summary', b'testPlan']: | for k in [b'title', b'summary', b'testPlan']: | ||||
| v = info[b'fields'].get(k) | v = info[b'fields'].get(k) | ||||
| params = {b'transactions': transactions} | params = {b'transactions': transactions} | ||||
| if revid is not None: | if revid is not None: | ||||
| # Update an existing Differential Revision | # Update an existing Differential Revision | ||||
| params[b'objectIdentifier'] = revid | params[b'objectIdentifier'] = revid | ||||
| revision = callconduit(repo.ui, b'differential.revision.edit', params) | revision = callconduit(repo.ui, b'differential.revision.edit', params) | ||||
| if not revision: | if not revision: | ||||
| raise error.Abort(_(b'cannot create revision for %s') % ctx) | if len(ctxs) == 1: | ||||
| msg = _(b'cannot create revision for %s') % ctx | |||||
| else: | |||||
| msg = _(b'cannot create revision for %s::%s') % (basectx, ctx) | |||||
| raise error.Abort(msg) | |||||
| return revision, diff | return revision, diff | ||||
| def userphids(ui, names): | def userphids(ui, names): | ||||
| """convert user names to PHIDs""" | """convert user names to PHIDs""" | ||||
| names = [name.lower() for name in names] | names = [name.lower() for name in names] | ||||
| query = {b'constraints': {b'usernames': names}} | query = {b'constraints': {b'usernames': names}} | ||||
| # can provide dependency relationship | # can provide dependency relationship | ||||
| lastrevphid = None | lastrevphid = None | ||||
| for rev in revs: | for rev in revs: | ||||
| ui.debug(b'sending rev %d\n' % rev) | ui.debug(b'sending rev %d\n' % rev) | ||||
| ctx = repo[rev] | ctx = repo[rev] | ||||
| # Get Differential Revision ID | # Get Differential Revision ID | ||||
| oldnode, olddiff, revid = oldmap.get(ctx.node(), (None, None, None)) | oldnode, olddiff, revid = oldmap.get(ctx.node(), (None, None, None)) | ||||
| oldbasenode = oldnode | |||||
| if oldnode != ctx.node() or opts.get(b'amend'): | if oldnode != ctx.node() or opts.get(b'amend'): | ||||
| # Create or update Differential Revision | # Create or update Differential Revision | ||||
| revision, diff = createdifferentialrevision( | revision, diff = createdifferentialrevision( | ||||
| ctx, | [ctx], | ||||
| revid, | revid, | ||||
| lastrevphid, | lastrevphid, | ||||
| oldbasenode, | |||||
| oldnode, | oldnode, | ||||
| olddiff, | olddiff, | ||||
| actions, | actions, | ||||
| opts.get(b'comment'), | opts.get(b'comment'), | ||||
| ) | ) | ||||
| diffmap[ctx.node()] = diff | diffmap[ctx.node()] = diff | ||||
| newrevid = int(revision[b'object'][b'id']) | newrevid = int(revision[b'object'][b'id']) | ||||
| newrevphid = revision[b'object'][b'phid'] | newrevphid = revision[b'object'][b'phid'] | ||||