This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9356

phabricator: allow local revisions to be specified with `phabupdate`
ClosedPublic

Authored by mharbison72 on Nov 21 2020, 12:22 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9624bf057c2a: phabricator: allow local revisions to be specified with `phabupdate`
Summary

It's way easier and less error prone to specify a revset after importing a
series than to manually type in a series of Differentials.

Unlike most revision oriented commands, this requires the --rev option
explicitly because the existing DREVSPEC doesn't need to have the leading 'D',
and therefore the meaning is ambiguous. I wouldn't have a problem giving
precedence to the local revnum, but phabread and phabimport also use
DREVSPEC, and local revisions make no sense there. I would be fine with
modifying that definition to require the leading 'D', but I'm not sure how many
people are used to not specifying it.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Nov 21 2020, 12:22 AM
Alphare accepted this revision.Nov 23 2020, 10:33 AM
Alphare added a subscriber: Alphare.

This seems like the right choice to me, confusing the local and remote revisions would be bad.

mharbison72 added a comment.Nov 23 2020, 10:37 AM

This seems like the right choice to me, confusing the local and remote revisions would be bad.

Which one, because we could disallow differential revs without the leading 'D', and not be ambiguous. I kind of lean towards that the more I think about it, but I haven't considered how easy it would be to detect when there's a mini revset language to account for.

pulkit accepted this revision.Dec 4 2020, 1:48 PM
This revision is now accepted and ready to land.Dec 4 2020, 1:48 PM

Revision Contents
Changeset List

Diff 23606

hgext/phabricator.py

