mercurial: comparison contrib/phabricator.py

equal deleted inserted replaced

-:0975506120fb
+:fa3aa6c98bb7
 import re
 from mercurial.node import bin, nullid
 from mercurial.i18n import _
 from mercurial import (
+cmdutil,
+context,
 encoding,
 error,
 mdiff,
 obsutil,
 patch,
 revision = callconduit(repo, 'differential.revision.edit', params)
 if not revision:
 raise error.Abort(_('cannot create revision for %s') % ctx)
-return revision
+return revision, diff
 def userphids(repo, names):
 """convert user names to PHIDs"""
 query = {'constraints': {'usernames': names}}
 result = callconduit(repo, 'user.search', query)
 % ' '.join(sorted(unresolved)))
 return [entry[r'phid'] for entry in data]
 @command('phabsend',
 [('r', 'rev', [], _('revisions to send'), _('REV')),
+('', 'amend', False, _('update commit messages')),
 ('', 'reviewer', [], _('specify reviewers')),
 ('', 'confirm', None, _('ask for confirmation before sending'))],
 _('REV [OPTIONS]'))
 def phabsend(ui, repo, *revs, **opts):
 """upload changesets to Phabricator
 For the first time uploading changesets, local tags will be created to
 maintain the association. After the first time, phabsend will check
 obsstore and tags information so it can figure out whether to update an
 existing Differential Revision, or create a new one.
+If --amend is set, update commit messages so they have the
+``Differential Revision`` URL, remove related tags. This is similar to what
+arcanist will do, and is more desired in author-push workflows. Otherwise,
+use local tags to record the ``Differential Revision`` association.
 The --confirm option lets you confirm changesets before sending them. You
 can also add following to your configuration file to make it default
 behaviour.
 [phabsend]
 confirm = true
+phabsend will check obsstore and the above association to decide whether to
+update an existing Differential Revision, or create a new one.
 """
 revs = list(revs) + opts.get('rev', [])
 revs = scmutil.revrange(repo, revs)
 if not revs:
 raise error.Abort(_('phabsend requires at least one changeset'))
+if opts.get('amend'):
+cmdutil.checkunfinished(repo)
 confirm = ui.configbool('phabsend', 'confirm')
 confirm |= bool(opts.get('confirm'))
 if confirm:
 confirmed = _confirmbeforesend(repo, revs)
 actions.append({'type': 'reviewers.add', 'value': phids})
 # {newnode: (oldnode, olddiff, olddrev}
 oldmap = getoldnodedrevmap(repo, [repo[r].node() for r in revs])
+drevids = [] # [int]
+diffmap = {} # {newnode: diff}
 # Send patches one by one so we know their Differential Revision IDs and
 # can provide dependency relationship
 lastrevid = None
 for rev in revs:
 ui.debug('sending rev %d\n' % rev)
 ctx = repo[rev]
 # Get Differential Revision ID
 oldnode, olddiff, revid = oldmap.get(ctx.node(), (None, None, None))
-if oldnode != ctx.node():
+if oldnode != ctx.node() or opts.get('amend'):
 # Create or update Differential Revision
-revision = createdifferentialrevision(ctx, revid, lastrevid,
+revision, diff = createdifferentialrevision(
-oldnode, olddiff, actions)
+ctx, revid, lastrevid, oldnode, olddiff, actions)
+diffmap[ctx.node()] = diff
 newrevid = int(revision[r'object'][r'id'])
 if revid:
 action = _('updated')
 else:
 action = _('created')
-# Create a local tag to note the association
+# Create a local tag to note the association, if commit message
-tagname = 'D%d' % newrevid
+# does not have it already
-tags.tag(repo, tagname, ctx.node(), message=None, user=None,
+m = _differentialrevisiondescre.search(ctx.description())
-date=None, local=True)
+if not m or int(m.group(1)) != newrevid:
+tagname = 'D%d' % newrevid
+tags.tag(repo, tagname, ctx.node(), message=None, user=None,
+date=None, local=True)
 else:
 # Nothing changed. But still set "newrevid" so the next revision
 # could depend on this one.
 newrevid = revid
 action = _('skipped')
 ui.write(_('D%s: %s - %s: %s\n') % (newrevid, action, ctx,
 ctx.description().split('\n')[0]))
+drevids.append(newrevid)
 lastrevid = newrevid
+# Update commit messages and remove tags
+if opts.get('amend'):
+unfi = repo.unfiltered()
+drevs = callconduit(repo, 'differential.query', {'ids': drevids})
+with repo.wlock(), repo.lock(), repo.transaction('phabsend'):
+wnode = unfi['.'].node()
+mapping = {} # {oldnode: [newnode]}
+for i, rev in enumerate(revs):
+old = unfi[rev]
+drevid = drevids[i]
+drev = [d for d in drevs if int(d[r'id']) == drevid][0]
+newdesc = getdescfromdrev(drev)
+# Make sure commit message contain "Differential Revision"
+if old.description() != newdesc:
+parents = [
+mapping.get(old.p1().node(), (old.p1(),))[0],
+mapping.get(old.p2().node(), (old.p2(),))[0],
+]
+new = context.metadataonlyctx(
+repo, old, parents=parents, text=newdesc,
+user=old.user(), date=old.date(), extra=old.extra())
+newnode = new.commit()
+mapping[old.node()] = [newnode]
+# Update diff property
+writediffproperties(unfi[newnode], diffmap[old.node()])
+# Remove local tags since it's no longer necessary
+tagname = 'D%d' % drevid
+if tagname in repo.tags():
+tags.tag(repo, tagname, nullid, message=None, user=None,
+date=None, local=True)
+scmutil.cleanupnodes(repo, mapping, 'phabsend')
+if wnode in mapping:
+unfi.setparents(mapping[wnode][0])
 # Map from "hg:meta" keys to header understood by "hg import". The order is
 # consistent with "hg export" output.
 _metanamemap = util.sortdict([(r'user', 'User'), (r'date', 'Date'),
 (r'node', 'Node ID'), (r'parent', 'Parent ')])

changeset 33787	fa3aa6c98bb7
parent 33785	f7d6978a4da9
child 33831	75fdaf851e83