This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9254

phabsend: use default one-line summary
ClosedPublic

Authored by martinvonz on Oct 28 2020, 11:41 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG294aab57a5f3: phabsend: use default one-line summary
Summary

This means that the phabricator.node and phabricator.desc color
configs will no longer be respected, but log.changeset and
log.desc will be respected instead.

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

martinvonz created this revision.Oct 28 2020, 11:41 AM
martinvonz added a commit: rHG294aab57a5f3: phabsend: use default one-line summary.Oct 28 2020, 9:50 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG294aab57a5f3: phabsend: use default one-line summary (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (13 lines)
Mtests/test-phabricator.t (128 lines)

Diff 23326

hgext/phabricator.py

eh.configitem( eh.configitem(
b'phabimport', b'obsolete', default=False, b'phabimport', b'obsolete', default=False,
) )
colortable = { colortable = {
b'phabricator.action.created': b'green', b'phabricator.action.created': b'green',
b'phabricator.action.skipped': b'magenta', b'phabricator.action.skipped': b'magenta',
b'phabricator.action.updated': b'magenta', b'phabricator.action.updated': b'magenta',
b'phabricator.desc': b'',
b'phabricator.drev': b'bold', b'phabricator.drev': b'bold',
b'phabricator.node': b'',
b'phabricator.status.abandoned': b'magenta dim', b'phabricator.status.abandoned': b'magenta dim',
b'phabricator.status.accepted': b'green bold', b'phabricator.status.accepted': b'green bold',
b'phabricator.status.closed': b'green', b'phabricator.status.closed': b'green',
b'phabricator.status.needsreview': b'yellow', b'phabricator.status.needsreview': b'yellow',
b'phabricator.status.needsrevision': b'red', b'phabricator.status.needsrevision': b'red',
b'phabricator.status.changesplanned': b'red', b'phabricator.status.changesplanned': b'red',
} }
{ {
b'created': _(b'created'), b'created': _(b'created'),
b'skipped': _(b'skipped'), b'skipped': _(b'skipped'),
b'updated': _(b'updated'), b'updated': _(b'updated'),
}[action], }[action],
b'phabricator.action.%s' % action, b'phabricator.action.%s' % action,
) )
drevdesc = ui.label(b'D%d' % newrevid, b'phabricator.drev') drevdesc = ui.label(b'D%d' % newrevid, b'phabricator.drev')
nodedesc = ui.label(bytes(ctx), b'phabricator.node') summary = cmdutil.format_changeset_summary(ui, ctx, b'phabsend')
desc = ui.label(ctx.description().split(b'\n')[0], b'phabricator.desc') ui.write(_(b'%s - %s - %s\n') % (drevdesc, actiondesc, summary))
ui.write(_(b'%s - %s - %s: %s\n') % (drevdesc, actiondesc, nodedesc, desc))
def _amend_diff_properties(unfi, drevid, newnodes, diff): def _amend_diff_properties(unfi, drevid, newnodes, diff):
"""update the local commit list for the ``diff`` associated with ``drevid`` """update the local commit list for the ``diff`` associated with ``drevid``
This is a utility function for the amend phase of ``phabsend``, which This is a utility function for the amend phase of ``phabsend``, which
converts failures to warning messages. converts failures to warning messages.
""" """
) )
def _confirmbeforesend(repo, revs, oldmap): def _confirmbeforesend(repo, revs, oldmap):
url, token = readurltoken(repo.ui) url, token = readurltoken(repo.ui)
ui = repo.ui ui = repo.ui
for rev in revs: for rev in revs:
ctx = repo[rev] ctx = repo[rev]
desc = ctx.description().splitlines()[0]
oldnode, olddiff, drevid = oldmap.get(ctx.node(), (None, None, None)) oldnode, olddiff, drevid = oldmap.get(ctx.node(), (None, None, None))
if drevid: if drevid:
drevdesc = ui.label(b'D%d' % drevid, b'phabricator.drev') drevdesc = ui.label(b'D%d' % drevid, b'phabricator.drev')
else: else:
drevdesc = ui.label(_(b'NEW'), b'phabricator.drev') drevdesc = ui.label(_(b'NEW'), b'phabricator.drev')
ui.write( ui.write(
_(b'%s - %s: %s\n') _(b'%s - %s\n')
% ( % (
drevdesc, drevdesc,
ui.label(bytes(ctx), b'phabricator.node'), cmdutil.format_changeset_summary(ui, ctx, b'phabsend'),
ui.label(desc, b'phabricator.desc'),
) )
) )
if ui.promptchoice( if ui.promptchoice(
_(b'Send the above changes to %s (Y/n)?$$ &Yes $$ &No') % url _(b'Send the above changes to %s (Y/n)?$$ &Yes $$ &No') % url
): ):
return False return False

tests/test-phabricator.t

