mercurial-scm/hg: contrib/phabricator.py annotate

annotate contrib/phabricator.py @ 33832:539541779010

phabricator: add a small language to query Differential Revisions Previously, `phabread` can only be used to read a single patch, or a single stack of patches. In the future, we want to have more complex queries like filtering with status (open, accepted, closed, etc), or maybe more complex like filtering by reviewers etc. The command line flag approach won't scale with that. Besides, we might want to have other commands to update Differential Revision status in batch, like accepting a stack using a single command. Therefore, this patch adds a small language. It has basic set operations: `&`, `+`, `-` and an ancestor operator to support `--stack`. Test Plan: Try querying this Phabricator instance: hg phabread 1+2 # 1, 2 hg phabread D2+D1 # 2, 1 hg phabread ':118-115+:2-1' # 114, 116, 117, 118, 2 hg phabread '((:118-(D115+117)))&:117' # 114, 116 hg phabread ':2&:117' --debug # differential.query is called only once Make sure the output is expected and prefetch works. Differential Revision: https://phab.mercurial-scm.org/D125

author	Jun Wu <quark@fb.com>
date	Mon, 17 Jul 2017 23:19:11 -0700
parents	75fdaf851e83
children	fb59192b4981

rev	line source
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	1 # phabricator.py - simple Phabricator integration
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	2 #
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	3 # Copyright 2017 Facebook, Inc.
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	4 #
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	7 """simple Phabricator integration
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	8
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	9 This extension provides a ``phabsend`` command which sends a stack of
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	10 changesets to Phabricator without amending commit messages, and a ``phabread``
04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	11 command which prints a stack of revisions in a format suitable
04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	12 for :hg:`import`.
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	13
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	14 By default, Phabricator requires ``Test Plan`` which might prevent some
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	15 changeset from being sent. The requirement could be disabled by changing
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	16 ``differential.require-test-plan-field`` config server side.
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	17
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	18 Config::
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	19
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	20 [phabricator]
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	21 # Phabricator URL
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	22 url = https://phab.example.com/
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	23
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	24 # API token. Get it from https://$HOST/conduit/login/
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	25 token = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	26
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	27 # Repo callsign. If a repo has a URL https://$HOST/diffusion/FOO, then its
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	28 # callsign is "FOO".
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	29 callsign = FOO
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	30
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	31 """
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	32
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	33 from __future__ import absolute_import
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	34
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	35 import itertools
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	36 import json
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	37 import operator
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	38 import re
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	39
33443 e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	40 from mercurial.node import bin, nullid
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	41 from mercurial.i18n import _
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	42 from mercurial import (
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	43 cmdutil,
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	44 context,
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	45 encoding,
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	46 error,
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	47 mdiff,
33735 e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33692 diff changeset	48 obsutil,
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	49 parser,
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	50 patch,
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	51 registrar,
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	52 scmutil,
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	53 smartset,
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	54 tags,
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	55 url as urlmod,
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	56 util,
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	57 )
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	58
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	59 cmdtable = {}
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	60 command = registrar.command(cmdtable)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	61
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	62 def urlencodenested(params):
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	63 """like urlencode, but works with nested parameters.
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	64
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	65 For example, if params is {'a': ['b', 'c'], 'd': {'e': 'f'}}, it will be
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	66 flattened to {'a[0]': 'b', 'a[1]': 'c', 'd[e]': 'f'} and then passed to
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	67 urlencode. Note: the encoding is consistent with PHP's http_build_query.
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	68 """
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	69 flatparams = util.sortdict()
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	70 def process(prefix, obj):
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	71 items = {list: enumerate, dict: lambda x: x.items()}.get(type(obj))
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	72 if items is None:
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	73 flatparams[prefix] = obj
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	74 else:
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	75 for k, v in items(obj):
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	76 if prefix:
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	77 process('%s[%s]' % (prefix, k), v)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	78 else:
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	79 process(k, v)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	80 process('', params)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	81 return util.urlreq.urlencode(flatparams)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	82
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	83 def readurltoken(repo):
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	84 """return conduit url, token and make sure they exist
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	85
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	86 Currently read from [phabricator] config section. In the future, it might
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	87 make sense to read from .arcconfig and .arcrc as well.
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	88 """
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	89 values = []
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	90 section = 'phabricator'
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	91 for name in ['url', 'token']:
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	92 value = repo.ui.config(section, name)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	93 if not value:
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	94 raise error.Abort(_('config %s.%s is required') % (section, name))
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	95 values.append(value)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	96 return values
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	97
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	98 def callconduit(repo, name, params):
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	99 """call Conduit API, params is a dict. return json.loads result, or None"""
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	100 host, token = readurltoken(repo)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	101 url, authinfo = util.url('/'.join([host, 'api', name])).authinfo()
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	102 urlopener = urlmod.opener(repo.ui, authinfo)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	103 repo.ui.debug('Conduit Call: %s %s\n' % (url, params))
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	104 params = params.copy()
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	105 params['api.token'] = token
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	106 request = util.urlreq.request(url, data=urlencodenested(params))
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	107 body = urlopener.open(request).read()
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	108 repo.ui.debug('Conduit Response: %s\n' % body)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	109 parsed = json.loads(body)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	110 if parsed.get(r'error_code'):
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	111 msg = (_('Conduit Error (%s): %s')
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	112 % (parsed[r'error_code'], parsed[r'error_info']))
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	113 raise error.Abort(msg)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	114 return parsed[r'result']
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	115
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	116 @command('debugcallconduit', [], _('METHOD'))
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	117 def debugcallconduit(ui, repo, name):
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	118 """call Conduit API
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	119
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	120 Call parameters are read from stdin as a JSON blob. Result will be written
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	121 to stdout as a JSON blob.
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	122 """
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	123 params = json.loads(ui.fin.read())
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	124 result = callconduit(repo, name, params)
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	125 s = json.dumps(result, sort_keys=True, indent=2, separators=(',', ': '))
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	126 ui.write('%s\n' % s)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	127
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	128 def getrepophid(repo):
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	129 """given callsign, return repository PHID or None"""
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	130 # developer config: phabricator.repophid
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	131 repophid = repo.ui.config('phabricator', 'repophid')
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	132 if repophid:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	133 return repophid
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	134 callsign = repo.ui.config('phabricator', 'callsign')
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	135 if not callsign:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	136 return None
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	137 query = callconduit(repo, 'diffusion.repository.search',
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	138 {'constraints': {'callsigns': [callsign]}})
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	139 if len(query[r'data']) == 0:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	140 return None
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	141 repophid = encoding.strtolocal(query[r'data'][0][r'phid'])
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	142 repo.ui.setconfig('phabricator', 'repophid', repophid)
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	143 return repophid
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	144
33263 ed61189763ef phabricator: check associated Differential Revision from commit message Jun Wu <quark@fb.com> parents: 33200 diff changeset	145 _differentialrevisiontagre = re.compile('\AD([1-9][0-9]*)\Z')
ed61189763ef phabricator: check associated Differential Revision from commit message Jun Wu <quark@fb.com> parents: 33200 diff changeset	146 _differentialrevisiondescre = re.compile(
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	147 '^Differential Revision:\s(?:.)D([1-9][0-9]*)$', re.M)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	148
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	149 def getoldnodedrevmap(repo, nodelist):
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	150 """find previous nodes that has been sent to Phabricator
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	151
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	152 return {node: (oldnode, Differential diff, Differential Revision ID)}
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	153 for node in nodelist with known previous sent versions, or associated
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	154 Differential Revision IDs. ``oldnode`` and ``Differential diff`` could
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	155 be ``None``.
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	156
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	157 Examines commit messages like "Differential Revision:" to get the
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	158 association information.
33263 ed61189763ef phabricator: check associated Differential Revision from commit message Jun Wu <quark@fb.com> parents: 33200 diff changeset	159
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	160 If such commit message line is not found, examines all precursors and their
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	161 tags. Tags with format like "D1234" are considered a match and the node
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	162 with that tag, and the number after "D" (ex. 1234) will be returned.
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	163
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	164 The ``old node``, if not None, is guaranteed to be the last diff of
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	165 corresponding Differential Revision, and exist in the repo.
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	166 """
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	167 url, token = readurltoken(repo)
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	168 unfi = repo.unfiltered()
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	169 nodemap = unfi.changelog.nodemap
33263 ed61189763ef phabricator: check associated Differential Revision from commit message Jun Wu <quark@fb.com> parents: 33200 diff changeset	170
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	171 result = {} # {node: (oldnode?, lastdiff?, drev)}
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	172 toconfirm = {} # {node: (force, {precnode}, drev)}
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	173 for node in nodelist:
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	174 ctx = unfi[node]
33443 e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	175 # For tags like "D123", put them into "toconfirm" to verify later
33735 e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33692 diff changeset	176 precnodes = list(obsutil.allpredecessors(unfi.obsstore, [node]))
33443 e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	177 for n in precnodes:
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	178 if n in nodemap:
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	179 for tag in unfi.nodetags(n):
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	180 m = _differentialrevisiontagre.match(tag)
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	181 if m:
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	182 toconfirm[node] = (0, set(precnodes), int(m.group(1)))
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	183 continue
33263 ed61189763ef phabricator: check associated Differential Revision from commit message Jun Wu <quark@fb.com> parents: 33200 diff changeset	184
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	185 # Check commit message
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	186 m = _differentialrevisiondescre.search(ctx.description())
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	187 if m:
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	188 toconfirm[node] = (1, set(precnodes), int(m.group(1)))
33263 ed61189763ef phabricator: check associated Differential Revision from commit message Jun Wu <quark@fb.com> parents: 33200 diff changeset	189
33443 e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	190 # Double check if tags are genuine by collecting all old nodes from
e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	191 # Phabricator, and expect precursors overlap with it.
e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	192 if toconfirm:
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	193 drevs = [drev for force, precs, drev in toconfirm.values()]
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	194 alldiffs = callconduit(unfi, 'differential.querydiffs',
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	195 {'revisionIDs': drevs})
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	196 getnode = lambda d: bin(encoding.unitolocal(
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	197 getdiffmeta(d).get(r'node', ''))) or None
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	198 for newnode, (force, precset, drev) in toconfirm.items():
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	199 diffs = [d for d in alldiffs.values()
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	200 if int(d[r'revisionID']) == drev]
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	201
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	202 # "precursors" as known by Phabricator
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	203 phprecset = set(getnode(d) for d in diffs)
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	204
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	205 # Ignore if precursors (Phabricator and local repo) do not overlap,
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	206 # and force is not set (when commit message says nothing)
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	207 if not force and not bool(phprecset & precset):
33443 e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	208 tagname = 'D%d' % drev
e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	209 tags.tag(repo, tagname, nullid, message=None, user=None,
e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	210 date=None, local=True)
e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	211 unfi.ui.warn(_('D%s: local tag removed - does not match '
e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	212 'Differential history\n') % drev)
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	213 continue
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	214
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	215 # Find the last node using Phabricator metadata, and make sure it
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	216 # exists in the repo
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	217 oldnode = lastdiff = None
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	218 if diffs:
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	219 lastdiff = max(diffs, key=lambda d: int(d[r'id']))
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	220 oldnode = getnode(lastdiff)
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	221 if oldnode and oldnode not in nodemap:
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	222 oldnode = None
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	223
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	224 result[newnode] = (oldnode, lastdiff, drev)
33443 e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	225
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	226 return result
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	227
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	228 def getdiff(ctx, diffopts):
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	229 """plain-text diff without header (user, commit message, etc)"""
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	230 output = util.stringio()
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	231 for chunk, _label in patch.diffui(ctx.repo(), ctx.p1().node(), ctx.node(),
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	232 None, opts=diffopts):
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	233 output.write(chunk)
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	234 return output.getvalue()
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	235
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	236 def creatediff(ctx):
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	237 """create a Differential Diff"""
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	238 repo = ctx.repo()
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	239 repophid = getrepophid(repo)
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	240 # Create a "Differential Diff" via "differential.createrawdiff" API
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	241 params = {'diff': getdiff(ctx, mdiff.diffopts(git=True, context=32767))}
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	242 if repophid:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	243 params['repositoryPHID'] = repophid
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	244 diff = callconduit(repo, 'differential.createrawdiff', params)
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	245 if not diff:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	246 raise error.Abort(_('cannot create diff for %s') % ctx)
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	247 return diff
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	248
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	249 def writediffproperties(ctx, diff):
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	250 """write metadata to diff so patches could be applied losslessly"""
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	251 params = {
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	252 'diff_id': diff[r'id'],
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	253 'name': 'hg:meta',
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	254 'data': json.dumps({
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	255 'user': ctx.user(),
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	256 'date': '%d %d' % ctx.date(),
33264 266321579c68 phabricator: add node and p1 to hg:meta property Jun Wu <quark@fb.com> parents: 33263 diff changeset	257 'node': ctx.hex(),
266321579c68 phabricator: add node and p1 to hg:meta property Jun Wu <quark@fb.com> parents: 33263 diff changeset	258 'parent': ctx.p1().hex(),
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	259 }),
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	260 }
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	261 callconduit(ctx.repo(), 'differential.setdiffproperty', params)
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	262
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	263 def createdifferentialrevision(ctx, revid=None, parentrevid=None, oldnode=None,
33692 f100354cce52 phabricator: update diff property even if we choose not to create a new diff Jun Wu <quark@fb.com> parents: 33691 diff changeset	264 olddiff=None, actions=None):
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	265 """create or update a Differential Revision
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	266
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	267 If revid is None, create a new Differential Revision, otherwise update
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	268 revid. If parentrevid is not None, set it as a dependency.
33265 95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	269
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	270 If oldnode is not None, check if the patch content (without commit message
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	271 and metadata) has changed before creating another diff.
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	272
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	273 If actions is not None, they will be appended to the transaction.
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	274 """
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	275 repo = ctx.repo()
33265 95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	276 if oldnode:
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	277 diffopts = mdiff.diffopts(git=True, context=1)
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	278 oldctx = repo.unfiltered()[oldnode]
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	279 neednewdiff = (getdiff(ctx, diffopts) != getdiff(oldctx, diffopts))
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	280 else:
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	281 neednewdiff = True
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	282
33265 95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	283 transactions = []
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	284 if neednewdiff:
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	285 diff = creatediff(ctx)
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	286 transactions.append({'type': 'update', 'value': diff[r'phid']})
33692 f100354cce52 phabricator: update diff property even if we choose not to create a new diff Jun Wu <quark@fb.com> parents: 33691 diff changeset	287 else:
f100354cce52 phabricator: update diff property even if we choose not to create a new diff Jun Wu <quark@fb.com> parents: 33691 diff changeset	288 # Even if we don't need to upload a new diff because the patch content
f100354cce52 phabricator: update diff property even if we choose not to create a new diff Jun Wu <quark@fb.com> parents: 33691 diff changeset	289 # does not change. We might still need to update its metadata so
f100354cce52 phabricator: update diff property even if we choose not to create a new diff Jun Wu <quark@fb.com> parents: 33691 diff changeset	290 # pushers could know the correct node metadata.
f100354cce52 phabricator: update diff property even if we choose not to create a new diff Jun Wu <quark@fb.com> parents: 33691 diff changeset	291 assert olddiff
f100354cce52 phabricator: update diff property even if we choose not to create a new diff Jun Wu <quark@fb.com> parents: 33691 diff changeset	292 diff = olddiff
f100354cce52 phabricator: update diff property even if we choose not to create a new diff Jun Wu <quark@fb.com> parents: 33691 diff changeset	293 writediffproperties(ctx, diff)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	294
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	295 # Use a temporary summary to set dependency. There might be better ways but
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	296 # I cannot find them for now. But do not do that if we are updating an
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	297 # existing revision (revid is not None) since that introduces visible
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	298 # churns (someone edited "Summary" twice) on the web page.
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	299 if parentrevid and revid is None:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	300 summary = 'Depends on D%s' % parentrevid
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	301 transactions += [{'type': 'summary', 'value': summary},
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	302 {'type': 'summary', 'value': ' '}]
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	303
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	304 if actions:
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	305 transactions += actions
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	306
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	307 # Parse commit message and update related fields.
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	308 desc = ctx.description()
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	309 info = callconduit(repo, 'differential.parsecommitmessage',
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	310 {'corpus': desc})
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	311 for k, v in info[r'fields'].items():
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	312 if k in ['title', 'summary', 'testPlan']:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	313 transactions.append({'type': k, 'value': v})
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	314
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	315 params = {'transactions': transactions}
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	316 if revid is not None:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	317 # Update an existing Differential Revision
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	318 params['objectIdentifier'] = revid
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	319
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	320 revision = callconduit(repo, 'differential.revision.edit', params)
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	321 if not revision:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	322 raise error.Abort(_('cannot create revision for %s') % ctx)
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	323
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	324 return revision, diff
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	325
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	326 def userphids(repo, names):
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	327 """convert user names to PHIDs"""
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	328 query = {'constraints': {'usernames': names}}
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	329 result = callconduit(repo, 'user.search', query)
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	330 # username not found is not an error of the API. So check if we have missed
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	331 # some names here.
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	332 data = result[r'data']
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	333 resolved = set(entry[r'fields'][r'username'] for entry in data)
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	334 unresolved = set(names) - resolved
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	335 if unresolved:
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	336 raise error.Abort(_('unknown username: %s')
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	337 % ' '.join(sorted(unresolved)))
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	338 return [entry[r'phid'] for entry in data]
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	339
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	340 @command('phabsend',
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	341 [('r', 'rev', [], _('revisions to send'), _('REV')),
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	342 ('', 'amend', False, _('update commit messages')),
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	343 ('', 'reviewer', [], _('specify reviewers')),
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	344 ('', 'confirm', None, _('ask for confirmation before sending'))],
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	345 _('REV [OPTIONS]'))
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	346 def phabsend(ui, repo, revs, *opts):
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	347 """upload changesets to Phabricator
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	348
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	349 If there are multiple revisions specified, they will be send as a stack
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	350 with a linear dependencies relationship using the order specified by the
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	351 revset.
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	352
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	353 For the first time uploading changesets, local tags will be created to
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	354 maintain the association. After the first time, phabsend will check
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	355 obsstore and tags information so it can figure out whether to update an
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	356 existing Differential Revision, or create a new one.
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	357
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	358 If --amend is set, update commit messages so they have the
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	359 ``Differential Revision`` URL, remove related tags. This is similar to what
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	360 arcanist will do, and is more desired in author-push workflows. Otherwise,
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	361 use local tags to record the ``Differential Revision`` association.
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	362
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	363 The --confirm option lets you confirm changesets before sending them. You
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	364 can also add following to your configuration file to make it default
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	365 behaviour.
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	366
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	367 [phabsend]
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	368 confirm = true
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	369
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	370 phabsend will check obsstore and the above association to decide whether to
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	371 update an existing Differential Revision, or create a new one.
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	372 """
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	373 revs = list(revs) + opts.get('rev', [])
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	374 revs = scmutil.revrange(repo, revs)
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	375
33266 5b2391b46906 phabricator: abort if phabsend gets empty revs Jun Wu <quark@fb.com> parents: 33265 diff changeset	376 if not revs:
5b2391b46906 phabricator: abort if phabsend gets empty revs Jun Wu <quark@fb.com> parents: 33265 diff changeset	377 raise error.Abort(_('phabsend requires at least one changeset'))
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	378 if opts.get('amend'):
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	379 cmdutil.checkunfinished(repo)
33266 5b2391b46906 phabricator: abort if phabsend gets empty revs Jun Wu <quark@fb.com> parents: 33265 diff changeset	380
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	381 confirm = ui.configbool('phabsend', 'confirm')
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	382 confirm \|= bool(opts.get('confirm'))
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	383 if confirm:
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	384 confirmed = _confirmbeforesend(repo, revs)
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	385 if not confirmed:
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	386 raise error.Abort(_('phabsend cancelled'))
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	387
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	388 actions = []
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	389 reviewers = opts.get('reviewer', [])
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	390 if reviewers:
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	391 phids = userphids(repo, reviewers)
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	392 actions.append({'type': 'reviewers.add', 'value': phids})
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	393
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	394 # {newnode: (oldnode, olddiff, olddrev}
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	395 oldmap = getoldnodedrevmap(repo, [repo[r].node() for r in revs])
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	396
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	397 drevids = [] # [int]
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	398 diffmap = {} # {newnode: diff}
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	399
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	400 # Send patches one by one so we know their Differential Revision IDs and
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	401 # can provide dependency relationship
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	402 lastrevid = None
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	403 for rev in revs:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	404 ui.debug('sending rev %d\n' % rev)
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	405 ctx = repo[rev]
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	406
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	407 # Get Differential Revision ID
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	408 oldnode, olddiff, revid = oldmap.get(ctx.node(), (None, None, None))
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	409 if oldnode != ctx.node() or opts.get('amend'):
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	410 # Create or update Differential Revision
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	411 revision, diff = createdifferentialrevision(
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	412 ctx, revid, lastrevid, oldnode, olddiff, actions)
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	413 diffmap[ctx.node()] = diff
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	414 newrevid = int(revision[r'object'][r'id'])
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	415 if revid:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	416 action = _('updated')
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	417 else:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	418 action = _('created')
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	419
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	420 # Create a local tag to note the association, if commit message
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	421 # does not have it already
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	422 m = _differentialrevisiondescre.search(ctx.description())
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	423 if not m or int(m.group(1)) != newrevid:
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	424 tagname = 'D%d' % newrevid
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	425 tags.tag(repo, tagname, ctx.node(), message=None, user=None,
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	426 date=None, local=True)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	427 else:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	428 # Nothing changed. But still set "newrevid" so the next revision
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	429 # could depend on this one.
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	430 newrevid = revid
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	431 action = _('skipped')
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	432
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	433 ui.write(_('D%s: %s - %s: %s\n') % (newrevid, action, ctx,
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	434 ctx.description().split('\n')[0]))
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	435 drevids.append(newrevid)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	436 lastrevid = newrevid
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	437
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	438 # Update commit messages and remove tags
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	439 if opts.get('amend'):
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	440 unfi = repo.unfiltered()
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	441 drevs = callconduit(repo, 'differential.query', {'ids': drevids})
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	442 with repo.wlock(), repo.lock(), repo.transaction('phabsend'):
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	443 wnode = unfi['.'].node()
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	444 mapping = {} # {oldnode: [newnode]}
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	445 for i, rev in enumerate(revs):
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	446 old = unfi[rev]
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	447 drevid = drevids[i]
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	448 drev = [d for d in drevs if int(d[r'id']) == drevid][0]
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	449 newdesc = getdescfromdrev(drev)
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	450 # Make sure commit message contain "Differential Revision"
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	451 if old.description() != newdesc:
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	452 parents = [
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	453 mapping.get(old.p1().node(), (old.p1(),))[0],
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	454 mapping.get(old.p2().node(), (old.p2(),))[0],
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	455 ]
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	456 new = context.metadataonlyctx(
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	457 repo, old, parents=parents, text=newdesc,
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	458 user=old.user(), date=old.date(), extra=old.extra())
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	459 newnode = new.commit()
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	460 mapping[old.node()] = [newnode]
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	461 # Update diff property
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	462 writediffproperties(unfi[newnode], diffmap[old.node()])
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	463 # Remove local tags since it's no longer necessary
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	464 tagname = 'D%d' % drevid
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	465 if tagname in repo.tags():
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	466 tags.tag(repo, tagname, nullid, message=None, user=None,
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	467 date=None, local=True)
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	468 scmutil.cleanupnodes(repo, mapping, 'phabsend')
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	469 if wnode in mapping:
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	470 unfi.setparents(mapping[wnode][0])
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	471
33264 266321579c68 phabricator: add node and p1 to hg:meta property Jun Wu <quark@fb.com> parents: 33263 diff changeset	472 # Map from "hg:meta" keys to header understood by "hg import". The order is
266321579c68 phabricator: add node and p1 to hg:meta property Jun Wu <quark@fb.com> parents: 33263 diff changeset	473 # consistent with "hg export" output.
266321579c68 phabricator: add node and p1 to hg:meta property Jun Wu <quark@fb.com> parents: 33263 diff changeset	474 _metanamemap = util.sortdict([(r'user', 'User'), (r'date', 'Date'),
266321579c68 phabricator: add node and p1 to hg:meta property Jun Wu <quark@fb.com> parents: 33263 diff changeset	475 (r'node', 'Node ID'), (r'parent', 'Parent ')])
266321579c68 phabricator: add node and p1 to hg:meta property Jun Wu <quark@fb.com> parents: 33263 diff changeset	476
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	477 def _confirmbeforesend(repo, revs):
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	478 ui = repo.ui
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	479 for rev in revs:
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	480 ctx = repo[rev]
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	481 desc = ctx.description().splitlines()[0]
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	482 ui.write(('%d: ' % rev), label='phabsend.revnumber')
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	483 ui.write(('%s\n' % desc), label='phabsend.desc')
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	484
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	485 if ui.promptchoice(_('Phabsend the above changes (yn)?'
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	486 '$$ &Yes $$ &No')):
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	487 return False
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	488
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	489 return True
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	490
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	491 # Small language to specify differential revisions. Support symbols: (), :X,
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	492 # +, and -.
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	493
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	494 _elements = {
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	495 # token-type: binding-strength, primary, prefix, infix, suffix
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	496 '(': (12, None, ('group', 1, ')'), None, None),
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	497 ':': (8, None, ('ancestors', 8), None, None),
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	498 '&': (5, None, None, ('and_', 5), None),
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	499 '+': (4, None, None, ('add', 4), None),
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	500 '-': (4, None, None, ('sub', 4), None),
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	501 ')': (0, None, None, None, None),
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	502 'symbol': (0, 'symbol', None, None, None),
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	503 'end': (0, None, None, None, None),
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	504 }
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	505
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	506 def _tokenize(text):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	507 text = text.replace(' ', '') # remove space
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	508 view = memoryview(text) # zero-copy slice
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	509 special = '():+-&'
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	510 pos = 0
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	511 length = len(text)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	512 while pos < length:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	513 symbol = ''.join(itertools.takewhile(lambda ch: ch not in special,
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	514 view[pos:]))
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	515 if symbol:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	516 yield ('symbol', symbol, pos)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	517 pos += len(symbol)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	518 else: # special char
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	519 yield (text[pos], None, pos)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	520 pos += 1
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	521 yield ('end', None, pos)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	522
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	523 def _parse(text):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	524 tree, pos = parser.parser(_elements).parse(_tokenize(text))
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	525 if pos != len(text):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	526 raise error.ParseError('invalid token', pos)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	527 return tree
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	528
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	529 def _parsedrev(symbol):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	530 """str -> int or None, ex. 'D45' -> 45; '12' -> 12; 'x' -> None"""
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	531 if symbol.startswith('D') and symbol[1:].isdigit():
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	532 return int(symbol[1:])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	533 if symbol.isdigit():
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	534 return int(symbol)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	535
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	536 def _prefetchdrevs(tree):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	537 """return ({single-drev-id}, {ancestor-drev-id}) to prefetch"""
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	538 drevs = set()
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	539 ancestordrevs = set()
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	540 op = tree[0]
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	541 if op == 'symbol':
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	542 r = _parsedrev(tree[1])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	543 if r:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	544 drevs.add(r)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	545 elif op == 'ancestors':
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	546 r, a = _prefetchdrevs(tree[1])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	547 drevs.update(r)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	548 ancestordrevs.update(r)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	549 ancestordrevs.update(a)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	550 else:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	551 for t in tree[1:]:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	552 r, a = _prefetchdrevs(t)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	553 drevs.update(r)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	554 ancestordrevs.update(a)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	555 return drevs, ancestordrevs
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	556
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	557 def querydrev(repo, spec):
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	558 """return a list of "Differential Revision" dicts
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	559
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	560 spec is a string using a simple query language, see docstring in phabread
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	561 for details.
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	562
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	563 A "Differential Revision dict" looks like:
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	564
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	565 {
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	566 "id": "2",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	567 "phid": "PHID-DREV-672qvysjcczopag46qty",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	568 "title": "example",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	569 "uri": "https://phab.example.com/D2",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	570 "dateCreated": "1499181406",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	571 "dateModified": "1499182103",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	572 "authorPHID": "PHID-USER-tv3ohwc4v4jeu34otlye",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	573 "status": "0",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	574 "statusName": "Needs Review",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	575 "properties": [],
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	576 "branch": null,
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	577 "summary": "",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	578 "testPlan": "",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	579 "lineCount": "2",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	580 "activeDiffPHID": "PHID-DIFF-xoqnjkobbm6k4dk6hi72",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	581 "diffs": [
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	582 "3",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	583 "4",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	584 ],
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	585 "commits": [],
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	586 "reviewers": [],
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	587 "ccs": [],
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	588 "hashes": [],
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	589 "auxiliary": {
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	590 "phabricator:projects": [],
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	591 "phabricator:depends-on": [
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	592 "PHID-DREV-gbapp366kutjebt7agcd"
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	593 ]
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	594 },
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	595 "repositoryPHID": "PHID-REPO-hub2hx62ieuqeheznasv",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	596 "sourcePath": null
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	597 }
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	598 """
33269 ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	599 def fetch(params):
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	600 """params -> single drev or None"""
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	601 key = (params.get(r'ids') or params.get(r'phids') or [None])[0]
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	602 if key in prefetched:
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	603 return prefetched[key]
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	604 drevs = callconduit(repo, 'differential.query', params)
33269 ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	605 # Fill prefetched with the result
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	606 for drev in drevs:
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	607 prefetched[drev[r'phid']] = drev
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	608 prefetched[int(drev[r'id'])] = drev
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	609 if key not in prefetched:
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	610 raise error.Abort(_('cannot get Differential Revision %r') % params)
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	611 return prefetched[key]
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	612
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	613 def getstack(topdrevids):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	614 """given a top, get a stack from the bottom, [id] -> [id]"""
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	615 visited = set()
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	616 result = []
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	617 queue = [{r'ids': [i]} for i in topdrevids]
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	618 while queue:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	619 params = queue.pop()
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	620 drev = fetch(params)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	621 if drev[r'id'] in visited:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	622 continue
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	623 visited.add(drev[r'id'])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	624 result.append(int(drev[r'id']))
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	625 auxiliary = drev.get(r'auxiliary', {})
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	626 depends = auxiliary.get(r'phabricator:depends-on', [])
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	627 for phid in depends:
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	628 queue.append({'phids': [phid]})
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	629 result.reverse()
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	630 return smartset.baseset(result)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	631
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	632 # Initialize prefetch cache
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	633 prefetched = {} # {id or phid: drev}
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	634
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	635 tree = _parse(spec)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	636 drevs, ancestordrevs = _prefetchdrevs(tree)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	637
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	638 # developer config: phabricator.batchsize
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	639 batchsize = repo.ui.configint('phabricator', 'batchsize', 12)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	640
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	641 # Prefetch Differential Revisions in batch
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	642 tofetch = set(drevs)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	643 for r in ancestordrevs:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	644 tofetch.update(range(max(1, r - batchsize), r + 1))
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	645 if drevs:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	646 fetch({r'ids': list(tofetch)})
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	647 getstack(list(ancestordrevs))
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	648
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	649 # Walk through the tree, return smartsets
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	650 def walk(tree):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	651 op = tree[0]
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	652 if op == 'symbol':
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	653 drev = _parsedrev(tree[1])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	654 if drev:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	655 return smartset.baseset([drev])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	656 else:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	657 raise error.Abort(_('unknown symbol: %s') % tree[1])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	658 elif op in {'and_', 'add', 'sub'}:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	659 assert len(tree) == 3
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	660 return getattr(operator, op)(walk(tree[1]), walk(tree[2]))
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	661 elif op == 'group':
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	662 return walk(tree[1])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	663 elif op == 'ancestors':
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	664 return getstack(walk(tree[1]))
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	665 else:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	666 raise error.ProgrammingError('illegal tree: %r' % tree)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	667
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	668 return [prefetched[r] for r in walk(tree)]
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	669
33268 85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	670 def getdescfromdrev(drev):
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	671 """get description (commit message) from "Differential Revision"
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	672
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	673 This is similar to differential.getcommitmessage API. But we only care
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	674 about limited fields: title, summary, test plan, and URL.
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	675 """
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	676 title = drev[r'title']
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	677 summary = drev[r'summary'].rstrip()
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	678 testplan = drev[r'testPlan'].rstrip()
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	679 if testplan:
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	680 testplan = 'Test Plan:\n%s' % testplan
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	681 uri = 'Differential Revision: %s' % drev[r'uri']
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	682 return '\n\n'.join(filter(None, [title, summary, testplan, uri]))
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	683
33441 de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	684 def getdiffmeta(diff):
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	685 """get commit metadata (date, node, user, p1) from a diff object
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	686
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	687 The metadata could be "hg:meta", sent by phabsend, like:
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	688
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	689 "properties": {
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	690 "hg:meta": {
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	691 "date": "1499571514 25200",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	692 "node": "98c08acae292b2faf60a279b4189beb6cff1414d",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	693 "user": "Foo Bar <foo@example.com>",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	694 "parent": "6d0abad76b30e4724a37ab8721d630394070fe16"
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	695 }
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	696 }
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	697
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	698 Or converted from "local:commits", sent by "arc", like:
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	699
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	700 "properties": {
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	701 "local:commits": {
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	702 "98c08acae292b2faf60a279b4189beb6cff1414d": {
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	703 "author": "Foo Bar",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	704 "time": 1499546314,
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	705 "branch": "default",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	706 "tag": "",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	707 "commit": "98c08acae292b2faf60a279b4189beb6cff1414d",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	708 "rev": "98c08acae292b2faf60a279b4189beb6cff1414d",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	709 "local": "1000",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	710 "parents": ["6d0abad76b30e4724a37ab8721d630394070fe16"],
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	711 "summary": "...",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	712 "message": "...",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	713 "authorEmail": "foo@example.com"
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	714 }
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	715 }
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	716 }
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	717
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	718 Note: metadata extracted from "local:commits" will lose time zone
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	719 information.
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	720 """
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	721 props = diff.get(r'properties') or {}
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	722 meta = props.get(r'hg:meta')
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	723 if not meta and props.get(r'local:commits'):
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	724 commit = sorted(props[r'local:commits'].values())[0]
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	725 meta = {
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	726 r'date': r'%d 0' % commit[r'time'],
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	727 r'node': commit[r'rev'],
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	728 r'user': r'%s <%s>' % (commit[r'author'], commit[r'authorEmail']),
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	729 }
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	730 if len(commit.get(r'parents', ())) >= 1:
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	731 meta[r'parent'] = commit[r'parents'][0]
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	732 return meta or {}
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	733
33831 75fdaf851e83 phabricator: change "readpatch" to be more flexible Jun Wu <quark@fb.com> parents: 33787 diff changeset	734 def readpatch(repo, drevs, write):
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	735 """generate plain-text patch readable by 'hg import'
04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	736
33831 75fdaf851e83 phabricator: change "readpatch" to be more flexible Jun Wu <quark@fb.com> parents: 33787 diff changeset	737 write is usually ui.write. drevs is what "querydrev" returns, results of
75fdaf851e83 phabricator: change "readpatch" to be more flexible Jun Wu <quark@fb.com> parents: 33787 diff changeset	738 "differential.query".
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	739 """
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	740 # Prefetch hg:meta property for all diffs
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	741 diffids = sorted(set(max(int(v) for v in drev[r'diffs']) for drev in drevs))
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	742 diffs = callconduit(repo, 'differential.querydiffs', {'ids': diffids})
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	743
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	744 # Generate patch for each drev
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	745 for drev in drevs:
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	746 repo.ui.note(_('reading D%s\n') % drev[r'id'])
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	747
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	748 diffid = max(int(v) for v in drev[r'diffs'])
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	749 body = callconduit(repo, 'differential.getrawdiff', {'diffID': diffid})
33268 85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	750 desc = getdescfromdrev(drev)
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	751 header = '# HG changeset patch\n'
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	752
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	753 # Try to preserve metadata from hg:meta property. Write hg patch
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	754 # headers that can be read by the "import" command. See patchheadermap
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	755 # and extract in mercurial/patch.py for supported headers.
33441 de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	756 meta = getdiffmeta(diffs[str(diffid)])
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	757 for k in _metanamemap.keys():
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	758 if k in meta:
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	759 header += '# %s %s\n' % (_metanamemap[k], meta[k])
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	760
33601 850d2ec2cf6a phabricator: convert unicode to binary when writing patches Jun Wu <quark@fb.com> parents: 33564 diff changeset	761 content = '%s%s\n%s' % (header, desc, body)
850d2ec2cf6a phabricator: convert unicode to binary when writing patches Jun Wu <quark@fb.com> parents: 33564 diff changeset	762 write(encoding.unitolocal(content))
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	763
04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	764 @command('phabread',
04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	765 [('', 'stack', False, _('read dependencies'))],
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	766 _('DREVSPEC [OPTIONS]'))
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	767 def phabread(ui, repo, spec, **opts):
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	768 """print patches from Phabricator suitable for importing
04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	769
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	770 DREVSPEC could be a Differential Revision identity, like ``D123``, or just
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	771 the number ``123``. It could also have common operators like ``+``, ``-``,
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	772 ``&``, ``(``, ``)`` for complex queries. Prefix ``:`` could be used to
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	773 select a stack.
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	774
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	775 For example, ``:D6+8-(2+D4)`` selects a stack up to D6, plus D8 and exclude
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	776 D2 and D4.
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	777
04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	778 If --stack is given, follow dependencies information and read all patches.
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	779 It is equivalent to the ``:`` operator.
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	780 """
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	781 if opts.get('stack'):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	782 spec = ':(%s)' % spec
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	783 drevs = querydrev(repo, spec)
33831 75fdaf851e83 phabricator: change "readpatch" to be more flexible Jun Wu <quark@fb.com> parents: 33787 diff changeset	784 readpatch(repo, drevs, ui.write)

Mercurial > public > mercurial-scm > hg

annotate contrib/phabricator.py @ 33832:539541779010