(b'', b'abandon', False, _(b'abandon revisions')), (b'', b'abandon', False, _(b'abandon revisions')),
(b'', b'reclaim', False, _(b'reclaim revisions')), (b'', b'reclaim', False, _(b'reclaim revisions')),
(b'', b'close', False, _(b'close revisions')), (b'', b'close', False, _(b'close revisions')),
(b'', b'reopen', False, _(b'reopen revisions')), (b'', b'reopen', False, _(b'reopen revisions')),
(b'', b'plan-changes', False, _(b'plan changes for revisions')), (b'', b'plan-changes', False, _(b'plan changes for revisions')),
(b'', b'resign', False, _(b'resign as a reviewer from revisions')), (b'', b'resign', False, _(b'resign as a reviewer from revisions')),
(b'', b'commandeer', False, _(b'commandeer revisions')), (b'', b'commandeer', False, _(b'commandeer revisions')),
(b'm', b'comment', b'', _(b'comment on the last revision')), (b'm', b'comment', b'', _(b'comment on the last revision')),
(b'r', b'rev', b'', _(b'local revision to update'), _(b'REV')),
], ],
_(b'DREVSPEC... [OPTIONS]'), _(b'[DREVSPEC...| -r REV...] [OPTIONS]'),
helpcategory=command.CATEGORY_IMPORT_EXPORT, helpcategory=command.CATEGORY_IMPORT_EXPORT,
optionalrepo=True, optionalrepo=True,
) )
def phabupdate(ui, repo, *specs, **opts): def phabupdate(ui, repo, *specs, **opts):
"""update Differential Revision in batch """update Differential Revision in batch
DREVSPEC selects revisions. See :hg:`help phabread` for its usage. DREVSPEC selects revisions. See :hg:`help phabread` for its usage.
""" """
flags = [n for n in transactions if opts.get(n.replace(b'-', b'_'))] flags = [n for n in transactions if opts.get(n.replace(b'-', b'_'))]
if len(flags) > 1: if len(flags) > 1:
raise error.Abort(_(b'%s cannot be used together') % b', '.join(flags)) raise error.Abort(_(b'%s cannot be used together') % b', '.join(flags))
actions = [] actions = []
for f in flags: for f in flags:
actions.append({b'type': f, b'value': True}) actions.append({b'type': f, b'value': True})
revs = opts.get(b'rev')
if revs:
if not repo:
raise error.InputError(_(b'--rev requires a repository'))
if specs:
raise error.InputError(_(b'cannot specify both DREVSPEC and --rev'))
drevmap = getdrevmap(repo, scmutil.revrange(repo, [revs]))
specs = []
unknown = []
for r, d in pycompat.iteritems(drevmap):
if d is None:
unknown.append(repo[r])
else:
specs.append(b'D%d' % d)
if unknown:
raise error.InputError(
_(b'selected revisions without a Differential: %s')
% scmutil.nodesummaries(repo, unknown)
)
drevs = _getdrevs(ui, opts.get(b'stack'), specs) drevs = _getdrevs(ui, opts.get(b'stack'), specs)
for i, drev in enumerate(drevs): for i, drev in enumerate(drevs):
if i + 1 == len(drevs) and opts.get(b'comment'): if i + 1 == len(drevs) and opts.get(b'comment'):
actions.append({b'type': b'comment', b'value': opts[b'comment']}) actions.append({b'type': b'comment', b'value': opts[b'comment']})
if actions: if actions:
params = { params = {
b'objectIdentifier': drev[b'phid'], b'objectIdentifier': drev[b'phid'],
b'transactions': actions, b'transactions': actions,

tests/phabricator/phabupdate-revs.json

  • This file was added.
{
"version": 1,
"interactions": [
{
"request": {
"method": "POST",
"uri": "https://phab.mercurial-scm.org//api/differential.query",
"body": "params=%7B%22__conduit__%22%3A+%7B%22token%22%3A+%22cli-hahayouwish%22%7D%2C+%22ids%22%3A+%5B7917%2C+7918%5D%7D&output=json&__conduit__=1",
"headers": {
"accept": [
"application/mercurial-0.1"
],
"content-length": [
"154"
],
"content-type": [
"application/x-www-form-urlencoded"
],
"host": [
"phab.mercurial-scm.org"
],
"user-agent": [
"mercurial/proto-1.0 (Mercurial 5.6+124-da178b816812+20201120)"
]
}
},
"response": {
"status": {
"code": 200,
"message": "OK"
},
"headers": {
"X-XSS-Protection": [
"1; mode=block"
],
"Date": [
"Sat, 21 Nov 2020 04:42:44 GMT"
],
"Referrer-Policy": [
"no-referrer"
],
"Strict-Transport-Security": [
"max-age=0; includeSubdomains; preload"
],
"Cache-Control": [
"no-store"
],
"Set-Cookie": [
"phsid=A%2Fw422dnwrfacwgvoi3igw4xdjyojfi67muc4ucxxs; expires=Thu, 20-Nov-2025 04:42:44 GMT; Max-Age=157680000; path=/; domain=phab.mercurial-scm.org; secure; httponly"
],
"X-Content-Type-Options": [
"nosniff"
],
"X-Frame-Options": [
"Deny"
],
"Server": [
"Apache/2.4.10 (Debian)"
],
"Transfer-Encoding": [
"chunked"
],
"Content-Type": [
"application/json"
],
"Expires": [
"Sat, 01 Jan 2000 00:00:00 GMT"
]
},
"body": {
"string": "{\"result\":[{\"id\":\"7918\",\"phid\":\"PHID-DREV-sfsckrwrwc77rdl3k5rz\",\"title\":\"create draft change for phabricator testing\",\"uri\":\"https:\\/\\/phab.mercurial-scm.org\\/D7918\",\"dateCreated\":\"1579221164\",\"dateModified\":\"1579222305\",\"authorPHID\":\"PHID-USER-tzhaient733lwrlbcag5\",\"status\":\"4\",\"statusName\":\"Abandoned\",\"properties\":{\"draft.broadcast\":true,\"lines.added\":1,\"lines.removed\":2},\"branch\":\"default\",\"summary\":\"\",\"testPlan\":\"\",\"lineCount\":\"3\",\"activeDiffPHID\":\"PHID-DIFF-pqdlhei24n47fzeofjph\",\"diffs\":[\"19394\"],\"commits\":[],\"reviewers\":{\"PHID-PROJ-3dvcxzznrjru2xmmses3\":\"PHID-PROJ-3dvcxzznrjru2xmmses3\"},\"ccs\":[\"PHID-USER-q42dn7cc3donqriafhjx\"],\"hashes\":[[\"hgcm\",\"\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\"]],\"auxiliary\":{\"phabricator:projects\":[],\"phabricator:depends-on\":[\"PHID-DREV-yhl3yvijs4jploa5iqm4\"]},\"repositoryPHID\":\"PHID-REPO-bvunnehri4u2isyr7bc3\",\"sourcePath\":\"\\/\"},{\"id\":\"7917\",\"phid\":\"PHID-DREV-yhl3yvijs4jploa5iqm4\",\"title\":\"create public change for phabricator testing\",\"uri\":\"https:\\/\\/phab.mercurial-scm.org\\/D7917\",\"dateCreated\":\"1579221160\",\"dateModified\":\"1579222286\",\"authorPHID\":\"PHID-USER-tzhaient733lwrlbcag5\",\"status\":\"4\",\"statusName\":\"Abandoned\",\"properties\":{\"draft.broadcast\":true,\"lines.added\":1,\"lines.removed\":1},\"branch\":\"default\",\"summary\":\"\",\"testPlan\":\"\",\"lineCount\":\"2\",\"activeDiffPHID\":\"PHID-DIFF-e64weyerxtutv2jvj2dt\",\"diffs\":[\"19393\"],\"commits\":[],\"reviewers\":{\"PHID-PROJ-3dvcxzznrjru2xmmses3\":\"PHID-PROJ-3dvcxzznrjru2xmmses3\"},\"ccs\":[\"PHID-USER-q42dn7cc3donqriafhjx\"],\"hashes\":[[\"hgcm\",\"\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\"]],\"auxiliary\":{\"phabricator:projects\":[],\"phabricator:depends-on\":[]},\"repositoryPHID\":\"PHID-REPO-bvunnehri4u2isyr7bc3\",\"sourcePath\":\"\\/\"}],\"error_code\":null,\"error_info\":null}"
}
}
},
{
"request": {
"method": "POST",
"uri": "https://phab.mercurial-scm.org//api/differential.revision.edit",
"body": "params=%7B%22__conduit__%22%3A+%7B%22token%22%3A+%22cli-hahayouwish%22%7D%2C+%22objectIdentifier%22%3A+%22PHID-DREV-yhl3yvijs4jploa5iqm4%22%2C+%22transactions%22%3A+%5B%7B%22type%22%3A+%22reclaim%22%2C+%22value%22%3A+true%7D%5D%7D&output=json&__conduit__=1",
"headers": {
"accept": [
"application/mercurial-0.1"
],
"content-length": [
"273"
],
"content-type": [
"application/x-www-form-urlencoded"
],
"host": [
"phab.mercurial-scm.org"
],
"user-agent": [
"mercurial/proto-1.0 (Mercurial 5.6+124-da178b816812+20201120)"
]
}
},
"response": {
"status": {
"code": 200,
"message": "OK"
},
"headers": {
"X-XSS-Protection": [
"1; mode=block"
],
"Date": [
"Sat, 21 Nov 2020 04:42:44 GMT"
],
"Referrer-Policy": [
"no-referrer"
],
"Strict-Transport-Security": [
"max-age=0; includeSubdomains; preload"
],
"Cache-Control": [
"no-store"
],
"Set-Cookie": [
"phsid=A%2Fx3q7clkv3ti5yodbqj65kwkptz476tzun2uauime; expires=Thu, 20-Nov-2025 04:42:44 GMT; Max-Age=157680000; path=/; domain=phab.mercurial-scm.org; secure; httponly"
],
"X-Content-Type-Options": [
"nosniff"
],
"X-Frame-Options": [
"Deny"
],
"Server": [
"Apache/2.4.10 (Debian)"
],
"Transfer-Encoding": [
"chunked"
],
"Content-Type": [
"application/json"
],
"Expires": [
"Sat, 01 Jan 2000 00:00:00 GMT"
]
},
"body": {
"string": "{\"result\":{\"object\":{\"id\":7917,\"phid\":\"PHID-DREV-yhl3yvijs4jploa5iqm4\"},\"transactions\":[{\"phid\":\"PHID-XACT-DREV-6alffj324fqa2nj\"},{\"phid\":\"PHID-XACT-DREV-p4bkxo6zaqhcnvp\"}]},\"error_code\":null,\"error_info\":null}"
}
}
},
{
"request": {
"method": "POST",
"uri": "https://phab.mercurial-scm.org//api/differential.revision.edit",
"body": "params=%7B%22__conduit__%22%3A+%7B%22token%22%3A+%22cli-hahayouwish%22%7D%2C+%22objectIdentifier%22%3A+%22PHID-DREV-sfsckrwrwc77rdl3k5rz%22%2C+%22transactions%22%3A+%5B%7B%22type%22%3A+%22reclaim%22%2C+%22value%22%3A+true%7D%5D%7D&output=json&__conduit__=1",
"headers": {
"accept": [
"application/mercurial-0.1"
],
"content-length": [
"273"
],
"content-type": [
"application/x-www-form-urlencoded"
],
"host": [
"phab.mercurial-scm.org"
],
"user-agent": [
"mercurial/proto-1.0 (Mercurial 5.6+124-da178b816812+20201120)"
]
}
},
"response": {
"status": {
"code": 200,
"message": "OK"
},
"headers": {
"X-XSS-Protection": [
"1; mode=block"
],
"Date": [
"Sat, 21 Nov 2020 04:42:45 GMT"
],
"Referrer-Policy": [
"no-referrer"
],
"Strict-Transport-Security": [
"max-age=0; includeSubdomains; preload"
],
"Cache-Control": [
"no-store"
],
"Set-Cookie": [
"phsid=A%2Fmgusoeqrp6o43ru5uhrtttwzxtf32aqb5siez3oo; expires=Thu, 20-Nov-2025 04:42:45 GMT; Max-Age=157680000; path=/; domain=phab.mercurial-scm.org; secure; httponly"
],
"X-Content-Type-Options": [
"nosniff"
],
"X-Frame-Options": [
"Deny"
],
"Server": [
"Apache/2.4.10 (Debian)"
],
"Transfer-Encoding": [
"chunked"
],
"Content-Type": [
"application/json"
],
"Expires": [
"Sat, 01 Jan 2000 00:00:00 GMT"
]
},
"body": {
"string": "{\"result\":{\"object\":{\"id\":7918,\"phid\":\"PHID-DREV-sfsckrwrwc77rdl3k5rz\"},\"transactions\":[{\"phid\":\"PHID-XACT-DREV-wfo42n4hsabosy5\"},{\"phid\":\"PHID-XACT-DREV-aqluo36kykh2jae\"}]},\"error_code\":null,\"error_info\":null}"
}
}
}
]
}
No newline at end of file

tests/test-phabricator.t

summary: create public change for phabricator testing summary: create public change for phabricator testing
changeset: 1:a692622e6937 changeset: 1:a692622e6937
phase: public phase: public
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: create beta for phabricator test summary: create beta for phabricator test
phabupdate can convert from local revisions
$ hg phabupdate --reclaim D7917 -r '.: and not public()'
abort: cannot specify both DREVSPEC and --rev
[10]
$ hg phabupdate --reclaim -r '.: and not public()' --test-vcr "$VCR/phabupdate-revs.json"
Phabimport accepts multiple DREVSPECs Phabimport accepts multiple DREVSPECs
$ hg rollback --config ui.rollback=True $ hg rollback --config ui.rollback=True
repository tip rolled back to revision 1 (undo phabimport) repository tip rolled back to revision 1 (undo phabimport)
$ hg phabimport --no-stack D7917 D7918 --test-vcr "$VCR/phabimport-multi-drev.json" $ hg phabimport --no-stack D7917 D7918 --test-vcr "$VCR/phabimport-multi-drev.json"
applying patch from D7917 applying patch from D7917
applying patch from D7918 applying patch from D7918