This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8751

phabupdate: allow revisions to be marked with "plan changes"
ClosedPublic

Authored by mharbison72 on Jul 15 2020, 1:31 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG225588c4c255: phabupdate: allow revisions to be marked with "plan changes"

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Jul 15 2020, 1:31 PM
marmoute accepted this revision.Jul 15 2020, 1:37 PM
marmoute added a subscriber: marmoute.

Looks like and good. I have some question of the test, but nothing blocking.

mharbison72 added a commit: rHG225588c4c255: phabupdate: allow revisions to be marked with "plan changes".Jul 16 2020, 12:54 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG225588c4c255: phabupdate: allow revisions to be marked with "plan changes" (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21941

hgext/phabricator.py

@vcrcommand( @vcrcommand(
b'phabupdate', b'phabupdate',
[ [
(b'', b'accept', False, _(b'accept revisions')), (b'', b'accept', False, _(b'accept revisions')),
(b'', b'reject', False, _(b'reject revisions')), (b'', b'reject', False, _(b'reject revisions')),
(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'plan-changes', False, _(b'plan changes for revisions')),
(b'm', b'comment', b'', _(b'comment on the last revision')), (b'm', b'comment', b'', _(b'comment on the last revision')),
], ],
_(b'DREVSPEC... [OPTIONS]'), _(b'DREVSPEC... [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.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
flags = [n for n in b'accept reject abandon reclaim'.split() if opts.get(n)] transactions = [
b'abandon',
b'accept',
b'plan-changes',
b'reclaim',
b'reject',
]
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})
drevs = _getdrevs(ui, opts.get(b'stack'), specs) drevs = _getdrevs(ui, opts.get(b'stack'), specs)

tests/phabricator/phabupdate-change-6876.json

  • This file was added.
{
"version": 1,
"interactions": [
{
"response": {
"headers": {
"x-xss-protection": [
"1; mode=block"
],
"expires": [
"Sat, 01 Jan 2000 00:00:00 GMT"
],
"server": [
"Apache/2.4.10 (Debian)"
],
"date": [
"Wed, 15 Jul 2020 17:23:27 GMT"
],
"cache-control": [
"no-store"
],
"content-type": [
"application/json"
],
"transfer-encoding": [
"chunked"
],
"strict-transport-security": [
"max-age=0; includeSubdomains; preload"
],
"x-frame-options": [
"Deny"
],
"referrer-policy": [
"no-referrer"
],
"x-content-type-options": [
"nosniff"
]
},
"body": {
"string": "{\"result\":[{\"id\":\"6876\",\"phid\":\"PHID-DREV-looitrxgt3omaau7a7qk\",\"title\":\"phabricator: support automatically obsoleting old revisions of pulled commits\",\"uri\":\"https:\\/\\/phab.mercurial-scm.org\\/D6876\",\"dateCreated\":\"1569388644\",\"dateModified\":\"1579887103\",\"authorPHID\":\"PHID-USER-tzhaient733lwrlbcag5\",\"status\":\"1\",\"statusName\":\"Needs Revision\",\"properties\":{\"draft.broadcast\":true,\"lines.added\":68,\"lines.removed\":1},\"branch\":null,\"summary\":\"This is basically an import of the `pullcreatemarkers` extension[1] from the FB\\nrepo, with minor adjustments to `getmatchingdiff()` to work with modern hg.\\nSince this is very phabricator specific, it makes more sense to me to bundle it\\ninto the existing extension. It wasn't very obvious from the old name what\\nfunctionality was provided, and it may make sense to do this in other scenarios\\nbesides `hg pull`.\\n\\nThere are two use cases that I can see- first, ensuring that old revisions are\\ncleaned up for a contributor (I seem to recall something I submitted recently\\nneeded to be explicitly pruned, though most submissions do clean up\\nautomatically). Second, any `hg phabread | hg import -` would otherwise need to\\nbe manually cleaned up. The latter is annoying enough that I tend not to grab\\nthe code and try it when reviewing.\\n\\nIt is currently guarded by a config option (off by default), because @marmoute\\nexpressed concerns about duplicate marker creation if the pushing reviewer also\\ncreates a marker. I don't think that's possible here, since the obsolete\\nrevisions are explicitly excluded. But maybe there are other reasons someone\\nwouldn't want older revisions obsoleted. The config name reflects the fact that\\nI'm not sure if other things like import should get this too.\\n\\nI suspect that we could wrap a function deeper in the pull sequence to improve\\nboth the code and the UX. For example, when pulling an obsolete marker, it can\\nprint out a warning that the working directory parent is obsolete, but that\\ndoesn't happen here. (It won't happen with this test. It *should* without the\\n`--bypass` option, but doesn't.) It should also be possible to not have to\\nquery the range of new revisions, and maybe it can be added to the existing\\ntransaction.\\n\\n[1] https:\\/\\/bitbucket.org\\/facebook\\/hg-experimental\\/src\\/default\\/hgext3rd\\/pullcreatemarkers.py\",\"testPlan\":\"\",\"lineCount\":\"69\",\"activeDiffPHID\":\"PHID-DIFF-jdpqpzciqcooaxf2kojh\",\"diffs\":[\"16604\"],\"commits\":[],\"reviewers\":{\"PHID-PROJ-3dvcxzznrjru2xmmses3\":\"PHID-PROJ-3dvcxzznrjru2xmmses3\",\"PHID-USER-cah4b6i3kszy6debh3bl\":\"PHID-USER-cah4b6i3kszy6debh3bl\"},\"ccs\":[\"PHID-USER-34jnztnonbr4lhwuybwl\",\"PHID-USER-e66t6wbudjtigdnqbl3e\",\"PHID-USER-5iy6mkoveguhm2zthvww\",\"PHID-USER-q42dn7cc3donqriafhjx\",\"PHID-USER-vflsibccj4unqydwfvne\"],\"hashes\":[],\"auxiliary\":{\"phabricator:projects\":[],\"phabricator:depends-on\":[\"PHID-DREV-2dbanvk64h5wguhxta2o\"]},\"repositoryPHID\":\"PHID-REPO-bvunnehri4u2isyr7bc3\",\"sourcePath\":null}],\"error_code\":null,\"error_info\":null}"
},
"status": {
"message": "OK",
"code": 200
}
},
"request": {
"uri": "https://phab.mercurial-scm.org//api/differential.query",
"body": "output=json&params=%7B%22__conduit__%22%3A+%7B%22token%22%3A+%22cli-hahayouwish%22%7D%2C+%22ids%22%3A+%5B6876%5D%7D&__conduit__=1",
"method": "POST",
"headers": {
"content-length": [
"146"
],
"accept": [
"application/mercurial-0.1"
],
"content-type": [
"application/x-www-form-urlencoded"
],
"user-agent": [
"mercurial/proto-1.0 (Mercurial 5.4.2+207-8403cc54bc83+20200709)"
],
"host": [
"phab.mercurial-scm.org"
]
}
}
},
{
"response": {
"headers": {
"x-xss-protection": [
"1; mode=block"
],
"expires": [
"Sat, 01 Jan 2000 00:00:00 GMT"
],
"server": [
"Apache/2.4.10 (Debian)"
],
"date": [
"Wed, 15 Jul 2020 17:23:28 GMT"
],
"cache-control": [
"no-store"
],
"content-type": [
"application/json"
],
"transfer-encoding": [
"chunked"
],
"strict-transport-security": [
"max-age=0; includeSubdomains; preload"
],
"x-frame-options": [
"Deny"
],
"referrer-policy": [
"no-referrer"
],
"x-content-type-options": [
"nosniff"
]
},
"body": {
"string": "{\"result\":{\"object\":{\"id\":6876,\"phid\":\"PHID-DREV-looitrxgt3omaau7a7qk\"},\"transactions\":[{\"phid\":\"PHID-XACT-DREV-g2xkgr2sjkrmhcr\"},{\"phid\":\"PHID-XACT-DREV-lgbrex6poz6x5pk\"}]},\"error_code\":null,\"error_info\":null}"
},
"status": {
"message": "OK",
"code": 200
}
},
"request": {
"uri": "https://phab.mercurial-scm.org//api/differential.revision.edit",
"body": "output=json&params=%7B%22__conduit__%22%3A+%7B%22token%22%3A+%22cli-hahayouwish%22%7D%2C+%22objectIdentifier%22%3A+%22PHID-DREV-looitrxgt3omaau7a7qk%22%2C+%22transactions%22%3A+%5B%7B%22type%22%3A+%22plan-changes%22%2C+%22value%22%3A+true%7D%5D%7D&__conduit__=1",
"method": "POST",
"headers": {
"content-length": [
"278"
],
"accept": [
"application/mercurial-0.1"
],
"content-type": [
"application/x-www-form-urlencoded"
],
"user-agent": [
"mercurial/proto-1.0 (Mercurial 5.4.2+207-8403cc54bc83+20200709)"
],
"host": [
"phab.mercurial-scm.org"
]
}
}
}
]
}
No newline at end of file

tests/test-phabricator.t

$ hg phabupdate --accept D4564 \ $ hg phabupdate --accept D4564 \
> -m 'I think I like where this is headed. Will read rest of series later.'\ > -m 'I think I like where this is headed. Will read rest of series later.'\
> --test-vcr "$VCR/accept-4564.json" > --test-vcr "$VCR/accept-4564.json"
abort: Conduit Error (ERR-CONDUIT-CORE): Validation errors: abort: Conduit Error (ERR-CONDUIT-CORE): Validation errors:
- You can not accept this revision because it has already been closed. Only open revisions can be accepted. - You can not accept this revision because it has already been closed. Only open revisions can be accepted.
[255] [255]
$ hg phabupdate --accept D7913 -m 'LGTM' --test-vcr "$VCR/accept-7913.json" $ hg phabupdate --accept D7913 -m 'LGTM' --test-vcr "$VCR/accept-7913.json"
phabupdate with --plan-changes:
$ hg phabupdate --plan-changes D6876 --test-vcr "$VCR/phabupdate-change-6876.json"
Create a differential diff: Create a differential diff:
$ HGENCODING=utf-8; export HGENCODING $ HGENCODING=utf-8; export HGENCODING
$ echo alpha > alpha $ echo alpha > alpha
$ hg ci --addremove -m 'create alpha for phabricator test €' $ hg ci --addremove -m 'create alpha for phabricator test €'
adding alpha adding alpha
$ hg phabsend -r . --test-vcr "$VCR/phabsend-create-alpha.json" $ hg phabsend -r . --test-vcr "$VCR/phabsend-create-alpha.json"
D7915 - created - d386117f30e6: create alpha for phabricator test \xe2\x82\xac (esc) D7915 - created - d386117f30e6: create alpha for phabricator test \xe2\x82\xac (esc)
new commits: ['347bf67801e5'] new commits: ['347bf67801e5']