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

annotate hgext/phabricator.py @ 48873:5aafc3c5bdec

py3: use io.BytesIO directly Previously, pycompat.bytesio and pycompat.stringio referred to io.BytesIO. And util.bytesio and util.stringio aliased the pycompat symbols. This commit switches everything to use io.BytesIO directly. util.bytesio and util.stringio still exist to provide backwards compatibility, as they were the preferred symbols. Differential Revision: https://phab.mercurial-scm.org/D12252

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Sun, 20 Feb 2022 15:03:26 -0700
parents	5ced12cfa41b
children	6000f5b25c9b

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.
39655 87539f615b87 phabricator: mark extension as experimental for now Augie Fackler <raf@durin42.com> parents: 39654 diff changeset	7 """simple Phabricator integration (EXPERIMENTAL)
33198 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
33975 07ffff841863 phabsend: make --amend the default Jun Wu <quark@fb.com> parents: 33974 diff changeset	10 changesets to Phabricator, and a ``phabread`` command which prints a stack of
07ffff841863 phabsend: make --amend the default Jun Wu <quark@fb.com> parents: 33974 diff changeset	11 revisions in a format suitable for :hg:`import`, and a ``phabupdate`` command
07ffff841863 phabsend: make --amend the default Jun Wu <quark@fb.com> parents: 33974 diff changeset	12 to update statuses in batch.
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	13
43839 70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	14 A "phabstatus" view for :hg:`show` is also provided; it displays status
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	15 information of Phabricator differentials associated with unfinished
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	16 changesets.
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	17
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	18 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	19 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	20 ``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	21
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	22 Config::
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 [phabricator]
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	25 # Phabricator URL
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	26 url = https://phab.example.com/
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	27
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	28 # 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	29 # callsign is "FOO".
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	30 callsign = FOO
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	31
34064 8b659b7388c0 phabricator: add a config to use curl for communication Jun Wu <quark@fb.com> parents: 34063 diff changeset	32 # curl command to use. If not set (default), use builtin HTTP library to
8b659b7388c0 phabricator: add a config to use curl for communication Jun Wu <quark@fb.com> parents: 34063 diff changeset	33 # communicate. If set, use the specified curl command. This could be useful
8b659b7388c0 phabricator: add a config to use curl for communication Jun Wu <quark@fb.com> parents: 34063 diff changeset	34 # if you need to specify advanced options that is not easily supported by
8b659b7388c0 phabricator: add a config to use curl for communication Jun Wu <quark@fb.com> parents: 34063 diff changeset	35 # the internal library.
8b659b7388c0 phabricator: add a config to use curl for communication Jun Wu <quark@fb.com> parents: 34063 diff changeset	36 curlcmd = curl --connect-timeout 2 --retry 3 --silent
36787 4397909f82d3 phabricator: specify API tokens per host, rather than per repo Tom Prince <mozilla@hocat.ca> parents: 36514 diff changeset	37
45969 57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	38 # retry failed command N time (default 0). Useful when using the extension
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	39 # over flakly connection.
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	40 #
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	41 # We wait `retry.interval` between each retry, in seconds.
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	42 # (default 1 second).
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	43 retry = 3
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	44 retry.interval = 10
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	45
45970 4d70444c3ea9 phabricator: use the `http.timeout` config for conduit call Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45969 diff changeset	46 # the retry option can combine well with the http.timeout one.
4d70444c3ea9 phabricator: use the `http.timeout` config for conduit call Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45969 diff changeset	47 #
4d70444c3ea9 phabricator: use the `http.timeout` config for conduit call Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45969 diff changeset	48 # For example to give up on http request after 20 seconds:
4d70444c3ea9 phabricator: use the `http.timeout` config for conduit call Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45969 diff changeset	49 [http]
4d70444c3ea9 phabricator: use the `http.timeout` config for conduit call Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45969 diff changeset	50 timeout=20
4d70444c3ea9 phabricator: use the `http.timeout` config for conduit call Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45969 diff changeset	51
37996 0fa050bc68cb phabricator: migrate [phabricator.auth] to [auth] Matt Harbison <matt_harbison@yahoo.com> parents: 37976 diff changeset	52 [auth]
37997 71cf20d47f25 phabricator: split auth.url into the standard auth.schemes and auth.prefix Matt Harbison <matt_harbison@yahoo.com> parents: 37996 diff changeset	53 example.schemes = https
71cf20d47f25 phabricator: split auth.url into the standard auth.schemes and auth.prefix Matt Harbison <matt_harbison@yahoo.com> parents: 37996 diff changeset	54 example.prefix = phab.example.com
71cf20d47f25 phabricator: split auth.url into the standard auth.schemes and auth.prefix Matt Harbison <matt_harbison@yahoo.com> parents: 37996 diff changeset	55
36787 4397909f82d3 phabricator: specify API tokens per host, rather than per repo Tom Prince <mozilla@hocat.ca> parents: 36514 diff changeset	56 # API token. Get it from https://$HOST/conduit/login/
37996 0fa050bc68cb phabricator: migrate [phabricator.auth] to [auth] Matt Harbison <matt_harbison@yahoo.com> parents: 37976 diff changeset	57 example.phabtoken = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx
33198 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
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	60 from __future__ import absolute_import
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	61
43187 453079605242 phabricator: add the uploadchunks function Ian Moody <moz-ian@perix.co.uk> parents: 43186 diff changeset	62 import base64
41080 9d35ae3d9999 phabricator: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 41078 diff changeset	63 import contextlib
43188 24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	64 import hashlib
48873 5aafc3c5bdec py3: use io.BytesIO directly Gregory Szorc <gregory.szorc@gmail.com> parents: 48116 diff changeset	65 import io
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	66 import itertools
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	67 import json
43189 9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	68 import mimetypes
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	69 import operator
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	70 import re
45969 57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	71 import time
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	72
47012 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46907 diff changeset	73 from mercurial.node import bin, short
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	74 from mercurial.i18n import _
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43080 diff changeset	75 from mercurial.pycompat import getattr
43183 73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	76 from mercurial.thirdparty import attr
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	77 from mercurial import (
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	78 cmdutil,
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	79 context,
44610 022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	80 copies,
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	81 encoding,
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	82 error,
42973 24bf7a3d3c30 phabricator: use exthelper to register commands, config, and templates Matt Harbison <matt_harbison@yahoo.com> parents: 42951 diff changeset	83 exthelper,
43839 70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	84 graphmod,
37997 71cf20d47f25 phabricator: split auth.url into the standard auth.schemes and auth.prefix Matt Harbison <matt_harbison@yahoo.com> parents: 37996 diff changeset	85 httpconnection as httpconnectionmod,
44127 59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	86 localrepo,
43839 70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	87 logcmdutil,
43186 f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	88 match,
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	89 mdiff,
33735 e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33692 diff changeset	90 obsutil,
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	91 parser,
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	92 patch,
41163 0101a35deae2 phabricator: warn if unable to amend, instead of aborting after posting Matt Harbison <matt_harbison@yahoo.com> parents: 41080 diff changeset	93 phases,
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	94 pycompat,
45426 1a5d3e555c70 phabricator: update the hashes in commit messages as they get submitted Matt Harbison <matt_harbison@yahoo.com> parents: 45246 diff changeset	95 rewriteutil,
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	96 scmutil,
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	97 smartset,
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	98 tags,
42188 289d82a070e9 phabricator: use templatefilters.json in writediffproperties Ian Moody <moz-ian@perix.co.uk> parents: 41971 diff changeset	99 templatefilters,
39654 4057e38bba76 phabricator: fix templating bug by using hybriddict Augie Fackler <raf@durin42.com> parents: 39652 diff changeset	100 templateutil,
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	101 url as urlmod,
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	102 util,
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	103 )
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36818 diff changeset	104 from mercurial.utils import (
a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36818 diff changeset	105 procutil,
37800 6cf5f5b4eb57 phabricator: specify some metadata compatibly with arc Tom Prince <mozilla@hocat.ca> parents: 37120 diff changeset	106 stringutil,
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46037 diff changeset	107 urlutil,
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36818 diff changeset	108 )
43839 70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	109 from . import show
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	110
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	111
39735 c0c703861b60 phabricator: add testedwith boilerplate Yuya Nishihara <yuya@tcha.org> parents: 39655 diff changeset	112 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
c0c703861b60 phabricator: add testedwith boilerplate Yuya Nishihara <yuya@tcha.org> parents: 39655 diff changeset	113 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
c0c703861b60 phabricator: add testedwith boilerplate Yuya Nishihara <yuya@tcha.org> parents: 39655 diff changeset	114 # be specifying the version(s) of Mercurial they are tested with, or
c0c703861b60 phabricator: add testedwith boilerplate Yuya Nishihara <yuya@tcha.org> parents: 39655 diff changeset	115 # leave the attribute unspecified.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	116 testedwith = b'ships-with-hg-core'
39735 c0c703861b60 phabricator: add testedwith boilerplate Yuya Nishihara <yuya@tcha.org> parents: 39655 diff changeset	117
42973 24bf7a3d3c30 phabricator: use exthelper to register commands, config, and templates Matt Harbison <matt_harbison@yahoo.com> parents: 42951 diff changeset	118 eh = exthelper.exthelper()
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	119
42973 24bf7a3d3c30 phabricator: use exthelper to register commands, config, and templates Matt Harbison <matt_harbison@yahoo.com> parents: 42951 diff changeset	120 cmdtable = eh.cmdtable
24bf7a3d3c30 phabricator: use exthelper to register commands, config, and templates Matt Harbison <matt_harbison@yahoo.com> parents: 42951 diff changeset	121 command = eh.command
24bf7a3d3c30 phabricator: use exthelper to register commands, config, and templates Matt Harbison <matt_harbison@yahoo.com> parents: 42951 diff changeset	122 configtable = eh.configtable
24bf7a3d3c30 phabricator: use exthelper to register commands, config, and templates Matt Harbison <matt_harbison@yahoo.com> parents: 42951 diff changeset	123 templatekeyword = eh.templatekeyword
44127 59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	124 uisetup = eh.finaluisetup
38042 5a7cf42ba6ef phabricator: register config settings Matt Harbison <matt_harbison@yahoo.com> parents: 37997 diff changeset	125
5a7cf42ba6ef phabricator: register config settings Matt Harbison <matt_harbison@yahoo.com> parents: 37997 diff changeset	126 # developer config: phabricator.batchsize
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	127 eh.configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	128 b'phabricator',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	129 b'batchsize',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	130 default=12,
38042 5a7cf42ba6ef phabricator: register config settings Matt Harbison <matt_harbison@yahoo.com> parents: 37997 diff changeset	131 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	132 eh.configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	133 b'phabricator',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	134 b'callsign',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	135 default=None,
38042 5a7cf42ba6ef phabricator: register config settings Matt Harbison <matt_harbison@yahoo.com> parents: 37997 diff changeset	136 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	137 eh.configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	138 b'phabricator',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	139 b'curlcmd',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	140 default=None,
38042 5a7cf42ba6ef phabricator: register config settings Matt Harbison <matt_harbison@yahoo.com> parents: 37997 diff changeset	141 )
44715 38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	142 # developer config: phabricator.debug
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	143 eh.configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	144 b'phabricator',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	145 b'debug',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	146 default=False,
44715 38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	147 )
38042 5a7cf42ba6ef phabricator: register config settings Matt Harbison <matt_harbison@yahoo.com> parents: 37997 diff changeset	148 # developer config: phabricator.repophid
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	149 eh.configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	150 b'phabricator',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	151 b'repophid',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	152 default=None,
38042 5a7cf42ba6ef phabricator: register config settings Matt Harbison <matt_harbison@yahoo.com> parents: 37997 diff changeset	153 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	154 eh.configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	155 b'phabricator',
45969 57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	156 b'retry',
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	157 default=0,
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	158 )
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	159 eh.configitem(
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	160 b'phabricator',
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	161 b'retry.interval',
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	162 default=1,
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	163 )
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	164 eh.configitem(
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	165 b'phabricator',
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	166 b'url',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	167 default=None,
38042 5a7cf42ba6ef phabricator: register config settings Matt Harbison <matt_harbison@yahoo.com> parents: 37997 diff changeset	168 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	169 eh.configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	170 b'phabsend',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	171 b'confirm',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	172 default=False,
38042 5a7cf42ba6ef phabricator: register config settings Matt Harbison <matt_harbison@yahoo.com> parents: 37997 diff changeset	173 )
44551 9bae1d1a0f4c phabricator: add a config knob to import in the secret phase Matt Harbison <matt_harbison@yahoo.com> parents: 44550 diff changeset	174 eh.configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	175 b'phabimport',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	176 b'secret',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	177 default=False,
44551 9bae1d1a0f4c phabricator: add a config knob to import in the secret phase Matt Harbison <matt_harbison@yahoo.com> parents: 44550 diff changeset	178 )
44552 f10055b099b3 phabricator: add a config knob to create obsolete markers when importing Matt Harbison <matt_harbison@yahoo.com> parents: 44551 diff changeset	179 eh.configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	180 b'phabimport',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	181 b'obsolete',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	182 default=False,
44552 f10055b099b3 phabricator: add a config knob to create obsolete markers when importing Matt Harbison <matt_harbison@yahoo.com> parents: 44551 diff changeset	183 )
38042 5a7cf42ba6ef phabricator: register config settings Matt Harbison <matt_harbison@yahoo.com> parents: 37997 diff changeset	184
34063 941c33cfde81 phabricator: standardize colors Jun Wu <quark@fb.com> parents: 33978 diff changeset	185 colortable = {
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	186 b'phabricator.action.created': b'green',
81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	187 b'phabricator.action.skipped': b'magenta',
81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	188 b'phabricator.action.updated': b'magenta',
81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	189 b'phabricator.drev': b'bold',
43858 b0867b7751ba phabricator: color the status in the "phabstatus" view Matt Harbison <matt_harbison@yahoo.com> parents: 43857 diff changeset	190 b'phabricator.status.abandoned': b'magenta dim',
b0867b7751ba phabricator: color the status in the "phabstatus" view Matt Harbison <matt_harbison@yahoo.com> parents: 43857 diff changeset	191 b'phabricator.status.accepted': b'green bold',
b0867b7751ba phabricator: color the status in the "phabstatus" view Matt Harbison <matt_harbison@yahoo.com> parents: 43857 diff changeset	192 b'phabricator.status.closed': b'green',
b0867b7751ba phabricator: color the status in the "phabstatus" view Matt Harbison <matt_harbison@yahoo.com> parents: 43857 diff changeset	193 b'phabricator.status.needsreview': b'yellow',
b0867b7751ba phabricator: color the status in the "phabstatus" view Matt Harbison <matt_harbison@yahoo.com> parents: 43857 diff changeset	194 b'phabricator.status.needsrevision': b'red',
b0867b7751ba phabricator: color the status in the "phabstatus" view Matt Harbison <matt_harbison@yahoo.com> parents: 43857 diff changeset	195 b'phabricator.status.changesplanned': b'red',
34063 941c33cfde81 phabricator: standardize colors Jun Wu <quark@fb.com> parents: 33978 diff changeset	196 }
941c33cfde81 phabricator: standardize colors Jun Wu <quark@fb.com> parents: 33978 diff changeset	197
39650 d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	198 _VCR_FLAGS = [
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	199 (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	200 b'',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	201 b'test-vcr',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	202 b'',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	203 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	204 b'Path to a vcr file. If nonexistent, will record a new vcr transcript'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	205 b', otherwise will mock all http requests using the specified vcr file.'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	206 b' (ADVANCED)'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	207 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	208 ),
39650 d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	209 ]
d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	210
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	211
44127 59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	212 @eh.wrapfunction(localrepo, "loadhgrc")
45502 c7fe0dfb5312 phabricator: fix loadhgrc() override broken by D8656 Martin von Zweigbergk <martinvonz@google.com> parents: 45485 diff changeset	213 def _loadhgrc(orig, ui, wdirvfs, hgvfs, requirements, args, *opts):
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	214 """Load ``.arcconfig`` content into a ui instance on repository open."""
44127 59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	215 result = False
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	216 arcconfig = {}
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	217
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	218 try:
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	219 # json.loads only accepts bytes from 3.6+
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	220 rawparams = encoding.unifromlocal(wdirvfs.read(b".arcconfig"))
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	221 # json.loads only returns unicode strings
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	222 arcconfig = pycompat.rapply(
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	223 lambda x: encoding.unitolocal(x)
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	224 if isinstance(x, pycompat.unicode)
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	225 else x,
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	226 pycompat.json_loads(rawparams),
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	227 )
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	228
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	229 result = True
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	230 except ValueError:
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	231 ui.warn(_(b"invalid JSON in %s\n") % wdirvfs.join(b".arcconfig"))
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	232 except IOError:
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	233 pass
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	234
44128 ff396501e841 phabricator: use .arcconfig for `phabricator.url` if not set locally Matt Harbison <matt_harbison@yahoo.com> parents: 44127 diff changeset	235 cfg = util.sortdict()
ff396501e841 phabricator: use .arcconfig for `phabricator.url` if not set locally Matt Harbison <matt_harbison@yahoo.com> parents: 44127 diff changeset	236
44127 59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	237 if b"repository.callsign" in arcconfig:
44128 ff396501e841 phabricator: use .arcconfig for `phabricator.url` if not set locally Matt Harbison <matt_harbison@yahoo.com> parents: 44127 diff changeset	238 cfg[(b"phabricator", b"callsign")] = arcconfig[b"repository.callsign"]
ff396501e841 phabricator: use .arcconfig for `phabricator.url` if not set locally Matt Harbison <matt_harbison@yahoo.com> parents: 44127 diff changeset	239
ff396501e841 phabricator: use .arcconfig for `phabricator.url` if not set locally Matt Harbison <matt_harbison@yahoo.com> parents: 44127 diff changeset	240 if b"phabricator.uri" in arcconfig:
ff396501e841 phabricator: use .arcconfig for `phabricator.url` if not set locally Matt Harbison <matt_harbison@yahoo.com> parents: 44127 diff changeset	241 cfg[(b"phabricator", b"url")] = arcconfig[b"phabricator.uri"]
ff396501e841 phabricator: use .arcconfig for `phabricator.url` if not set locally Matt Harbison <matt_harbison@yahoo.com> parents: 44127 diff changeset	242
ff396501e841 phabricator: use .arcconfig for `phabricator.url` if not set locally Matt Harbison <matt_harbison@yahoo.com> parents: 44127 diff changeset	243 if cfg:
ff396501e841 phabricator: use .arcconfig for `phabricator.url` if not set locally Matt Harbison <matt_harbison@yahoo.com> parents: 44127 diff changeset	244 ui.applyconfig(cfg, source=wdirvfs.join(b".arcconfig"))
44127 59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	245
45485 b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45426 diff changeset	246 return (
45502 c7fe0dfb5312 phabricator: fix loadhgrc() override broken by D8656 Martin von Zweigbergk <martinvonz@google.com> parents: 45485 diff changeset	247 orig(ui, wdirvfs, hgvfs, requirements, args, *opts) or result
45485 b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45426 diff changeset	248 ) # Load .hg/hgrc
44127 59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	249
59b3fe1e2021 phabricator: use .arcconfig for the callsign if not set locally (issue6243) Matt Harbison <matt_harbison@yahoo.com> parents: 44076 diff changeset	250
42435 16312ea45a8b phabricator: make `hg debugcallconduit` work outside a hg repo Pulkit Goyal <pulkit@yandex-team.ru> parents: 42434 diff changeset	251 def vcrcommand(name, flags, spec, helpcategory=None, optionalrepo=False):
39650 d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	252 fullflags = flags + _VCR_FLAGS
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	253
42268 af13e2088f77 phabricator: add custom vcr matcher to match request bodies Ian Moody <moz-ian@perix.co.uk> parents: 42258 diff changeset	254 def hgmatcher(r1, r2):
af13e2088f77 phabricator: add custom vcr matcher to match request bodies Ian Moody <moz-ian@perix.co.uk> parents: 42258 diff changeset	255 if r1.uri != r2.uri or r1.method != r2.method:
af13e2088f77 phabricator: add custom vcr matcher to match request bodies Ian Moody <moz-ian@perix.co.uk> parents: 42258 diff changeset	256 return False
43264 a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	257 r1params = util.urlreq.parseqs(r1.body)
a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	258 r2params = util.urlreq.parseqs(r2.body)
a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	259 for key in r1params:
a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	260 if key not in r2params:
a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	261 return False
a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	262 value = r1params[key][0]
a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	263 # we want to compare json payloads without worrying about ordering
a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	264 if value.startswith(b'{') and value.endswith(b'}'):
43380 579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43350 diff changeset	265 r1json = pycompat.json_loads(value)
579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43350 diff changeset	266 r2json = pycompat.json_loads(r2params[key][0])
43264 a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	267 if r1json != r2json:
a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	268 return False
a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	269 elif r2params[key][0] != value:
a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	270 return False
a4da1c3b82ab phabricator: update hgmatcher to cope with the new data format Ian Moody <moz-ian@perix.co.uk> parents: 43263 diff changeset	271 return True
42268 af13e2088f77 phabricator: add custom vcr matcher to match request bodies Ian Moody <moz-ian@perix.co.uk> parents: 42258 diff changeset	272
42443 d3c81439e2ee phabricator: auto-sanitise API tokens and HTTP cookies from VCR recordings Ian Moody <moz-ian@perix.co.uk> parents: 42435 diff changeset	273 def sanitiserequest(request):
d3c81439e2ee phabricator: auto-sanitise API tokens and HTTP cookies from VCR recordings Ian Moody <moz-ian@perix.co.uk> parents: 42435 diff changeset	274 request.body = re.sub(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	275 br'cli-[a-z0-9]+', br'cli-hahayouwish', request.body
42443 d3c81439e2ee phabricator: auto-sanitise API tokens and HTTP cookies from VCR recordings Ian Moody <moz-ian@perix.co.uk> parents: 42435 diff changeset	276 )
d3c81439e2ee phabricator: auto-sanitise API tokens and HTTP cookies from VCR recordings Ian Moody <moz-ian@perix.co.uk> parents: 42435 diff changeset	277 return request
d3c81439e2ee phabricator: auto-sanitise API tokens and HTTP cookies from VCR recordings Ian Moody <moz-ian@perix.co.uk> parents: 42435 diff changeset	278
d3c81439e2ee phabricator: auto-sanitise API tokens and HTTP cookies from VCR recordings Ian Moody <moz-ian@perix.co.uk> parents: 42435 diff changeset	279 def sanitiseresponse(response):
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43504 diff changeset	280 if 'set-cookie' in response['headers']:
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43504 diff changeset	281 del response['headers']['set-cookie']
42443 d3c81439e2ee phabricator: auto-sanitise API tokens and HTTP cookies from VCR recordings Ian Moody <moz-ian@perix.co.uk> parents: 42435 diff changeset	282 return response
d3c81439e2ee phabricator: auto-sanitise API tokens and HTTP cookies from VCR recordings Ian Moody <moz-ian@perix.co.uk> parents: 42435 diff changeset	283
39650 d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	284 def decorate(fn):
d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	285 def inner(args, *kwargs):
45246 b1f2659c1c34 phabricator: unconditionally pop `test_vcr` to fix debugcallconduit Ian Moody <moz-ian@perix.co.uk> parents: 45152 diff changeset	286 vcr = kwargs.pop('test_vcr')
b1f2659c1c34 phabricator: unconditionally pop `test_vcr` to fix debugcallconduit Ian Moody <moz-ian@perix.co.uk> parents: 45152 diff changeset	287 if vcr:
b1f2659c1c34 phabricator: unconditionally pop `test_vcr` to fix debugcallconduit Ian Moody <moz-ian@perix.co.uk> parents: 45152 diff changeset	288 cassette = pycompat.fsdecode(vcr)
39650 d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	289 import hgdemandimport
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	290
39650 d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	291 with hgdemandimport.deactivated():
d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	292 import vcr as vcrmod
d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	293 import vcr.stubs as stubs
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	294
40378 b015f30a91fb phabricator: do more of the VCR work in demandimport.deactivated() Augie Fackler <augie@google.com> parents: 40151 diff changeset	295 vcr = vcrmod.VCR(
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43504 diff changeset	296 serializer='json',
42443 d3c81439e2ee phabricator: auto-sanitise API tokens and HTTP cookies from VCR recordings Ian Moody <moz-ian@perix.co.uk> parents: 42435 diff changeset	297 before_record_request=sanitiserequest,
d3c81439e2ee phabricator: auto-sanitise API tokens and HTTP cookies from VCR recordings Ian Moody <moz-ian@perix.co.uk> parents: 42435 diff changeset	298 before_record_response=sanitiseresponse,
40378 b015f30a91fb phabricator: do more of the VCR work in demandimport.deactivated() Augie Fackler <augie@google.com> parents: 40151 diff changeset	299 custom_patches=[
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	300 (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	301 urlmod,
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43504 diff changeset	302 'httpconnection',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	303 stubs.VCRHTTPConnection,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	304 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	305 (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	306 urlmod,
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43504 diff changeset	307 'httpsconnection',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	308 stubs.VCRHTTPSConnection,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	309 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	310 ],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	311 )
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43504 diff changeset	312 vcr.register_matcher('hgmatcher', hgmatcher)
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43504 diff changeset	313 with vcr.use_cassette(cassette, match_on=['hgmatcher']):
40378 b015f30a91fb phabricator: do more of the VCR work in demandimport.deactivated() Augie Fackler <augie@google.com> parents: 40151 diff changeset	314 return fn(args, *kwargs)
39650 d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	315 return fn(args, *kwargs)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	316
44436 09f3e003fc2a phabricator: avoid a stacktrace when command arguments are missing Matt Harbison <matt_harbison@yahoo.com> parents: 44427 diff changeset	317 cmd = util.checksignature(inner, depth=2)
09f3e003fc2a phabricator: avoid a stacktrace when command arguments are missing Matt Harbison <matt_harbison@yahoo.com> parents: 44427 diff changeset	318 cmd.__name__ = fn.__name__
09f3e003fc2a phabricator: avoid a stacktrace when command arguments are missing Matt Harbison <matt_harbison@yahoo.com> parents: 44427 diff changeset	319 cmd.__doc__ = fn.__doc__
09f3e003fc2a phabricator: avoid a stacktrace when command arguments are missing Matt Harbison <matt_harbison@yahoo.com> parents: 44427 diff changeset	320
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	321 return command(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	322 name,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	323 fullflags,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	324 spec,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	325 helpcategory=helpcategory,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	326 optionalrepo=optionalrepo,
44436 09f3e003fc2a phabricator: avoid a stacktrace when command arguments are missing Matt Harbison <matt_harbison@yahoo.com> parents: 44427 diff changeset	327 )(cmd)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	328
39650 d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	329 return decorate
d8f07b16abfc phabricator: add support for using the vcr library to mock interactions Augie Fackler <raf@durin42.com> parents: 38945 diff changeset	330
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	331
44715 38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	332 def _debug(ui, msg, *opts):
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	333 """write debug output for Phabricator if ``phabricator.debug`` is set
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	334
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	335 Specifically, this avoids dumping Conduit and HTTP auth chatter that is
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	336 printed with the --debug argument.
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	337 """
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	338 if ui.configbool(b"phabricator", b"debug"):
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	339 flag = ui.debugflag
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	340 try:
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	341 ui.debugflag = True
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	342 ui.write(msg, *opts)
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	343 finally:
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	344 ui.debugflag = flag
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	345
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	346
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	347 def urlencodenested(params):
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	348 """like urlencode, but works with nested parameters.
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	349
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	350 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	351 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	352 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	353 """
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	354 flatparams = util.sortdict()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	355
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	356 def process(prefix, obj):
41017 d7d3164e6a31 phabricator: properly encode boolean types in the request body Matt Harbison <matt_harbison@yahoo.com> parents: 40546 diff changeset	357 if isinstance(obj, bool):
d7d3164e6a31 phabricator: properly encode boolean types in the request body Matt Harbison <matt_harbison@yahoo.com> parents: 40546 diff changeset	358 obj = {True: b'true', False: b'false'}[obj] # Python -> PHP form
41900 47125193bad0 py3: convert indexes into bytes when enumerating lists in urlencodenested Ian Moody <moz-ian@perix.co.uk> parents: 41899 diff changeset	359 lister = lambda l: [(b'%d' % k, v) for k, v in enumerate(l)]
47125193bad0 py3: convert indexes into bytes when enumerating lists in urlencodenested Ian Moody <moz-ian@perix.co.uk> parents: 41899 diff changeset	360 items = {list: lister, dict: lambda x: x.items()}.get(type(obj))
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	361 if items is None:
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	362 flatparams[prefix] = obj
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	363 else:
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	364 for k, v in items(obj):
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	365 if prefix:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	366 process(b'%s[%s]' % (prefix, k), v)
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	367 else:
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	368 process(k, v)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	369
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	370 process(b'', params)
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46037 diff changeset	371 return urlutil.urlreq.urlencode(flatparams)
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	372
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	373
42433 500b64c5d991 phabricator: pass ui into readurltoken instead of passing repo Pulkit Goyal <pulkit@yandex-team.ru> parents: 42431 diff changeset	374 def readurltoken(ui):
37996 0fa050bc68cb phabricator: migrate [phabricator.auth] to [auth] Matt Harbison <matt_harbison@yahoo.com> parents: 37976 diff changeset	375 """return conduit url, token and make sure they exist
0fa050bc68cb phabricator: migrate [phabricator.auth] to [auth] Matt Harbison <matt_harbison@yahoo.com> parents: 37976 diff changeset	376
37997 71cf20d47f25 phabricator: split auth.url into the standard auth.schemes and auth.prefix Matt Harbison <matt_harbison@yahoo.com> parents: 37996 diff changeset	377 Currently read from [auth] config section. In the future, it might
37996 0fa050bc68cb phabricator: migrate [phabricator.auth] to [auth] Matt Harbison <matt_harbison@yahoo.com> parents: 37976 diff changeset	378 make sense to read from .arcconfig and .arcrc as well.
0fa050bc68cb phabricator: migrate [phabricator.auth] to [auth] Matt Harbison <matt_harbison@yahoo.com> parents: 37976 diff changeset	379 """
42433 500b64c5d991 phabricator: pass ui into readurltoken instead of passing repo Pulkit Goyal <pulkit@yandex-team.ru> parents: 42431 diff changeset	380 url = ui.config(b'phabricator', b'url')
37996 0fa050bc68cb phabricator: migrate [phabricator.auth] to [auth] Matt Harbison <matt_harbison@yahoo.com> parents: 37976 diff changeset	381 if not url:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	382 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	383 _(b'config %s.%s is required') % (b'phabricator', b'url')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	384 )
37996 0fa050bc68cb phabricator: migrate [phabricator.auth] to [auth] Matt Harbison <matt_harbison@yahoo.com> parents: 37976 diff changeset	385
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46037 diff changeset	386 res = httpconnectionmod.readauthforuri(ui, url, urlutil.url(url).user)
37997 71cf20d47f25 phabricator: split auth.url into the standard auth.schemes and auth.prefix Matt Harbison <matt_harbison@yahoo.com> parents: 37996 diff changeset	387 token = None
37996 0fa050bc68cb phabricator: migrate [phabricator.auth] to [auth] Matt Harbison <matt_harbison@yahoo.com> parents: 37976 diff changeset	388
37997 71cf20d47f25 phabricator: split auth.url into the standard auth.schemes and auth.prefix Matt Harbison <matt_harbison@yahoo.com> parents: 37996 diff changeset	389 if res:
71cf20d47f25 phabricator: split auth.url into the standard auth.schemes and auth.prefix Matt Harbison <matt_harbison@yahoo.com> parents: 37996 diff changeset	390 group, auth = res
71cf20d47f25 phabricator: split auth.url into the standard auth.schemes and auth.prefix Matt Harbison <matt_harbison@yahoo.com> parents: 37996 diff changeset	391
42433 500b64c5d991 phabricator: pass ui into readurltoken instead of passing repo Pulkit Goyal <pulkit@yandex-team.ru> parents: 42431 diff changeset	392 ui.debug(b"using auth.%s.* for authentication\n" % group)
37997 71cf20d47f25 phabricator: split auth.url into the standard auth.schemes and auth.prefix Matt Harbison <matt_harbison@yahoo.com> parents: 37996 diff changeset	393
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	394 token = auth.get(b'phabtoken')
37996 0fa050bc68cb phabricator: migrate [phabricator.auth] to [auth] Matt Harbison <matt_harbison@yahoo.com> parents: 37976 diff changeset	395
36787 4397909f82d3 phabricator: specify API tokens per host, rather than per repo Tom Prince <mozilla@hocat.ca> parents: 36514 diff changeset	396 if not token:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	397 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	398 _(b'Can\'t find conduit token associated to %s') % (url,)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	399 )
36787 4397909f82d3 phabricator: specify API tokens per host, rather than per repo Tom Prince <mozilla@hocat.ca> parents: 36514 diff changeset	400
4397909f82d3 phabricator: specify API tokens per host, rather than per repo Tom Prince <mozilla@hocat.ca> parents: 36514 diff changeset	401 return url, token
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	402
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	403
42434 f163e2b2594c phabricator: pass ui instead of repo to callconduit Pulkit Goyal <pulkit@yandex-team.ru> parents: 42433 diff changeset	404 def callconduit(ui, name, params):
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	405 """call Conduit API, params is a dict. return json.loads result, or None"""
42434 f163e2b2594c phabricator: pass ui instead of repo to callconduit Pulkit Goyal <pulkit@yandex-team.ru> parents: 42433 diff changeset	406 host, token = readurltoken(ui)
47056 067f2c53fb24 phabricator: adapt to the new `urlutil.url()` API Matt Harbison <matt_harbison@yahoo.com> parents: 46907 diff changeset	407 url, authinfo = urlutil.url(b'/'.join([host, b'api', name])).authinfo()
42434 f163e2b2594c phabricator: pass ui instead of repo to callconduit Pulkit Goyal <pulkit@yandex-team.ru> parents: 42433 diff changeset	408 ui.debug(b'Conduit Call: %s %s\n' % (url, pycompat.byterepr(params)))
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	409 params = params.copy()
43261 f5aa4a53acd1 phabricator: change conduit data format to match arcanist Ian Moody <moz-ian@perix.co.uk> parents: 43259 diff changeset	410 params[b'__conduit__'] = {
f5aa4a53acd1 phabricator: change conduit data format to match arcanist Ian Moody <moz-ian@perix.co.uk> parents: 43259 diff changeset	411 b'token': token,
f5aa4a53acd1 phabricator: change conduit data format to match arcanist Ian Moody <moz-ian@perix.co.uk> parents: 43259 diff changeset	412 }
f5aa4a53acd1 phabricator: change conduit data format to match arcanist Ian Moody <moz-ian@perix.co.uk> parents: 43259 diff changeset	413 rawdata = {
f5aa4a53acd1 phabricator: change conduit data format to match arcanist Ian Moody <moz-ian@perix.co.uk> parents: 43259 diff changeset	414 b'params': templatefilters.json(params),
f5aa4a53acd1 phabricator: change conduit data format to match arcanist Ian Moody <moz-ian@perix.co.uk> parents: 43259 diff changeset	415 b'output': b'json',
f5aa4a53acd1 phabricator: change conduit data format to match arcanist Ian Moody <moz-ian@perix.co.uk> parents: 43259 diff changeset	416 b'__conduit__': 1,
f5aa4a53acd1 phabricator: change conduit data format to match arcanist Ian Moody <moz-ian@perix.co.uk> parents: 43259 diff changeset	417 }
f5aa4a53acd1 phabricator: change conduit data format to match arcanist Ian Moody <moz-ian@perix.co.uk> parents: 43259 diff changeset	418 data = urlencodenested(rawdata)
42434 f163e2b2594c phabricator: pass ui instead of repo to callconduit Pulkit Goyal <pulkit@yandex-team.ru> parents: 42433 diff changeset	419 curlcmd = ui.config(b'phabricator', b'curlcmd')
34064 8b659b7388c0 phabricator: add a config to use curl for communication Jun Wu <quark@fb.com> parents: 34063 diff changeset	420 if curlcmd:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	421 sin, sout = procutil.popen2(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	422 b'%s -d @- %s' % (curlcmd, procutil.shellquote(url))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	423 )
34064 8b659b7388c0 phabricator: add a config to use curl for communication Jun Wu <quark@fb.com> parents: 34063 diff changeset	424 sin.write(data)
8b659b7388c0 phabricator: add a config to use curl for communication Jun Wu <quark@fb.com> parents: 34063 diff changeset	425 sin.close()
8b659b7388c0 phabricator: add a config to use curl for communication Jun Wu <quark@fb.com> parents: 34063 diff changeset	426 body = sout.read()
8b659b7388c0 phabricator: add a config to use curl for communication Jun Wu <quark@fb.com> parents: 34063 diff changeset	427 else:
42434 f163e2b2594c phabricator: pass ui instead of repo to callconduit Pulkit Goyal <pulkit@yandex-team.ru> parents: 42433 diff changeset	428 urlopener = urlmod.opener(ui, authinfo)
41901 a98dabdb5a7b py3: convert URL to str before passing it to request Ian Moody <moz-ian@perix.co.uk> parents: 41900 diff changeset	429 request = util.urlreq.request(pycompat.strurl(url), data=data)
45969 57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	430 max_try = ui.configint(b'phabricator', b'retry') + 1
45970 4d70444c3ea9 phabricator: use the `http.timeout` config for conduit call Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45969 diff changeset	431 timeout = ui.configwith(float, b'http', b'timeout')
45969 57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	432 for try_count in range(max_try):
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	433 try:
45970 4d70444c3ea9 phabricator: use the `http.timeout` config for conduit call Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45969 diff changeset	434 with contextlib.closing(
4d70444c3ea9 phabricator: use the `http.timeout` config for conduit call Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45969 diff changeset	435 urlopener.open(request, timeout=timeout)
4d70444c3ea9 phabricator: use the `http.timeout` config for conduit call Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45969 diff changeset	436 ) as rsp:
45969 57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	437 body = rsp.read()
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	438 break
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	439 except util.urlerr.urlerror as err:
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	440 if try_count == max_try - 1:
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	441 raise
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	442 ui.debug(
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	443 b'Conduit Request failed (try %d/%d): %r\n'
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	444 % (try_count + 1, max_try, err)
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	445 )
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	446 # failing request might come from overloaded server
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	447 retry_interval = ui.configint(b'phabricator', b'retry.interval')
57183111a463 phabricator: introduce a `phabricator.retry` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45942 diff changeset	448 time.sleep(retry_interval)
42434 f163e2b2594c phabricator: pass ui instead of repo to callconduit Pulkit Goyal <pulkit@yandex-team.ru> parents: 42433 diff changeset	449 ui.debug(b'Conduit Response: %s\n' % body)
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	450 parsed = pycompat.rapply(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	451 lambda x: encoding.unitolocal(x)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	452 if isinstance(x, pycompat.unicode)
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	453 else x,
43047 0f90c2d2d7e8 py3: fix phabricator's use of json.loads() for py3.5 Ian Moody <moz-ian@perix.co.uk> parents: 42973 diff changeset	454 # json.loads only accepts bytes from py3.6+
43380 579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43350 diff changeset	455 pycompat.json_loads(encoding.unifromlocal(body)),
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	456 )
c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	457 if parsed.get(b'error_code'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	458 msg = _(b'Conduit Error (%s): %s') % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	459 parsed[b'error_code'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	460 parsed[b'error_info'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	461 )
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	462 raise error.Abort(msg)
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	463 return parsed[b'result']
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	464
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	465
42435 16312ea45a8b phabricator: make `hg debugcallconduit` work outside a hg repo Pulkit Goyal <pulkit@yandex-team.ru> parents: 42434 diff changeset	466 @vcrcommand(b'debugcallconduit', [], _(b'METHOD'), optionalrepo=True)
33198 36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	467 def debugcallconduit(ui, repo, name):
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	468 """call Conduit API
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	469
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	470 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	471 to stdout as a JSON blob.
36b3febd739f phabricator: add a contrib script Jun Wu <quark@fb.com> parents: diff changeset	472 """
41971 99e00e5c4746 py3: convert to/from bytes/unicode for json.(dump\|load)s in debugcallconduit Ian Moody <moz-ian@perix.co.uk> parents: 41970 diff changeset	473 # json.loads only accepts bytes from 3.6+
99e00e5c4746 py3: convert to/from bytes/unicode for json.(dump\|load)s in debugcallconduit Ian Moody <moz-ian@perix.co.uk> parents: 41970 diff changeset	474 rawparams = encoding.unifromlocal(ui.fin.read())
99e00e5c4746 py3: convert to/from bytes/unicode for json.(dump\|load)s in debugcallconduit Ian Moody <moz-ian@perix.co.uk> parents: 41970 diff changeset	475 # json.loads only returns unicode strings
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	476 params = pycompat.rapply(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	477 lambda x: encoding.unitolocal(x)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	478 if isinstance(x, pycompat.unicode)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	479 else x,
43380 579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43350 diff changeset	480 pycompat.json_loads(rawparams),
41971 99e00e5c4746 py3: convert to/from bytes/unicode for json.(dump\|load)s in debugcallconduit Ian Moody <moz-ian@perix.co.uk> parents: 41970 diff changeset	481 )
99e00e5c4746 py3: convert to/from bytes/unicode for json.(dump\|load)s in debugcallconduit Ian Moody <moz-ian@perix.co.uk> parents: 41970 diff changeset	482 # json.dumps only accepts unicode strings
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	483 result = pycompat.rapply(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	484 lambda x: encoding.unifromlocal(x) if isinstance(x, bytes) else x,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	485 callconduit(ui, name, params),
41971 99e00e5c4746 py3: convert to/from bytes/unicode for json.(dump\|load)s in debugcallconduit Ian Moody <moz-ian@perix.co.uk> parents: 41970 diff changeset	486 )
99e00e5c4746 py3: convert to/from bytes/unicode for json.(dump\|load)s in debugcallconduit Ian Moody <moz-ian@perix.co.uk> parents: 41970 diff changeset	487 s = json.dumps(result, sort_keys=True, indent=2, separators=(u',', u': '))
99e00e5c4746 py3: convert to/from bytes/unicode for json.(dump\|load)s in debugcallconduit Ian Moody <moz-ian@perix.co.uk> parents: 41970 diff changeset	488 ui.write(b'%s\n' % encoding.unitolocal(s))
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	489
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	490
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	491 def getrepophid(repo):
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	492 """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	493 # developer config: phabricator.repophid
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	494 repophid = repo.ui.config(b'phabricator', b'repophid')
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	495 if repophid:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	496 return repophid
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	497 callsign = repo.ui.config(b'phabricator', b'callsign')
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	498 if not callsign:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	499 return None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	500 query = callconduit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	501 repo.ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	502 b'diffusion.repository.search',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	503 {b'constraints': {b'callsigns': [callsign]}},
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	504 )
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	505 if len(query[b'data']) == 0:
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	506 return None
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	507 repophid = query[b'data'][0][b'phid']
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	508 repo.ui.setconfig(b'phabricator', b'repophid', repophid)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	509 return repophid
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	510
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	511
41532 bd3f03d8cc9f global: use raw strings for regular expressions with escapes Gregory Szorc <gregory.szorc@gmail.com> parents: 41365 diff changeset	512 _differentialrevisiontagre = re.compile(br'\AD([1-9][0-9]*)\Z')
33263 ed61189763ef phabricator: check associated Differential Revision from commit message Jun Wu <quark@fb.com> parents: 33200 diff changeset	513 _differentialrevisiondescre = re.compile(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	514 br'^Differential Revision:\s(?P<url>(?:.)D(?P<id>[1-9][0-9]*))$', re.M
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	515 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	516
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	517
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	518 def getoldnodedrevmap(repo, nodelist):
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	519 """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	520
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	521 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	522 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	523 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	524 be ``None``.
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	525
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	526 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	527 association information.
33263 ed61189763ef phabricator: check associated Differential Revision from commit message Jun Wu <quark@fb.com> parents: 33200 diff changeset	528
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	529 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	530 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	531 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	532
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	533 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	534 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	535 """
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	536 unfi = repo.unfiltered()
43549 4cb3f5bb29ec index: use `index.has_node` in `phabricator.getoldnodedrevmap` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43506 diff changeset	537 has_node = unfi.changelog.index.has_node
33263 ed61189763ef phabricator: check associated Differential Revision from commit message Jun Wu <quark@fb.com> parents: 33200 diff changeset	538
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	539 result = {} # {node: (oldnode?, lastdiff?, drev)}
44715 38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	540 # ordered for test stability when printing new -> old mapping below
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	541 toconfirm = util.sortdict() # {node: (force, {precnode}, drev)}
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	542 for node in nodelist:
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	543 ctx = unfi[node]
33443 e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	544 # 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	545 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	546 for n in precnodes:
43549 4cb3f5bb29ec index: use `index.has_node` in `phabricator.getoldnodedrevmap` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43506 diff changeset	547 if has_node(n):
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	548 for tag in unfi.nodetags(n):
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	549 m = _differentialrevisiontagre.match(tag)
3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	550 if m:
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	551 toconfirm[node] = (0, set(precnodes), int(m.group(1)))
43829 16b607e9f714 phabricator: fix processing of tags/desc in getoldnodedrevmap() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43549 diff changeset	552 break
16b607e9f714 phabricator: fix processing of tags/desc in getoldnodedrevmap() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43549 diff changeset	553 else:
16b607e9f714 phabricator: fix processing of tags/desc in getoldnodedrevmap() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43549 diff changeset	554 continue # move to next predecessor
16b607e9f714 phabricator: fix processing of tags/desc in getoldnodedrevmap() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43549 diff changeset	555 break # found a tag, stop
16b607e9f714 phabricator: fix processing of tags/desc in getoldnodedrevmap() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43549 diff changeset	556 else:
16b607e9f714 phabricator: fix processing of tags/desc in getoldnodedrevmap() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43549 diff changeset	557 # Check commit message
16b607e9f714 phabricator: fix processing of tags/desc in getoldnodedrevmap() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43549 diff changeset	558 m = _differentialrevisiondescre.search(ctx.description())
16b607e9f714 phabricator: fix processing of tags/desc in getoldnodedrevmap() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43549 diff changeset	559 if m:
16b607e9f714 phabricator: fix processing of tags/desc in getoldnodedrevmap() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43549 diff changeset	560 toconfirm[node] = (1, set(precnodes), int(m.group('id')))
33263 ed61189763ef phabricator: check associated Differential Revision from commit message Jun Wu <quark@fb.com> parents: 33200 diff changeset	561
33443 e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	562 # 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	563 # Phabricator, and expect precursors overlap with it.
e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	564 if toconfirm:
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	565 drevs = [drev for force, precs, drev in toconfirm.values()]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	566 alldiffs = callconduit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	567 unfi.ui, b'differential.querydiffs', {b'revisionIDs': drevs}
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	568 )
44646 5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	569
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	570 def getnodes(d, precset):
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	571 # Ignore other nodes that were combined into the Differential
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	572 # that aren't predecessors of the current local node.
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	573 return [n for n in getlocalcommits(d) if n in precset]
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	574
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	575 for newnode, (force, precset, drev) in toconfirm.items():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	576 diffs = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	577 d for d in alldiffs.values() if int(d[b'revisionID']) == drev
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	578 ]
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	579
44646 5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	580 # local predecessors known by Phabricator
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	581 phprecset = {n for d in diffs for n in getnodes(d, precset)}
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	582
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	583 # 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	584 # and force is not set (when commit message says nothing)
44646 5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	585 if not force and not phprecset:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	586 tagname = b'D%d' % drev
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	587 tags.tag(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	588 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	589 tagname,
47012 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46907 diff changeset	590 repo.nullid,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	591 message=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	592 user=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	593 date=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	594 local=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	595 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	596 unfi.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	597 _(
43399 742065def6ca py3: use %d to format an int Ian Moody <moz-ian@perix.co.uk> parents: 43380 diff changeset	598 b'D%d: local tag removed - does not match '
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	599 b'Differential history\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	600 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	601 % drev
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	602 )
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	603 continue
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	604
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	605 # 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	606 # exists in the repo
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	607 oldnode = lastdiff = None
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	608 if diffs:
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	609 lastdiff = max(diffs, key=lambda d: int(d[b'id']))
44646 5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	610 oldnodes = getnodes(lastdiff, precset)
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	611
44715 38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	612 _debug(
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	613 unfi.ui,
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	614 b"%s mapped to old nodes %s\n"
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	615 % (
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	616 short(newnode),
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	617 stringutil.pprint([short(n) for n in sorted(oldnodes)]),
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	618 ),
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	619 )
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	620
44646 5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	621 # If this commit was the result of `hg fold` after submission,
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	622 # and now resubmitted with --fold, the easiest thing to do is
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	623 # to leave the node clear. This only results in creating a new
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	624 # diff for the _same_ Differential Revision if this commit is
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	625 # the first or last in the selected range. If we picked a node
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	626 # from the list instead, it would have to be the lowest if at
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	627 # the beginning of the --fold range, or the highest at the end.
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	628 # Otherwise, one or more of the nodes wouldn't be considered in
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	629 # the diff, and the Differential wouldn't be properly updated.
44646 5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	630 # If this commit is the result of `hg split` in the same
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	631 # scenario, there is a single oldnode here (and multiple
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	632 # newnodes mapped to it). That makes it the same as the normal
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	633 # case, as the edges of the newnode range cleanly maps to one
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	634 # oldnode each.
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	635 if len(oldnodes) == 1:
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	636 oldnode = oldnodes[0]
43549 4cb3f5bb29ec index: use `index.has_node` in `phabricator.getoldnodedrevmap` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43506 diff changeset	637 if oldnode and not has_node(oldnode):
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	638 oldnode = None
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	639
1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	640 result[newnode] = (oldnode, lastdiff, drev)
33443 e48082e0a8d5 phabricator: verify local tags before trusting them Jun Wu <quark@fb.com> parents: 33442 diff changeset	641
33442 3ab0d5767b54 phabricator: finding old nodes in batch Jun Wu <quark@fb.com> parents: 33441 diff changeset	642 return result
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	643
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	644
43839 70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	645 def getdrevmap(repo, revs):
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	646 """Return a dict mapping each rev in `revs` to their Differential Revision
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	647 ID or None.
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	648 """
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	649 result = {}
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	650 for rev in revs:
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	651 result[rev] = None
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	652 ctx = repo[rev]
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	653 # Check commit message
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	654 m = _differentialrevisiondescre.search(ctx.description())
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	655 if m:
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	656 result[rev] = int(m.group('id'))
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	657 continue
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	658 # Check tags
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	659 for tag in repo.nodetags(ctx.node()):
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	660 m = _differentialrevisiontagre.match(tag)
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	661 if m:
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	662 result[rev] = int(m.group(1))
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	663 break
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	664
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	665 return result
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	666
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	667
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	668 def getdiff(basectx, ctx, diffopts):
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	669 """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	670 output = util.stringio()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	671 for chunk, _label in patch.diffui(
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	672 ctx.repo(), basectx.p1().node(), ctx.node(), None, opts=diffopts
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	673 ):
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	674 output.write(chunk)
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	675 return output.getvalue()
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	676
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	677
43182 a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	678 class DiffChangeType(object):
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	679 ADD = 1
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	680 CHANGE = 2
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	681 DELETE = 3
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	682 MOVE_AWAY = 4
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	683 COPY_AWAY = 5
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	684 MOVE_HERE = 6
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	685 COPY_HERE = 7
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	686 MULTICOPY = 8
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	687
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	688
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	689 class DiffFileType(object):
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	690 TEXT = 1
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	691 IMAGE = 2
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	692 BINARY = 3
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	693
a66e2844b0c6 phabricator: add the DiffChangeType and DiffFileType constants Ian Moody <moz-ian@perix.co.uk> parents: 43117 diff changeset	694
43183 73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	695 @attr.s
73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	696 class phabhunk(dict):
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	697 """Represents a Differential hunk, which is owned by a Differential change"""
43183 73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	698
73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	699 oldOffset = attr.ib(default=0) # camelcase-required
73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	700 oldLength = attr.ib(default=0) # camelcase-required
73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	701 newOffset = attr.ib(default=0) # camelcase-required
73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	702 newLength = attr.ib(default=0) # camelcase-required
73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	703 corpus = attr.ib(default='')
73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	704 # These get added to the phabchange's equivalents
73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	705 addLines = attr.ib(default=0) # camelcase-required
73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	706 delLines = attr.ib(default=0) # camelcase-required
73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	707
73d4bc60e389 phabricator: add the phabhunk data structure Ian Moody <moz-ian@perix.co.uk> parents: 43182 diff changeset	708
43184 99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	709 @attr.s
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	710 class phabchange(object):
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	711 """Represents a Differential change, owns Differential hunks and owned by a
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	712 Differential diff. Each one represents one file in a diff.
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	713 """
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	714
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	715 currentPath = attr.ib(default=None) # camelcase-required
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	716 oldPath = attr.ib(default=None) # camelcase-required
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	717 awayPaths = attr.ib(default=attr.Factory(list)) # camelcase-required
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	718 metadata = attr.ib(default=attr.Factory(dict))
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	719 oldProperties = attr.ib(default=attr.Factory(dict)) # camelcase-required
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	720 newProperties = attr.ib(default=attr.Factory(dict)) # camelcase-required
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	721 type = attr.ib(default=DiffChangeType.CHANGE)
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	722 fileType = attr.ib(default=DiffFileType.TEXT) # camelcase-required
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	723 commitHash = attr.ib(default=None) # camelcase-required
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	724 addLines = attr.ib(default=0) # camelcase-required
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	725 delLines = attr.ib(default=0) # camelcase-required
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	726 hunks = attr.ib(default=attr.Factory(list))
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	727
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	728 def copynewmetadatatoold(self):
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	729 for key in list(self.metadata.keys()):
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	730 newkey = key.replace(b'new:', b'old:')
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	731 self.metadata[newkey] = self.metadata[key]
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	732
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	733 def addoldmode(self, value):
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	734 self.oldProperties[b'unix:filemode'] = value
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	735
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	736 def addnewmode(self, value):
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	737 self.newProperties[b'unix:filemode'] = value
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	738
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	739 def addhunk(self, hunk):
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	740 if not isinstance(hunk, phabhunk):
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	741 raise error.Abort(b'phabchange.addhunk only takes phabhunks')
43259 162b81e65e60 phabricator: convert phabhunk and phabchange keys to bytes when finalising Ian Moody <moz-ian@perix.co.uk> parents: 43258 diff changeset	742 self.hunks.append(pycompat.byteskwargs(attr.asdict(hunk)))
43184 99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	743 # It's useful to include these stats since the Phab web UI shows them,
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	744 # and uses them to estimate how large a change a Revision is. Also used
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	745 # in email subjects for the [+++--] bit.
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	746 self.addLines += hunk.addLines
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	747 self.delLines += hunk.delLines
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	748
99ee4afd352f phabricator: add the phabchange data structure Ian Moody <moz-ian@perix.co.uk> parents: 43183 diff changeset	749
43185 75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	750 @attr.s
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	751 class phabdiff(object):
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	752 """Represents a Differential diff, owns Differential changes. Corresponds
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	753 to a commit.
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	754 """
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	755
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	756 # Doesn't seem to be any reason to send this (output of uname -n)
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	757 sourceMachine = attr.ib(default=b'') # camelcase-required
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	758 sourcePath = attr.ib(default=b'/') # camelcase-required
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	759 sourceControlBaseRevision = attr.ib(default=b'0' * 40) # camelcase-required
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	760 sourceControlPath = attr.ib(default=b'/') # camelcase-required
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	761 sourceControlSystem = attr.ib(default=b'hg') # camelcase-required
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	762 branch = attr.ib(default=b'default')
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	763 bookmark = attr.ib(default=None)
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	764 creationMethod = attr.ib(default=b'phabsend') # camelcase-required
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	765 lintStatus = attr.ib(default=b'none') # camelcase-required
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	766 unitStatus = attr.ib(default=b'none') # camelcase-required
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	767 changes = attr.ib(default=attr.Factory(dict))
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	768 repositoryPHID = attr.ib(default=None) # camelcase-required
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	769
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	770 def addchange(self, change):
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	771 if not isinstance(change, phabchange):
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	772 raise error.Abort(b'phabdiff.addchange only takes phabchanges')
43259 162b81e65e60 phabricator: convert phabhunk and phabchange keys to bytes when finalising Ian Moody <moz-ian@perix.co.uk> parents: 43258 diff changeset	773 self.changes[change.currentPath] = pycompat.byteskwargs(
162b81e65e60 phabricator: convert phabhunk and phabchange keys to bytes when finalising Ian Moody <moz-ian@perix.co.uk> parents: 43258 diff changeset	774 attr.asdict(change)
162b81e65e60 phabricator: convert phabhunk and phabchange keys to bytes when finalising Ian Moody <moz-ian@perix.co.uk> parents: 43258 diff changeset	775 )
43185 75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	776
75e7628b488f phabricator: add the phabdiff data structure Ian Moody <moz-ian@perix.co.uk> parents: 43184 diff changeset	777
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	778 def maketext(pchange, basectx, ctx, fname):
43186 f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	779 """populate the phabchange for a text file"""
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	780 repo = ctx.repo()
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	781 fmatcher = match.exact([fname])
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	782 diffopts = mdiff.diffopts(git=True, context=32767)
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	783 _pfctx, _fctx, header, fhunks = next(
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	784 patch.diffhunks(repo, basectx.p1(), ctx, fmatcher, opts=diffopts)
43186 f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	785 )
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	786
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	787 for fhunk in fhunks:
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	788 (oldOffset, oldLength, newOffset, newLength), lines = fhunk
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	789 corpus = b''.join(lines[1:])
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	790 shunk = list(header)
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	791 shunk.extend(lines)
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	792 _mf, _mt, addLines, delLines, _hb = patch.diffstatsum(
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	793 patch.diffstatdata(util.iterlines(shunk))
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	794 )
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	795 pchange.addhunk(
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	796 phabhunk(
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	797 oldOffset,
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	798 oldLength,
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	799 newOffset,
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	800 newLength,
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	801 corpus,
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	802 addLines,
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	803 delLines,
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	804 )
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	805 )
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	806
f742fabad507 phabricator: add the maketext function Ian Moody <moz-ian@perix.co.uk> parents: 43185 diff changeset	807
43187 453079605242 phabricator: add the uploadchunks function Ian Moody <moz-ian@perix.co.uk> parents: 43186 diff changeset	808 def uploadchunks(fctx, fphid):
453079605242 phabricator: add the uploadchunks function Ian Moody <moz-ian@perix.co.uk> parents: 43186 diff changeset	809 """upload large binary files as separate chunks.
453079605242 phabricator: add the uploadchunks function Ian Moody <moz-ian@perix.co.uk> parents: 43186 diff changeset	810 Phab requests chunking over 8MiB, and splits into 4MiB chunks
453079605242 phabricator: add the uploadchunks function Ian Moody <moz-ian@perix.co.uk> parents: 43186 diff changeset	811 """
453079605242 phabricator: add the uploadchunks function Ian Moody <moz-ian@perix.co.uk> parents: 43186 diff changeset	812 ui = fctx.repo().ui
453079605242 phabricator: add the uploadchunks function Ian Moody <moz-ian@perix.co.uk> parents: 43186 diff changeset	813 chunks = callconduit(ui, b'file.querychunks', {b'filePHID': fphid})
43504 a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	814 with ui.makeprogress(
43187 453079605242 phabricator: add the uploadchunks function Ian Moody <moz-ian@perix.co.uk> parents: 43186 diff changeset	815 _(b'uploading file chunks'), unit=_(b'chunks'), total=len(chunks)
43504 a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	816 ) as progress:
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	817 for chunk in chunks:
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	818 progress.increment()
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	819 if chunk[b'complete']:
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	820 continue
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	821 bstart = int(chunk[b'byteStart'])
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	822 bend = int(chunk[b'byteEnd'])
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	823 callconduit(
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	824 ui,
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	825 b'file.uploadchunk',
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	826 {
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	827 b'filePHID': fphid,
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	828 b'byteStart': bstart,
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	829 b'data': base64.b64encode(fctx.data()[bstart:bend]),
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	830 b'dataEncoding': b'base64',
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	831 },
a78a65c33b5a phabricator: use context manager form of progress in uploadchunks Ian Moody <moz-ian@perix.co.uk> parents: 43399 diff changeset	832 )
43187 453079605242 phabricator: add the uploadchunks function Ian Moody <moz-ian@perix.co.uk> parents: 43186 diff changeset	833
453079605242 phabricator: add the uploadchunks function Ian Moody <moz-ian@perix.co.uk> parents: 43186 diff changeset	834
43188 24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	835 def uploadfile(fctx):
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	836 """upload binary files to Phabricator"""
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	837 repo = fctx.repo()
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	838 ui = repo.ui
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	839 fname = fctx.path()
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	840 size = fctx.size()
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	841 fhash = pycompat.bytestr(hashlib.sha256(fctx.data()).hexdigest())
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	842
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	843 # an allocate call is required first to see if an upload is even required
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	844 # (Phab might already have it) and to determine if chunking is needed
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	845 allocateparams = {
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	846 b'name': fname,
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	847 b'contentLength': size,
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	848 b'contentHash': fhash,
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	849 }
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	850 filealloc = callconduit(ui, b'file.allocate', allocateparams)
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	851 fphid = filealloc[b'filePHID']
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	852
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	853 if filealloc[b'upload']:
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	854 ui.write(_(b'uploading %s\n') % bytes(fctx))
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	855 if not fphid:
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	856 uploadparams = {
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	857 b'name': fname,
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	858 b'data_base64': base64.b64encode(fctx.data()),
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	859 }
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	860 fphid = callconduit(ui, b'file.upload', uploadparams)
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	861 else:
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	862 uploadchunks(fctx, fphid)
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	863 else:
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	864 ui.debug(b'server already has %s\n' % bytes(fctx))
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	865
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	866 if not fphid:
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	867 raise error.Abort(b'Upload of %s failed.' % bytes(fctx))
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	868
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	869 return fphid
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	870
24e8aac7c630 phabricator: add the uploadfile function Ian Moody <moz-ian@perix.co.uk> parents: 43187 diff changeset	871
44424 98f7b9cf7bfc phabricator: pass old `fctx` to `addoldbinary()` instead of inferring it Matt Harbison <matt_harbison@yahoo.com> parents: 44423 diff changeset	872 def addoldbinary(pchange, oldfctx, fctx):
43189 9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	873 """add the metadata for the previous version of a binary file to the
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	874 phabchange for the new version
44424 98f7b9cf7bfc phabricator: pass old `fctx` to `addoldbinary()` instead of inferring it Matt Harbison <matt_harbison@yahoo.com> parents: 44423 diff changeset	875
98f7b9cf7bfc phabricator: pass old `fctx` to `addoldbinary()` instead of inferring it Matt Harbison <matt_harbison@yahoo.com> parents: 44423 diff changeset	876 ``oldfctx`` is the previous version of the file; ``fctx`` is the new
98f7b9cf7bfc phabricator: pass old `fctx` to `addoldbinary()` instead of inferring it Matt Harbison <matt_harbison@yahoo.com> parents: 44423 diff changeset	877 version of the file, or None if the file is being removed.
43189 9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	878 """
44424 98f7b9cf7bfc phabricator: pass old `fctx` to `addoldbinary()` instead of inferring it Matt Harbison <matt_harbison@yahoo.com> parents: 44423 diff changeset	879 if not fctx or fctx.cmp(oldfctx):
43189 9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	880 # Files differ, add the old one
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	881 pchange.metadata[b'old:file:size'] = oldfctx.size()
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	882 mimeguess, _enc = mimetypes.guess_type(
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	883 encoding.unifromlocal(oldfctx.path())
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	884 )
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	885 if mimeguess:
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	886 pchange.metadata[b'old:file:mime-type'] = pycompat.bytestr(
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	887 mimeguess
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	888 )
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	889 fphid = uploadfile(oldfctx)
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	890 pchange.metadata[b'old:binary-phid'] = fphid
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	891 else:
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	892 # If it's left as IMAGE/BINARY web UI might try to display it
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	893 pchange.fileType = DiffFileType.TEXT
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	894 pchange.copynewmetadatatoold()
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	895
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	896
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	897 def makebinary(pchange, fctx):
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	898 """populate the phabchange for a binary file"""
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	899 pchange.fileType = DiffFileType.BINARY
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	900 fphid = uploadfile(fctx)
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	901 pchange.metadata[b'new:binary-phid'] = fphid
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	902 pchange.metadata[b'new:file:size'] = fctx.size()
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	903 mimeguess, _enc = mimetypes.guess_type(encoding.unifromlocal(fctx.path()))
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	904 if mimeguess:
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	905 mimeguess = pycompat.bytestr(mimeguess)
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	906 pchange.metadata[b'new:file:mime-type'] = mimeguess
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	907 if mimeguess.startswith(b'image/'):
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	908 pchange.fileType = DiffFileType.IMAGE
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	909
9f802243a42e phabricator: add makebinary and addoldbinary functions Ian Moody <moz-ian@perix.co.uk> parents: 43188 diff changeset	910
43190 c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	911 # Copied from mercurial/patch.py
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	912 gitmode = {b'l': b'120000', b'x': b'100755', b'': b'100644'}
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	913
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	914
43263 06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	915 def notutf8(fctx):
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	916 """detect non-UTF-8 text files since Phabricator requires them to be marked
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	917 as binary
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	918 """
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	919 try:
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	920 fctx.data().decode('utf-8')
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	921 return False
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	922 except UnicodeDecodeError:
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	923 fctx.repo().ui.write(
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	924 _(b'file %s detected as non-UTF-8, marked as binary\n')
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	925 % fctx.path()
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	926 )
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	927 return True
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	928
06a33a501aa2 phabricator: treat non-utf-8 text files as binary as phabricator requires Ian Moody <moz-ian@perix.co.uk> parents: 43262 diff changeset	929
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	930 def addremoved(pdiff, basectx, ctx, removed):
43190 c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	931 """add removed files to the phabdiff. Shouldn't include moves"""
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	932 for fname in removed:
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	933 pchange = phabchange(
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	934 currentPath=fname, oldPath=fname, type=DiffChangeType.DELETE
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	935 )
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	936 oldfctx = basectx.p1()[fname]
44608 7b9aaec17126 phabricator: eliminate a couple of duplicate filectx lookups Matt Harbison <matt_harbison@yahoo.com> parents: 44585 diff changeset	937 pchange.addoldmode(gitmode[oldfctx.flags()])
44425 aa9979bb6853 phabricator: rename a variable to clarify that it is the parent filecontext Matt Harbison <matt_harbison@yahoo.com> parents: 44424 diff changeset	938 if not (oldfctx.isbinary() or notutf8(oldfctx)):
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	939 maketext(pchange, basectx, ctx, fname)
43190 c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	940
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	941 pdiff.addchange(pchange)
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	942
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	943
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	944 def addmodified(pdiff, basectx, ctx, modified):
43190 c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	945 """add modified files to the phabdiff"""
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	946 for fname in modified:
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	947 fctx = ctx[fname]
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	948 oldfctx = basectx.p1()[fname]
43190 c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	949 pchange = phabchange(currentPath=fname, oldPath=fname)
44608 7b9aaec17126 phabricator: eliminate a couple of duplicate filectx lookups Matt Harbison <matt_harbison@yahoo.com> parents: 44585 diff changeset	950 filemode = gitmode[fctx.flags()]
7b9aaec17126 phabricator: eliminate a couple of duplicate filectx lookups Matt Harbison <matt_harbison@yahoo.com> parents: 44585 diff changeset	951 originalmode = gitmode[oldfctx.flags()]
43190 c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	952 if filemode != originalmode:
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	953 pchange.addoldmode(originalmode)
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	954 pchange.addnewmode(filemode)
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	955
44427 4ce2330f2d0b phabricator: also check parent fctx for binary where it is checked for UTF-8 Matt Harbison <matt_harbison@yahoo.com> parents: 44426 diff changeset	956 if (
4ce2330f2d0b phabricator: also check parent fctx for binary where it is checked for UTF-8 Matt Harbison <matt_harbison@yahoo.com> parents: 44426 diff changeset	957 fctx.isbinary()
4ce2330f2d0b phabricator: also check parent fctx for binary where it is checked for UTF-8 Matt Harbison <matt_harbison@yahoo.com> parents: 44426 diff changeset	958 or notutf8(fctx)
4ce2330f2d0b phabricator: also check parent fctx for binary where it is checked for UTF-8 Matt Harbison <matt_harbison@yahoo.com> parents: 44426 diff changeset	959 or oldfctx.isbinary()
4ce2330f2d0b phabricator: also check parent fctx for binary where it is checked for UTF-8 Matt Harbison <matt_harbison@yahoo.com> parents: 44426 diff changeset	960 or notutf8(oldfctx)
4ce2330f2d0b phabricator: also check parent fctx for binary where it is checked for UTF-8 Matt Harbison <matt_harbison@yahoo.com> parents: 44426 diff changeset	961 ):
43190 c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	962 makebinary(pchange, fctx)
44608 7b9aaec17126 phabricator: eliminate a couple of duplicate filectx lookups Matt Harbison <matt_harbison@yahoo.com> parents: 44585 diff changeset	963 addoldbinary(pchange, oldfctx, fctx)
43190 c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	964 else:
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	965 maketext(pchange, basectx, ctx, fname)
43190 c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	966
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	967 pdiff.addchange(pchange)
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	968
c19b327017b9 phabricator: add addremoved and addmodified functions Ian Moody <moz-ian@perix.co.uk> parents: 43189 diff changeset	969
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	970 def addadded(pdiff, basectx, ctx, added, removed):
43258 d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	971 """add file adds to the phabdiff, both new files and copies/moves"""
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	972 # Keep track of files that've been recorded as moved/copied, so if there are
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	973 # additional copies we can mark them (moves get removed from removed)
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	974 copiedchanges = {}
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	975 movedchanges = {}
44610 022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	976
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	977 copy = {}
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	978 if basectx != ctx:
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	979 copy = copies.pathcopies(basectx.p1(), ctx)
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	980
43258 d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	981 for fname in added:
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	982 fctx = ctx[fname]
44426 66a05dbb8b4c phabricator: don't infer the old `fctx` in `notutf8()` Matt Harbison <matt_harbison@yahoo.com> parents: 44425 diff changeset	983 oldfctx = None
43258 d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	984 pchange = phabchange(currentPath=fname)
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	985
44608 7b9aaec17126 phabricator: eliminate a couple of duplicate filectx lookups Matt Harbison <matt_harbison@yahoo.com> parents: 44585 diff changeset	986 filemode = gitmode[fctx.flags()]
44610 022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	987
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	988 if copy:
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	989 originalfname = copy.get(fname, fname)
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	990 else:
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	991 originalfname = fname
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	992 if fctx.renamed():
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	993 originalfname = fctx.renamed()[0]
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	994
022bf71515c9 phabricator: account for `basectx != ctx` when calculating renames Matt Harbison <matt_harbison@yahoo.com> parents: 44609 diff changeset	995 renamed = fname != originalfname
43258 d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	996
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	997 if renamed:
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	998 oldfctx = basectx.p1()[originalfname]
44426 66a05dbb8b4c phabricator: don't infer the old `fctx` in `notutf8()` Matt Harbison <matt_harbison@yahoo.com> parents: 44425 diff changeset	999 originalmode = gitmode[oldfctx.flags()]
43258 d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1000 pchange.oldPath = originalfname
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1001
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1002 if originalfname in removed:
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1003 origpchange = phabchange(
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1004 currentPath=originalfname,
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1005 oldPath=originalfname,
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1006 type=DiffChangeType.MOVE_AWAY,
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1007 awayPaths=[fname],
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1008 )
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1009 movedchanges[originalfname] = origpchange
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1010 removed.remove(originalfname)
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1011 pchange.type = DiffChangeType.MOVE_HERE
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1012 elif originalfname in movedchanges:
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1013 movedchanges[originalfname].type = DiffChangeType.MULTICOPY
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1014 movedchanges[originalfname].awayPaths.append(fname)
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1015 pchange.type = DiffChangeType.COPY_HERE
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1016 else: # pure copy
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1017 if originalfname not in copiedchanges:
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1018 origpchange = phabchange(
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1019 currentPath=originalfname, type=DiffChangeType.COPY_AWAY
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1020 )
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1021 copiedchanges[originalfname] = origpchange
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1022 else:
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1023 origpchange = copiedchanges[originalfname]
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1024 origpchange.awayPaths.append(fname)
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1025 pchange.type = DiffChangeType.COPY_HERE
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1026
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1027 if filemode != originalmode:
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1028 pchange.addoldmode(originalmode)
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1029 pchange.addnewmode(filemode)
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1030 else: # Brand-new file
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1031 pchange.addnewmode(gitmode[fctx.flags()])
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1032 pchange.type = DiffChangeType.ADD
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1033
44427 4ce2330f2d0b phabricator: also check parent fctx for binary where it is checked for UTF-8 Matt Harbison <matt_harbison@yahoo.com> parents: 44426 diff changeset	1034 if (
4ce2330f2d0b phabricator: also check parent fctx for binary where it is checked for UTF-8 Matt Harbison <matt_harbison@yahoo.com> parents: 44426 diff changeset	1035 fctx.isbinary()
4ce2330f2d0b phabricator: also check parent fctx for binary where it is checked for UTF-8 Matt Harbison <matt_harbison@yahoo.com> parents: 44426 diff changeset	1036 or notutf8(fctx)
4ce2330f2d0b phabricator: also check parent fctx for binary where it is checked for UTF-8 Matt Harbison <matt_harbison@yahoo.com> parents: 44426 diff changeset	1037 or (oldfctx and (oldfctx.isbinary() or notutf8(oldfctx)))
4ce2330f2d0b phabricator: also check parent fctx for binary where it is checked for UTF-8 Matt Harbison <matt_harbison@yahoo.com> parents: 44426 diff changeset	1038 ):
43258 d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1039 makebinary(pchange, fctx)
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1040 if renamed:
44426 66a05dbb8b4c phabricator: don't infer the old `fctx` in `notutf8()` Matt Harbison <matt_harbison@yahoo.com> parents: 44425 diff changeset	1041 addoldbinary(pchange, oldfctx, fctx)
43258 d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1042 else:
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1043 maketext(pchange, basectx, ctx, fname)
43258 d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1044
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1045 pdiff.addchange(pchange)
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1046
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1047 for _path, copiedchange in copiedchanges.items():
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1048 pdiff.addchange(copiedchange)
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1049 for _path, movedchange in movedchanges.items():
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1050 pdiff.addchange(movedchange)
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1051
d5d1edf66091 phabricator: add addadded function Ian Moody <moz-ian@perix.co.uk> parents: 43190 diff changeset	1052
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1053 def creatediff(basectx, ctx):
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1054 """create a Differential Diff"""
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1055 repo = ctx.repo()
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1056 repophid = getrepophid(repo)
43262 af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1057 # Create a "Differential Diff" via "differential.creatediff" API
af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1058 pdiff = phabdiff(
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1059 sourceControlBaseRevision=b'%s' % basectx.p1().hex(),
43262 af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1060 branch=b'%s' % ctx.branch(),
af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1061 )
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1062 modified, added, removed, _d, _u, _i, _c = basectx.p1().status(ctx)
43262 af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1063 # addadded will remove moved files from removed, so addremoved won't get
af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1064 # them
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1065 addadded(pdiff, basectx, ctx, added, removed)
53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1066 addmodified(pdiff, basectx, ctx, modified)
53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1067 addremoved(pdiff, basectx, ctx, removed)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1068 if repophid:
43262 af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1069 pdiff.repositoryPHID = repophid
af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1070 diff = callconduit(
af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1071 repo.ui,
af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1072 b'differential.creatediff',
af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1073 pycompat.byteskwargs(attr.asdict(pdiff)),
af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1074 )
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1075 if not diff:
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1076 if basectx != ctx:
53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1077 msg = _(b'cannot create diff for %s::%s') % (basectx, ctx)
53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1078 else:
53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1079 msg = _(b'cannot create diff for %s') % ctx
53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1080 raise error.Abort(msg)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1081 return diff
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1082
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1083
44643 0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1084 def writediffproperties(ctxs, diff):
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1085 """write metadata to diff so patches could be applied losslessly
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1086
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1087 ``ctxs`` is the list of commits that created the diff, in ascending order.
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1088 The list is generally a single commit, but may be several when using
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1089 ``phabsend --fold``.
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1090 """
43262 af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1091 # creatediff returns with a diffid but query returns with an id
af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1092 diffid = diff.get(b'diffid', diff.get(b'id'))
44643 0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1093 basectx = ctxs[0]
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1094 tipctx = ctxs[-1]
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1095
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1096 params = {
43262 af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1097 b'diff_id': diffid,
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1098 b'name': b'hg:meta',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1099 b'data': templatefilters.json(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1100 {
44643 0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1101 b'user': tipctx.user(),
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1102 b'date': b'%d %d' % tipctx.date(),
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1103 b'branch': tipctx.branch(),
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1104 b'node': tipctx.hex(),
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1105 b'parent': basectx.p1().hex(),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1106 }
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1107 ),
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1108 }
44643 0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1109 callconduit(basectx.repo().ui, b'differential.setdiffproperty', params)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1110
44643 0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1111 commits = {}
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1112 for ctx in ctxs:
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1113 commits[ctx.hex()] = {
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1114 b'author': stringutil.person(ctx.user()),
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1115 b'authorEmail': stringutil.email(ctx.user()),
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1116 b'time': int(ctx.date()[0]),
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1117 b'commit': ctx.hex(),
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1118 b'parents': [ctx.p1().hex()],
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1119 b'branch': ctx.branch(),
0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1120 }
37800 6cf5f5b4eb57 phabricator: specify some metadata compatibly with arc Tom Prince <mozilla@hocat.ca> parents: 37120 diff changeset	1121 params = {
43262 af067d29b19e phabricator: switch to the creatediff endpoint Ian Moody <moz-ian@perix.co.uk> parents: 43261 diff changeset	1122 b'diff_id': diffid,
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1123 b'name': b'local:commits',
44643 0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1124 b'data': templatefilters.json(commits),
37800 6cf5f5b4eb57 phabricator: specify some metadata compatibly with arc Tom Prince <mozilla@hocat.ca> parents: 37120 diff changeset	1125 }
44643 0437959de6f5 phabricator: record all local commits used to create a Differential revision Matt Harbison <matt_harbison@yahoo.com> parents: 44610 diff changeset	1126 callconduit(basectx.repo().ui, b'differential.setdiffproperty', params)
37800 6cf5f5b4eb57 phabricator: specify some metadata compatibly with arc Tom Prince <mozilla@hocat.ca> parents: 37120 diff changeset	1127
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1128
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1129 def createdifferentialrevision(
44645 419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1130 ctxs,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1131 revid=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1132 parentrevphid=None,
44645 419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1133 oldbasenode=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1134 oldnode=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1135 olddiff=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1136 actions=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1137 comment=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1138 ):
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1139 """create or update a Differential Revision
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1140
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1141 If revid is None, create a new Differential Revision, otherwise update
42449 c19d259fd6ad phabricator: use parents.set to always set dependencies Ian Moody <moz-ian@perix.co.uk> parents: 42444 diff changeset	1142 revid. If parentrevphid 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	1143
44645 419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1144 If there is a single commit for the new Differential Revision, ``ctxs`` will
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1145 be a list of that single context. Otherwise, it is a list that covers the
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1146 range of changes for the differential, where ``ctxs[0]`` is the first change
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1147 to include and ``ctxs[-1]`` is the last.
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1148
33265 95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	1149 If oldnode is not None, check if the patch content (without commit message
44645 419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1150 and metadata) has changed before creating another diff. For a Revision with
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1151 a single commit, ``oldbasenode`` and ``oldnode`` have the same value. For a
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1152 Revision covering multiple commits, ``oldbasenode`` corresponds to
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1153 ``ctxs[0]`` the previous time this Revision was posted, and ``oldnode``
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1154 corresponds to ``ctxs[-1]``.
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1155
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1156 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	1157 """
44645 419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1158 ctx = ctxs[-1]
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1159 basectx = ctxs[0]
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1160
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1161 repo = ctx.repo()
33265 95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	1162 if oldnode:
33976 27ff2a87d8c0 phabsend: detect patch change with larger context Jun Wu <quark@fb.com> parents: 33975 diff changeset	1163 diffopts = mdiff.diffopts(git=True, context=32767)
44645 419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1164 unfi = repo.unfiltered()
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1165 oldctx = unfi[oldnode]
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1166 oldbasectx = unfi[oldbasenode]
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1167 neednewdiff = getdiff(basectx, ctx, diffopts) != getdiff(
53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1168 oldbasectx, oldctx, diffopts
53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1169 )
33265 95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	1170 else:
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	1171 neednewdiff = True
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1172
33265 95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	1173 transactions = []
95f658b558a3 phabricator: do not upload new diff if nothing changes Jun Wu <quark@fb.com> parents: 33264 diff changeset	1174 if neednewdiff:
44609 53d75fdeaaaa phabricator: add basectx arguments to file related `phabsend` utilities Matt Harbison <matt_harbison@yahoo.com> parents: 44608 diff changeset	1175 diff = creatediff(basectx, ctx)
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1176 transactions.append({b'type': b'update', b'value': diff[b'phid']})
42431 29528c4235a1 phabricator: add commenting to phabsend for new/updated Diffs Ian Moody <moz-ian@perix.co.uk> parents: 42268 diff changeset	1177 if comment:
29528c4235a1 phabricator: add commenting to phabsend for new/updated Diffs Ian Moody <moz-ian@perix.co.uk> parents: 42268 diff changeset	1178 transactions.append({b'type': b'comment', b'value': comment})
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	1179 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	1180 # 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	1181 # 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	1182 # 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	1183 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	1184 diff = olddiff
44645 419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1185 writediffproperties(ctxs, diff)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1186
42449 c19d259fd6ad phabricator: use parents.set to always set dependencies Ian Moody <moz-ian@perix.co.uk> parents: 42444 diff changeset	1187 # Set the parent Revision every time, so commit re-ordering is picked-up
c19d259fd6ad phabricator: use parents.set to always set dependencies Ian Moody <moz-ian@perix.co.uk> parents: 42444 diff changeset	1188 if parentrevphid:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1189 transactions.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1190 {b'type': b'parents.set', b'value': [parentrevphid]}
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1191 )
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1192
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1193 if actions:
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1194 transactions += actions
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1195
44644 dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1196 # When folding multiple local commits into a single review, arcanist will
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1197 # take the summary line of the first commit as the title, and then
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1198 # concatenate the rest of the remaining messages (including each of their
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1199 # first lines) to the rest of the first commit message (each separated by
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1200 # an empty line), and use that as the summary field. Do the same here.
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1201 # For commits with only a one line message, there is no summary field, as
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1202 # this gets assigned to the title.
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1203 fields = util.sortdict() # sorted for stable wire protocol in tests
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1204
44645 419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1205 for i, _ctx in enumerate(ctxs):
44644 dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1206 # Parse commit message and update related fields.
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1207 desc = _ctx.description()
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1208 info = callconduit(
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1209 repo.ui, b'differential.parsecommitmessage', {b'corpus': desc}
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1210 )
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1211
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1212 for k in [b'title', b'summary', b'testPlan']:
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1213 v = info[b'fields'].get(k)
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1214 if not v:
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1215 continue
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1216
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1217 if i == 0:
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1218 # Title, summary and test plan (if present) are taken verbatim
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1219 # for the first commit.
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1220 fields[k] = v.rstrip()
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1221 continue
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1222 elif k == b'title':
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1223 # Add subsequent titles (i.e. the first line of the commit
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1224 # message) back to the summary.
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1225 k = b'summary'
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1226
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1227 # Append any current field to the existing composite field
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1228 fields[k] = b'\n\n'.join(filter(None, [fields.get(k), v.rstrip()]))
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1229
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1230 for k, v in fields.items():
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1231 transactions.append({b'type': k, b'value': v})
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1232
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1233 params = {b'transactions': transactions}
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1234 if revid is not None:
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1235 # Update an existing Differential Revision
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1236 params[b'objectIdentifier'] = revid
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1237
42434 f163e2b2594c phabricator: pass ui instead of repo to callconduit Pulkit Goyal <pulkit@yandex-team.ru> parents: 42433 diff changeset	1238 revision = callconduit(repo.ui, b'differential.revision.edit', params)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1239 if not revision:
44645 419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1240 if len(ctxs) == 1:
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1241 msg = _(b'cannot create revision for %s') % ctx
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1242 else:
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1243 msg = _(b'cannot create revision for %s::%s') % (basectx, ctx)
419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1244 raise error.Abort(msg)
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1245
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1246 return revision, diff
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1247
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1248
44420 ddcb51390891 phabricator: pass ui instead of repo to `userphids()` Matt Harbison <matt_harbison@yahoo.com> parents: 44419 diff changeset	1249 def userphids(ui, names):
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1250 """convert user names to PHIDs"""
41705 570e62f1dcf2 phabricator: make user searches case-insensitive Julien Cristau <jcristau@mozilla.com> parents: 41532 diff changeset	1251 names = [name.lower() for name in names]
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1252 query = {b'constraints': {b'usernames': names}}
44420 ddcb51390891 phabricator: pass ui instead of repo to `userphids()` Matt Harbison <matt_harbison@yahoo.com> parents: 44419 diff changeset	1253 result = callconduit(ui, b'user.search', query)
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1254 # 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	1255 # some names here.
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1256 data = result[b'data']
44452 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44436 diff changeset	1257 resolved = {entry[b'fields'][b'username'].lower() for entry in data}
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1258 unresolved = set(names) - resolved
b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1259 if unresolved:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1260 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1261 _(b'unknown username: %s') % b' '.join(sorted(unresolved))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1262 )
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1263 return [entry[b'phid'] for entry in data]
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1264
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1265
44648 949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1266 def _print_phabsend_action(ui, ctx, newrevid, action):
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1267 """print the ``action`` that occurred when posting ``ctx`` for review
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1268
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1269 This is a utility function for the sending phase of ``phabsend``, which
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1270 makes it easier to show a status for all local commits with `--fold``.
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1271 """
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1272 actiondesc = ui.label(
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1273 {
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1274 b'created': _(b'created'),
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1275 b'skipped': _(b'skipped'),
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1276 b'updated': _(b'updated'),
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1277 }[action],
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1278 b'phabricator.action.%s' % action,
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1279 )
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1280 drevdesc = ui.label(b'D%d' % newrevid, b'phabricator.drev')
45772 294aab57a5f3 phabsend: use default one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 45502 diff changeset	1281 summary = cmdutil.format_changeset_summary(ui, ctx, b'phabsend')
294aab57a5f3 phabsend: use default one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 45502 diff changeset	1282 ui.write(_(b'%s - %s - %s\n') % (drevdesc, actiondesc, summary))
44648 949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1283
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1284
44647 99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1285 def _amend_diff_properties(unfi, drevid, newnodes, diff):
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1286 """update the local commit list for the ``diff`` associated with ``drevid``
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1287
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1288 This is a utility function for the amend phase of ``phabsend``, which
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1289 converts failures to warning messages.
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1290 """
44715 38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	1291 _debug(
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	1292 unfi.ui,
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	1293 b"new commits: %s\n" % stringutil.pprint([short(n) for n in newnodes]),
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	1294 )
38f7b2f02f6d phabricator: add debug logging to show previous node values in `phabsend` Matt Harbison <matt_harbison@yahoo.com> parents: 44648 diff changeset	1295
44647 99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1296 try:
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1297 writediffproperties([unfi[newnode] for newnode in newnodes], diff)
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1298 except util.urlerr.urlerror:
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1299 # If it fails just warn and keep going, otherwise the DREV
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1300 # associations will be lost
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1301 unfi.ui.warnnoi18n(b'Failed to update metadata for D%d\n' % drevid)
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1302
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1303
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1304 @vcrcommand(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1305 b'phabsend',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1306 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1307 (b'r', b'rev', [], _(b'revisions to send'), _(b'REV')),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1308 (b'', b'amend', True, _(b'update commit messages')),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1309 (b'', b'reviewer', [], _(b'specify reviewers')),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1310 (b'', b'blocker', [], _(b'specify blocking reviewers')),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1311 (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1312 b'm',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1313 b'comment',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1314 b'',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1315 _(b'add a comment to Revisions with new/updated Diffs'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1316 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1317 (b'', b'confirm', None, _(b'ask for confirmation before sending')),
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1318 (b'', b'fold', False, _(b'combine the revisions into one review')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1319 ],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1320 _(b'REV [OPTIONS]'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1321 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1322 )
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1323 def phabsend(ui, repo, revs, *opts):
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1324 """upload changesets to Phabricator
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1325
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1326 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	1327 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	1328 revset.
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1329
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1330 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	1331 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	1332 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	1333 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	1334
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1335 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	1336 ``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	1337 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	1338 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	1339
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1340 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	1341 can also add following to your configuration file to make it default
33974 45a8cd74de4e phabsend: polish the docstring a bit Jun Wu <quark@fb.com> parents: 33834 diff changeset	1342 behaviour::
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1343
33974 45a8cd74de4e phabsend: polish the docstring a bit Jun Wu <quark@fb.com> parents: 33834 diff changeset	1344 [phabsend]
45a8cd74de4e phabsend: polish the docstring a bit Jun Wu <quark@fb.com> parents: 33834 diff changeset	1345 confirm = true
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1346
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1347 By default, a separate review will be created for each commit that is
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1348 selected, and will have the same parent/child relationship in Phabricator.
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1349 If ``--fold`` is set, multiple commits are rolled up into a single review
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1350 as if diffed from the parent of the first revision to the last. The commit
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1351 messages are concatenated in the summary field on Phabricator.
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1352
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1353 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	1354 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	1355 """
41970 51ba9fbcca52 py3: use pycompat.byteskwargs on opts in phabricator.py Ian Moody <moz-ian@perix.co.uk> parents: 41950 diff changeset	1356 opts = pycompat.byteskwargs(opts)
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1357 revs = list(revs) + opts.get(b'rev', [])
48116 5ced12cfa41b errors: raise InputError on bad revset to revrange() iff provided by the user Martin von Zweigbergk <martinvonz@google.com> parents: 47057 diff changeset	1358 revs = logcmdutil.revrange(repo, revs)
44076 a7c4bcf7018a phabricator: post revisions in ascending topological order (issue6241) Matt Harbison <matt_harbison@yahoo.com> parents: 43858 diff changeset	1359 revs.sort() # ascending order to preserve topological parent/child in phab
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1360
33266 5b2391b46906 phabricator: abort if phabsend gets empty revs Jun Wu <quark@fb.com> parents: 33265 diff changeset	1361 if not revs:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1362 raise error.Abort(_(b'phabsend requires at least one changeset'))
81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1363 if opts.get(b'amend'):
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1364 cmdutil.checkunfinished(repo)
33266 5b2391b46906 phabricator: abort if phabsend gets empty revs Jun Wu <quark@fb.com> parents: 33265 diff changeset	1365
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1366 ctxs = [repo[rev] for rev in revs]
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1367
44719 c482e2fe444c phabricator: prevent posting obsolete commits Matt Harbison <matt_harbison@yahoo.com> parents: 44718 diff changeset	1368 if any(c for c in ctxs if c.obsolete()):
c482e2fe444c phabricator: prevent posting obsolete commits Matt Harbison <matt_harbison@yahoo.com> parents: 44718 diff changeset	1369 raise error.Abort(_(b"obsolete commits cannot be posted for review"))
c482e2fe444c phabricator: prevent posting obsolete commits Matt Harbison <matt_harbison@yahoo.com> parents: 44718 diff changeset	1370
44774 c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1371 # Ensure the local commits are an unbroken range. The semantics of the
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1372 # --fold option implies this, and the auto restacking of orphans requires
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1373 # it. Otherwise A+C in A->B->C will cause B to be orphaned, and C' to
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1374 # get A' as a parent.
45152 b3b0cd8b9366 phabricator: clarify the multiple heads/roots error message for phabsend Matt Harbison <matt_harbison@yahoo.com> parents: 45140 diff changeset	1375 def _fail_nonlinear_revs(revs, revtype):
b3b0cd8b9366 phabricator: clarify the multiple heads/roots error message for phabsend Matt Harbison <matt_harbison@yahoo.com> parents: 45140 diff changeset	1376 badnodes = [repo[r].node() for r in revs]
44774 c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1377 raise error.Abort(
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1378 _(b"cannot phabsend multiple %s revisions: %s")
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1379 % (revtype, scmutil.nodesummaries(repo, badnodes)),
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1380 hint=_(b"the revisions must form a linear chain"),
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1381 )
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1382
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1383 heads = repo.revs(b'heads(%ld)', revs)
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1384 if len(heads) > 1:
45152 b3b0cd8b9366 phabricator: clarify the multiple heads/roots error message for phabsend Matt Harbison <matt_harbison@yahoo.com> parents: 45140 diff changeset	1385 _fail_nonlinear_revs(heads, b"head")
44774 c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1386
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1387 roots = repo.revs(b'roots(%ld)', revs)
c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1388 if len(roots) > 1:
45152 b3b0cd8b9366 phabricator: clarify the multiple heads/roots error message for phabsend Matt Harbison <matt_harbison@yahoo.com> parents: 45140 diff changeset	1389 _fail_nonlinear_revs(roots, b"root")
44774 c1c922391314 phabricator: ensure that `phabsend` is given a contiguous, linear commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44720 diff changeset	1390
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1391 fold = opts.get(b'fold')
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1392 if fold:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1393 if len(revs) == 1:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1394 # TODO: just switch to --no-fold instead?
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1395 raise error.Abort(_(b"cannot fold a single revision"))
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1396
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1397 # There's no clear way to manage multiple commits with a Dxxx tag, so
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1398 # require the amend option. (We could append "_nnn", but then it
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1399 # becomes jumbled if earlier commits are added to an update.) It should
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1400 # lock the repo and ensure that the range is editable, but that would
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1401 # make the code pretty convoluted. The default behavior of `arc` is to
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1402 # create a new review anyway.
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1403 if not opts.get(b"amend"):
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1404 raise error.Abort(_(b"cannot fold with --no-amend"))
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1405
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1406 # It might be possible to bucketize the revisions by the DREV value, and
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1407 # iterate over those groups when posting, and then again when amending.
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1408 # But for simplicity, require all selected revisions to be for the same
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1409 # DREV (if present). Adding local revisions to an existing DREV is
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1410 # acceptable.
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1411 drevmatchers = [
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1412 _differentialrevisiondescre.search(ctx.description())
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1413 for ctx in ctxs
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1414 ]
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1415 if len({m.group('url') for m in drevmatchers if m}) > 1:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1416 raise error.Abort(
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1417 _(b"cannot fold revisions with different DREV values")
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1418 )
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1419
33978 088598153aa2 phabsend: show associated Differential Revisions with --confirm Jun Wu <quark@fb.com> parents: 33977 diff changeset	1420 # {newnode: (oldnode, olddiff, olddrev}
088598153aa2 phabsend: show associated Differential Revisions with --confirm Jun Wu <quark@fb.com> parents: 33977 diff changeset	1421 oldmap = getoldnodedrevmap(repo, [repo[r].node() for r in revs])
088598153aa2 phabsend: show associated Differential Revisions with --confirm Jun Wu <quark@fb.com> parents: 33977 diff changeset	1422
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1423 confirm = ui.configbool(b'phabsend', b'confirm')
81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1424 confirm \|= bool(opts.get(b'confirm'))
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1425 if confirm:
33978 088598153aa2 phabsend: show associated Differential Revisions with --confirm Jun Wu <quark@fb.com> parents: 33977 diff changeset	1426 confirmed = _confirmbeforesend(repo, revs, oldmap)
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1427 if not confirmed:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1428 raise error.Abort(_(b'phabsend cancelled'))
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1429
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1430 actions = []
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1431 reviewers = opts.get(b'reviewer', [])
42444 f33d3ee110da phabricator: add --blocker argument to phabsend to specify blocking reviewers Ian Moody <moz-ian@perix.co.uk> parents: 42443 diff changeset	1432 blockers = opts.get(b'blocker', [])
f33d3ee110da phabricator: add --blocker argument to phabsend to specify blocking reviewers Ian Moody <moz-ian@perix.co.uk> parents: 42443 diff changeset	1433 phids = []
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1434 if reviewers:
44420 ddcb51390891 phabricator: pass ui instead of repo to `userphids()` Matt Harbison <matt_harbison@yahoo.com> parents: 44419 diff changeset	1435 phids.extend(userphids(repo.ui, reviewers))
42444 f33d3ee110da phabricator: add --blocker argument to phabsend to specify blocking reviewers Ian Moody <moz-ian@perix.co.uk> parents: 42443 diff changeset	1436 if blockers:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1437 phids.extend(
44420 ddcb51390891 phabricator: pass ui instead of repo to `userphids()` Matt Harbison <matt_harbison@yahoo.com> parents: 44419 diff changeset	1438 map(
ddcb51390891 phabricator: pass ui instead of repo to `userphids()` Matt Harbison <matt_harbison@yahoo.com> parents: 44419 diff changeset	1439 lambda phid: b'blocking(%s)' % phid,
ddcb51390891 phabricator: pass ui instead of repo to `userphids()` Matt Harbison <matt_harbison@yahoo.com> parents: 44419 diff changeset	1440 userphids(repo.ui, blockers),
ddcb51390891 phabricator: pass ui instead of repo to `userphids()` Matt Harbison <matt_harbison@yahoo.com> parents: 44419 diff changeset	1441 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1442 )
42444 f33d3ee110da phabricator: add --blocker argument to phabsend to specify blocking reviewers Ian Moody <moz-ian@perix.co.uk> parents: 42443 diff changeset	1443 if phids:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1444 actions.append({b'type': b'reviewers.add', b'value': phids})
33498 b7a75b9a3386 phabricator: allow specifying reviewers on phabsend Jun Wu <quark@fb.com> parents: 33443 diff changeset	1445
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1446 drevids = [] # [int]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1447 diffmap = {} # {newnode: diff}
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1448
42449 c19d259fd6ad phabricator: use parents.set to always set dependencies Ian Moody <moz-ian@perix.co.uk> parents: 42444 diff changeset	1449 # Send patches one by one so we know their Differential Revision PHIDs and
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1450 # can provide dependency relationship
42449 c19d259fd6ad phabricator: use parents.set to always set dependencies Ian Moody <moz-ian@perix.co.uk> parents: 42444 diff changeset	1451 lastrevphid = None
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1452 for ctx in ctxs:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1453 if fold:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1454 ui.debug(b'sending rev %d::%d\n' % (ctx.rev(), ctxs[-1].rev()))
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1455 else:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1456 ui.debug(b'sending rev %d\n' % ctx.rev())
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1457
228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1458 # Get Differential Revision ID
33691 1664406a44d9 phabricator: use Phabricator's last node information Jun Wu <quark@fb.com> parents: 33690 diff changeset	1459 oldnode, olddiff, revid = oldmap.get(ctx.node(), (None, None, None))
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1460 oldbasenode, oldbasediff, oldbaserevid = oldnode, olddiff, revid
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1461
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1462 if fold:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1463 oldbasenode, oldbasediff, oldbaserevid = oldmap.get(
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1464 ctxs[-1].node(), (None, None, None)
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1465 )
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1466
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1467 if oldnode != ctx.node() or opts.get(b'amend'):
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1468 # Create or update Differential Revision
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1469 revision, diff = createdifferentialrevision(
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1470 ctxs if fold else [ctx],
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1471 revid,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1472 lastrevphid,
44645 419fec8237b7 phabricator: teach createdifferentialrevision() to allow a folded commit range Matt Harbison <matt_harbison@yahoo.com> parents: 44644 diff changeset	1473 oldbasenode,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1474 oldnode,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1475 olddiff,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1476 actions,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1477 opts.get(b'comment'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1478 )
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1479
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1480 if fold:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1481 for ctx in ctxs:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1482 diffmap[ctx.node()] = diff
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1483 else:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1484 diffmap[ctx.node()] = diff
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1485
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1486 newrevid = int(revision[b'object'][b'id'])
42449 c19d259fd6ad phabricator: use parents.set to always set dependencies Ian Moody <moz-ian@perix.co.uk> parents: 42444 diff changeset	1487 newrevphid = revision[b'object'][b'phid']
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1488 if revid:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1489 action = b'updated'
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1490 else:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1491 action = b'created'
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1492
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1493 # 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	1494 # does not have it already
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1495 if not fold:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1496 m = _differentialrevisiondescre.search(ctx.description())
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1497 if not m or int(m.group('id')) != newrevid:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1498 tagname = b'D%d' % newrevid
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1499 tags.tag(
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1500 repo,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1501 tagname,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1502 ctx.node(),
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1503 message=None,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1504 user=None,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1505 date=None,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1506 local=True,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1507 )
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1508 else:
42449 c19d259fd6ad phabricator: use parents.set to always set dependencies Ian Moody <moz-ian@perix.co.uk> parents: 42444 diff changeset	1509 # Nothing changed. But still set "newrevphid" so the next revision
c19d259fd6ad phabricator: use parents.set to always set dependencies Ian Moody <moz-ian@perix.co.uk> parents: 42444 diff changeset	1510 # could depend on this one and "newrevid" for the summary line.
44419 df8053082364 phabricator: pass ui instead of repo to `querydrev()` Matt Harbison <matt_harbison@yahoo.com> parents: 44418 diff changeset	1511 newrevphid = querydrev(repo.ui, b'%d' % revid)[0][b'phid']
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1512 newrevid = revid
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1513 action = b'skipped'
33199 228ad1e58a85 phabricator: add phabsend command to send a stack Jun Wu <quark@fb.com> parents: 33198 diff changeset	1514
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1515 drevids.append(newrevid)
42449 c19d259fd6ad phabricator: use parents.set to always set dependencies Ian Moody <moz-ian@perix.co.uk> parents: 42444 diff changeset	1516 lastrevphid = newrevphid
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	1517
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1518 if fold:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1519 for c in ctxs:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1520 if oldmap.get(c.node(), (None, None, None))[2]:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1521 action = b'updated'
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1522 else:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1523 action = b'created'
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1524 _print_phabsend_action(ui, c, newrevid, action)
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1525 break
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1526
44648 949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1527 _print_phabsend_action(ui, ctx, newrevid, action)
949a87145336 phabricator: extract logic to print the status when posting a commit Matt Harbison <matt_harbison@yahoo.com> parents: 44647 diff changeset	1528
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1529 # Update commit messages and remove tags
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1530 if opts.get(b'amend'):
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1531 unfi = repo.unfiltered()
42434 f163e2b2594c phabricator: pass ui instead of repo to callconduit Pulkit Goyal <pulkit@yandex-team.ru> parents: 42433 diff changeset	1532 drevs = callconduit(ui, b'differential.query', {b'ids': drevids})
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1533 with repo.wlock(), repo.lock(), repo.transaction(b'phabsend'):
44720 601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1534 # Eagerly evaluate commits to restabilize before creating new
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1535 # commits. The selected revisions are excluded because they are
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1536 # automatically restacked as part of the submission process.
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1537 restack = [
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1538 c
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1539 for c in repo.set(
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1540 b"(%ld::) - (%ld) - unstable() - obsolete() - public()",
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1541 revs,
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1542 revs,
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1543 )
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1544 ]
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1545 wnode = unfi[b'.'].node()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1546 mapping = {} # {oldnode: [newnode]}
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1547 newnodes = []
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1548
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1549 drevid = drevids[0]
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1550
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1551 for i, rev in enumerate(revs):
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1552 old = unfi[rev]
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1553 if not fold:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1554 drevid = drevids[i]
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1555 drev = [d for d in drevs if int(d[b'id']) == drevid][0]
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1556
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1557 newdesc = get_amended_desc(drev, old, fold)
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1558 # Make sure commit message contain "Differential Revision"
44718 0680b8a1992a phabricator: avoid creating unstable children within the review stack Matt Harbison <matt_harbison@yahoo.com> parents: 44717 diff changeset	1559 if (
0680b8a1992a phabricator: avoid creating unstable children within the review stack Matt Harbison <matt_harbison@yahoo.com> parents: 44717 diff changeset	1560 old.description() != newdesc
0680b8a1992a phabricator: avoid creating unstable children within the review stack Matt Harbison <matt_harbison@yahoo.com> parents: 44717 diff changeset	1561 or old.p1().node() in mapping
0680b8a1992a phabricator: avoid creating unstable children within the review stack Matt Harbison <matt_harbison@yahoo.com> parents: 44717 diff changeset	1562 or old.p2().node() in mapping
0680b8a1992a phabricator: avoid creating unstable children within the review stack Matt Harbison <matt_harbison@yahoo.com> parents: 44717 diff changeset	1563 ):
41163 0101a35deae2 phabricator: warn if unable to amend, instead of aborting after posting Matt Harbison <matt_harbison@yahoo.com> parents: 41080 diff changeset	1564 if old.phase() == phases.public:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1565 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1566 _(b"warning: not updating public commit %s\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1567 % scmutil.formatchangeid(old)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1568 )
41163 0101a35deae2 phabricator: warn if unable to amend, instead of aborting after posting Matt Harbison <matt_harbison@yahoo.com> parents: 41080 diff changeset	1569 continue
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1570 parents = [
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1571 mapping.get(old.p1().node(), (old.p1(),))[0],
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1572 mapping.get(old.p2().node(), (old.p2(),))[0],
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1573 ]
45426 1a5d3e555c70 phabricator: update the hashes in commit messages as they get submitted Matt Harbison <matt_harbison@yahoo.com> parents: 45246 diff changeset	1574 newdesc = rewriteutil.update_hash_refs(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	1575 repo,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	1576 newdesc,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	1577 mapping,
45426 1a5d3e555c70 phabricator: update the hashes in commit messages as they get submitted Matt Harbison <matt_harbison@yahoo.com> parents: 45246 diff changeset	1578 )
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1579 new = context.metadataonlyctx(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1580 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1581 old,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1582 parents=parents,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1583 text=newdesc,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1584 user=old.user(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1585 date=old.date(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1586 extra=old.extra(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1587 )
38336 bb7e3c6ef592 phabricator: preserve the phase when amending in the Differential fields Matt Harbison <matt_harbison@yahoo.com> parents: 38042 diff changeset	1588
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38392 diff changeset	1589 newnode = new.commit()
38336 bb7e3c6ef592 phabricator: preserve the phase when amending in the Differential fields Matt Harbison <matt_harbison@yahoo.com> parents: 38042 diff changeset	1590
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1591 mapping[old.node()] = [newnode]
44647 99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1592
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1593 if fold:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1594 # Defer updating the (single) Diff until all nodes are
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1595 # collected. No tags were created, so none need to be
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1596 # removed.
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1597 newnodes.append(newnode)
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1598 continue
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1599
44647 99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1600 _amend_diff_properties(
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1601 unfi, drevid, [newnode], diffmap[old.node()]
99fa161a883c phabricator: extract the logic to amend diff properties to a function Matt Harbison <matt_harbison@yahoo.com> parents: 44646 diff changeset	1602 )
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1603
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1604 # Remove local tags since it's no longer necessary
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1605 tagname = b'D%d' % drevid
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1606 if tagname in repo.tags():
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1607 tags.tag(
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1608 repo,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1609 tagname,
47012 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46907 diff changeset	1610 repo.nullid,
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1611 message=None,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1612 user=None,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1613 date=None,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1614 local=True,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1615 )
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1616 elif fold:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1617 # When folding multiple commits into one review with
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1618 # --fold, track even the commits that weren't amended, so
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1619 # that their association isn't lost if the properties are
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1620 # rewritten below.
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1621 newnodes.append(old.node())
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1622
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1623 # If the submitted commits are public, no amend takes place so
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1624 # there are no newnodes and therefore no diff update to do.
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1625 if fold and newnodes:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1626 diff = diffmap[old.node()]
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1627
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1628 # The diff object in diffmap doesn't have the local commits
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1629 # because that could be returned from differential.creatediff,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1630 # not differential.querydiffs. So use the queried diff (if
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1631 # present), or force the amend (a new revision is being posted.)
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1632 if not olddiff or set(newnodes) != getlocalcommits(olddiff):
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1633 _debug(ui, b"updating local commit list for D%d\n" % drevid)
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1634 _amend_diff_properties(unfi, drevid, newnodes, diff)
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1635 else:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1636 _debug(
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1637 ui,
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1638 b"local commit list for D%d is already up-to-date\n"
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1639 % drevid,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1640 )
44717 3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1641 elif fold:
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1642 _debug(ui, b"no newnodes to update\n")
3dc6a70779f2 phabricator: add an option to fold several commits into one review (issue6244) Matt Harbison <matt_harbison@yahoo.com> parents: 44715 diff changeset	1643
44720 601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1644 # Restack any children of first-time submissions that were orphaned
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1645 # in the process. The ctx won't report that it is an orphan until
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1646 # the cleanup takes place below.
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1647 for old in restack:
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1648 parents = [
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1649 mapping.get(old.p1().node(), (old.p1(),))[0],
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1650 mapping.get(old.p2().node(), (old.p2(),))[0],
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1651 ]
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1652 new = context.metadataonlyctx(
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1653 repo,
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1654 old,
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1655 parents=parents,
45426 1a5d3e555c70 phabricator: update the hashes in commit messages as they get submitted Matt Harbison <matt_harbison@yahoo.com> parents: 45246 diff changeset	1656 text=rewriteutil.update_hash_refs(
1a5d3e555c70 phabricator: update the hashes in commit messages as they get submitted Matt Harbison <matt_harbison@yahoo.com> parents: 45246 diff changeset	1657 repo, old.description(), mapping
1a5d3e555c70 phabricator: update the hashes in commit messages as they get submitted Matt Harbison <matt_harbison@yahoo.com> parents: 45246 diff changeset	1658 ),
44720 601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1659 user=old.user(),
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1660 date=old.date(),
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1661 extra=old.extra(),
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1662 )
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1663
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1664 newnode = new.commit()
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1665
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1666 # Don't obsolete unselected descendants of nodes that have not
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1667 # been changed in this transaction- that results in an error.
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1668 if newnode != old.node():
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1669 mapping[old.node()] = [newnode]
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1670 _debug(
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1671 ui,
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1672 b"restabilizing %s as %s\n"
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1673 % (short(old.node()), short(newnode)),
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1674 )
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1675 else:
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1676 _debug(
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1677 ui,
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1678 b"not restabilizing unchanged %s\n" % short(old.node()),
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1679 )
601ce5392cb0 phabricator: restack any new orphans created by phabsend (issue6045) Matt Harbison <matt_harbison@yahoo.com> parents: 44719 diff changeset	1680
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38392 diff changeset	1681 scmutil.cleanupnodes(repo, mapping, b'phabsend', fixphase=True)
33787 fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1682 if wnode in mapping:
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1683 unfi.setparents(mapping[wnode][0])
fa3aa6c98bb7 phabricator: add --amend option to phabsend Jun Wu <quark@fb.com> parents: 33785 diff changeset	1684
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1685
33264 266321579c68 phabricator: add node and p1 to hg:meta property Jun Wu <quark@fb.com> parents: 33263 diff changeset	1686 # 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	1687 # consistent with "hg export" output.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1688 _metanamemap = util.sortdict(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1689 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1690 (b'user', b'User'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1691 (b'date', b'Date'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1692 (b'branch', b'Branch'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1693 (b'node', b'Node ID'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1694 (b'parent', b'Parent '),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1695 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1696 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1697
33264 266321579c68 phabricator: add node and p1 to hg:meta property Jun Wu <quark@fb.com> parents: 33263 diff changeset	1698
33978 088598153aa2 phabsend: show associated Differential Revisions with --confirm Jun Wu <quark@fb.com> parents: 33977 diff changeset	1699 def _confirmbeforesend(repo, revs, oldmap):
42433 500b64c5d991 phabricator: pass ui into readurltoken instead of passing repo Pulkit Goyal <pulkit@yandex-team.ru> parents: 42431 diff changeset	1700 url, token = readurltoken(repo.ui)
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1701 ui = repo.ui
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1702 for rev in revs:
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1703 ctx = repo[rev]
33978 088598153aa2 phabsend: show associated Differential Revisions with --confirm Jun Wu <quark@fb.com> parents: 33977 diff changeset	1704 oldnode, olddiff, drevid = oldmap.get(ctx.node(), (None, None, None))
088598153aa2 phabsend: show associated Differential Revisions with --confirm Jun Wu <quark@fb.com> parents: 33977 diff changeset	1705 if drevid:
43321 a2ff3aff81d2 py3: use %d instead of %s when formatting an int into a bytestring Ian Moody <moz-ian@perix.co.uk> parents: 43282 diff changeset	1706 drevdesc = ui.label(b'D%d' % drevid, b'phabricator.drev')
33978 088598153aa2 phabsend: show associated Differential Revisions with --confirm Jun Wu <quark@fb.com> parents: 33977 diff changeset	1707 else:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1708 drevdesc = ui.label(_(b'NEW'), b'phabricator.drev')
33978 088598153aa2 phabsend: show associated Differential Revisions with --confirm Jun Wu <quark@fb.com> parents: 33977 diff changeset	1709
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1710 ui.write(
45772 294aab57a5f3 phabsend: use default one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 45502 diff changeset	1711 _(b'%s - %s\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1712 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1713 drevdesc,
45772 294aab57a5f3 phabsend: use default one-line summary Martin von Zweigbergk <martinvonz@google.com> parents: 45502 diff changeset	1714 cmdutil.format_changeset_summary(ui, ctx, b'phabsend'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1715 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1716 )
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1717
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1718 if ui.promptchoice(
44945 7a0a1be721a3 phabricator: make it clear what happen when no response Sushil khanchi <sushilkhanchi97@gmail.com> parents: 44847 diff changeset	1719 _(b'Send the above changes to %s (Y/n)?$$ &Yes $$ &No') % url
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1720 ):
33690 40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1721 return False
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1722
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1723 return True
40cfe3197bc1 phabricator: add --confirm option to phabsend command Pulkit Goyal <7895pulkit@gmail.com> parents: 33601 diff changeset	1724
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1725
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1726 _knownstatusnames = {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1727 b'accepted',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1728 b'needsreview',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1729 b'needsrevision',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1730 b'closed',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1731 b'abandoned',
43857 74ec6ca0eb75 phabricator: add the "Changes Planned" status name Matt Harbison <matt_harbison@yahoo.com> parents: 43840 diff changeset	1732 b'changesplanned',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1733 }
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1734
33833 fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	1735
fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	1736 def _getstatusname(drev):
fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	1737 """get normalized status name from a Differential Revision"""
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1738 return drev[b'statusName'].replace(b' ', b'').lower()
33833 fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	1739
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1740
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1741 # 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	1742 # +, and -.
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1743
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1744 _elements = {
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1745 # token-type: binding-strength, primary, prefix, infix, suffix
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1746 b'(': (12, None, (b'group', 1, b')'), None, None),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1747 b':': (8, None, (b'ancestors', 8), None, None),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1748 b'&': (5, None, None, (b'and_', 5), None),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1749 b'+': (4, None, None, (b'add', 4), None),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1750 b'-': (4, None, None, (b'sub', 4), None),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1751 b')': (0, None, None, None, None),
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1752 b'symbol': (0, b'symbol', None, None, None),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1753 b'end': (0, None, None, None, None),
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1754 }
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1755
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1756
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1757 def _tokenize(text):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1758 view = memoryview(text) # zero-copy slice
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1759 special = b'():+-& '
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1760 pos = 0
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1761 length = len(text)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1762 while pos < length:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1763 symbol = b''.join(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1764 itertools.takewhile(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1765 lambda ch: ch not in special, pycompat.iterbytestr(view[pos:])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1766 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1767 )
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1768 if symbol:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1769 yield (b'symbol', symbol, pos)
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1770 pos += len(symbol)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1771 else: # special char, ignore space
43282 47946f08e463 py3: don't index into bytes in phabricator's _tokenize() Ian Moody <moz-ian@perix.co.uk> parents: 43264 diff changeset	1772 if text[pos : pos + 1] != b' ':
47946f08e463 py3: don't index into bytes in phabricator's _tokenize() Ian Moody <moz-ian@perix.co.uk> parents: 43264 diff changeset	1773 yield (text[pos : pos + 1], None, pos)
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1774 pos += 1
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1775 yield (b'end', None, pos)
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1776
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1777
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1778 def _parse(text):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1779 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	1780 if pos != len(text):
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1781 raise error.ParseError(b'invalid token', pos)
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1782 return tree
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1783
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1784
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1785 def _parsedrev(symbol):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1786 """str -> int or None, ex. 'D45' -> 45; '12' -> 12; 'x' -> None"""
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1787 if symbol.startswith(b'D') and symbol[1:].isdigit():
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1788 return int(symbol[1:])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1789 if symbol.isdigit():
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1790 return int(symbol)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1791
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1792
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1793 def _prefetchdrevs(tree):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1794 """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	1795 drevs = set()
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1796 ancestordrevs = set()
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1797 op = tree[0]
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1798 if op == b'symbol':
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1799 r = _parsedrev(tree[1])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1800 if r:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1801 drevs.add(r)
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1802 elif op == b'ancestors':
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1803 r, a = _prefetchdrevs(tree[1])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1804 drevs.update(r)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1805 ancestordrevs.update(r)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1806 ancestordrevs.update(a)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1807 else:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1808 for t in tree[1:]:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1809 r, a = _prefetchdrevs(t)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1810 drevs.update(r)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1811 ancestordrevs.update(a)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1812 return drevs, ancestordrevs
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1813
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1814
44419 df8053082364 phabricator: pass ui instead of repo to `querydrev()` Matt Harbison <matt_harbison@yahoo.com> parents: 44418 diff changeset	1815 def querydrev(ui, spec):
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1816 """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	1817
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1818 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	1819 for details.
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1820
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1821 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	1822
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1823 {
44393 adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1824 "activeDiffPHID": "PHID-DIFF-xoqnjkobbm6k4dk6hi72",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1825 "authorPHID": "PHID-USER-tv3ohwc4v4jeu34otlye",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1826 "auxiliary": {
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1827 "phabricator:depends-on": [
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1828 "PHID-DREV-gbapp366kutjebt7agcd"
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1829 ]
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1830 "phabricator:projects": [],
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1831 },
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1832 "branch": "default",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1833 "ccs": [],
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1834 "commits": [],
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1835 "dateCreated": "1499181406",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1836 "dateModified": "1499182103",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1837 "diffs": [
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1838 "3",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1839 "4",
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1840 ],
44393 adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1841 "hashes": [],
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1842 "id": "2",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1843 "lineCount": "2",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1844 "phid": "PHID-DREV-672qvysjcczopag46qty",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1845 "properties": {},
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1846 "repositoryPHID": "PHID-REPO-hub2hx62ieuqeheznasv",
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1847 "reviewers": [],
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1848 "sourcePath": null
44393 adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1849 "status": "0",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1850 "statusName": "Needs Review",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1851 "summary": "",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1852 "testPlan": "",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1853 "title": "example",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1854 "uri": "https://phab.example.com/D2",
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1855 }
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1856 """
44393 adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1857 # TODO: replace differential.query and differential.querydiffs with
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1858 # differential.diff.search because the former (and their output) are
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	1859 # frozen, and planned to be deprecated and removed.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1860
33269 ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	1861 def fetch(params):
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	1862 """params -> single drev or None"""
41902 59bae59b7498 py3: fix a few "dict keys as str instead of bytes" issues in phabricator.py Ian Moody <moz-ian@perix.co.uk> parents: 41901 diff changeset	1863 key = (params.get(b'ids') or params.get(b'phids') or [None])[0]
33269 ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	1864 if key in prefetched:
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	1865 return prefetched[key]
44419 df8053082364 phabricator: pass ui instead of repo to `querydrev()` Matt Harbison <matt_harbison@yahoo.com> parents: 44418 diff changeset	1866 drevs = callconduit(ui, b'differential.query', params)
33269 ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	1867 # Fill prefetched with the result
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	1868 for drev in drevs:
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1869 prefetched[drev[b'phid']] = drev
c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1870 prefetched[int(drev[b'id'])] = drev
33269 ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	1871 if key not in prefetched:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1872 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1873 _(b'cannot get Differential Revision %r') % params
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1874 )
33269 ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	1875 return prefetched[key]
ead6749354e1 phabricator: try to fetch differential revisions in batch Jun Wu <quark@fb.com> parents: 33268 diff changeset	1876
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1877 def getstack(topdrevids):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1878 """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	1879 visited = set()
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1880 result = []
41902 59bae59b7498 py3: fix a few "dict keys as str instead of bytes" issues in phabricator.py Ian Moody <moz-ian@perix.co.uk> parents: 41901 diff changeset	1881 queue = [{b'ids': [i]} for i in topdrevids]
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1882 while queue:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1883 params = queue.pop()
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1884 drev = fetch(params)
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1885 if drev[b'id'] in visited:
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1886 continue
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1887 visited.add(drev[b'id'])
c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1888 result.append(int(drev[b'id']))
c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1889 auxiliary = drev.get(b'auxiliary', {})
c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1890 depends = auxiliary.get(b'phabricator:depends-on', [])
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	1891 for phid in depends:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1892 queue.append({b'phids': [phid]})
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1893 result.reverse()
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1894 return smartset.baseset(result)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1895
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1896 # Initialize prefetch cache
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1897 prefetched = {} # {id or phid: drev}
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1898
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1899 tree = _parse(spec)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1900 drevs, ancestordrevs = _prefetchdrevs(tree)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1901
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1902 # developer config: phabricator.batchsize
44419 df8053082364 phabricator: pass ui instead of repo to `querydrev()` Matt Harbison <matt_harbison@yahoo.com> parents: 44418 diff changeset	1903 batchsize = ui.configint(b'phabricator', b'batchsize')
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1904
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1905 # Prefetch Differential Revisions in batch
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1906 tofetch = set(drevs)
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1907 for r in ancestordrevs:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1908 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	1909 if drevs:
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1910 fetch({b'ids': list(tofetch)})
33833 fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	1911 validids = sorted(set(getstack(list(ancestordrevs))) \| set(drevs))
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1912
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1913 # 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	1914 def walk(tree):
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1915 op = tree[0]
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1916 if op == b'symbol':
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1917 drev = _parsedrev(tree[1])
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1918 if drev:
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1919 return smartset.baseset([drev])
33833 fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	1920 elif tree[1] in _knownstatusnames:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1921 drevs = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1922 r
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1923 for r in validids
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1924 if _getstatusname(prefetched[r]) == tree[1]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1925 ]
33833 fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	1926 return smartset.baseset(drevs)
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1927 else:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1928 raise error.Abort(_(b'unknown symbol: %s') % tree[1])
81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1929 elif op in {b'and_', b'add', b'sub'}:
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1930 assert len(tree) == 3
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1931 return getattr(operator, op)(walk(tree[1]), walk(tree[2]))
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1932 elif op == b'group':
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1933 return walk(tree[1])
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1934 elif op == b'ancestors':
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1935 return getstack(walk(tree[1]))
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1936 else:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1937 raise error.ProgrammingError(b'illegal tree: %r' % tree)
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1938
539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	1939 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	1940
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1941
33268 85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	1942 def getdescfromdrev(drev):
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	1943 """get description (commit message) from "Differential Revision"
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	1944
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	1945 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	1946 about limited fields: title, summary, test plan, and URL.
85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	1947 """
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1948 title = drev[b'title']
c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1949 summary = drev[b'summary'].rstrip()
c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1950 testplan = drev[b'testPlan'].rstrip()
33268 85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	1951 if testplan:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1952 testplan = b'Test Plan:\n%s' % testplan
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	1953 uri = b'Differential Revision: %s' % drev[b'uri']
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	1954 return b'\n\n'.join(filter(None, [title, summary, testplan, uri]))
33268 85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	1955
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	1956
44644 dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1957 def get_amended_desc(drev, ctx, folded):
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1958 """similar to ``getdescfromdrev``, but supports a folded series of commits
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1959
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1960 This is used when determining if an individual commit needs to have its
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1961 message amended after posting it for review. The determination is made for
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1962 each individual commit, even when they were folded into one review.
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1963 """
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1964 if not folded:
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1965 return getdescfromdrev(drev)
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1966
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1967 uri = b'Differential Revision: %s' % drev[b'uri']
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1968
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1969 # Since the commit messages were combined when posting multiple commits
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1970 # with --fold, the fields can't be read from Phabricator here, or all
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1971 # affected local revisions will end up with the same commit message after
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1972 # the URI is amended in. Append in the DREV line, or update it if it
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1973 # exists. At worst, this means commit message or test plan updates on
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1974 # Phabricator aren't propagated back to the repository, but that seems
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1975 # reasonable for the case where local commits are effectively combined
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1976 # in Phabricator.
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1977 m = _differentialrevisiondescre.search(ctx.description())
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1978 if not m:
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1979 return b'\n\n'.join([ctx.description(), uri])
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1980
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1981 return _differentialrevisiondescre.sub(uri, ctx.description())
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1982
dbe9182c90f5 phabricator: combine commit messages into the review when folding commits Matt Harbison <matt_harbison@yahoo.com> parents: 44643 diff changeset	1983
44646 5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1984 def getlocalcommits(diff):
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1985 """get the set of local commits from a diff object
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1986
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1987 See ``getdiffmeta()`` for an example diff object.
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1988 """
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1989 props = diff.get(b'properties') or {}
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1990 commits = props.get(b'local:commits') or {}
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1991 if len(commits) > 1:
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1992 return {bin(c) for c in commits.keys()}
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1993
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1994 # Storing the diff metadata predates storing `local:commits`, so continue
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1995 # to use that in the --no-fold case.
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1996 return {bin(getdiffmeta(diff).get(b'node', b'')) or None}
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1997
5f9c917e3b50 phabricator: teach `getoldnodedrevmap()` to handle folded reviews Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	1998
33441 de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	1999 def getdiffmeta(diff):
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2000 """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	2001
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2002 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	2003
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2004 "properties": {
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2005 "hg:meta": {
44393 adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	2006 "branch": "default",
33441 de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2007 "date": "1499571514 25200",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2008 "node": "98c08acae292b2faf60a279b4189beb6cff1414d",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2009 "user": "Foo Bar <foo@example.com>",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2010 "parent": "6d0abad76b30e4724a37ab8721d630394070fe16"
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2011 }
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2012 }
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2013
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2014 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	2015
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2016 "properties": {
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2017 "local:commits": {
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2018 "98c08acae292b2faf60a279b4189beb6cff1414d": {
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2019 "author": "Foo Bar",
44393 adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	2020 "authorEmail": "foo@example.com"
33441 de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2021 "branch": "default",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2022 "commit": "98c08acae292b2faf60a279b4189beb6cff1414d",
44393 adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	2023 "local": "1000",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	2024 "message": "...",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	2025 "parents": ["6d0abad76b30e4724a37ab8721d630394070fe16"],
33441 de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2026 "rev": "98c08acae292b2faf60a279b4189beb6cff1414d",
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2027 "summary": "...",
44393 adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	2028 "tag": "",
adb93aa98c78 phabricator: update the protocol documentation Matt Harbison <matt_harbison@yahoo.com> parents: 44329 diff changeset	2029 "time": 1499546314,
33441 de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2030 }
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2031 }
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2032 }
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2033
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2034 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	2035 information.
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2036 """
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	2037 props = diff.get(b'properties') or {}
c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	2038 meta = props.get(b'hg:meta')
42257 a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2039 if not meta:
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2040 if props.get(b'local:commits'):
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2041 commit = sorted(props[b'local:commits'].values())[0]
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2042 meta = {}
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2043 if b'author' in commit and b'authorEmail' in commit:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2044 meta[b'user'] = b'%s <%s>' % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2045 commit[b'author'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2046 commit[b'authorEmail'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2047 )
42257 a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2048 if b'time' in commit:
42618 c17e6a3e7356 phabricator: handle local:commits time being string or int Ian Moody <moz-ian@perix.co.uk> parents: 42449 diff changeset	2049 meta[b'date'] = b'%d 0' % int(commit[b'time'])
42257 a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2050 if b'branch' in commit:
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2051 meta[b'branch'] = commit[b'branch']
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2052 node = commit.get(b'commit', commit.get(b'rev'))
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2053 if node:
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2054 meta[b'node'] = node
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2055 if len(commit.get(b'parents', ())) >= 1:
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2056 meta[b'parent'] = commit[b'parents'][0]
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2057 else:
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2058 meta = {}
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2059 if b'date' not in meta and b'dateCreated' in diff:
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2060 meta[b'date'] = b'%s 0' % diff[b'dateCreated']
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2061 if b'branch' not in meta and diff.get(b'branch'):
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2062 meta[b'branch'] = diff[b'branch']
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2063 if b'parent' not in meta and diff.get(b'sourceControlBaseRevision'):
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2064 meta[b'parent'] = diff[b'sourceControlBaseRevision']
a4f7dceb07bf phabricator: fallback to reading metadata from diff for phabread Ian Moody <moz-ian@perix.co.uk> parents: 42256 diff changeset	2065 return meta
33441 de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2066
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2067
44585 2d63a8910db6 phabricator: remove -argument from _getdrevs() Yuya Nishihara <yuya@tcha.org>* parents: 44579 diff changeset	2068 def _getdrevs(ui, stack, specs):
44578 90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2069 """convert user supplied DREVSPECs into "Differential Revision" dicts
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2070
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2071 See ``hg help phabread`` for how to specify each DREVSPEC.
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2072 """
44585 2d63a8910db6 phabricator: remove -argument from _getdrevs() Yuya Nishihara <yuya@tcha.org>* parents: 44579 diff changeset	2073 if len(specs) > 0:
44578 90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2074
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2075 def _formatspec(s):
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2076 if stack:
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2077 s = b':(%s)' % s
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2078 return b'(%s)' % s
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2079
44585 2d63a8910db6 phabricator: remove -argument from _getdrevs() Yuya Nishihara <yuya@tcha.org>* parents: 44579 diff changeset	2080 spec = b'+'.join(pycompat.maplist(_formatspec, specs))
44578 90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2081
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2082 drevs = querydrev(ui, spec)
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2083 if drevs:
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2084 return drevs
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2085
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2086 raise error.Abort(_(b"empty DREVSPEC set"))
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2087
90adda73676a phabricator: add a helper function to convert DREVSPECs to a DREV dict list Matt Harbison <matt_harbison@yahoo.com> parents: 44568 diff changeset	2088
44418 41217dfa7a6d phabricator: pass ui instead of repo to `readpatch()` Matt Harbison <matt_harbison@yahoo.com> parents: 44393 diff changeset	2089 def readpatch(ui, drevs, write):
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	2090 """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	2091
44422 d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2092 write takes a list of (DREV, bytes), where DREV is the differential number
d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2093 (as bytes, without the "D" prefix) and the bytes are the text of a patch
d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2094 to be imported. drevs is what "querydrev" returns, results of
33831 75fdaf851e83 phabricator: change "readpatch" to be more flexible Jun Wu <quark@fb.com> parents: 33787 diff changeset	2095 "differential.query".
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	2096 """
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	2097 # Prefetch hg:meta property for all diffs
44452 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44436 diff changeset	2098 diffids = sorted({max(int(v) for v in drev[b'diffs']) for drev in drevs})
44418 41217dfa7a6d phabricator: pass ui instead of repo to `readpatch()` Matt Harbison <matt_harbison@yahoo.com> parents: 44393 diff changeset	2099 diffs = callconduit(ui, b'differential.querydiffs', {b'ids': diffids})
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	2100
44422 d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2101 patches = []
d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2102
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	2103 # 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	2104 for drev in drevs:
44418 41217dfa7a6d phabricator: pass ui instead of repo to `readpatch()` Matt Harbison <matt_harbison@yahoo.com> parents: 44393 diff changeset	2105 ui.note(_(b'reading D%s\n') % drev[b'id'])
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	2106
41897 c340a8ac7ef3 phabricator: convert conduit response JSON unicode to bytes inside callconduit Ian Moody <moz-ian@perix.co.uk> parents: 41705 diff changeset	2107 diffid = max(int(v) for v in drev[b'diffs'])
44418 41217dfa7a6d phabricator: pass ui instead of repo to `readpatch()` Matt Harbison <matt_harbison@yahoo.com> parents: 44393 diff changeset	2108 body = callconduit(ui, b'differential.getrawdiff', {b'diffID': diffid})
33268 85391b95961d phabricator: avoid calling differential.getcommitmessage Jun Wu <quark@fb.com> parents: 33267 diff changeset	2109 desc = getdescfromdrev(drev)
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	2110 header = b'# HG changeset patch\n'
33267 dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	2111
dba9f88659a3 phabricator: rework phabread to reduce memory usage and round-trips Jun Wu <quark@fb.com> parents: 33266 diff changeset	2112 # 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	2113 # 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	2114 # and extract in mercurial/patch.py for supported headers.
41902 59bae59b7498 py3: fix a few "dict keys as str instead of bytes" issues in phabricator.py Ian Moody <moz-ian@perix.co.uk> parents: 41901 diff changeset	2115 meta = getdiffmeta(diffs[b'%d' % diffid])
33441 de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2116 for k in _metanamemap.keys():
de7c6ec27d99 phabricator: respect metadata sent by arc Jun Wu <quark@fb.com> parents: 33271 diff changeset	2117 if k in meta:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	2118 header += b'# %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	2119
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	2120 content = b'%s%s\n%s' % (header, desc, body)
44422 d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2121 patches.append((drev[b'id'], content))
d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2122
d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2123 # Write patches to the supplied callback
d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2124 write(patches)
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	2125
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2126
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2127 @vcrcommand(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2128 b'phabread',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2129 [(b'', b'stack', False, _(b'read dependencies'))],
44579 a7f8c657a3f0 phabricator: allow multiple DREVSPEC args to phabread\|phabimport\|phabupdate Matt Harbison <matt_harbison@yahoo.com> parents: 44578 diff changeset	2130 _(b'DREVSPEC... [OPTIONS]'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2131 helpcategory=command.CATEGORY_IMPORT_EXPORT,
44423 5e2d74e5f450 phabricator: make `hg phabread` work outside of a repository Matt Harbison <matt_harbison@yahoo.com> parents: 44422 diff changeset	2132 optionalrepo=True,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2133 )
44579 a7f8c657a3f0 phabricator: allow multiple DREVSPEC args to phabread\|phabimport\|phabupdate Matt Harbison <matt_harbison@yahoo.com> parents: 44578 diff changeset	2134 def phabread(ui, repo, specs, *opts):
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	2135 """print patches from Phabricator suitable for importing
04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	2136
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	2137 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	2138 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	2139 ``&``, ``(``, ``)`` for complex queries. Prefix ``:`` could be used to
44579 a7f8c657a3f0 phabricator: allow multiple DREVSPEC args to phabread\|phabimport\|phabupdate Matt Harbison <matt_harbison@yahoo.com> parents: 44578 diff changeset	2140 select a stack. If multiple DREVSPEC values are given, the result is the
a7f8c657a3f0 phabricator: allow multiple DREVSPEC args to phabread\|phabimport\|phabupdate Matt Harbison <matt_harbison@yahoo.com> parents: 44578 diff changeset	2141 union of each individually evaluated value. No attempt is currently made
a7f8c657a3f0 phabricator: allow multiple DREVSPEC args to phabread\|phabimport\|phabupdate Matt Harbison <matt_harbison@yahoo.com> parents: 44578 diff changeset	2142 to reorder the values to run from parent to child.
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	2143
33833 fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	2144 ``abandoned``, ``accepted``, ``closed``, ``needsreview``, ``needsrevision``
fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	2145 could be used to filter patches by status. For performance reason, they
fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	2146 only represent a subset of non-status selections and cannot be used alone.
fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	2147
33832 539541779010 phabricator: add a small language to query Differential Revisions Jun Wu <quark@fb.com> parents: 33831 diff changeset	2148 For example, ``:D6+8-(2+D4)`` selects a stack up to D6, plus D8 and exclude
33833 fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	2149 D2 and D4. ``:D9 & needsreview`` selects "Needs Review" revisions in a
fb59192b4981 phabricator: add status to revision query language Jun Wu <quark@fb.com> parents: 33832 diff changeset	2150 stack up to D9.
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	2151
04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	2152 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	2153 It is equivalent to the ``:`` operator.
33200 04cf9927f350 phabricator: add phabread command to read patches Jun Wu <quark@fb.com> parents: 33199 diff changeset	2154 """
41970 51ba9fbcca52 py3: use pycompat.byteskwargs on opts in phabricator.py Ian Moody <moz-ian@perix.co.uk> parents: 41950 diff changeset	2155 opts = pycompat.byteskwargs(opts)
44579 a7f8c657a3f0 phabricator: allow multiple DREVSPEC args to phabread\|phabimport\|phabupdate Matt Harbison <matt_harbison@yahoo.com> parents: 44578 diff changeset	2156 drevs = _getdrevs(ui, opts.get(b'stack'), specs)
44422 d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2157
d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2158 def _write(patches):
d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2159 for drev, content in patches:
d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2160 ui.write(content)
d5d262c7e7a2 phabricator: refactor `phabread` to write all patches at once Matt Harbison <matt_harbison@yahoo.com> parents: 44421 diff changeset	2161
44423 5e2d74e5f450 phabricator: make `hg phabread` work outside of a repository Matt Harbison <matt_harbison@yahoo.com> parents: 44422 diff changeset	2162 readpatch(ui, drevs, _write)
33834 6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2163
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2164
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2165 @vcrcommand(
44550 bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2166 b'phabimport',
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2167 [(b'', b'stack', False, _(b'import dependencies as well'))],
44579 a7f8c657a3f0 phabricator: allow multiple DREVSPEC args to phabread\|phabimport\|phabupdate Matt Harbison <matt_harbison@yahoo.com> parents: 44578 diff changeset	2168 _(b'DREVSPEC... [OPTIONS]'),
44550 bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2169 helpcategory=command.CATEGORY_IMPORT_EXPORT,
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2170 )
44579 a7f8c657a3f0 phabricator: allow multiple DREVSPEC args to phabread\|phabimport\|phabupdate Matt Harbison <matt_harbison@yahoo.com> parents: 44578 diff changeset	2171 def phabimport(ui, repo, specs, *opts):
44550 bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2172 """import patches from Phabricator for the specified Differential Revisions
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2173
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2174 The patches are read and applied starting at the parent of the working
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2175 directory.
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2176
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2177 See ``hg help phabread`` for how to specify DREVSPEC.
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2178 """
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2179 opts = pycompat.byteskwargs(opts)
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2180
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2181 # --bypass avoids losing exec and symlink bits when importing on Windows,
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2182 # and allows importing with a dirty wdir. It also aborts instead of leaving
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2183 # rejects.
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2184 opts[b'bypass'] = True
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2185
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2186 # Mandatory default values, synced with commands.import
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2187 opts[b'strip'] = 1
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2188 opts[b'prefix'] = b''
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2189 # Evolve 9.3.0 assumes this key is present in cmdutil.tryimportone()
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2190 opts[b'obsolete'] = False
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2191
44551 9bae1d1a0f4c phabricator: add a config knob to import in the secret phase Matt Harbison <matt_harbison@yahoo.com> parents: 44550 diff changeset	2192 if ui.configbool(b'phabimport', b'secret'):
9bae1d1a0f4c phabricator: add a config knob to import in the secret phase Matt Harbison <matt_harbison@yahoo.com> parents: 44550 diff changeset	2193 opts[b'secret'] = True
44552 f10055b099b3 phabricator: add a config knob to create obsolete markers when importing Matt Harbison <matt_harbison@yahoo.com> parents: 44551 diff changeset	2194 if ui.configbool(b'phabimport', b'obsolete'):
f10055b099b3 phabricator: add a config knob to create obsolete markers when importing Matt Harbison <matt_harbison@yahoo.com> parents: 44551 diff changeset	2195 opts[b'obsolete'] = True # Handled by evolve wrapping tryimportone()
44551 9bae1d1a0f4c phabricator: add a config knob to import in the secret phase Matt Harbison <matt_harbison@yahoo.com> parents: 44550 diff changeset	2196
44550 bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2197 def _write(patches):
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2198 parents = repo[None].parents()
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2199
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2200 with repo.wlock(), repo.lock(), repo.transaction(b'phabimport'):
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2201 for drev, contents in patches:
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2202 ui.status(_(b'applying patch from D%s\n') % drev)
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2203
48873 5aafc3c5bdec py3: use io.BytesIO directly Gregory Szorc <gregory.szorc@gmail.com> parents: 48116 diff changeset	2204 with patch.extract(ui, io.BytesIO(contents)) as patchdata:
44550 bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2205 msg, node, rej = cmdutil.tryimportone(
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2206 ui,
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2207 repo,
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2208 patchdata,
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2209 parents,
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2210 opts,
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2211 [],
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2212 None, # Never update wdir to another revision
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2213 )
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2214
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2215 if not node:
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2216 raise error.Abort(_(b'D%s: no diffs found') % drev)
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2217
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2218 ui.note(msg + b'\n')
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2219 parents = [repo[node]]
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2220
44579 a7f8c657a3f0 phabricator: allow multiple DREVSPEC args to phabread\|phabimport\|phabupdate Matt Harbison <matt_harbison@yahoo.com> parents: 44578 diff changeset	2221 drevs = _getdrevs(ui, opts.get(b'stack'), specs)
44550 bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2222
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2223 readpatch(repo.ui, drevs, _write)
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2224
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2225
bbb170f9396d phabricator: add a `phabimport` command Matt Harbison <matt_harbison@yahoo.com> parents: 44452 diff changeset	2226 @vcrcommand(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2227 b'phabupdate',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2228 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2229 (b'', b'accept', False, _(b'accept revisions')),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2230 (b'', b'reject', False, _(b'reject revisions')),
45136 1ff5070c0ab4 phabupdate: allows revisions to be marked "request-review" Matt Harbison <matt_harbison@yahoo.com> parents: 45135 diff changeset	2231 (b'', b'request-review', False, _(b'request review on revisions')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2232 (b'', b'abandon', False, _(b'abandon revisions')),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2233 (b'', b'reclaim', False, _(b'reclaim revisions')),
45137 3ad0855cc602 phabupdate: allow revisions to be marked "closed" Matt Harbison <matt_harbison@yahoo.com> parents: 45136 diff changeset	2234 (b'', b'close', False, _(b'close revisions')),
45138 2010f3143062 phabupdate: allow revisions to be reopened Matt Harbison <matt_harbison@yahoo.com> parents: 45137 diff changeset	2235 (b'', b'reopen', False, _(b'reopen revisions')),
45135 225588c4c255 phabupdate: allow revisions to be marked with "plan changes" Matt Harbison <matt_harbison@yahoo.com> parents: 44945 diff changeset	2236 (b'', b'plan-changes', False, _(b'plan changes for revisions')),
45140 c59e7bed8924 phabupdate: allow resigning from revisions Matt Harbison <matt_harbison@yahoo.com> parents: 45139 diff changeset	2237 (b'', b'resign', False, _(b'resign as a reviewer from revisions')),
45139 383b8c77096d phabupdate: allow revisions to be commandeered Matt Harbison <matt_harbison@yahoo.com> parents: 45138 diff changeset	2238 (b'', b'commandeer', False, _(b'commandeer revisions')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2239 (b'm', b'comment', b'', _(b'comment on the last revision')),
46037 9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2240 (b'r', b'rev', b'', _(b'local revision to update'), _(b'REV')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2241 ],
46037 9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2242 _(b'[DREVSPEC...\| -r REV...] [OPTIONS]'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2243 helpcategory=command.CATEGORY_IMPORT_EXPORT,
44421 b715432fabba phabricator: make `hg phabupdate` work outside of a repository Matt Harbison <matt_harbison@yahoo.com> parents: 44420 diff changeset	2244 optionalrepo=True,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2245 )
44579 a7f8c657a3f0 phabricator: allow multiple DREVSPEC args to phabread\|phabimport\|phabupdate Matt Harbison <matt_harbison@yahoo.com> parents: 44578 diff changeset	2246 def phabupdate(ui, repo, specs, *opts):
33834 6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2247 """update Differential Revision in batch
6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2248
6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2249 DREVSPEC selects revisions. See :hg:`help phabread` for its usage.
6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2250 """
41970 51ba9fbcca52 py3: use pycompat.byteskwargs on opts in phabricator.py Ian Moody <moz-ian@perix.co.uk> parents: 41950 diff changeset	2251 opts = pycompat.byteskwargs(opts)
45135 225588c4c255 phabupdate: allow revisions to be marked with "plan changes" Matt Harbison <matt_harbison@yahoo.com> parents: 44945 diff changeset	2252 transactions = [
225588c4c255 phabupdate: allow revisions to be marked with "plan changes" Matt Harbison <matt_harbison@yahoo.com> parents: 44945 diff changeset	2253 b'abandon',
225588c4c255 phabupdate: allow revisions to be marked with "plan changes" Matt Harbison <matt_harbison@yahoo.com> parents: 44945 diff changeset	2254 b'accept',
45137 3ad0855cc602 phabupdate: allow revisions to be marked "closed" Matt Harbison <matt_harbison@yahoo.com> parents: 45136 diff changeset	2255 b'close',
45139 383b8c77096d phabupdate: allow revisions to be commandeered Matt Harbison <matt_harbison@yahoo.com> parents: 45138 diff changeset	2256 b'commandeer',
45135 225588c4c255 phabupdate: allow revisions to be marked with "plan changes" Matt Harbison <matt_harbison@yahoo.com> parents: 44945 diff changeset	2257 b'plan-changes',
225588c4c255 phabupdate: allow revisions to be marked with "plan changes" Matt Harbison <matt_harbison@yahoo.com> parents: 44945 diff changeset	2258 b'reclaim',
225588c4c255 phabupdate: allow revisions to be marked with "plan changes" Matt Harbison <matt_harbison@yahoo.com> parents: 44945 diff changeset	2259 b'reject',
45138 2010f3143062 phabupdate: allow revisions to be reopened Matt Harbison <matt_harbison@yahoo.com> parents: 45137 diff changeset	2260 b'reopen',
45136 1ff5070c0ab4 phabupdate: allows revisions to be marked "request-review" Matt Harbison <matt_harbison@yahoo.com> parents: 45135 diff changeset	2261 b'request-review',
45140 c59e7bed8924 phabupdate: allow resigning from revisions Matt Harbison <matt_harbison@yahoo.com> parents: 45139 diff changeset	2262 b'resign',
45135 225588c4c255 phabupdate: allow revisions to be marked with "plan changes" Matt Harbison <matt_harbison@yahoo.com> parents: 44945 diff changeset	2263 ]
225588c4c255 phabupdate: allow revisions to be marked with "plan changes" Matt Harbison <matt_harbison@yahoo.com> parents: 44945 diff changeset	2264 flags = [n for n in transactions if opts.get(n.replace(b'-', b'_'))]
33834 6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2265 if len(flags) > 1:
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	2266 raise error.Abort(_(b'%s cannot be used together') % b', '.join(flags))
33834 6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2267
6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2268 actions = []
6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2269 for f in flags:
43350 132ddd1cba85 phabricator: use True primitive instead of b'true' for phabupdate actions Ian Moody <moz-ian@perix.co.uk> parents: 43321 diff changeset	2270 actions.append({b'type': f, b'value': True})
33834 6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2271
46037 9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2272 revs = opts.get(b'rev')
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2273 if revs:
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2274 if not repo:
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2275 raise error.InputError(_(b'--rev requires a repository'))
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2276
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2277 if specs:
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2278 raise error.InputError(_(b'cannot specify both DREVSPEC and --rev'))
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2279
48116 5ced12cfa41b errors: raise InputError on bad revset to revrange() iff provided by the user Martin von Zweigbergk <martinvonz@google.com> parents: 47057 diff changeset	2280 drevmap = getdrevmap(repo, logcmdutil.revrange(repo, [revs]))
46037 9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2281 specs = []
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2282 unknown = []
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2283 for r, d in pycompat.iteritems(drevmap):
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2284 if d is None:
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2285 unknown.append(repo[r])
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2286 else:
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2287 specs.append(b'D%d' % d)
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2288 if unknown:
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2289 raise error.InputError(
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2290 _(b'selected revisions without a Differential: %s')
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2291 % scmutil.nodesummaries(repo, unknown)
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2292 )
9624bf057c2a phabricator: allow local revisions to be specified with `phabupdate` Matt Harbison <matt_harbison@yahoo.com> parents: 45970 diff changeset	2293
44579 a7f8c657a3f0 phabricator: allow multiple DREVSPEC args to phabread\|phabimport\|phabupdate Matt Harbison <matt_harbison@yahoo.com> parents: 44578 diff changeset	2294 drevs = _getdrevs(ui, opts.get(b'stack'), specs)
33834 6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2295 for i, drev in enumerate(drevs):
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	2296 if i + 1 == len(drevs) and opts.get(b'comment'):
81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	2297 actions.append({b'type': b'comment', b'value': opts[b'comment']})
33834 6e666cd59879 phabricator: add phabupdate command to update status in batch Jun Wu <quark@fb.com> parents: 33833 diff changeset	2298 if actions:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2299 params = {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2300 b'objectIdentifier': drev[b'phid'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2301 b'transactions': actions,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2302 }
42434 f163e2b2594c phabricator: pass ui instead of repo to callconduit Pulkit Goyal <pulkit@yandex-team.ru> parents: 42433 diff changeset	2303 callconduit(ui, b'differential.revision.edit', params)
35722 f18ba40d792f phabricator: add a template item for linking to a differential review Tom Prince <mozilla@hocat.ca> parents: 35626 diff changeset	2304
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2305
42973 24bf7a3d3c30 phabricator: use exthelper to register commands, config, and templates Matt Harbison <matt_harbison@yahoo.com> parents: 42951 diff changeset	2306 @eh.templatekeyword(b'phabreview', requires={b'ctx'})
36514 7b74afec6772 templatekw: switch non-showlist template keywords to new API Yuya Nishihara <yuya@tcha.org> parents: 35722 diff changeset	2307 def template_review(context, mapping):
35722 f18ba40d792f phabricator: add a template item for linking to a differential review Tom Prince <mozilla@hocat.ca> parents: 35626 diff changeset	2308 """:phabreview: Object describing the review for this changeset.
f18ba40d792f phabricator: add a template item for linking to a differential review Tom Prince <mozilla@hocat.ca> parents: 35626 diff changeset	2309 Has attributes `url` and `id`.
f18ba40d792f phabricator: add a template item for linking to a differential review Tom Prince <mozilla@hocat.ca> parents: 35626 diff changeset	2310 """
38392 81a4be7099fa py3: byte-stringify literals in contrib/phabricator.py as example Yuya Nishihara <yuya@tcha.org> parents: 38336 diff changeset	2311 ctx = context.resource(mapping, b'ctx')
35722 f18ba40d792f phabricator: add a template item for linking to a differential review Tom Prince <mozilla@hocat.ca> parents: 35626 diff changeset	2312 m = _differentialrevisiondescre.search(ctx.description())
f18ba40d792f phabricator: add a template item for linking to a differential review Tom Prince <mozilla@hocat.ca> parents: 35626 diff changeset	2313 if m:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2314 return templateutil.hybriddict(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2315 {
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2316 b'url': m.group('url'),
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2317 b'id': b"D%s" % m.group('id'),
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2318 }
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43047 diff changeset	2319 )
41164 43fd1947301d phabricator: teach {phabreview} to work without --amend Matt Harbison <matt_harbison@yahoo.com> parents: 41163 diff changeset	2320 else:
43fd1947301d phabricator: teach {phabreview} to work without --amend Matt Harbison <matt_harbison@yahoo.com> parents: 41163 diff changeset	2321 tags = ctx.repo().nodetags(ctx.node())
43fd1947301d phabricator: teach {phabreview} to work without --amend Matt Harbison <matt_harbison@yahoo.com> parents: 41163 diff changeset	2322 for t in tags:
43fd1947301d phabricator: teach {phabreview} to work without --amend Matt Harbison <matt_harbison@yahoo.com> parents: 41163 diff changeset	2323 if _differentialrevisiontagre.match(t):
43fd1947301d phabricator: teach {phabreview} to work without --amend Matt Harbison <matt_harbison@yahoo.com> parents: 41163 diff changeset	2324 url = ctx.repo().ui.config(b'phabricator', b'url')
43fd1947301d phabricator: teach {phabreview} to work without --amend Matt Harbison <matt_harbison@yahoo.com> parents: 41163 diff changeset	2325 if not url.endswith(b'/'):
43fd1947301d phabricator: teach {phabreview} to work without --amend Matt Harbison <matt_harbison@yahoo.com> parents: 41163 diff changeset	2326 url += b'/'
43fd1947301d phabricator: teach {phabreview} to work without --amend Matt Harbison <matt_harbison@yahoo.com> parents: 41163 diff changeset	2327 url += t
43fd1947301d phabricator: teach {phabreview} to work without --amend Matt Harbison <matt_harbison@yahoo.com> parents: 41163 diff changeset	2328
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2329 return templateutil.hybriddict(
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2330 {
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2331 b'url': url,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2332 b'id': t,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2333 }
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2334 )
41164 43fd1947301d phabricator: teach {phabreview} to work without --amend Matt Harbison <matt_harbison@yahoo.com> parents: 41163 diff changeset	2335 return None
43839 70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2336
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2337
43840 79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2338 @eh.templatekeyword(b'phabstatus', requires={b'ctx', b'repo', b'ui'})
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2339 def template_status(context, mapping):
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2340 """:phabstatus: String. Status of Phabricator differential."""
43840 79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2341 ctx = context.resource(mapping, b'ctx')
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2342 repo = context.resource(mapping, b'repo')
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2343 ui = context.resource(mapping, b'ui')
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2344
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2345 rev = ctx.rev()
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2346 try:
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2347 drevid = getdrevmap(repo, [rev])[rev]
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2348 except KeyError:
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2349 return None
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2350 drevs = callconduit(ui, b'differential.query', {b'ids': [drevid]})
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2351 for drev in drevs:
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2352 if int(drev[b'id']) == drevid:
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2353 return templateutil.hybriddict(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2354 {
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2355 b'url': drev[b'uri'],
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2356 b'status': drev[b'statusName'],
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45772 diff changeset	2357 }
43840 79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2358 )
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2359 return None
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2360
79c0121220e3 phabricator: add a "phabstatus" template keyword Denis Laxalde <denis.laxalde@logilab.fr> parents: 43839 diff changeset	2361
43839 70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2362 @show.showview(b'phabstatus', csettopic=b'work')
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2363 def phabstatusshowview(ui, repo, displayer):
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2364 """Phabricator differiential status"""
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2365 revs = repo.revs('sort(_underway(), topo)')
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2366 drevmap = getdrevmap(repo, revs)
44452 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44436 diff changeset	2367 unknownrevs, drevids, revsbydrevid = [], set(), {}
43839 70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2368 for rev, drevid in pycompat.iteritems(drevmap):
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2369 if drevid is not None:
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2370 drevids.add(drevid)
44452 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44436 diff changeset	2371 revsbydrevid.setdefault(drevid, set()).add(rev)
43839 70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2372 else:
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2373 unknownrevs.append(rev)
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2374
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2375 drevs = callconduit(ui, b'differential.query', {b'ids': list(drevids)})
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2376 drevsbyrev = {}
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2377 for drev in drevs:
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2378 for rev in revsbydrevid[int(drev[b'id'])]:
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2379 drevsbyrev[rev] = drev
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2380
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2381 def phabstatus(ctx):
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2382 drev = drevsbyrev[ctx.rev()]
43858 b0867b7751ba phabricator: color the status in the "phabstatus" view Matt Harbison <matt_harbison@yahoo.com> parents: 43857 diff changeset	2383 status = ui.label(
b0867b7751ba phabricator: color the status in the "phabstatus" view Matt Harbison <matt_harbison@yahoo.com> parents: 43857 diff changeset	2384 b'%(statusName)s' % drev,
b0867b7751ba phabricator: color the status in the "phabstatus" view Matt Harbison <matt_harbison@yahoo.com> parents: 43857 diff changeset	2385 b'phabricator.status.%s' % _getstatusname(drev),
b0867b7751ba phabricator: color the status in the "phabstatus" view Matt Harbison <matt_harbison@yahoo.com> parents: 43857 diff changeset	2386 )
b0867b7751ba phabricator: color the status in the "phabstatus" view Matt Harbison <matt_harbison@yahoo.com> parents: 43857 diff changeset	2387 ui.write(b"\n%s %s\n" % (drev[b'uri'], status))
43839 70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2388
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2389 revs -= smartset.baseset(unknownrevs)
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2390 revdag = graphmod.dagwalker(repo, revs)
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2391
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2392 ui.setconfig(b'experimental', b'graphshorten', True)
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2393 displayer._exthook = phabstatus
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2394 nodelen = show.longestshortest(repo, revs)
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2395 logcmdutil.displaygraph(
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2396 ui,
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2397 repo,
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2398 revdag,
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2399 displayer,
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2400 graphmod.asciiedges,
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2401 props={b'nodelen': nodelen},
70060915c3f2 phabricator: add a "phabstatus" show view Denis Laxalde <denis@laxalde.org> parents: 43829 diff changeset	2402 )

Mercurial > public > mercurial-scm > hg

annotate hgext/phabricator.py @ 48873:5aafc3c5bdec