$ hg phabupdate --plan-changes D6876 --test-vcr "$VCR/phabupdate-change-6876.json" $ 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 - 0:d386117f30e6 tip "create alpha for phabricator test \xe2\x82\xac" (esc)
new commits: ['347bf67801e5'] new commits: ['347bf67801e5']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d386117f30e6-24ffe649-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d386117f30e6-24ffe649-phabsend.hg
$ echo more >> alpha $ echo more >> alpha
$ HGEDITOR=true hg ci --amend $ HGEDITOR=true hg ci --amend
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/347bf67801e5-3bf313e4-amend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/347bf67801e5-3bf313e4-amend.hg
$ echo beta > beta $ echo beta > beta
$ hg ci --addremove -m 'create beta for phabricator test' $ hg ci --addremove -m 'create beta for phabricator test'
adding beta adding beta
$ hg phabsend -r ".^::" --test-vcr "$VCR/phabsend-update-alpha-create-beta.json" $ hg phabsend -r ".^::" --test-vcr "$VCR/phabsend-update-alpha-create-beta.json"
c44b38f24a45 mapped to old nodes [] c44b38f24a45 mapped to old nodes []
D7915 - updated - c44b38f24a45: create alpha for phabricator test \xe2\x82\xac (esc) D7915 - updated - 0:c44b38f24a45 "create alpha for phabricator test \xe2\x82\xac" (esc)
D7916 - created - 9e6901f21d5b: create beta for phabricator test D7916 - created - 1:9e6901f21d5b tip "create beta for phabricator test"
new commits: ['a692622e6937'] new commits: ['a692622e6937']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9e6901f21d5b-1fcd4f0e-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9e6901f21d5b-1fcd4f0e-phabsend.hg
$ unset HGENCODING $ unset HGENCODING
The amend won't explode after posting a public commit. The local tag is left The amend won't explode after posting a public commit. The local tag is left
behind to identify it. behind to identify it.
$ echo 'public change' > beta $ echo 'public change' > beta
$ hg ci -m 'create public change for phabricator testing' $ hg ci -m 'create public change for phabricator testing'
$ hg phase --public . $ hg phase --public .
$ echo 'draft change' > alpha $ echo 'draft change' > alpha
$ hg ci -m 'create draft change for phabricator testing' $ hg ci -m 'create draft change for phabricator testing'
$ hg phabsend --amend -r '.^::' --test-vcr "$VCR/phabsend-create-public.json" $ hg phabsend --amend -r '.^::' --test-vcr "$VCR/phabsend-create-public.json"
D7917 - created - 7b4185ab5d16: create public change for phabricator testing D7917 - created - 2:7b4185ab5d16 "create public change for phabricator testing"
D7918 - created - 251c1c333fc6: create draft change for phabricator testing D7918 - created - 3:251c1c333fc6 tip "create draft change for phabricator testing"
warning: not updating public commit 2:7b4185ab5d16 warning: not updating public commit 2:7b4185ab5d16
new commits: ['3244dc4a3334'] new commits: ['3244dc4a3334']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/251c1c333fc6-41cb7c3b-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/251c1c333fc6-41cb7c3b-phabsend.hg
$ hg tags -v $ hg tags -v
tip 3:3244dc4a3334 tip 3:3244dc4a3334
D7917 2:7b4185ab5d16 local D7917 2:7b4185ab5d16 local
$ hg debugcallconduit user.search --test-vcr "$VCR/phab-conduit.json" <<EOF $ hg debugcallconduit user.search --test-vcr "$VCR/phab-conduit.json" <<EOF
1 https://phab.mercurial-scm.org/D7916 D7916 1 https://phab.mercurial-scm.org/D7916 D7916
0 https://phab.mercurial-scm.org/D7915 D7915 0 https://phab.mercurial-scm.org/D7915 D7915
Commenting when phabsending: Commenting when phabsending:
$ echo comment > comment $ echo comment > comment
$ hg ci --addremove -m "create comment for phabricator test" $ hg ci --addremove -m "create comment for phabricator test"
adding comment adding comment
$ hg phabsend -r . -m "For default branch" --test-vcr "$VCR/phabsend-comment-created.json" $ hg phabsend -r . -m "For default branch" --test-vcr "$VCR/phabsend-comment-created.json"
D7919 - created - d5dddca9023d: create comment for phabricator test D7919 - created - 4:d5dddca9023d tip "create comment for phabricator test"
new commits: ['f7db812bbe1d'] new commits: ['f7db812bbe1d']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5dddca9023d-adf673ba-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5dddca9023d-adf673ba-phabsend.hg
$ echo comment2 >> comment $ echo comment2 >> comment
$ hg ci --amend $ hg ci --amend
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f7db812bbe1d-8fcded77-amend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f7db812bbe1d-8fcded77-amend.hg
$ hg phabsend -r . -m "Address review comments" --test-vcr "$VCR/phabsend-comment-updated.json" $ hg phabsend -r . -m "Address review comments" --test-vcr "$VCR/phabsend-comment-updated.json"
1849d7828727 mapped to old nodes [] 1849d7828727 mapped to old nodes []
D7919 - updated - 1849d7828727: create comment for phabricator test D7919 - updated - 4:1849d7828727 tip "create comment for phabricator test"
Phabsending a skipped commit: Phabsending a skipped commit:
$ hg phabsend --no-amend -r . --test-vcr "$VCR/phabsend-skipped.json" $ hg phabsend --no-amend -r . --test-vcr "$VCR/phabsend-skipped.json"
1849d7828727 mapped to old nodes ['1849d7828727'] 1849d7828727 mapped to old nodes ['1849d7828727']
D7919 - skipped - 1849d7828727: create comment for phabricator test D7919 - skipped - 4:1849d7828727 tip "create comment for phabricator test"
Phabsend doesn't create an instability when restacking existing revisions on top Phabsend doesn't create an instability when restacking existing revisions on top
of new revisions. of new revisions.
$ hg init reorder $ hg init reorder
$ cd reorder $ cd reorder
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [phabricator] > [phabricator]
> url = https://phab.mercurial-scm.org/ > url = https://phab.mercurial-scm.org/
> callsign = HG > callsign = HG
> [experimental] > [experimental]
> evolution = all > evolution = all
> EOF > EOF
$ echo "add" > file1.txt $ echo "add" > file1.txt
$ hg ci -Aqm 'added' $ hg ci -Aqm 'added'
$ echo "mod1" > file1.txt $ echo "mod1" > file1.txt
$ hg ci -m 'modified 1' $ hg ci -m 'modified 1'
$ echo "mod2" > file1.txt $ echo "mod2" > file1.txt
$ hg ci -m 'modified 2' $ hg ci -m 'modified 2'
$ hg phabsend -r . --test-vcr "$VCR/phabsend-add-parent-setup.json" $ hg phabsend -r . --test-vcr "$VCR/phabsend-add-parent-setup.json"
D8433 - created - 5d3959e20d1d: modified 2 D8433 - created - 2:5d3959e20d1d tip "modified 2"
new commits: ['2b4aa8a88d61'] new commits: ['2b4aa8a88d61']
$ hg log -G -T compact $ hg log -G -T compact
@ 3[tip]:1 2b4aa8a88d61 1970-01-01 00:00 +0000 test @ 3[tip]:1 2b4aa8a88d61 1970-01-01 00:00 +0000 test
| modified 2 | modified 2
| |
o 1 d549263bcb2d 1970-01-01 00:00 +0000 test o 1 d549263bcb2d 1970-01-01 00:00 +0000 test
| modified 1 | modified 1
| |
o 0 5cbade24e0fa 1970-01-01 00:00 +0000 test o 0 5cbade24e0fa 1970-01-01 00:00 +0000 test
added added
Also check that it doesn't create more orphans outside of the stack Also check that it doesn't create more orphans outside of the stack
$ hg up -q 1 $ hg up -q 1
$ echo "mod3" > file1.txt $ echo "mod3" > file1.txt
$ hg ci -m 'modified 3' $ hg ci -m 'modified 3'
created new head created new head
$ hg up -q 3 $ hg up -q 3
$ hg phabsend -r ".^ + ." --test-vcr "$VCR/phabsend-add-parent.json" $ hg phabsend -r ".^ + ." --test-vcr "$VCR/phabsend-add-parent.json"
2b4aa8a88d61 mapped to old nodes ['2b4aa8a88d61'] 2b4aa8a88d61 mapped to old nodes ['2b4aa8a88d61']
D8434 - created - d549263bcb2d: modified 1 D8434 - created - 1:d549263bcb2d "modified 1"
D8433 - updated - 2b4aa8a88d61: modified 2 D8433 - updated - 3:2b4aa8a88d61 "modified 2"
new commits: ['876a60d024de'] new commits: ['876a60d024de']
new commits: ['0c6523cb1d0f'] new commits: ['0c6523cb1d0f']
restabilizing 1eda4bf55021 as d2c78c3a3e01 restabilizing 1eda4bf55021 as d2c78c3a3e01
$ hg log -G -T compact $ hg log -G -T compact
o 7[tip]:5 d2c78c3a3e01 1970-01-01 00:00 +0000 test o 7[tip]:5 d2c78c3a3e01 1970-01-01 00:00 +0000 test
| modified 3 | modified 3
| |
| @ 6 0c6523cb1d0f 1970-01-01 00:00 +0000 test | @ 6 0c6523cb1d0f 1970-01-01 00:00 +0000 test
abort: obsolete commits cannot be posted for review abort: obsolete commits cannot be posted for review
[255] [255]
Don't restack existing orphans Don't restack existing orphans
$ hg phabsend -r 5::tip --test-vcr "$VCR/phabsend-no-restack-orphan.json" $ hg phabsend -r 5::tip --test-vcr "$VCR/phabsend-no-restack-orphan.json"
876a60d024de mapped to old nodes ['876a60d024de'] 876a60d024de mapped to old nodes ['876a60d024de']
0c6523cb1d0f mapped to old nodes ['0c6523cb1d0f'] 0c6523cb1d0f mapped to old nodes ['0c6523cb1d0f']
D8434 - updated - 876a60d024de: modified 1 D8434 - updated - 5:876a60d024de "modified 1"
D8433 - updated - 0c6523cb1d0f: modified 2 D8433 - updated - 6:0c6523cb1d0f "modified 2"
D8435 - created - 082be6c94150: modified A D8435 - created - 10:082be6c94150 tip "modified A"
new commits: ['b5913193c805'] new commits: ['b5913193c805']
not restabilizing unchanged d2c78c3a3e01 not restabilizing unchanged d2c78c3a3e01
$ hg log -G $ hg log -G
@ changeset: 11:b5913193c805 @ changeset: 11:b5913193c805
| tag: tip | tag: tip
| parent: 6:0c6523cb1d0f | parent: 6:0c6523cb1d0f
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
$ hg ci -Am 'add binary' $ hg ci -Am 'add binary'
adding bin adding bin
>>> open('bin', 'wb').write(b'\0b') and None >>> open('bin', 'wb').write(b'\0b') and None
$ hg ci -m 'modify binary' $ hg ci -m 'modify binary'
$ hg rm bin $ hg rm bin
$ hg ci -m 'remove binary' $ hg ci -m 'remove binary'
$ hg phabsend -r .~2:: --test-vcr "$VCR/phabsend-binary.json" $ hg phabsend -r .~2:: --test-vcr "$VCR/phabsend-binary.json"
uploading bin@aa24a81f55de uploading bin@aa24a81f55de
D8007 - created - aa24a81f55de: add binary D8007 - created - 5:aa24a81f55de "add binary"
uploading bin@d8d62a881b54 uploading bin@d8d62a881b54
D8008 - created - d8d62a881b54: modify binary D8008 - created - 6:d8d62a881b54 "modify binary"
D8009 - created - af55645b2e29: remove binary D8009 - created - 7:af55645b2e29 tip "remove binary"
new commits: ['b8139fbb4a57'] new commits: ['b8139fbb4a57']
new commits: ['c88ce4c2d2ad'] new commits: ['c88ce4c2d2ad']
new commits: ['75dbbc901145'] new commits: ['75dbbc901145']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/aa24a81f55de-a3a0cf24-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/aa24a81f55de-a3a0cf24-phabsend.hg
Phabsend a renamed binary and a copied binary, with and without content changes Phabsend a renamed binary and a copied binary, with and without content changes
to src and dest to src and dest
>>> open('bin2_moved', 'wb').write(b'\0precopy mod') and None >>> open('bin2_moved', 'wb').write(b'\0precopy mod') and None
$ hg cp bin2_moved bin2_moved_copied $ hg cp bin2_moved bin2_moved_copied
>>> open('bin2_moved', 'wb').write(b'\0copy src+mod') and None >>> open('bin2_moved', 'wb').write(b'\0copy src+mod') and None
$ hg ci -m "copy+mod moved binary" $ hg ci -m "copy+mod moved binary"
$ hg phabsend -r .~4:: --test-vcr "$VCR/phabsend-binary-renames.json" $ hg phabsend -r .~4:: --test-vcr "$VCR/phabsend-binary-renames.json"
uploading bin2@f42f9195e00c uploading bin2@f42f9195e00c
D8128 - created - f42f9195e00c: add another binary D8128 - created - 8:f42f9195e00c "add another binary"
D8129 - created - 834ab31d80ae: moved binary D8129 - created - 9:834ab31d80ae "moved binary"
D8130 - created - 494b750e5194: copied binary D8130 - created - 10:494b750e5194 "copied binary"
uploading bin2_moved_again@25f766b50cc2 uploading bin2_moved_again@25f766b50cc2
D8131 - created - 25f766b50cc2: move+mod copied binary D8131 - created - 11:25f766b50cc2 "move+mod copied binary"
uploading bin2_moved_copied@1b87b363a5e4 uploading bin2_moved_copied@1b87b363a5e4
uploading bin2_moved@1b87b363a5e4 uploading bin2_moved@1b87b363a5e4
D8132 - created - 1b87b363a5e4: copy+mod moved binary D8132 - created - 12:1b87b363a5e4 tip "copy+mod moved binary"
new commits: ['90437c20312a'] new commits: ['90437c20312a']
new commits: ['f391f4da4c61'] new commits: ['f391f4da4c61']
new commits: ['da86a9f3268c'] new commits: ['da86a9f3268c']
new commits: ['003ffc16ba66'] new commits: ['003ffc16ba66']
new commits: ['13bd750c36fa'] new commits: ['13bd750c36fa']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f42f9195e00c-e82a0769-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f42f9195e00c-e82a0769-phabsend.hg
Phabreading a DREV with a local:commits time as a string: Phabreading a DREV with a local:commits time as a string:
$ echo mod3 > file.txt $ echo mod3 > file.txt
$ hg ci -m '3: a commit with no detailed message' $ hg ci -m '3: a commit with no detailed message'
The folding of immutable commits works... The folding of immutable commits works...
$ hg phase -r tip --public $ hg phase -r tip --public
$ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-immutable.json" $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-immutable.json"
D8386 - created - a959a3f69d8d: one: first commit to review D8386 - created - 1:a959a3f69d8d "one: first commit to review"
D8386 - created - 24a4438154ba: two: second commit to review D8386 - created - 2:24a4438154ba "two: second commit to review"
D8386 - created - d235829e802c: 3: a commit with no detailed message D8386 - created - 3:d235829e802c tip "3: a commit with no detailed message"
warning: not updating public commit 1:a959a3f69d8d warning: not updating public commit 1:a959a3f69d8d
warning: not updating public commit 2:24a4438154ba warning: not updating public commit 2:24a4438154ba
warning: not updating public commit 3:d235829e802c warning: not updating public commit 3:d235829e802c
no newnodes to update no newnodes to update
$ hg phase -r 0 --draft --force $ hg phase -r 0 --draft --force
... as does the initial mutable fold... ... as does the initial mutable fold...
$ echo y | hg phabsend --fold --confirm -r 1:: \ $ echo y | hg phabsend --fold --confirm -r 1:: \
> --test-vcr "$VCR/phabsend-fold-initial.json" > --test-vcr "$VCR/phabsend-fold-initial.json"
NEW - a959a3f69d8d: one: first commit to review NEW - 1:a959a3f69d8d "one: first commit to review"
NEW - 24a4438154ba: two: second commit to review NEW - 2:24a4438154ba "two: second commit to review"
NEW - d235829e802c: 3: a commit with no detailed message NEW - 3:d235829e802c tip "3: a commit with no detailed message"
Send the above changes to https://phab.mercurial-scm.org/ (Y/n)? y Send the above changes to https://phab.mercurial-scm.org/ (Y/n)? y
D8387 - created - a959a3f69d8d: one: first commit to review D8387 - created - 1:a959a3f69d8d "one: first commit to review"
D8387 - created - 24a4438154ba: two: second commit to review D8387 - created - 2:24a4438154ba "two: second commit to review"
D8387 - created - d235829e802c: 3: a commit with no detailed message D8387 - created - 3:d235829e802c tip "3: a commit with no detailed message"
updating local commit list for D8387 updating local commit list for D8387
new commits: ['602c4e738243', '832553266fe8', '921f8265efbd'] new commits: ['602c4e738243', '832553266fe8', '921f8265efbd']
saved backup bundle to $TESTTMP/folded/.hg/strip-backup/a959a3f69d8d-a4a24136-phabsend.hg saved backup bundle to $TESTTMP/folded/.hg/strip-backup/a959a3f69d8d-a4a24136-phabsend.hg
... and doesn't mangle the local commits. ... and doesn't mangle the local commits.
$ hg log -T '{rev}:{node|short}\n{indent(desc, " ")}\n' $ hg log -T '{rev}:{node|short}\n{indent(desc, " ")}\n'
3:921f8265efbd 3:921f8265efbd
$ echo 'modified' > file2.txt $ echo 'modified' > file2.txt
$ hg add file2.txt $ hg add file2.txt
$ hg amend --config experimental.evolution=all --config extensions.amend= $ hg amend --config experimental.evolution=all --config extensions.amend=
1 new orphan changesets 1 new orphan changesets
$ hg up 3 $ hg up 3
obsolete feature not enabled but 1 markers found! obsolete feature not enabled but 1 markers found!
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg rebase --config experimental.evolution=all --config extensions.rebase= $ hg rebase --config experimental.evolution=all --config extensions.rebase=
note: not rebasing 2:832553266fe8 "two: second commit to review", already in destination as 4:0124e5474c88 "two: second commit to review" (tip) note: not rebasing 2:832553266fe8 "two: second commit to review", already in destination as 4:0124e5474c88 tip "two: second commit to review"
rebasing 3:921f8265efbd "3: a commit with no detailed message" rebasing 3:921f8265efbd "3: a commit with no detailed message"
When commits have changed locally, the local commit list on Phabricator is When commits have changed locally, the local commit list on Phabricator is
updated. updated.
$ echo y | hg phabsend --fold --confirm -r 1:: \ $ echo y | hg phabsend --fold --confirm -r 1:: \
> --test-vcr "$VCR/phabsend-fold-updated.json" > --test-vcr "$VCR/phabsend-fold-updated.json"
obsolete feature not enabled but 2 markers found! obsolete feature not enabled but 2 markers found!
602c4e738243 mapped to old nodes ['602c4e738243'] 602c4e738243 mapped to old nodes ['602c4e738243']
0124e5474c88 mapped to old nodes ['832553266fe8'] 0124e5474c88 mapped to old nodes ['832553266fe8']
e4edb1fe3565 mapped to old nodes ['921f8265efbd'] e4edb1fe3565 mapped to old nodes ['921f8265efbd']
D8387 - 602c4e738243: one: first commit to review D8387 - 1:602c4e738243 "one: first commit to review"
D8387 - 0124e5474c88: two: second commit to review D8387 - 4:0124e5474c88 "two: second commit to review"
D8387 - e4edb1fe3565: 3: a commit with no detailed message D8387 - 5:e4edb1fe3565 tip "3: a commit with no detailed message"
Send the above changes to https://phab.mercurial-scm.org/ (Y/n)? y Send the above changes to https://phab.mercurial-scm.org/ (Y/n)? y
D8387 - updated - 602c4e738243: one: first commit to review D8387 - updated - 1:602c4e738243 "one: first commit to review"
D8387 - updated - 0124e5474c88: two: second commit to review D8387 - updated - 4:0124e5474c88 "two: second commit to review"
D8387 - updated - e4edb1fe3565: 3: a commit with no detailed message D8387 - updated - 5:e4edb1fe3565 tip "3: a commit with no detailed message"
obsolete feature not enabled but 2 markers found! (?) obsolete feature not enabled but 2 markers found! (?)
updating local commit list for D8387 updating local commit list for D8387
new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565'] new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565']
$ hg log -Tcompact $ hg log -Tcompact
obsolete feature not enabled but 2 markers found! obsolete feature not enabled but 2 markers found!
5[tip] e4edb1fe3565 1970-01-01 00:00 +0000 test 5[tip] e4edb1fe3565 1970-01-01 00:00 +0000 test
3: a commit with no detailed message 3: a commit with no detailed message
When nothing has changed locally since the last phabsend, the commit list isn't When nothing has changed locally since the last phabsend, the commit list isn't
updated, and nothing is changed locally afterward. updated, and nothing is changed locally afterward.
$ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-no-changes.json" $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-no-changes.json"
obsolete feature not enabled but 2 markers found! obsolete feature not enabled but 2 markers found!
602c4e738243 mapped to old nodes ['602c4e738243'] 602c4e738243 mapped to old nodes ['602c4e738243']
0124e5474c88 mapped to old nodes ['0124e5474c88'] 0124e5474c88 mapped to old nodes ['0124e5474c88']
e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] e4edb1fe3565 mapped to old nodes ['e4edb1fe3565']
D8387 - updated - 602c4e738243: one: first commit to review D8387 - updated - 1:602c4e738243 "one: first commit to review"
D8387 - updated - 0124e5474c88: two: second commit to review D8387 - updated - 4:0124e5474c88 "two: second commit to review"
D8387 - updated - e4edb1fe3565: 3: a commit with no detailed message D8387 - updated - 5:e4edb1fe3565 tip "3: a commit with no detailed message"
obsolete feature not enabled but 2 markers found! (?) obsolete feature not enabled but 2 markers found! (?)
local commit list for D8387 is already up-to-date local commit list for D8387 is already up-to-date
$ hg log -Tcompact $ hg log -Tcompact
obsolete feature not enabled but 2 markers found! obsolete feature not enabled but 2 markers found!
5[tip] e4edb1fe3565 1970-01-01 00:00 +0000 test 5[tip] e4edb1fe3565 1970-01-01 00:00 +0000 test
3: a commit with no detailed message 3: a commit with no detailed message
4:1 0124e5474c88 1970-01-01 00:00 +0000 test 4:1 0124e5474c88 1970-01-01 00:00 +0000 test
$ echo 'another mod' > file2.txt $ echo 'another mod' > file2.txt
$ hg ci -m 'four: extend the fold range' $ hg ci -m 'four: extend the fold range'
obsolete feature not enabled but 2 markers found! obsolete feature not enabled but 2 markers found!
$ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-extend-end.json" \ $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-extend-end.json" \
> --config experimental.evolution=all > --config experimental.evolution=all
602c4e738243 mapped to old nodes ['602c4e738243'] 602c4e738243 mapped to old nodes ['602c4e738243']
0124e5474c88 mapped to old nodes ['0124e5474c88'] 0124e5474c88 mapped to old nodes ['0124e5474c88']
e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] e4edb1fe3565 mapped to old nodes ['e4edb1fe3565']
D8387 - updated - 602c4e738243: one: first commit to review D8387 - updated - 1:602c4e738243 "one: first commit to review"
D8387 - updated - 0124e5474c88: two: second commit to review D8387 - updated - 4:0124e5474c88 "two: second commit to review"
D8387 - updated - e4edb1fe3565: 3: a commit with no detailed message D8387 - updated - 5:e4edb1fe3565 "3: a commit with no detailed message"
D8387 - created - 94aaae213b23: four: extend the fold range D8387 - created - 6:94aaae213b23 tip "four: extend the fold range"
updating local commit list for D8387 updating local commit list for D8387
new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565', '51a04fea8707'] new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565', '51a04fea8707']
$ hg log -r . -T '{desc}\n' $ hg log -r . -T '{desc}\n'
four: extend the fold range four: extend the fold range
Differential Revision: https://phab.mercurial-scm.org/D8387 Differential Revision: https://phab.mercurial-scm.org/D8387
$ hg log -T'{rev} {if(phabreview, "{phabreview.url} {phabreview.id}")}\n' -r 1:: $ hg log -T'{rev} {if(phabreview, "{phabreview.url} {phabreview.id}")}\n' -r 1::
obsolete feature not enabled but 3 markers found! obsolete feature not enabled but 3 markers found!
TODO: See if it can reuse the existing Differential. TODO: See if it can reuse the existing Differential.
$ hg phabsend --fold -r 0:: --test-vcr "$VCR/phabsend-fold-extend-front.json" \ $ hg phabsend --fold -r 0:: --test-vcr "$VCR/phabsend-fold-extend-front.json" \
> --config experimental.evolution=all > --config experimental.evolution=all
602c4e738243 mapped to old nodes ['602c4e738243'] 602c4e738243 mapped to old nodes ['602c4e738243']
0124e5474c88 mapped to old nodes ['0124e5474c88'] 0124e5474c88 mapped to old nodes ['0124e5474c88']
e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] e4edb1fe3565 mapped to old nodes ['e4edb1fe3565']
51a04fea8707 mapped to old nodes ['51a04fea8707'] 51a04fea8707 mapped to old nodes ['51a04fea8707']
D8388 - created - 98d480e0d494: added file D8388 - created - 0:98d480e0d494 "added file"
D8388 - updated - 602c4e738243: one: first commit to review D8388 - updated - 1:602c4e738243 "one: first commit to review"
D8388 - updated - 0124e5474c88: two: second commit to review D8388 - updated - 4:0124e5474c88 "two: second commit to review"
D8388 - updated - e4edb1fe3565: 3: a commit with no detailed message D8388 - updated - 5:e4edb1fe3565 "3: a commit with no detailed message"
D8388 - updated - 51a04fea8707: four: extend the fold range D8388 - updated - 7:51a04fea8707 tip "four: extend the fold range"
updating local commit list for D8388 updating local commit list for D8388
new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'ac7db67f0991'] new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'ac7db67f0991']
$ hg log -T '{rev}:{node|short}\n{indent(desc, " ")}\n' $ hg log -T '{rev}:{node|short}\n{indent(desc, " ")}\n'
obsolete feature not enabled but 8 markers found! obsolete feature not enabled but 8 markers found!
12:ac7db67f0991 12:ac7db67f0991
four: extend the fold range four: extend the fold range
$ hg phabsend --fold -r 8:: --test-vcr "$VCR/phabsend-fold-split-end.json" \ $ hg phabsend --fold -r 8:: --test-vcr "$VCR/phabsend-fold-split-end.json" \
> --config experimental.evolution=all > --config experimental.evolution=all
15e9b14b4b4c mapped to old nodes ['15e9b14b4b4c'] 15e9b14b4b4c mapped to old nodes ['15e9b14b4b4c']
6320b7d714cf mapped to old nodes ['6320b7d714cf'] 6320b7d714cf mapped to old nodes ['6320b7d714cf']
3ee132d41dbc mapped to old nodes ['3ee132d41dbc'] 3ee132d41dbc mapped to old nodes ['3ee132d41dbc']
30682b960804 mapped to old nodes ['30682b960804'] 30682b960804 mapped to old nodes ['30682b960804']
6bc15dc99efd mapped to old nodes ['ac7db67f0991'] 6bc15dc99efd mapped to old nodes ['ac7db67f0991']
b50946d5e490 mapped to old nodes ['ac7db67f0991'] b50946d5e490 mapped to old nodes ['ac7db67f0991']
D8388 - updated - 15e9b14b4b4c: added file D8388 - updated - 8:15e9b14b4b4c "added file"
D8388 - updated - 6320b7d714cf: one: first commit to review D8388 - updated - 9:6320b7d714cf "one: first commit to review"
D8388 - updated - 3ee132d41dbc: two: second commit to review D8388 - updated - 10:3ee132d41dbc "two: second commit to review"
D8388 - updated - 30682b960804: 3: a commit with no detailed message D8388 - updated - 11:30682b960804 "3: a commit with no detailed message"
D8388 - updated - 6bc15dc99efd: four: extend the fold range D8388 - updated - 14:6bc15dc99efd "four: extend the fold range"
D8388 - updated - b50946d5e490: four: extend the fold range D8388 - updated - 15:b50946d5e490 tip "four: extend the fold range"
updating local commit list for D8388 updating local commit list for D8388
new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', '6bc15dc99efd', 'b50946d5e490'] new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', '6bc15dc99efd', 'b50946d5e490']
Test phabsend --fold with an `hg fold` at the end of the range Test phabsend --fold with an `hg fold` at the end of the range
$ hg --config experimental.evolution=all --config extensions.rebase= \ $ hg --config experimental.evolution=all --config extensions.rebase= \
> rebase -r '.^' -r . -d '.^^' --collapse -l log.txt > rebase -r '.^' -r . -d '.^^' --collapse -l log.txt
rebasing 14:6bc15dc99efd "four: extend the fold range" rebasing 14:6bc15dc99efd "four: extend the fold range"
rebasing 15:b50946d5e490 "four: extend the fold range" (tip) rebasing 15:b50946d5e490 tip "four: extend the fold range"
$ hg phabsend --fold -r 8:: --test-vcr "$VCR/phabsend-fold-fold-end.json" \ $ hg phabsend --fold -r 8:: --test-vcr "$VCR/phabsend-fold-fold-end.json" \
> --config experimental.evolution=all > --config experimental.evolution=all
15e9b14b4b4c mapped to old nodes ['15e9b14b4b4c'] 15e9b14b4b4c mapped to old nodes ['15e9b14b4b4c']
6320b7d714cf mapped to old nodes ['6320b7d714cf'] 6320b7d714cf mapped to old nodes ['6320b7d714cf']
3ee132d41dbc mapped to old nodes ['3ee132d41dbc'] 3ee132d41dbc mapped to old nodes ['3ee132d41dbc']
30682b960804 mapped to old nodes ['30682b960804'] 30682b960804 mapped to old nodes ['30682b960804']
e919cdf3d4fe mapped to old nodes ['6bc15dc99efd', 'b50946d5e490'] e919cdf3d4fe mapped to old nodes ['6bc15dc99efd', 'b50946d5e490']
D8388 - updated - 15e9b14b4b4c: added file D8388 - updated - 8:15e9b14b4b4c "added file"
D8388 - updated - 6320b7d714cf: one: first commit to review D8388 - updated - 9:6320b7d714cf "one: first commit to review"
D8388 - updated - 3ee132d41dbc: two: second commit to review D8388 - updated - 10:3ee132d41dbc "two: second commit to review"
D8388 - updated - 30682b960804: 3: a commit with no detailed message D8388 - updated - 11:30682b960804 "3: a commit with no detailed message"
D8388 - updated - e919cdf3d4fe: four: extend the fold range D8388 - updated - 16:e919cdf3d4fe tip "four: extend the fold range"
updating local commit list for D8388 updating local commit list for D8388
new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'e919cdf3d4fe'] new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'e919cdf3d4fe']
$ hg log -r tip -v $ hg log -r tip -v
obsolete feature not enabled but 12 markers found! obsolete feature not enabled but 12 markers found!
changeset: 16:e919cdf3d4fe changeset: 16:e919cdf3d4fe
tag: tip tag: tip
parent: 11:30682b960804 parent: 11:30682b960804
$ echo content > file.txt $ echo content > file.txt
$ hg ci -m 'base review (generate test for phabsend)' $ hg ci -m 'base review (generate test for phabsend)'
$ echo 'more content' > file.txt $ echo 'more content' > file.txt
$ hg ci -m '133c1c6c6449 is my parent (generate test for phabsend)' $ hg ci -m '133c1c6c6449 is my parent (generate test for phabsend)'
$ echo 'even more content' > file.txt $ echo 'even more content' > file.txt
$ hg ci -m 'c2874a398f7e is my parent (generate test for phabsend)' $ hg ci -m 'c2874a398f7e is my parent (generate test for phabsend)'
$ hg phabsend -r 17::18 --test-vcr "$VCR/phabsend-hash-fixes.json" $ hg phabsend -r 17::18 --test-vcr "$VCR/phabsend-hash-fixes.json"
D8945 - created - 133c1c6c6449: base review (generate test for phabsend) D8945 - created - 17:133c1c6c6449 "base review (generate test for phabsend)"
D8946 - created - c2874a398f7e: 133c1c6c6449 is my parent (generate test for phabsend) D8946 - created - 18:c2874a398f7e "133c1c6c6449 is my parent (generate test for phabsend)"
new commits: ['f444f060f4d6'] new commits: ['f444f060f4d6']
new commits: ['9c9290f945b1'] new commits: ['9c9290f945b1']
restabilizing 1528c12fa2e4 as b28b20212bd4 restabilizing 1528c12fa2e4 as b28b20212bd4
$ hg log -l 3 -Tcompact $ hg log -l 3 -Tcompact
22[tip] b28b20212bd4 1970-01-01 00:00 +0000 test 22[tip] b28b20212bd4 1970-01-01 00:00 +0000 test
9c9290f945b1 is my parent (generate test for phabsend) 9c9290f945b1 is my parent (generate test for phabsend)
21 9c9290f945b1 1970-01-01 00:00 +0000 test 21 9c9290f945b1 1970-01-01 00:00 +0000 test
f444f060f4d6 is my parent (generate test for phabsend) f444f060f4d6 is my parent (generate test for phabsend)
20:16 f444f060f4d6 1970-01-01 00:00 +0000 test 20:16 f444f060f4d6 1970-01-01 00:00 +0000 test
base review (generate test for phabsend) base review (generate test for phabsend)
$ cd .. $ cd ..