Mercurial > hg
annotate tests/test-phabricator.t @ 45244:d4a28b76fa54
cleanup: fix bad formatting of state.py from D8811
`test-check-format.t` was failing for me. Do I just have the wrong
version?
Differential Revision: https://phab.mercurial-scm.org/D8841
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 28 Jul 2020 11:11:14 -0700 |
parents | b3b0cd8b9366 |
children | b4887d0680a4 |
rev | line source |
---|---|
39651
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
1 #require vcr |
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
2 $ cat >> $HGRCPATH <<EOF |
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
3 > [extensions] |
39652
d2c81e83de2a
phabricator: move extension from contrib to hgext
Augie Fackler <raf@durin42.com>
parents:
39651
diff
changeset
|
4 > phabricator = |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
5 > |
44716
ed81fa859426
tests: move the phabricator auth token to the global config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
44715
diff
changeset
|
6 > [auth] |
ed81fa859426
tests: move the phabricator auth token to the global config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
44715
diff
changeset
|
7 > hgphab.schemes = https |
ed81fa859426
tests: move the phabricator auth token to the global config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
44715
diff
changeset
|
8 > hgphab.prefix = phab.mercurial-scm.org |
ed81fa859426
tests: move the phabricator auth token to the global config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
44715
diff
changeset
|
9 > # When working on the extension and making phabricator interaction |
ed81fa859426
tests: move the phabricator auth token to the global config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
44715
diff
changeset
|
10 > # changes, edit this to be a real phabricator token. When done, edit |
ed81fa859426
tests: move the phabricator auth token to the global config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
44715
diff
changeset
|
11 > # it back. The VCR transcripts will be auto-sanitised to replace your real |
ed81fa859426
tests: move the phabricator auth token to the global config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
44715
diff
changeset
|
12 > # token with this value. |
ed81fa859426
tests: move the phabricator auth token to the global config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
44715
diff
changeset
|
13 > hgphab.phabtoken = cli-hahayouwish |
ed81fa859426
tests: move the phabricator auth token to the global config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
44715
diff
changeset
|
14 > |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
15 > [phabricator] |
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
16 > debug = True |
39651
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
17 > EOF |
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
18 $ hg init repo |
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
19 $ cd repo |
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
20 $ cat >> .hg/hgrc <<EOF |
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
21 > [phabricator] |
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
22 > url = https://phab.mercurial-scm.org/ |
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
23 > callsign = HG |
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
24 > EOF |
a641fd1a1196
tests: add some basic tests of phabricator interactions
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
25 $ VCR="$TESTDIR/phabricator" |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
26 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
27 Error is handled reasonably. We override the phabtoken here so that |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
28 when you're developing changes to phabricator.py you can edit the |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
29 above config and have a real token in the test but not have to edit |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
30 this test. |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
31 $ hg phabread --config auth.hgphab.phabtoken=cli-notavalidtoken \ |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
32 > --test-vcr "$VCR/phabread-conduit-error.json" D4480 | head |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
33 abort: Conduit Error (ERR-INVALID-AUTH): API token "cli-notavalidtoken" has the wrong length. API tokens should be 32 characters long. |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
34 |
44579
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
35 Missing arguments don't crash, and may print the command help |
44436
09f3e003fc2a
phabricator: avoid a stacktrace when command arguments are missing
Matt Harbison <matt_harbison@yahoo.com>
parents:
44329
diff
changeset
|
36 |
44579
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
37 $ hg debugcallconduit |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
38 hg debugcallconduit: invalid arguments |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
39 hg debugcallconduit METHOD |
44436
09f3e003fc2a
phabricator: avoid a stacktrace when command arguments are missing
Matt Harbison <matt_harbison@yahoo.com>
parents:
44329
diff
changeset
|
40 |
44579
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
41 call Conduit API |
44436
09f3e003fc2a
phabricator: avoid a stacktrace when command arguments are missing
Matt Harbison <matt_harbison@yahoo.com>
parents:
44329
diff
changeset
|
42 |
09f3e003fc2a
phabricator: avoid a stacktrace when command arguments are missing
Matt Harbison <matt_harbison@yahoo.com>
parents:
44329
diff
changeset
|
43 options: |
09f3e003fc2a
phabricator: avoid a stacktrace when command arguments are missing
Matt Harbison <matt_harbison@yahoo.com>
parents:
44329
diff
changeset
|
44 |
44579
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
45 (use 'hg debugcallconduit -h' to show more help) |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
46 [255] |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
47 $ hg phabread |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
48 abort: empty DREVSPEC set |
44436
09f3e003fc2a
phabricator: avoid a stacktrace when command arguments are missing
Matt Harbison <matt_harbison@yahoo.com>
parents:
44329
diff
changeset
|
49 [255] |
09f3e003fc2a
phabricator: avoid a stacktrace when command arguments are missing
Matt Harbison <matt_harbison@yahoo.com>
parents:
44329
diff
changeset
|
50 |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
51 Basic phabread: |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
52 $ hg phabread --test-vcr "$VCR/phabread-4480.json" D4480 | head |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
53 # HG changeset patch |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
54 # Date 1536771503 0 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
55 # Parent a5de21c9e3703f8e8eb064bd7d893ff2f703c66a |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
56 exchangev2: start to implement pull with wire protocol v2 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
57 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
58 Wire protocol version 2 will take a substantially different |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
59 approach to exchange than version 1 (at least as far as pulling |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
60 is concerned). |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
61 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
62 This commit establishes a new exchangev2 module for holding |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
63 |
44579
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
64 Phabread with multiple DREVSPEC |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
65 |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
66 TODO: attempt to order related revisions like --stack? |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
67 $ hg phabread --test-vcr "$VCR/phabread-multi-drev.json" D8205 8206 D8207 \ |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
68 > | grep '^Differential Revision' |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
69 Differential Revision: https://phab.mercurial-scm.org/D8205 |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
70 Differential Revision: https://phab.mercurial-scm.org/D8206 |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
71 Differential Revision: https://phab.mercurial-scm.org/D8207 |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
72 |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
73 Empty DREVSPECs don't crash |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
74 |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
75 $ hg phabread --test-vcr "$VCR/phabread-empty-drev.json" D7917-D7917 |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
76 abort: empty DREVSPEC set |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
77 [255] |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
78 |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
79 |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
80 phabupdate with an accept: |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
81 $ hg phabupdate --accept D4564 \ |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
82 > -m 'I think I like where this is headed. Will read rest of series later.'\ |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
83 > --test-vcr "$VCR/accept-4564.json" |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
84 abort: Conduit Error (ERR-CONDUIT-CORE): Validation errors: |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
85 - You can not accept this revision because it has already been closed. Only open revisions can be accepted. |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
86 [255] |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
87 $ hg phabupdate --accept D7913 -m 'LGTM' --test-vcr "$VCR/accept-7913.json" |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
88 |
45135
225588c4c255
phabupdate: allow revisions to be marked with "plan changes"
Matt Harbison <matt_harbison@yahoo.com>
parents:
44945
diff
changeset
|
89 phabupdate with --plan-changes: |
225588c4c255
phabupdate: allow revisions to be marked with "plan changes"
Matt Harbison <matt_harbison@yahoo.com>
parents:
44945
diff
changeset
|
90 |
225588c4c255
phabupdate: allow revisions to be marked with "plan changes"
Matt Harbison <matt_harbison@yahoo.com>
parents:
44945
diff
changeset
|
91 $ hg phabupdate --plan-changes D6876 --test-vcr "$VCR/phabupdate-change-6876.json" |
225588c4c255
phabupdate: allow revisions to be marked with "plan changes"
Matt Harbison <matt_harbison@yahoo.com>
parents:
44945
diff
changeset
|
92 |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
93 Create a differential diff: |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
94 $ HGENCODING=utf-8; export HGENCODING |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
95 $ echo alpha > alpha |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
96 $ hg ci --addremove -m 'create alpha for phabricator test €' |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
97 adding alpha |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
98 $ hg phabsend -r . --test-vcr "$VCR/phabsend-create-alpha.json" |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
99 D7915 - created - d386117f30e6: create alpha for phabricator test \xe2\x82\xac (esc) |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
100 new commits: ['347bf67801e5'] |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
101 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d386117f30e6-24ffe649-phabsend.hg |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
102 $ echo more >> alpha |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
103 $ HGEDITOR=true hg ci --amend |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
104 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/347bf67801e5-3bf313e4-amend.hg |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
105 $ echo beta > beta |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
106 $ hg ci --addremove -m 'create beta for phabricator test' |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
107 adding beta |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
108 $ hg phabsend -r ".^::" --test-vcr "$VCR/phabsend-update-alpha-create-beta.json" |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
109 c44b38f24a45 mapped to old nodes [] |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
110 D7915 - updated - c44b38f24a45: create alpha for phabricator test \xe2\x82\xac (esc) |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
111 D7916 - created - 9e6901f21d5b: create beta for phabricator test |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
112 new commits: ['a692622e6937'] |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
113 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9e6901f21d5b-1fcd4f0e-phabsend.hg |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
114 $ unset HGENCODING |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
115 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
116 The amend won't explode after posting a public commit. The local tag is left |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
117 behind to identify it. |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
118 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
119 $ echo 'public change' > beta |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
120 $ hg ci -m 'create public change for phabricator testing' |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
121 $ hg phase --public . |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
122 $ echo 'draft change' > alpha |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
123 $ hg ci -m 'create draft change for phabricator testing' |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
124 $ hg phabsend --amend -r '.^::' --test-vcr "$VCR/phabsend-create-public.json" |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
125 D7917 - created - 7b4185ab5d16: create public change for phabricator testing |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
126 D7918 - created - 251c1c333fc6: create draft change for phabricator testing |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
127 warning: not updating public commit 2:7b4185ab5d16 |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
128 new commits: ['3244dc4a3334'] |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
129 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/251c1c333fc6-41cb7c3b-phabsend.hg |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
130 $ hg tags -v |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
131 tip 3:3244dc4a3334 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
132 D7917 2:7b4185ab5d16 local |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
133 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
134 $ hg debugcallconduit user.search --test-vcr "$VCR/phab-conduit.json" <<EOF |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
135 > { |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
136 > "constraints": { |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
137 > "isBot": true |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
138 > } |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
139 > } |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
140 > EOF |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
141 { |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
142 "cursor": { |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
143 "after": null, |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
144 "before": null, |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
145 "limit": 100, |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
146 "order": null |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
147 }, |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
148 "data": [], |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
149 "maps": {}, |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
150 "query": { |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
151 "queryKey": null |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
152 } |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
153 } |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
154 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
155 Template keywords |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
156 $ hg log -T'{rev} {phabreview|json}\n' |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
157 3 {"id": "D7918", "url": "https://phab.mercurial-scm.org/D7918"} |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
158 2 {"id": "D7917", "url": "https://phab.mercurial-scm.org/D7917"} |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
159 1 {"id": "D7916", "url": "https://phab.mercurial-scm.org/D7916"} |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
160 0 {"id": "D7915", "url": "https://phab.mercurial-scm.org/D7915"} |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
161 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
162 $ hg log -T'{rev} {if(phabreview, "{phabreview.url} {phabreview.id}")}\n' |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
163 3 https://phab.mercurial-scm.org/D7918 D7918 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
164 2 https://phab.mercurial-scm.org/D7917 D7917 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
165 1 https://phab.mercurial-scm.org/D7916 D7916 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
166 0 https://phab.mercurial-scm.org/D7915 D7915 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
167 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
168 Commenting when phabsending: |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
169 $ echo comment > comment |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
170 $ hg ci --addremove -m "create comment for phabricator test" |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
171 adding comment |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
172 $ hg phabsend -r . -m "For default branch" --test-vcr "$VCR/phabsend-comment-created.json" |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
173 D7919 - created - d5dddca9023d: create comment for phabricator test |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
174 new commits: ['f7db812bbe1d'] |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
175 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5dddca9023d-adf673ba-phabsend.hg |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
176 $ echo comment2 >> comment |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
177 $ hg ci --amend |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
178 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f7db812bbe1d-8fcded77-amend.hg |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
179 $ hg phabsend -r . -m "Address review comments" --test-vcr "$VCR/phabsend-comment-updated.json" |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
180 1849d7828727 mapped to old nodes [] |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
181 D7919 - updated - 1849d7828727: create comment for phabricator test |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
182 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
183 Phabsending a skipped commit: |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
184 $ hg phabsend --no-amend -r . --test-vcr "$VCR/phabsend-skipped.json" |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
185 1849d7828727 mapped to old nodes ['1849d7828727'] |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
186 D7919 - skipped - 1849d7828727: create comment for phabricator test |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
187 |
44775
cf3e07d7648a
tests: clarify a comment describing a phabricator test scenario
Matt Harbison <matt_harbison@yahoo.com>
parents:
44774
diff
changeset
|
188 Phabsend doesn't create an instability when restacking existing revisions on top |
44718
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
189 of new revisions. |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
190 |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
191 $ hg init reorder |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
192 $ cd reorder |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
193 $ cat >> .hg/hgrc <<EOF |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
194 > [phabricator] |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
195 > url = https://phab.mercurial-scm.org/ |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
196 > callsign = HG |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
197 > [experimental] |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
198 > evolution = all |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
199 > EOF |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
200 |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
201 $ echo "add" > file1.txt |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
202 $ hg ci -Aqm 'added' |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
203 $ echo "mod1" > file1.txt |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
204 $ hg ci -m 'modified 1' |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
205 $ echo "mod2" > file1.txt |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
206 $ hg ci -m 'modified 2' |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
207 $ hg phabsend -r . --test-vcr "$VCR/phabsend-add-parent-setup.json" |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
208 D8433 - created - 5d3959e20d1d: modified 2 |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
209 new commits: ['2b4aa8a88d61'] |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
210 $ hg log -G -T compact |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
211 @ 3[tip]:1 2b4aa8a88d61 1970-01-01 00:00 +0000 test |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
212 | modified 2 |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
213 | |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
214 o 1 d549263bcb2d 1970-01-01 00:00 +0000 test |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
215 | modified 1 |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
216 | |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
217 o 0 5cbade24e0fa 1970-01-01 00:00 +0000 test |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
218 added |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
219 |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
220 Also check that it doesn't create more orphans outside of the stack |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
221 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
222 $ hg up -q 1 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
223 $ echo "mod3" > file1.txt |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
224 $ hg ci -m 'modified 3' |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
225 created new head |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
226 $ hg up -q 3 |
44718
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
227 $ hg phabsend -r ".^ + ." --test-vcr "$VCR/phabsend-add-parent.json" |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
228 2b4aa8a88d61 mapped to old nodes ['2b4aa8a88d61'] |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
229 D8434 - created - d549263bcb2d: modified 1 |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
230 D8433 - updated - 2b4aa8a88d61: modified 2 |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
231 new commits: ['876a60d024de'] |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
232 new commits: ['0c6523cb1d0f'] |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
233 restabilizing 1eda4bf55021 as d2c78c3a3e01 |
44718
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
234 $ hg log -G -T compact |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
235 o 7[tip]:5 d2c78c3a3e01 1970-01-01 00:00 +0000 test |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
236 | modified 3 |
44718
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
237 | |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
238 | @ 6 0c6523cb1d0f 1970-01-01 00:00 +0000 test |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
239 |/ modified 2 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
240 | |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
241 o 5:0 876a60d024de 1970-01-01 00:00 +0000 test |
44718
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
242 | modified 1 |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
243 | |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
244 o 0 5cbade24e0fa 1970-01-01 00:00 +0000 test |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
245 added |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
246 |
44719
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
247 Posting obsolete commits is disallowed |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
248 |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
249 $ echo "mod3" > file1.txt |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
250 $ hg ci -m 'modified A' |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
251 $ echo "mod4" > file1.txt |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
252 $ hg ci -m 'modified B' |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
253 |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
254 $ hg up '.^' |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
255 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
256 $ echo 'obsolete' > file1.txt |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
257 $ hg amend --config extensions.amend= |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
258 1 new orphan changesets |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
259 $ hg log -G |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
260 @ changeset: 10:082be6c94150 |
44719
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
261 | tag: tip |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
262 | parent: 6:0c6523cb1d0f |
44719
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
263 | user: test |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
264 | date: Thu Jan 01 00:00:00 1970 +0000 |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
265 | summary: modified A |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
266 | |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
267 | * changeset: 9:a67643f48146 |
44719
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
268 | | user: test |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
269 | | date: Thu Jan 01 00:00:00 1970 +0000 |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
270 | | instability: orphan |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
271 | | summary: modified B |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
272 | | |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
273 | x changeset: 8:db79727cb2f7 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
274 |/ parent: 6:0c6523cb1d0f |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
275 | user: test |
44719
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
276 | date: Thu Jan 01 00:00:00 1970 +0000 |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
277 | obsolete: rewritten using amend as 10:082be6c94150 |
44719
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
278 | summary: modified A |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
279 | |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
280 | o changeset: 7:d2c78c3a3e01 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
281 | | parent: 5:876a60d024de |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
282 | | user: test |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
283 | | date: Thu Jan 01 00:00:00 1970 +0000 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
284 | | summary: modified 3 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
285 | | |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
286 o | changeset: 6:0c6523cb1d0f |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
287 |/ user: test |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
288 | date: Thu Jan 01 00:00:00 1970 +0000 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
289 | summary: modified 2 |
44719
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
290 | |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
291 o changeset: 5:876a60d024de |
44719
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
292 | parent: 0:5cbade24e0fa |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
293 | user: test |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
294 | date: Thu Jan 01 00:00:00 1970 +0000 |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
295 | summary: modified 1 |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
296 | |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
297 o changeset: 0:5cbade24e0fa |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
298 user: test |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
299 date: Thu Jan 01 00:00:00 1970 +0000 |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
300 summary: added |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
301 |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
302 $ hg phabsend -r 5:: |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
303 abort: obsolete commits cannot be posted for review |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
304 [255] |
c482e2fe444c
phabricator: prevent posting obsolete commits
Matt Harbison <matt_harbison@yahoo.com>
parents:
44718
diff
changeset
|
305 |
44720
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
306 Don't restack existing orphans |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
307 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
308 $ hg phabsend -r 5::tip --test-vcr "$VCR/phabsend-no-restack-orphan.json" |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
309 876a60d024de mapped to old nodes ['876a60d024de'] |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
310 0c6523cb1d0f mapped to old nodes ['0c6523cb1d0f'] |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
311 D8434 - updated - 876a60d024de: modified 1 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
312 D8433 - updated - 0c6523cb1d0f: modified 2 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
313 D8435 - created - 082be6c94150: modified A |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
314 new commits: ['b5913193c805'] |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
315 not restabilizing unchanged d2c78c3a3e01 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
316 $ hg log -G |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
317 @ changeset: 11:b5913193c805 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
318 | tag: tip |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
319 | parent: 6:0c6523cb1d0f |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
320 | user: test |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
321 | date: Thu Jan 01 00:00:00 1970 +0000 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
322 | summary: modified A |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
323 | |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
324 | * changeset: 9:a67643f48146 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
325 | | user: test |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
326 | | date: Thu Jan 01 00:00:00 1970 +0000 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
327 | | instability: orphan |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
328 | | summary: modified B |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
329 | | |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
330 | x changeset: 8:db79727cb2f7 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
331 |/ parent: 6:0c6523cb1d0f |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
332 | user: test |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
333 | date: Thu Jan 01 00:00:00 1970 +0000 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
334 | obsolete: rewritten using amend, phabsend as 11:b5913193c805 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
335 | summary: modified A |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
336 | |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
337 | o changeset: 7:d2c78c3a3e01 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
338 | | parent: 5:876a60d024de |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
339 | | user: test |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
340 | | date: Thu Jan 01 00:00:00 1970 +0000 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
341 | | summary: modified 3 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
342 | | |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
343 o | changeset: 6:0c6523cb1d0f |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
344 |/ user: test |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
345 | date: Thu Jan 01 00:00:00 1970 +0000 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
346 | summary: modified 2 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
347 | |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
348 o changeset: 5:876a60d024de |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
349 | parent: 0:5cbade24e0fa |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
350 | user: test |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
351 | date: Thu Jan 01 00:00:00 1970 +0000 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
352 | summary: modified 1 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
353 | |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
354 o changeset: 0:5cbade24e0fa |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
355 user: test |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
356 date: Thu Jan 01 00:00:00 1970 +0000 |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
357 summary: added |
601ce5392cb0
phabricator: restack any new orphans created by phabsend (issue6045)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44719
diff
changeset
|
358 |
44718
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
359 $ cd .. |
0680b8a1992a
phabricator: avoid creating unstable children within the review stack
Matt Harbison <matt_harbison@yahoo.com>
parents:
44717
diff
changeset
|
360 |
44169
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
361 Phabesending a new binary, a modified binary, and a removed binary |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
362 |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
363 >>> open('bin', 'wb').write(b'\0a') and None |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
364 $ hg ci -Am 'add binary' |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
365 adding bin |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
366 >>> open('bin', 'wb').write(b'\0b') and None |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
367 $ hg ci -m 'modify binary' |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
368 $ hg rm bin |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
369 $ hg ci -m 'remove binary' |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
370 $ hg phabsend -r .~2:: --test-vcr "$VCR/phabsend-binary.json" |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
371 uploading bin@aa24a81f55de |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
372 D8007 - created - aa24a81f55de: add binary |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
373 uploading bin@d8d62a881b54 |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
374 D8008 - created - d8d62a881b54: modify binary |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
375 D8009 - created - af55645b2e29: remove binary |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
376 new commits: ['b8139fbb4a57'] |
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
377 new commits: ['c88ce4c2d2ad'] |
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
378 new commits: ['75dbbc901145'] |
44169
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
379 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/aa24a81f55de-a3a0cf24-phabsend.hg |
5d85e9ddc7b9
phabricator: fix a crash when submitting binaries (issue6260)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44128
diff
changeset
|
380 |
44329
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
381 Phabsend a renamed binary and a copied binary, with and without content changes |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
382 to src and dest |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
383 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
384 >>> open('bin2', 'wb').write(b'\0c') and None |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
385 $ hg ci -Am 'add another binary' |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
386 adding bin2 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
387 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
388 TODO: "bin2" can't be viewed in this commit (left or right side), and the URL |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
389 looks much different than when viewing "bin2_moved". No idea if this is a phab |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
390 bug, or phabsend bug. The patch (as printed by phabread) look reasonable |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
391 though. |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
392 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
393 $ hg mv bin2 bin2_moved |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
394 $ hg ci -m "moved binary" |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
395 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
396 Note: "bin2_moved" is also not viewable in phabricator with this review |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
397 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
398 $ hg cp bin2_moved bin2_copied |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
399 $ hg ci -m "copied binary" |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
400 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
401 Note: "bin2_moved_again" is marked binary in phabricator, and both sides of it |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
402 are viewable in their proper state. "bin2_copied" is not viewable, and not |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
403 listed as binary in phabricator. |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
404 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
405 >>> open('bin2_copied', 'wb').write(b'\0move+mod') and None |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
406 $ hg mv bin2_copied bin2_moved_again |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
407 $ hg ci -m "move+mod copied binary" |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
408 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
409 Note: "bin2_moved" and "bin2_moved_copy" are both marked binary, and both |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
410 viewable on each side. |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
411 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
412 >>> open('bin2_moved', 'wb').write(b'\0precopy mod') and None |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
413 $ hg cp bin2_moved bin2_moved_copied |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
414 >>> open('bin2_moved', 'wb').write(b'\0copy src+mod') and None |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
415 $ hg ci -m "copy+mod moved binary" |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
416 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
417 $ hg phabsend -r .~4:: --test-vcr "$VCR/phabsend-binary-renames.json" |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
418 uploading bin2@f42f9195e00c |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
419 D8128 - created - f42f9195e00c: add another binary |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
420 D8129 - created - 834ab31d80ae: moved binary |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
421 D8130 - created - 494b750e5194: copied binary |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
422 uploading bin2_moved_again@25f766b50cc2 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
423 D8131 - created - 25f766b50cc2: move+mod copied binary |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
424 uploading bin2_moved_copied@1b87b363a5e4 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
425 uploading bin2_moved@1b87b363a5e4 |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
426 D8132 - created - 1b87b363a5e4: copy+mod moved binary |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
427 new commits: ['90437c20312a'] |
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
428 new commits: ['f391f4da4c61'] |
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
429 new commits: ['da86a9f3268c'] |
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
430 new commits: ['003ffc16ba66'] |
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
431 new commits: ['13bd750c36fa'] |
44329
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
432 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f42f9195e00c-e82a0769-phabsend.hg |
d1177d39012e
phabricator: fix a phabsend crash when processing a renamed binary
Matt Harbison <matt_harbison@yahoo.com>
parents:
44169
diff
changeset
|
433 |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
434 Phabreading a DREV with a local:commits time as a string: |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
435 $ hg phabread --test-vcr "$VCR/phabread-str-time.json" D1285 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
436 # HG changeset patch |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
437 # User Pulkit Goyal <7895pulkit@gmail.com> |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
438 # Date 1509404054 -19800 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
439 # Node ID 44fc1c1f1774a76423b9c732af6938435099bcc5 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
440 # Parent 8feef8ef8389a3b544e0a74624f1efc3a8d85d35 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
441 repoview: add a new attribute _visibilityexceptions and related API |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
442 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
443 Currently we don't have a defined way in core to make some hidden revisions |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
444 visible in filtered repo. Extensions to achieve the purpose of unhiding some |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
445 hidden commits, wrap repoview.pinnedrevs() function. |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
446 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
447 To make the above task simple and have well defined API, this patch adds a new |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
448 attribute '_visibilityexceptions' to repoview class which will contains |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
449 the hidden revs which should be exception. |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
450 This will allow to set different exceptions for different repoview objects |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
451 backed by the same unfiltered repo. |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
452 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
453 This patch also adds API to add revs to the attribute set and get them. |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
454 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
455 Thanks to Jun for suggesting the use of repoview class instead of localrepo. |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
456 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
457 Differential Revision: https://phab.mercurial-scm.org/D1285 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
458 diff --git a/mercurial/repoview.py b/mercurial/repoview.py |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
459 --- a/mercurial/repoview.py |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
460 +++ b/mercurial/repoview.py |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
461 @@ * @@ (glob) |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
462 subclasses of `localrepo`. Eg: `bundlerepo` or `statichttprepo`. |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
463 """ |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
464 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
465 + # hidden revs which should be visible |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
466 + _visibilityexceptions = set() |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
467 + |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
468 def __init__(self, repo, filtername): |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
469 object.__setattr__(self, r'_unfilteredrepo', repo) |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
470 object.__setattr__(self, r'filtername', filtername) |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
471 @@ -231,6 +234,14 @@ |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
472 return self |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
473 return self.unfiltered().filtered(name) |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
474 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
475 + def addvisibilityexceptions(self, revs): |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
476 + """adds hidden revs which should be visible to set of exceptions""" |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
477 + self._visibilityexceptions.update(revs) |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
478 + |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
479 + def getvisibilityexceptions(self): |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
480 + """returns the set of hidden revs which should be visible""" |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
481 + return self._visibilityexceptions |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
482 + |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
483 # everything access are forwarded to the proxied repo |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
484 def __getattr__(self, attr): |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
485 return getattr(self._unfilteredrepo, attr) |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
486 diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
487 --- a/mercurial/localrepo.py |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
488 +++ b/mercurial/localrepo.py |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
489 @@ -570,6 +570,14 @@ |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
490 def close(self): |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
491 self._writecaches() |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
492 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
493 + def addvisibilityexceptions(self, exceptions): |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
494 + # should be called on a filtered repository |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
495 + pass |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
496 + |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
497 + def getvisibilityexceptions(self): |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
498 + # should be called on a filtered repository |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
499 + return set() |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
500 + |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
501 def _loadextensions(self): |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
502 extensions.loadall(self.ui) |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
503 |
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
504 |
44127
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
505 A bad .arcconfig doesn't error out |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
506 $ echo 'garbage' > .arcconfig |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
507 $ hg config phabricator --debug |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
508 invalid JSON in $TESTTMP/repo/.arcconfig |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
509 read config from: */.hgrc (glob) |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
510 */.hgrc:*: phabricator.debug=True (glob) |
44127
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
511 $TESTTMP/repo/.hg/hgrc:*: phabricator.url=https://phab.mercurial-scm.org/ (glob) |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
512 $TESTTMP/repo/.hg/hgrc:*: phabricator.callsign=HG (glob) |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
513 |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
514 The .arcconfig content overrides global config |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
515 $ cat >> $HGRCPATH << EOF |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
516 > [phabricator] |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
517 > url = global |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
518 > callsign = global |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
519 > EOF |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
520 $ cp $TESTDIR/../.arcconfig . |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
521 $ mv .hg/hgrc .hg/hgrc.bak |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
522 $ hg config phabricator --debug |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
523 read config from: */.hgrc (glob) |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
524 */.hgrc:*: phabricator.debug=True (glob) |
44127
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
525 $TESTTMP/repo/.arcconfig: phabricator.callsign=HG |
44128
ff396501e841
phabricator: use .arcconfig for `phabricator.url` if not set locally
Matt Harbison <matt_harbison@yahoo.com>
parents:
44127
diff
changeset
|
526 $TESTTMP/repo/.arcconfig: phabricator.url=https://phab.mercurial-scm.org/ |
44127
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
527 |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
528 But it doesn't override local config |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
529 $ cat >> .hg/hgrc << EOF |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
530 > [phabricator] |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
531 > url = local |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
532 > callsign = local |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
533 > EOF |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
534 $ hg config phabricator --debug |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
535 read config from: */.hgrc (glob) |
44715
38f7b2f02f6d
phabricator: add debug logging to show previous node values in `phabsend`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44579
diff
changeset
|
536 */.hgrc:*: phabricator.debug=True (glob) |
44127
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
537 $TESTTMP/repo/.hg/hgrc:*: phabricator.url=local (glob) |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
538 $TESTTMP/repo/.hg/hgrc:*: phabricator.callsign=local (glob) |
59b3fe1e2021
phabricator: use .arcconfig for the callsign if not set locally (issue6243)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44125
diff
changeset
|
539 $ mv .hg/hgrc.bak .hg/hgrc |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
540 |
44550
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
541 Phabimport works with a stack |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
542 |
44125
a5e3f38407cb
tests: restore phabricator tests and regenerate the recordings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43260
diff
changeset
|
543 $ cd .. |
44550
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
544 $ hg clone repo repo2 -qr 1 |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
545 $ cp repo/.hg/hgrc repo2/.hg/ |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
546 $ cd repo2 |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
547 $ hg phabimport --stack 'D7918' --test-vcr "$VCR/phabimport-stack.json" |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
548 applying patch from D7917 |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
549 applying patch from D7918 |
44576
2ec6160449aa
tests: avoid logging a commit with a Unicode character in test-phabricator.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
44551
diff
changeset
|
550 $ hg log -r .: -G -Tcompact |
44550
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
551 o 3[tip] aaef04066140 1970-01-01 00:00 +0000 test |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
552 | create draft change for phabricator testing |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
553 | |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
554 o 2 8de3712202d1 1970-01-01 00:00 +0000 test |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
555 | create public change for phabricator testing |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
556 | |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
557 @ 1 a692622e6937 1970-01-01 00:00 +0000 test |
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
558 | create beta for phabricator test |
44576
2ec6160449aa
tests: avoid logging a commit with a Unicode character in test-phabricator.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
44551
diff
changeset
|
559 ~ |
44551
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
560 Phabimport can create secret commits |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
561 |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
562 $ hg rollback --config ui.rollback=True |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
563 repository tip rolled back to revision 1 (undo phabimport) |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
564 $ hg phabimport --stack 'D7918' --test-vcr "$VCR/phabimport-stack.json" \ |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
565 > --config phabimport.secret=True |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
566 applying patch from D7917 |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
567 applying patch from D7918 |
44576
2ec6160449aa
tests: avoid logging a commit with a Unicode character in test-phabricator.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
44551
diff
changeset
|
568 $ hg log -r 'reverse(.:)' -T phases |
44551
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
569 changeset: 3:aaef04066140 |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
570 tag: tip |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
571 phase: secret |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
572 user: test |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
573 date: Thu Jan 01 00:00:00 1970 +0000 |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
574 summary: create draft change for phabricator testing |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
575 |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
576 changeset: 2:8de3712202d1 |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
577 phase: secret |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
578 user: test |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
579 date: Thu Jan 01 00:00:00 1970 +0000 |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
580 summary: create public change for phabricator testing |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
581 |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
582 changeset: 1:a692622e6937 |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
583 phase: public |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
584 user: test |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
585 date: Thu Jan 01 00:00:00 1970 +0000 |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
586 summary: create beta for phabricator test |
9bae1d1a0f4c
phabricator: add a config knob to import in the secret phase
Matt Harbison <matt_harbison@yahoo.com>
parents:
44550
diff
changeset
|
587 |
44579
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
588 Phabimport accepts multiple DREVSPECs |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
589 |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
590 $ hg rollback --config ui.rollback=True |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
591 repository tip rolled back to revision 1 (undo phabimport) |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
592 $ hg phabimport --no-stack D7917 D7918 --test-vcr "$VCR/phabimport-multi-drev.json" |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
593 applying patch from D7917 |
a7f8c657a3f0
phabricator: allow multiple DREVSPEC args to phabread|phabimport|phabupdate
Matt Harbison <matt_harbison@yahoo.com>
parents:
44576
diff
changeset
|
594 applying patch from D7918 |
44550
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
595 |
44774
c1c922391314
phabricator: ensure that `phabsend` is given a contiguous, linear commit range
Matt Harbison <matt_harbison@yahoo.com>
parents:
44720
diff
changeset
|
596 Phabsend requires a linear range of commits |
c1c922391314
phabricator: ensure that `phabsend` is given a contiguous, linear commit range
Matt Harbison <matt_harbison@yahoo.com>
parents:
44720
diff
changeset
|
597 |
c1c922391314
phabricator: ensure that `phabsend` is given a contiguous, linear commit range
Matt Harbison <matt_harbison@yahoo.com>
parents:
44720
diff
changeset
|
598 $ hg phabsend -r 0+2+3 |
45152
b3b0cd8b9366
phabricator: clarify the multiple heads/roots error message for phabsend
Matt Harbison <matt_harbison@yahoo.com>
parents:
45135
diff
changeset
|
599 abort: cannot phabsend multiple head revisions: c44b38f24a45 aaef04066140 |
44774
c1c922391314
phabricator: ensure that `phabsend` is given a contiguous, linear commit range
Matt Harbison <matt_harbison@yahoo.com>
parents:
44720
diff
changeset
|
600 (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
|
601 [255] |
c1c922391314
phabricator: ensure that `phabsend` is given a contiguous, linear commit range
Matt Harbison <matt_harbison@yahoo.com>
parents:
44720
diff
changeset
|
602 |
44717
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
603 Validate arguments with --fold |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
604 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
605 $ hg phabsend --fold -r 1 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
606 abort: 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:
44716
diff
changeset
|
607 [255] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
608 $ hg phabsend --fold --no-amend -r 1:: |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
609 abort: 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:
44716
diff
changeset
|
610 [255] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
611 $ hg phabsend --fold -r 1:: |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
612 abort: 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:
44716
diff
changeset
|
613 [255] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
614 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
615 Setup a series of commits to be folded, and include the Test Plan field multiple |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
616 times to test the concatenation logic. No Test Plan field in the last one to |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
617 ensure missing fields are skipped. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
618 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
619 $ hg init ../folded |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
620 $ cd ../folded |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
621 $ cat >> .hg/hgrc <<EOF |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
622 > [phabricator] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
623 > url = https://phab.mercurial-scm.org/ |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
624 > callsign = HG |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
625 > EOF |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
626 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
627 $ echo 'added' > file.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
628 $ hg ci -Aqm 'added file' |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
629 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
630 $ cat > log.txt <<EOF |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
631 > one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
632 > |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
633 > This file was modified with 'mod1' as its contents. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
634 > |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
635 > Test Plan: |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
636 > LOL! What testing?! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
637 > EOF |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
638 $ echo mod1 > file.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
639 $ hg ci -l log.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
640 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
641 $ cat > log.txt <<EOF |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
642 > two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
643 > |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
644 > This file was modified with 'mod2' as its contents. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
645 > |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
646 > Test Plan: |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
647 > Haha! yeah, right. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
648 > |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
649 > EOF |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
650 $ echo mod2 > file.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
651 $ hg ci -l log.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
652 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
653 $ echo mod3 > file.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
654 $ hg ci -m '3: a commit with no detailed message' |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
655 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
656 The folding of immutable commits works... |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
657 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
658 $ hg phase -r tip --public |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
659 $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-immutable.json" |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
660 D8386 - created - a959a3f69d8d: one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
661 D8386 - created - 24a4438154ba: two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
662 D8386 - created - d235829e802c: 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
663 warning: not updating public commit 1:a959a3f69d8d |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
664 warning: not updating public commit 2:24a4438154ba |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
665 warning: not updating public commit 3:d235829e802c |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
666 no newnodes to update |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
667 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
668 $ hg phase -r 0 --draft --force |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
669 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
670 ... as does the initial mutable fold... |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
671 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
672 $ echo y | hg phabsend --fold --confirm -r 1:: \ |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
673 > --test-vcr "$VCR/phabsend-fold-initial.json" |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
674 NEW - a959a3f69d8d: one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
675 NEW - 24a4438154ba: two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
676 NEW - d235829e802c: 3: a commit with no detailed message |
44945
7a0a1be721a3
phabricator: make it clear what happen when no response
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
44775
diff
changeset
|
677 Send the above changes to https://phab.mercurial-scm.org/ (Y/n)? y |
44717
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
678 D8387 - created - a959a3f69d8d: one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
679 D8387 - created - 24a4438154ba: two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
680 D8387 - created - d235829e802c: 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
681 updating local commit list for D8387 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
682 new commits: ['602c4e738243', '832553266fe8', '921f8265efbd'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
683 saved backup bundle to $TESTTMP/folded/.hg/strip-backup/a959a3f69d8d-a4a24136-phabsend.hg |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
684 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
685 ... and doesn't mangle the local commits. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
686 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
687 $ hg log -T '{rev}:{node|short}\n{indent(desc, " ")}\n' |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
688 3:921f8265efbd |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
689 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
690 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
691 Differential Revision: https://phab.mercurial-scm.org/D8387 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
692 2:832553266fe8 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
693 two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
694 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
695 This file was modified with 'mod2' as its contents. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
696 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
697 Test Plan: |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
698 Haha! yeah, right. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
699 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
700 Differential Revision: https://phab.mercurial-scm.org/D8387 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
701 1:602c4e738243 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
702 one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
703 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
704 This file was modified with 'mod1' as its contents. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
705 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
706 Test Plan: |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
707 LOL! What testing?! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
708 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
709 Differential Revision: https://phab.mercurial-scm.org/D8387 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
710 0:98d480e0d494 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
711 added file |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
712 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
713 Setup some obsmarkers by adding a file to the middle commit. This stress tests |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
714 getoldnodedrevmap() in later phabsends. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
715 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
716 $ hg up '.^' |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
717 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
718 $ echo 'modified' > file2.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
719 $ hg add file2.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
720 $ hg amend --config experimental.evolution=all --config extensions.amend= |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
721 1 new orphan changesets |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
722 $ hg up 3 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
723 obsolete feature not enabled but 1 markers found! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
724 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
725 $ hg rebase --config experimental.evolution=all --config extensions.rebase= |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
726 note: not rebasing 2:832553266fe8 "two: second commit to review", already in destination as 4:0124e5474c88 "two: second commit to review" (tip) |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
727 rebasing 3:921f8265efbd "3: a commit with no detailed message" |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
728 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
729 When commits have changed locally, the local commit list on Phabricator is |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
730 updated. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
731 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
732 $ echo y | hg phabsend --fold --confirm -r 1:: \ |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
733 > --test-vcr "$VCR/phabsend-fold-updated.json" |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
734 obsolete feature not enabled but 2 markers found! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
735 602c4e738243 mapped to old nodes ['602c4e738243'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
736 0124e5474c88 mapped to old nodes ['832553266fe8'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
737 e4edb1fe3565 mapped to old nodes ['921f8265efbd'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
738 D8387 - 602c4e738243: one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
739 D8387 - 0124e5474c88: two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
740 D8387 - e4edb1fe3565: 3: a commit with no detailed message |
44945
7a0a1be721a3
phabricator: make it clear what happen when no response
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
44775
diff
changeset
|
741 Send the above changes to https://phab.mercurial-scm.org/ (Y/n)? y |
44717
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
742 D8387 - updated - 602c4e738243: one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
743 D8387 - updated - 0124e5474c88: two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
744 D8387 - updated - e4edb1fe3565: 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
745 obsolete feature not enabled but 2 markers found! (?) |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
746 updating local commit list for D8387 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
747 new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
748 $ hg log -Tcompact |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
749 obsolete feature not enabled but 2 markers found! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
750 5[tip] e4edb1fe3565 1970-01-01 00:00 +0000 test |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
751 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
752 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
753 4:1 0124e5474c88 1970-01-01 00:00 +0000 test |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
754 two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
755 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
756 1 602c4e738243 1970-01-01 00:00 +0000 test |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
757 one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
758 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
759 0 98d480e0d494 1970-01-01 00:00 +0000 test |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
760 added file |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
761 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
762 When nothing has changed locally since the last phabsend, the commit list isn't |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
763 updated, and nothing is changed locally afterward. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
764 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
765 $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-no-changes.json" |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
766 obsolete feature not enabled but 2 markers found! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
767 602c4e738243 mapped to old nodes ['602c4e738243'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
768 0124e5474c88 mapped to old nodes ['0124e5474c88'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
769 e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
770 D8387 - updated - 602c4e738243: one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
771 D8387 - updated - 0124e5474c88: two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
772 D8387 - updated - e4edb1fe3565: 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
773 obsolete feature not enabled but 2 markers found! (?) |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
774 local commit list for D8387 is already up-to-date |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
775 $ hg log -Tcompact |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
776 obsolete feature not enabled but 2 markers found! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
777 5[tip] e4edb1fe3565 1970-01-01 00:00 +0000 test |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
778 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
779 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
780 4:1 0124e5474c88 1970-01-01 00:00 +0000 test |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
781 two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
782 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
783 1 602c4e738243 1970-01-01 00:00 +0000 test |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
784 one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
785 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
786 0 98d480e0d494 1970-01-01 00:00 +0000 test |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
787 added file |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
788 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
789 Fold will accept new revisions at the end... |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
790 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
791 $ echo 'another mod' > file2.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
792 $ hg ci -m 'four: extend the fold range' |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
793 obsolete feature not enabled but 2 markers found! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
794 $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-extend-end.json" \ |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
795 > --config experimental.evolution=all |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
796 602c4e738243 mapped to old nodes ['602c4e738243'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
797 0124e5474c88 mapped to old nodes ['0124e5474c88'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
798 e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
799 D8387 - updated - 602c4e738243: one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
800 D8387 - updated - 0124e5474c88: two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
801 D8387 - updated - e4edb1fe3565: 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
802 D8387 - created - 94aaae213b23: four: extend the fold range |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
803 updating local commit list for D8387 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
804 new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565', '51a04fea8707'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
805 $ hg log -r . -T '{desc}\n' |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
806 four: extend the fold range |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
807 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
808 Differential Revision: https://phab.mercurial-scm.org/D8387 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
809 $ hg log -T'{rev} {if(phabreview, "{phabreview.url} {phabreview.id}")}\n' -r 1:: |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
810 obsolete feature not enabled but 3 markers found! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
811 1 https://phab.mercurial-scm.org/D8387 D8387 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
812 4 https://phab.mercurial-scm.org/D8387 D8387 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
813 5 https://phab.mercurial-scm.org/D8387 D8387 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
814 7 https://phab.mercurial-scm.org/D8387 D8387 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
815 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
816 ... and also accepts new revisions at the beginning of the range |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
817 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
818 It's a bit unfortunate that not having a Differential URL on the first commit |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
819 causes a new Differential Revision to be created, though it isn't *entirely* |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
820 unreasonable. At least this updates the subsequent commits. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
821 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
822 TODO: See if it can reuse the existing Differential. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
823 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
824 $ hg phabsend --fold -r 0:: --test-vcr "$VCR/phabsend-fold-extend-front.json" \ |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
825 > --config experimental.evolution=all |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
826 602c4e738243 mapped to old nodes ['602c4e738243'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
827 0124e5474c88 mapped to old nodes ['0124e5474c88'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
828 e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
829 51a04fea8707 mapped to old nodes ['51a04fea8707'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
830 D8388 - created - 98d480e0d494: added file |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
831 D8388 - updated - 602c4e738243: one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
832 D8388 - updated - 0124e5474c88: two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
833 D8388 - updated - e4edb1fe3565: 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
834 D8388 - updated - 51a04fea8707: four: extend the fold range |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
835 updating local commit list for D8388 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
836 new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'ac7db67f0991'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
837 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
838 $ hg log -T '{rev}:{node|short}\n{indent(desc, " ")}\n' |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
839 obsolete feature not enabled but 8 markers found! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
840 12:ac7db67f0991 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
841 four: extend the fold range |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
842 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
843 Differential Revision: https://phab.mercurial-scm.org/D8388 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
844 11:30682b960804 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
845 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
846 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
847 Differential Revision: https://phab.mercurial-scm.org/D8388 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
848 10:3ee132d41dbc |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
849 two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
850 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
851 This file was modified with 'mod2' as its contents. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
852 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
853 Test Plan: |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
854 Haha! yeah, right. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
855 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
856 Differential Revision: https://phab.mercurial-scm.org/D8388 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
857 9:6320b7d714cf |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
858 one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
859 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
860 This file was modified with 'mod1' as its contents. |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
861 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
862 Test Plan: |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
863 LOL! What testing?! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
864 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
865 Differential Revision: https://phab.mercurial-scm.org/D8388 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
866 8:15e9b14b4b4c |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
867 added file |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
868 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
869 Differential Revision: https://phab.mercurial-scm.org/D8388 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
870 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
871 Test phabsend --fold with an `hg split` at the end of the range |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
872 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
873 $ echo foo > file3.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
874 $ hg add file3.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
875 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
876 $ hg log -r . -T '{desc}' > log.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
877 $ echo 'amended mod' > file2.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
878 $ hg ci --amend -l log.txt --config experimental.evolution=all |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
879 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
880 $ cat <<EOF | hg --config extensions.split= --config ui.interactive=True \ |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
881 > --config experimental.evolution=all split -r . |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
882 > n |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
883 > y |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
884 > y |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
885 > y |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
886 > y |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
887 > EOF |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
888 diff --git a/file2.txt b/file2.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
889 1 hunks, 1 lines changed |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
890 examine changes to 'file2.txt'? |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
891 (enter ? for help) [Ynesfdaq?] n |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
892 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
893 diff --git a/file3.txt b/file3.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
894 new file mode 100644 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
895 examine changes to 'file3.txt'? |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
896 (enter ? for help) [Ynesfdaq?] y |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
897 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
898 @@ -0,0 +1,1 @@ |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
899 +foo |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
900 record change 2/2 to 'file3.txt'? |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
901 (enter ? for help) [Ynesfdaq?] y |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
902 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
903 created new head |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
904 diff --git a/file2.txt b/file2.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
905 1 hunks, 1 lines changed |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
906 examine changes to 'file2.txt'? |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
907 (enter ? for help) [Ynesfdaq?] y |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
908 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
909 @@ -1,1 +1,1 @@ |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
910 -modified |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
911 +amended mod |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
912 record this change to 'file2.txt'? |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
913 (enter ? for help) [Ynesfdaq?] y |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
914 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
915 $ hg phabsend --fold -r 8:: --test-vcr "$VCR/phabsend-fold-split-end.json" \ |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
916 > --config experimental.evolution=all |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
917 15e9b14b4b4c mapped to old nodes ['15e9b14b4b4c'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
918 6320b7d714cf mapped to old nodes ['6320b7d714cf'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
919 3ee132d41dbc mapped to old nodes ['3ee132d41dbc'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
920 30682b960804 mapped to old nodes ['30682b960804'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
921 6bc15dc99efd mapped to old nodes ['ac7db67f0991'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
922 b50946d5e490 mapped to old nodes ['ac7db67f0991'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
923 D8388 - updated - 15e9b14b4b4c: added file |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
924 D8388 - updated - 6320b7d714cf: one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
925 D8388 - updated - 3ee132d41dbc: two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
926 D8388 - updated - 30682b960804: 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
927 D8388 - updated - 6bc15dc99efd: four: extend the fold range |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
928 D8388 - updated - b50946d5e490: four: extend the fold range |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
929 updating local commit list for D8388 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
930 new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', '6bc15dc99efd', 'b50946d5e490'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
931 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
932 Test phabsend --fold with an `hg fold` at the end of the range |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
933 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
934 $ hg --config experimental.evolution=all --config extensions.rebase= \ |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
935 > rebase -r '.^' -r . -d '.^^' --collapse -l log.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
936 rebasing 14:6bc15dc99efd "four: extend the fold range" |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
937 rebasing 15:b50946d5e490 "four: extend the fold range" (tip) |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
938 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
939 $ hg phabsend --fold -r 8:: --test-vcr "$VCR/phabsend-fold-fold-end.json" \ |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
940 > --config experimental.evolution=all |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
941 15e9b14b4b4c mapped to old nodes ['15e9b14b4b4c'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
942 6320b7d714cf mapped to old nodes ['6320b7d714cf'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
943 3ee132d41dbc mapped to old nodes ['3ee132d41dbc'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
944 30682b960804 mapped to old nodes ['30682b960804'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
945 e919cdf3d4fe mapped to old nodes ['6bc15dc99efd', 'b50946d5e490'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
946 D8388 - updated - 15e9b14b4b4c: added file |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
947 D8388 - updated - 6320b7d714cf: one: first commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
948 D8388 - updated - 3ee132d41dbc: two: second commit to review |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
949 D8388 - updated - 30682b960804: 3: a commit with no detailed message |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
950 D8388 - updated - e919cdf3d4fe: four: extend the fold range |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
951 updating local commit list for D8388 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
952 new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'e919cdf3d4fe'] |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
953 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
954 $ hg log -r tip -v |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
955 obsolete feature not enabled but 12 markers found! |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
956 changeset: 16:e919cdf3d4fe |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
957 tag: tip |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
958 parent: 11:30682b960804 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
959 user: test |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
960 date: Thu Jan 01 00:00:00 1970 +0000 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
961 files: file2.txt file3.txt |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
962 description: |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
963 four: extend the fold range |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
964 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
965 Differential Revision: https://phab.mercurial-scm.org/D8388 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
966 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
967 |
3dc6a70779f2
phabricator: add an option to fold several commits into one review (issue6244)
Matt Harbison <matt_harbison@yahoo.com>
parents:
44716
diff
changeset
|
968 |
44550
bbb170f9396d
phabricator: add a `phabimport` command
Matt Harbison <matt_harbison@yahoo.com>
parents:
44436
diff
changeset
|
969 $ cd .. |