author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Thu, 23 Feb 2023 19:06:24 +0100 | |
changeset 50198 | a6a8946d5173 |
parent 49995 | 27fd12eca557 |
child 51110 | 042d32355a4a |
permissions | -rw-r--r-- |
34938
aa05b95949fe
tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34876
diff
changeset
|
1 |
$ cat > $TESTTMP/hook.sh << 'EOF' |
aa05b95949fe
tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34876
diff
changeset
|
2 |
> echo "test-hook-close-phase: $HG_NODE: $HG_OLDPHASE -> $HG_PHASE" |
aa05b95949fe
tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34876
diff
changeset
|
3 |
> EOF |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
4 |
|
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
5 |
$ cat >> $HGRCPATH << EOF |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
6 |
> [extensions] |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
7 |
> phasereport=$TESTDIR/testlib/ext-phase-report.py |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
8 |
> [hooks] |
34938
aa05b95949fe
tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34876
diff
changeset
|
9 |
> txnclose-phase.test = sh $TESTTMP/hook.sh |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
10 |
> EOF |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
11 |
|
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
12 |
$ hglog() { hg log -G --template "{rev} {phaseidx} {desc}\n" $*; } |
15694
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
13 |
$ mkcommit() { |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
14 |
> echo "$1" > "$1" |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
15 |
> hg add "$1" |
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
16 |
> message="$1" |
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
17 |
> shift |
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
18 |
> hg ci -m "$message" $* |
15694
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
19 |
> } |
15423
ea5b346024e1
phases: add a very simple test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
20 |
|
ea5b346024e1
phases: add a very simple test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 |
$ hg init initialrepo |
ea5b346024e1
phases: add a very simple test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 |
$ cd initialrepo |
16622
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
23 |
|
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
24 |
Cannot change null revision phase |
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
25 |
|
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
26 |
$ hg phase --force --secret null |
16659
58edd786e96f
phase: make if abort on nullid for the good reason
Patrick Mezard <patrick@mezard.eu>
parents:
16622
diff
changeset
|
27 |
abort: cannot change null revision phase |
16622
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
28 |
[255] |
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
29 |
$ hg phase null |
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
30 |
-1: public |
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
31 |
|
15694
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
32 |
$ mkcommit A |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
33 |
test-debug-phase: new rev 0: x -> 1 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
34 |
test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> draft |
15694
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
35 |
|
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
36 |
New commit are draft by default |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
37 |
|
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
38 |
$ hglog |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
39 |
@ 0 1 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
40 |
|
15694
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
41 |
|
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
42 |
Following commit are draft too |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
43 |
|
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
44 |
$ mkcommit B |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
45 |
test-debug-phase: new rev 1: x -> 1 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
46 |
test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> draft |
15423
ea5b346024e1
phases: add a very simple test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
47 |
|
ea5b346024e1
phases: add a very simple test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
48 |
$ hglog |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
49 |
@ 1 1 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
50 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
51 |
o 0 1 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
52 |
|
15694
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
53 |
|
44004
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
54 |
Working directory phase is secret when its parent is secret. |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
55 |
|
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
56 |
$ hg phase --force --secret . |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
57 |
test-debug-phase: move rev 0: 1 -> 2 |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
58 |
test-debug-phase: move rev 1: 1 -> 2 |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
59 |
test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: draft -> secret |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
60 |
test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: draft -> secret |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
61 |
$ hg log -r 'wdir()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
62 |
secret |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
63 |
$ hg log -r 'wdir() and public()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
64 |
$ hg log -r 'wdir() and draft()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
65 |
$ hg log -r 'wdir() and secret()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
66 |
secret |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
67 |
|
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
68 |
Working directory phase is draft when its parent is draft. |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
69 |
|
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
70 |
$ hg phase --draft . |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
71 |
test-debug-phase: move rev 1: 2 -> 1 |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
72 |
test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: secret -> draft |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
73 |
$ hg log -r 'wdir()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
74 |
draft |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
75 |
$ hg log -r 'wdir() and public()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
76 |
$ hg log -r 'wdir() and draft()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
77 |
draft |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
78 |
$ hg log -r 'wdir() and secret()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
79 |
|
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
80 |
Working directory phase is secret when a new commit will be created as secret, |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
81 |
even if the parent is draft. |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
82 |
|
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
83 |
$ hg log -r 'wdir() and secret()' -T '{phase}\n' \ |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
84 |
> --config phases.new-commit='secret' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
85 |
secret |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
86 |
|
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
87 |
Working directory phase is draft when its parent is public. |
15694
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
88 |
|
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
89 |
$ hg phase --public . |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
90 |
test-debug-phase: move rev 0: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
91 |
test-debug-phase: move rev 1: 1 -> 0 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
92 |
test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: draft -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
93 |
test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: draft -> public |
44004
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
94 |
$ hg log -r 'wdir()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
95 |
draft |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
96 |
$ hg log -r 'wdir() and public()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
97 |
$ hg log -r 'wdir() and draft()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
98 |
draft |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
99 |
$ hg log -r 'wdir() and secret()' -T '{phase}\n' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
100 |
$ hg log -r 'wdir() and secret()' -T '{phase}\n' \ |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
101 |
> --config phases.new-commit='secret' |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
102 |
secret |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
103 |
|
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
104 |
Draft commit are properly created over public one: |
9c1fd975e9ac
phases: make the working directory consistently a draft
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
42893
diff
changeset
|
105 |
|
25120
a7701001c829
phase: default to current revision if no rev is provided (issue4666)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
106 |
$ hg phase |
a7701001c829
phase: default to current revision if no rev is provided (issue4666)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
107 |
1: public |
15694
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
108 |
$ hglog |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
109 |
@ 1 0 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
110 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
111 |
o 0 0 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
112 |
|
15694
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
113 |
|
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
114 |
$ mkcommit C |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
115 |
test-debug-phase: new rev 2: x -> 1 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
116 |
test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> draft |
15694
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
117 |
$ mkcommit D |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
118 |
test-debug-phase: new rev 3: x -> 1 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
119 |
test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> draft |
15694
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
120 |
|
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
121 |
$ hglog |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
122 |
@ 3 1 D |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
123 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
124 |
o 2 1 C |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
125 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
126 |
o 1 0 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
127 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
128 |
o 0 0 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
129 |
|
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
130 |
|
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
131 |
Test creating changeset as secret |
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
132 |
|
16030
308406677e9d
phases: allow phase name in phases.new-commit settings
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16013
diff
changeset
|
133 |
$ mkcommit E --config phases.new-commit='secret' |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
134 |
test-debug-phase: new rev 4: x -> 2 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
135 |
test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: -> secret |
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
136 |
$ hglog |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
137 |
@ 4 2 E |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
138 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
139 |
o 3 1 D |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
140 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
141 |
o 2 1 C |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
142 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
143 |
o 1 0 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
144 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
145 |
o 0 0 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
146 |
|
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
147 |
|
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
148 |
Test the secret property is inherited |
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
149 |
|
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
150 |
$ mkcommit H |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
151 |
test-debug-phase: new rev 5: x -> 2 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
152 |
test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: -> secret |
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
153 |
$ hglog |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
154 |
@ 5 2 H |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
155 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
156 |
o 4 2 E |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
157 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
158 |
o 3 1 D |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
159 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
160 |
o 2 1 C |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
161 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
162 |
o 1 0 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
163 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
164 |
o 0 0 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
165 |
|
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
166 |
|
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
167 |
Even on merge |
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
168 |
|
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
169 |
$ hg up -q 1 |
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
170 |
$ mkcommit "B'" |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
171 |
test-debug-phase: new rev 6: x -> 1 |
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
172 |
created new head |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
173 |
test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> draft |
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
174 |
$ hglog |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
175 |
@ 6 1 B' |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
176 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
177 |
| o 5 2 H |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
178 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
179 |
| o 4 2 E |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
180 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
181 |
| o 3 1 D |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
182 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
183 |
| o 2 1 C |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
184 |
|/ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
185 |
o 1 0 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
186 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
187 |
o 0 0 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
188 |
|
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
189 |
$ hg merge 4 # E |
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
190 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
191 |
(branch merge, don't forget to commit) |
25120
a7701001c829
phase: default to current revision if no rev is provided (issue4666)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
192 |
$ hg phase |
a7701001c829
phase: default to current revision if no rev is provided (issue4666)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
193 |
6: draft |
a7701001c829
phase: default to current revision if no rev is provided (issue4666)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
194 |
4: secret |
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
195 |
$ hg ci -m "merge B' and E" |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
196 |
test-debug-phase: new rev 7: x -> 2 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
197 |
test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: -> secret |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
198 |
|
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
199 |
$ hglog |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
200 |
@ 7 2 merge B' and E |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
201 |
|\ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
202 |
| o 6 1 B' |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
203 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
204 |
+---o 5 2 H |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
205 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
206 |
o | 4 2 E |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
207 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
208 |
o | 3 1 D |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
209 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
210 |
o | 2 1 C |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
211 |
|/ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
212 |
o 1 0 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
213 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
214 |
o 0 0 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
215 |
|
15712
06b8b74720d6
phases: test the new-commit option and proper inheritence of phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15694
diff
changeset
|
216 |
|
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
217 |
Test secret changeset are not pushed |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
218 |
|
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
219 |
$ hg init ../push-dest |
15820
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
220 |
$ cat > ../push-dest/.hg/hgrc << EOF |
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
221 |
> [phases] |
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
222 |
> publish=False |
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
223 |
> EOF |
15838
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
224 |
$ hg outgoing ../push-dest --template='{rev} {phase} {desc|firstline}\n' |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
225 |
comparing with ../push-dest |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
226 |
searching for changes |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
227 |
0 public A |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
228 |
1 public B |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
229 |
2 draft C |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
230 |
3 draft D |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
231 |
6 draft B' |
17198
ecde35a1af9e
outgoing: accept revset argument for --rev
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
232 |
$ hg outgoing -r 'branch(default)' ../push-dest --template='{rev} {phase} {desc|firstline}\n' |
15838
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
233 |
comparing with ../push-dest |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
234 |
searching for changes |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
235 |
0 public A |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
236 |
1 public B |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
237 |
2 draft C |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
238 |
3 draft D |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
239 |
6 draft B' |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
240 |
|
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
241 |
$ hg push ../push-dest -f # force because we push multiple heads |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
242 |
pushing to ../push-dest |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
243 |
searching for changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
244 |
adding changesets |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
245 |
adding manifests |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
246 |
adding file changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
247 |
added 5 changesets with 5 changes to 5 files (+1 heads) |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
248 |
test-debug-phase: new rev 0: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
249 |
test-debug-phase: new rev 1: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
250 |
test-debug-phase: new rev 2: x -> 1 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
251 |
test-debug-phase: new rev 3: x -> 1 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
252 |
test-debug-phase: new rev 4: x -> 1 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
253 |
test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
254 |
test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
255 |
test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> draft |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
256 |
test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> draft |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
257 |
test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> draft |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
258 |
$ hglog |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
259 |
@ 7 2 merge B' and E |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
260 |
|\ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
261 |
| o 6 1 B' |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
262 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
263 |
+---o 5 2 H |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
264 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
265 |
o | 4 2 E |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
266 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
267 |
o | 3 1 D |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
268 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
269 |
o | 2 1 C |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
270 |
|/ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
271 |
o 1 0 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
272 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
273 |
o 0 0 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
274 |
|
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
275 |
$ cd ../push-dest |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
276 |
$ hglog |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
277 |
o 4 1 B' |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
278 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
279 |
| o 3 1 D |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
280 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
281 |
| o 2 1 C |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
282 |
|/ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
283 |
o 1 0 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
284 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
285 |
o 0 0 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
286 |
|
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
287 |
|
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
288 |
(Issue3303) |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
289 |
Check that remote secret changeset are ignore when checking creation of remote heads |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
290 |
|
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20530
diff
changeset
|
291 |
We add a secret head into the push destination. This secret head shadows a |
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
292 |
visible shared between the initial repo and the push destination. |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
293 |
|
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
294 |
$ hg up -q 4 # B' |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
295 |
$ mkcommit Z --config phases.new-commit=secret |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
296 |
test-debug-phase: new rev 5: x -> 2 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
297 |
test-hook-close-phase: 2713879da13d6eea1ff22b442a5a87cb31a7ce6a: -> secret |
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
298 |
$ hg phase . |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
299 |
5: secret |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
300 |
|
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20530
diff
changeset
|
301 |
We now try to push a new public changeset that descend from the common public |
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20530
diff
changeset
|
302 |
head shadowed by the remote secret head. |
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
303 |
|
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
304 |
$ cd ../initialrepo |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
305 |
$ hg up -q 6 #B' |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
306 |
$ mkcommit I |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
307 |
test-debug-phase: new rev 8: x -> 1 |
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
308 |
created new head |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
309 |
test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061: -> draft |
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
310 |
$ hg push ../push-dest |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
311 |
pushing to ../push-dest |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
312 |
searching for changes |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
313 |
adding changesets |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
314 |
adding manifests |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
315 |
adding file changes |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
316 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
317 |
test-debug-phase: new rev 6: x -> 1 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
318 |
test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061: -> draft |
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
319 |
|
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
320 |
:note: The "(+1 heads)" is wrong as we do not had any visible head |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
321 |
|
18462
593eb3786165
documentation: update to new filter names
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18394
diff
changeset
|
322 |
check that branch cache with "served" filter are properly computed and stored |
18189
b9026ba002f6
branchmap: enable caching for filtered version too
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17985
diff
changeset
|
323 |
|
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
324 |
$ ls ../push-dest/.hg/cache/branch2* |
32268
24f55686a63d
caches: stop warming the cache after changegroup application
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31767
diff
changeset
|
325 |
../push-dest/.hg/cache/branch2-base |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
326 |
../push-dest/.hg/cache/branch2-served |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
327 |
$ cat ../push-dest/.hg/cache/branch2-served |
18394
5010448197bc
branchmap: update cache of 'unserved' filter on new changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18382
diff
changeset
|
328 |
6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722 |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
329 |
b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
330 |
6d6770faffce199f1fddd1cf87f6f026138cf061 o default |
18394
5010448197bc
branchmap: update cache of 'unserved' filter on new changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18382
diff
changeset
|
331 |
$ hg heads -R ../push-dest --template '{rev}:{node} {phase}\n' #update visible cache too |
5010448197bc
branchmap: update cache of 'unserved' filter on new changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18382
diff
changeset
|
332 |
6:6d6770faffce199f1fddd1cf87f6f026138cf061 draft |
5010448197bc
branchmap: update cache of 'unserved' filter on new changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18382
diff
changeset
|
333 |
5:2713879da13d6eea1ff22b442a5a87cb31a7ce6a secret |
5010448197bc
branchmap: update cache of 'unserved' filter on new changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18382
diff
changeset
|
334 |
3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e draft |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
335 |
$ ls ../push-dest/.hg/cache/branch2* |
32268
24f55686a63d
caches: stop warming the cache after changegroup application
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31767
diff
changeset
|
336 |
../push-dest/.hg/cache/branch2-base |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
337 |
../push-dest/.hg/cache/branch2-served |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
338 |
../push-dest/.hg/cache/branch2-visible |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
339 |
$ cat ../push-dest/.hg/cache/branch2-served |
18394
5010448197bc
branchmap: update cache of 'unserved' filter on new changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18382
diff
changeset
|
340 |
6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722 |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
341 |
b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
342 |
6d6770faffce199f1fddd1cf87f6f026138cf061 o default |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
343 |
$ cat ../push-dest/.hg/cache/branch2-visible |
18189
b9026ba002f6
branchmap: enable caching for filtered version too
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17985
diff
changeset
|
344 |
6d6770faffce199f1fddd1cf87f6f026138cf061 6 |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
345 |
b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
346 |
2713879da13d6eea1ff22b442a5a87cb31a7ce6a o default |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
347 |
6d6770faffce199f1fddd1cf87f6f026138cf061 o default |
18189
b9026ba002f6
branchmap: enable caching for filtered version too
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17985
diff
changeset
|
348 |
|
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
349 |
|
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
350 |
Restore condition prior extra insertion. |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
351 |
$ hg -q --config extensions.mq= strip . |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
352 |
$ hg up -q 7 |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
353 |
$ cd .. |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
354 |
|
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
355 |
Test secret changeset are not pull |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
356 |
|
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
357 |
$ hg init pull-dest |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
358 |
$ cd pull-dest |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
359 |
$ hg pull ../initialrepo |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
360 |
pulling from ../initialrepo |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
361 |
requesting all changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
362 |
adding changesets |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
363 |
adding manifests |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
364 |
adding file changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
365 |
added 5 changesets with 5 changes to 5 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
366 |
new changesets 4a2df7238c3b:cf9fe039dfd6 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
367 |
test-debug-phase: new rev 0: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
368 |
test-debug-phase: new rev 1: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
369 |
test-debug-phase: new rev 2: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
370 |
test-debug-phase: new rev 3: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
371 |
test-debug-phase: new rev 4: x -> 0 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
372 |
test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
373 |
test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
374 |
test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
375 |
test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
376 |
test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> public |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
377 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
378 |
$ hglog |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
379 |
o 4 0 B' |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
380 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
381 |
| o 3 0 D |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
382 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
383 |
| o 2 0 C |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
384 |
|/ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
385 |
o 1 0 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
386 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
387 |
o 0 0 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
388 |
|
15819
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
389 |
$ cd .. |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
390 |
|
15838
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
391 |
But secret can still be bundled explicitly |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
392 |
|
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
393 |
$ cd initialrepo |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
394 |
$ hg bundle --base '4^' -r 'children(4)' ../secret-bundle.hg |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
395 |
4 changesets found |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
396 |
$ cd .. |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
397 |
|
15888
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
398 |
Test secret changeset are not cloned |
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
399 |
(during local clone) |
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
400 |
|
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
401 |
$ hg clone -qU initialrepo clone-dest |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
402 |
test-debug-phase: new rev 0: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
403 |
test-debug-phase: new rev 1: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
404 |
test-debug-phase: new rev 2: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
405 |
test-debug-phase: new rev 3: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
406 |
test-debug-phase: new rev 4: x -> 0 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
407 |
test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
408 |
test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
409 |
test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
410 |
test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
411 |
test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> public |
15888
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
412 |
$ hglog -R clone-dest |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
413 |
o 4 0 B' |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
414 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
415 |
| o 3 0 D |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
416 |
| | |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
417 |
| o 2 0 C |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
418 |
|/ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
419 |
o 1 0 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
420 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
421 |
o 0 0 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
422 |
|
15888
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
423 |
|
25111
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
424 |
Test summary |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
425 |
|
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
426 |
$ hg summary -R clone-dest --verbose |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
427 |
parent: -1:000000000000 (no revision checked out) |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
428 |
branch: default |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
429 |
commit: (clean) |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
430 |
update: 5 new changesets (update) |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
431 |
$ hg summary -R initialrepo |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
432 |
parent: 7:17a481b3bccb tip |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
433 |
merge B' and E |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
434 |
branch: default |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25120
diff
changeset
|
435 |
commit: (clean) (secret) |
25111
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
436 |
update: 1 new changesets, 2 branch heads (merge) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25120
diff
changeset
|
437 |
phases: 3 draft, 3 secret |
25111
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
438 |
$ hg summary -R initialrepo --quiet |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
439 |
parent: 7:17a481b3bccb tip |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
440 |
update: 1 new changesets, 2 branch heads (merge) |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
441 |
|
15819
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
442 |
Test revset |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
443 |
|
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
444 |
$ cd initialrepo |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
445 |
$ hglog -r 'public()' |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
446 |
o 1 0 B |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
447 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
448 |
o 0 0 A |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
449 |
|
15819
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
450 |
$ hglog -r 'draft()' |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
451 |
o 6 1 B' |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
452 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
453 |
~ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
454 |
o 3 1 D |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
455 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
456 |
o 2 1 C |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
457 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
458 |
~ |
15819
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
459 |
$ hglog -r 'secret()' |
49770
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
460 |
@ 7 2 merge B' and E |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
461 |
|\ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
462 |
| ~ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
463 |
| o 5 2 H |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
464 |
|/ |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
465 |
o 4 2 E |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
466 |
| |
9da992241302
tests: use graph log in test-phases.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
49452
diff
changeset
|
467 |
~ |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
468 |
|
15907
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
469 |
test that phase are displayed in log at debug level |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
470 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
471 |
$ hg log --debug |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
472 |
changeset: 7:17a481b3bccb796c0521ae97903d81c52bfee4af |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
473 |
tag: tip |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
474 |
phase: secret |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
475 |
parent: 6:cf9fe039dfd67e829edf6522a45de057b5c86519 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
476 |
parent: 4:a603bfb5a83e312131cebcd05353c217d4d21dde |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
477 |
manifest: 7:5e724ffacba267b2ab726c91fc8b650710deaaa8 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
478 |
user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
479 |
date: Thu Jan 01 00:00:00 1970 +0000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
480 |
extra: branch=default |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
481 |
description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
482 |
merge B' and E |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
483 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
484 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
485 |
changeset: 6:cf9fe039dfd67e829edf6522a45de057b5c86519 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
486 |
phase: draft |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
487 |
parent: 1:27547f69f25460a52fff66ad004e58da7ad3fb56 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
488 |
parent: -1:0000000000000000000000000000000000000000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
489 |
manifest: 6:ab8bfef2392903058bf4ebb9e7746e8d7026b27a |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
490 |
user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
491 |
date: Thu Jan 01 00:00:00 1970 +0000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
492 |
files+: B' |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
493 |
extra: branch=default |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
494 |
description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
495 |
B' |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
496 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
497 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
498 |
changeset: 5:a030c6be5127abc010fcbff1851536552e6951a8 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
499 |
phase: secret |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
500 |
parent: 4:a603bfb5a83e312131cebcd05353c217d4d21dde |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
501 |
parent: -1:0000000000000000000000000000000000000000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
502 |
manifest: 5:5c710aa854874fe3d5fa7192e77bdb314cc08b5a |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
503 |
user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
504 |
date: Thu Jan 01 00:00:00 1970 +0000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
505 |
files+: H |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
506 |
extra: branch=default |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
507 |
description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
508 |
H |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
509 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
510 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
511 |
changeset: 4:a603bfb5a83e312131cebcd05353c217d4d21dde |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
512 |
phase: secret |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
513 |
parent: 3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
514 |
parent: -1:0000000000000000000000000000000000000000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
515 |
manifest: 4:7173fd1c27119750b959e3a0f47ed78abe75d6dc |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
516 |
user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
517 |
date: Thu Jan 01 00:00:00 1970 +0000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
518 |
files+: E |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
519 |
extra: branch=default |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
520 |
description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
521 |
E |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
522 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
523 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
524 |
changeset: 3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
525 |
phase: draft |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
526 |
parent: 2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
527 |
parent: -1:0000000000000000000000000000000000000000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
528 |
manifest: 3:6e1f4c47ecb533ffd0c8e52cdc88afb6cd39e20c |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
529 |
user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
530 |
date: Thu Jan 01 00:00:00 1970 +0000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
531 |
files+: D |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
532 |
extra: branch=default |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
533 |
description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
534 |
D |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
535 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
536 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
537 |
changeset: 2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
538 |
phase: draft |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
539 |
parent: 1:27547f69f25460a52fff66ad004e58da7ad3fb56 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
540 |
parent: -1:0000000000000000000000000000000000000000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
541 |
manifest: 2:66a5a01817fdf5239c273802b5b7618d051c89e4 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
542 |
user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
543 |
date: Thu Jan 01 00:00:00 1970 +0000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
544 |
files+: C |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
545 |
extra: branch=default |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
546 |
description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
547 |
C |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
548 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
549 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
550 |
changeset: 1:27547f69f25460a52fff66ad004e58da7ad3fb56 |
22765
55dcc7fb731c
log: do not hide the public phase in debug mode (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21024
diff
changeset
|
551 |
phase: public |
15907
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
552 |
parent: 0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
553 |
parent: -1:0000000000000000000000000000000000000000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
554 |
manifest: 1:cb5cbbc1bfbf24cc34b9e8c16914e9caa2d2a7fd |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
555 |
user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
556 |
date: Thu Jan 01 00:00:00 1970 +0000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
557 |
files+: B |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
558 |
extra: branch=default |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
559 |
description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
560 |
B |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
561 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
562 |
|
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
563 |
changeset: 0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256 |
22765
55dcc7fb731c
log: do not hide the public phase in debug mode (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21024
diff
changeset
|
564 |
phase: public |
15907
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
565 |
parent: -1:0000000000000000000000000000000000000000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
566 |
parent: -1:0000000000000000000000000000000000000000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
567 |
manifest: 0:007d8c9d88841325f5c6b06371b35b4e8a2b1a83 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
568 |
user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
569 |
date: Thu Jan 01 00:00:00 1970 +0000 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
570 |
files+: A |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
571 |
extra: branch=default |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
572 |
description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
573 |
A |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
574 |
|
17985
f94ead934067
tests: fix broken fix of test-phases output
Matt Mackall <mpm@selenic.com>
parents:
17979
diff
changeset
|
575 |
|
17979
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
576 |
|
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
577 |
|
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
578 |
(Issue3707) |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
579 |
test invalid phase name |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
580 |
|
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
581 |
$ mkcommit I --config phases.new-commit='babar' |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
582 |
transaction abort! |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
583 |
rollback completed |
45894
9dc1351d0b5f
errors: raise ConfigError on failure to parse config file
Martin von Zweigbergk <martinvonz@google.com>
parents:
45841
diff
changeset
|
584 |
config error: phases.new-commit: not a valid phase name ('babar') |
45841
bff719525815
errors: set detailed exit code to 30 for config errors
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
585 |
[30] |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
586 |
Test phase command |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
587 |
=================== |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
588 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
589 |
initial picture |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
590 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
591 |
$ hg log -G --template "{rev} {phase} {desc}\n" |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
592 |
@ 7 secret merge B' and E |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
593 |
|\ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
594 |
| o 6 draft B' |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
595 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
596 |
+---o 5 secret H |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
597 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
598 |
o | 4 secret E |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
599 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
600 |
o | 3 draft D |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
601 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
602 |
o | 2 draft C |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
603 |
|/ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
604 |
o 1 public B |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
605 |
| |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
606 |
o 0 public A |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
607 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
608 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
609 |
display changesets phase |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
610 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
611 |
(mixing -r and plain rev specification) |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
612 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
613 |
$ hg phase 1::4 -r 7 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
614 |
1: public |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
615 |
2: draft |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
616 |
3: draft |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
617 |
4: secret |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
618 |
7: secret |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
619 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
620 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
621 |
move changeset forward |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
622 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
623 |
(with -r option) |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
624 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
625 |
$ hg phase --public -r 2 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
626 |
test-debug-phase: move rev 2: 1 -> 0 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
627 |
test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: draft -> public |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
628 |
$ hg log -G --template "{rev} {phase} {desc}\n" |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
629 |
@ 7 secret merge B' and E |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
630 |
|\ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
631 |
| o 6 draft B' |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
632 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
633 |
+---o 5 secret H |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
634 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
635 |
o | 4 secret E |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
636 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
637 |
o | 3 draft D |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
638 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
639 |
o | 2 public C |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
640 |
|/ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
641 |
o 1 public B |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
642 |
| |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
643 |
o 0 public A |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
644 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
645 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
646 |
move changeset backward |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
647 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
648 |
(without -r option) |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
649 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
650 |
$ hg phase --draft --force 2 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
651 |
test-debug-phase: move rev 2: 0 -> 1 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
652 |
test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: public -> draft |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
653 |
$ hg log -G --template "{rev} {phase} {desc}\n" |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
654 |
@ 7 secret merge B' and E |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
655 |
|\ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
656 |
| o 6 draft B' |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
657 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
658 |
+---o 5 secret H |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
659 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
660 |
o | 4 secret E |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
661 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
662 |
o | 3 draft D |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
663 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
664 |
o | 2 draft C |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
665 |
|/ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
666 |
o 1 public B |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
667 |
| |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
668 |
o 0 public A |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
669 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
670 |
|
31152
b7cef987356d
phases: remove experimental.nativephaseskillswitch
Jun Wu <quark@fb.com>
parents:
31053
diff
changeset
|
671 |
move changeset forward and backward |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
672 |
|
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
673 |
$ hg phase --draft --force 1::4 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
674 |
test-debug-phase: move rev 1: 0 -> 1 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
675 |
test-debug-phase: move rev 4: 2 -> 1 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
676 |
test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: public -> draft |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
677 |
test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: secret -> draft |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
678 |
$ hg log -G --template "{rev} {phase} {desc}\n" |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
679 |
@ 7 secret merge B' and E |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
680 |
|\ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
681 |
| o 6 draft B' |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
682 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
683 |
+---o 5 secret H |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
684 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
685 |
o | 4 draft E |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
686 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
687 |
o | 3 draft D |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
688 |
| | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
689 |
o | 2 draft C |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
690 |
|/ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
691 |
o 1 draft B |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
692 |
| |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
693 |
o 0 public A |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
694 |
|
16097
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
695 |
test partial failure |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
696 |
|
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
697 |
$ hg phase --public 7 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
698 |
test-debug-phase: move rev 1: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
699 |
test-debug-phase: move rev 2: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
700 |
test-debug-phase: move rev 3: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
701 |
test-debug-phase: move rev 4: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
702 |
test-debug-phase: move rev 6: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
703 |
test-debug-phase: move rev 7: 2 -> 0 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
704 |
test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: draft -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
705 |
test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: draft -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
706 |
test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: draft -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
707 |
test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: draft -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
708 |
test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: draft -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
709 |
test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: secret -> public |
16097
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
710 |
$ hg phase --draft '5 or 7' |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
711 |
test-debug-phase: move rev 5: 2 -> 1 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
712 |
test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: secret -> draft |
20093
1dee888b22f7
phase: better error message when --force is needed
Martin Geisler <martin@geisler.net>
parents:
18462
diff
changeset
|
713 |
cannot move 1 changesets to a higher phase, use --force |
16097
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
714 |
phase changed for 1 changesets |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
715 |
[1] |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
716 |
$ hg log -G --template "{rev} {phase} {desc}\n" |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
717 |
@ 7 public merge B' and E |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
718 |
|\ |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
719 |
| o 6 public B' |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
720 |
| | |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
721 |
+---o 5 draft H |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
722 |
| | |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
723 |
o | 4 public E |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
724 |
| | |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
725 |
o | 3 public D |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
726 |
| | |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
727 |
o | 2 public C |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
728 |
|/ |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
729 |
o 1 public B |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
730 |
| |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
731 |
o 0 public A |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
732 |
|
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
733 |
|
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
734 |
test complete failure |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
735 |
|
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
736 |
$ hg phase --draft 7 |
20093
1dee888b22f7
phase: better error message when --force is needed
Martin Geisler <martin@geisler.net>
parents:
18462
diff
changeset
|
737 |
cannot move 1 changesets to a higher phase, use --force |
16097
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
738 |
no phases changed |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
739 |
[1] |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16659
diff
changeset
|
740 |
|
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16659
diff
changeset
|
741 |
$ cd .. |
20332
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
742 |
|
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
743 |
test hidden changeset are not cloned as public (issue3935) |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
744 |
|
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
745 |
$ cd initialrepo |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
746 |
|
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
747 |
(enabling evolution) |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22765
diff
changeset
|
748 |
$ cat >> $HGRCPATH << EOF |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22765
diff
changeset
|
749 |
> [experimental] |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34711
diff
changeset
|
750 |
> evolution.createmarkers=True |
20332
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
751 |
> EOF |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
752 |
|
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
753 |
(making a changeset hidden; H in that case) |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
754 |
$ hg debugobsolete `hg id --debug -r 5` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
40919
diff
changeset
|
755 |
1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33459
diff
changeset
|
756 |
obsoleted 1 changesets |
20332
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
757 |
|
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
758 |
$ cd .. |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
759 |
$ hg clone initialrepo clonewithobs |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
760 |
requesting all changes |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
761 |
adding changesets |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
762 |
adding manifests |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
763 |
adding file changes |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
764 |
added 7 changesets with 6 changes to 6 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
765 |
new changesets 4a2df7238c3b:17a481b3bccb |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
766 |
test-debug-phase: new rev 0: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
767 |
test-debug-phase: new rev 1: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
768 |
test-debug-phase: new rev 2: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
769 |
test-debug-phase: new rev 3: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
770 |
test-debug-phase: new rev 4: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
771 |
test-debug-phase: new rev 5: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32268
diff
changeset
|
772 |
test-debug-phase: new rev 6: x -> 0 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
773 |
test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
774 |
test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
775 |
test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
776 |
test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
777 |
test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
778 |
test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
779 |
test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: -> public |
20332
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
780 |
updating to branch default |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
781 |
6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
782 |
$ cd clonewithobs |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
783 |
$ hg log -G --template "{rev} {phase} {desc}\n" |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
784 |
@ 6 public merge B' and E |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
785 |
|\ |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
786 |
| o 5 public B' |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
787 |
| | |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
788 |
o | 4 public E |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
789 |
| | |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
790 |
o | 3 public D |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
791 |
| | |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
792 |
o | 2 public C |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
793 |
|/ |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
794 |
o 1 public B |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
795 |
| |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
796 |
o 0 public A |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
797 |
|
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
798 |
|
20530
78f547cdc362
verify: do not prevent verify repository containing hidden changesets
Yuya Nishihara <yuya@tcha.org>
parents:
20332
diff
changeset
|
799 |
test verify repo containing hidden changesets, which should not abort just |
78f547cdc362
verify: do not prevent verify repository containing hidden changesets
Yuya Nishihara <yuya@tcha.org>
parents:
20332
diff
changeset
|
800 |
because repo.cancopy() is False |
20332
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
801 |
|
20530
78f547cdc362
verify: do not prevent verify repository containing hidden changesets
Yuya Nishihara <yuya@tcha.org>
parents:
20332
diff
changeset
|
802 |
$ cd ../initialrepo |
49825
2f2682f40ea0
tests: use the `--quiet` flag for verify when applicable
Raphaël Gomès <rgomes@octobus.net>
parents:
49771
diff
changeset
|
803 |
$ hg verify -q |
31053
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
804 |
|
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
805 |
$ cd .. |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
806 |
|
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
807 |
check whether HG_PENDING makes pending changes only in related |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
808 |
repositories visible to an external hook. |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
809 |
|
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
810 |
(emulate a transaction running concurrently by copied |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
811 |
.hg/phaseroots.pending in subsequent test) |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
812 |
|
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
813 |
$ cat > $TESTTMP/savepending.sh <<EOF |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
814 |
> cp .hg/store/phaseroots.pending .hg/store/phaseroots.pending.saved |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
815 |
> exit 1 # to avoid changing phase for subsequent tests |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
816 |
> EOF |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
817 |
$ cd push-dest |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
818 |
$ hg phase 6 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
819 |
6: draft |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
820 |
$ hg --config hooks.pretxnclose="sh $TESTTMP/savepending.sh" phase -f -s 6 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
821 |
abort: pretxnclose hook exited with status 1 |
46417
768056549737
errors: use exit code 40 for when a hook fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
45894
diff
changeset
|
822 |
[40] |
31053
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
823 |
$ cp .hg/store/phaseroots.pending.saved .hg/store/phaseroots.pending |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
824 |
|
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
825 |
(check (in)visibility of phaseroot while transaction running in repo) |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
826 |
|
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
827 |
$ cat > $TESTTMP/checkpending.sh <<EOF |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
828 |
> echo '@initialrepo' |
31767
6c800688afe1
tests: quote paths in shell script hooks
Matt Harbison <matt_harbison@yahoo.com>
parents:
31152
diff
changeset
|
829 |
> hg -R "$TESTTMP/initialrepo" phase 7 |
31053
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
830 |
> echo '@push-dest' |
31767
6c800688afe1
tests: quote paths in shell script hooks
Matt Harbison <matt_harbison@yahoo.com>
parents:
31152
diff
changeset
|
831 |
> hg -R "$TESTTMP/push-dest" phase 6 |
31053
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
832 |
> exit 1 # to avoid changing phase for subsequent tests |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
833 |
> EOF |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
834 |
$ cd ../initialrepo |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
835 |
$ hg phase 7 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
836 |
7: public |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
837 |
$ hg --config hooks.pretxnclose="sh $TESTTMP/checkpending.sh" phase -f -s 7 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
838 |
@initialrepo |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
839 |
7: secret |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
840 |
@push-dest |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
841 |
6: draft |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
842 |
abort: pretxnclose hook exited with status 1 |
46417
768056549737
errors: use exit code 40 for when a hook fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
45894
diff
changeset
|
843 |
[40] |
34711
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
844 |
|
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
845 |
Check that pretxnclose-phase hook can control phase movement |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
846 |
|
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
847 |
$ hg phase --force b3325c91a4d9 --secret |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
848 |
test-debug-phase: move rev 3: 0 -> 2 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
849 |
test-debug-phase: move rev 4: 0 -> 2 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
850 |
test-debug-phase: move rev 5: 1 -> 2 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
851 |
test-debug-phase: move rev 7: 0 -> 2 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
852 |
test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: public -> secret |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
853 |
test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: public -> secret |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
854 |
test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: draft -> secret |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
855 |
test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: public -> secret |
34711
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
856 |
$ hg log -G -T phases |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
857 |
@ changeset: 7:17a481b3bccb |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
858 |
|\ tag: tip |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
859 |
| | phase: secret |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
860 |
| | parent: 6:cf9fe039dfd6 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
861 |
| | parent: 4:a603bfb5a83e |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
862 |
| | user: test |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
863 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
864 |
| | summary: merge B' and E |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
865 |
| | |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
866 |
| o changeset: 6:cf9fe039dfd6 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
867 |
| | phase: public |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
868 |
| | parent: 1:27547f69f254 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
869 |
| | user: test |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
870 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
871 |
| | summary: B' |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
872 |
| | |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
873 |
o | changeset: 4:a603bfb5a83e |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
874 |
| | phase: secret |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
875 |
| | user: test |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
876 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
877 |
| | summary: E |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
878 |
| | |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
879 |
o | changeset: 3:b3325c91a4d9 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
880 |
| | phase: secret |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
881 |
| | user: test |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
882 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
883 |
| | summary: D |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
884 |
| | |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
885 |
o | changeset: 2:f838bfaca5c7 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
886 |
|/ phase: public |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
887 |
| user: test |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
888 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
889 |
| summary: C |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
890 |
| |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
891 |
o changeset: 1:27547f69f254 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
892 |
| phase: public |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
893 |
| user: test |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
894 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
895 |
| summary: B |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
896 |
| |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
897 |
o changeset: 0:4a2df7238c3b |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
898 |
phase: public |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
899 |
user: test |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
900 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
901 |
summary: A |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
902 |
|
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
903 |
|
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
904 |
Install a hook that prevent b3325c91a4d9 to become public |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
905 |
|
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
906 |
$ cat >> .hg/hgrc << EOF |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
907 |
> [hooks] |
34938
aa05b95949fe
tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34876
diff
changeset
|
908 |
> pretxnclose-phase.nopublish_D = sh -c "(echo \$HG_NODE| grep -v b3325c91a4d9>/dev/null) || [ 'public' != \$HG_PHASE ]" |
34711
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
909 |
> EOF |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
910 |
|
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
911 |
Try various actions. only the draft move should succeed |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
912 |
|
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
913 |
$ hg phase --public b3325c91a4d9 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
914 |
abort: pretxnclose-phase.nopublish_D hook exited with status 1 |
46417
768056549737
errors: use exit code 40 for when a hook fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
45894
diff
changeset
|
915 |
[40] |
34711
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
916 |
$ hg phase --public a603bfb5a83e |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
917 |
abort: pretxnclose-phase.nopublish_D hook exited with status 1 |
46417
768056549737
errors: use exit code 40 for when a hook fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
45894
diff
changeset
|
918 |
[40] |
34711
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
919 |
$ hg phase --draft 17a481b3bccb |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
920 |
test-debug-phase: move rev 3: 2 -> 1 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
921 |
test-debug-phase: move rev 4: 2 -> 1 |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
922 |
test-debug-phase: move rev 7: 2 -> 1 |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
923 |
test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: secret -> draft |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
924 |
test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: secret -> draft |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34866
diff
changeset
|
925 |
test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: secret -> draft |
34711
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
926 |
$ hg phase --public 17a481b3bccb |
f6d17075608f
phase: add a dedicated pretxnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
927 |
abort: pretxnclose-phase.nopublish_D hook exited with status 1 |
46417
768056549737
errors: use exit code 40 for when a hook fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
45894
diff
changeset
|
928 |
[40] |
39297
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
929 |
|
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
930 |
$ cd .. |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
931 |
|
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
932 |
Test for the "internal" phase |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
933 |
============================= |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
934 |
|
39299
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
935 |
Check we deny its usage on older repository |
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
936 |
|
49452
74fb1842f8b9
phase: rename the requirement for internal-phase (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49451
diff
changeset
|
937 |
$ hg init no-internal-phase --config format.use-internal-phase=no |
39299
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
938 |
$ cd no-internal-phase |
48463
880adb2cd147
test: simplify `debugformat` matching in test-phases.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48321
diff
changeset
|
939 |
$ hg debugrequires | grep internal-phase |
880adb2cd147
test: simplify `debugformat` matching in test-phases.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48321
diff
changeset
|
940 |
[1] |
39299
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
941 |
$ echo X > X |
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
942 |
$ hg add X |
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
943 |
$ hg status |
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
944 |
A X |
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
945 |
$ hg --config "phases.new-commit=internal" commit -m "my test internal commit" 2>&1 | grep ProgrammingError |
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
946 |
** ProgrammingError: this repository does not support the internal phase |
47841
f1af5a084862
pyoxidized: adapt output of `test-phases.t`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47279
diff
changeset
|
947 |
raise error.ProgrammingError(msg) (no-pyoxidizer !) |
45212
41021660baa1
tests: glob 'mercurial.error' in test-phases.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44618
diff
changeset
|
948 |
*ProgrammingError: this repository does not support the internal phase (glob) |
40417
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
949 |
$ hg --config "phases.new-commit=archived" commit -m "my test archived commit" 2>&1 | grep ProgrammingError |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
950 |
** ProgrammingError: this repository does not support the archived phase |
47841
f1af5a084862
pyoxidized: adapt output of `test-phases.t`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47279
diff
changeset
|
951 |
raise error.ProgrammingError(msg) (no-pyoxidizer !) |
45212
41021660baa1
tests: glob 'mercurial.error' in test-phases.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44618
diff
changeset
|
952 |
*ProgrammingError: this repository does not support the archived phase (glob) |
39299
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
953 |
|
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
954 |
$ cd .. |
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
955 |
|
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
956 |
Check it works fine with repository that supports it. |
7775c1fb8fa0
phases: enforce internal phase support
Boris Feld <boris.feld@octobus.net>
parents:
39297
diff
changeset
|
957 |
|
49452
74fb1842f8b9
phase: rename the requirement for internal-phase (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49451
diff
changeset
|
958 |
$ hg init internal-phase --config format.use-internal-phase=yes |
39297
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
959 |
$ cd internal-phase |
48463
880adb2cd147
test: simplify `debugformat` matching in test-phases.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48321
diff
changeset
|
960 |
$ hg debugrequires | grep internal-phase |
49452
74fb1842f8b9
phase: rename the requirement for internal-phase (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49451
diff
changeset
|
961 |
internal-phase-2 |
39297
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
962 |
$ mkcommit A |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
963 |
test-debug-phase: new rev 0: x -> 1 |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
964 |
test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> draft |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
965 |
|
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
966 |
Commit an internal changesets |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
967 |
|
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
968 |
$ echo B > B |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
969 |
$ hg add B |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
970 |
$ hg status |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
971 |
A B |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
972 |
$ hg --config "phases.new-commit=internal" commit -m "my test internal commit" |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
973 |
test-debug-phase: new rev 1: x -> 96 |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
974 |
test-hook-close-phase: c01c42dffc7f81223397e99652a0703f83e1c5ea: -> internal |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
975 |
|
40417
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
976 |
The changeset is a working parent descendant. |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
977 |
Per the usual visibility rules, it is made visible. |
39297
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
978 |
|
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
979 |
$ hg log -G -l 3 |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
980 |
@ changeset: 1:c01c42dffc7f |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
981 |
| tag: tip |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
982 |
| user: test |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
983 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
984 |
| summary: my test internal commit |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
985 |
| |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
986 |
o changeset: 0:4a2df7238c3b |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
987 |
user: test |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
988 |
date: Thu Jan 01 00:00:00 1970 +0000 |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
989 |
summary: A |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
990 |
|
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
991 |
|
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
992 |
Commit is hidden as expected |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
993 |
|
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
994 |
$ hg up 0 |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
995 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
996 |
$ hg log -G |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
997 |
@ changeset: 0:4a2df7238c3b |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
998 |
tag: tip |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
999 |
user: test |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
1000 |
date: Thu Jan 01 00:00:00 1970 +0000 |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
1001 |
summary: A |
06c976acc581
phases: add an internal phases
Boris Feld <boris.feld@octobus.net>
parents:
34938
diff
changeset
|
1002 |
|
40417
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1003 |
|
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1004 |
Test for archived phase |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1005 |
----------------------- |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1006 |
|
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1007 |
Commit an archived changesets |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1008 |
|
49451
0c70d888a484
phase: introduce a dedicated requirement for the `archived` phase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49315
diff
changeset
|
1009 |
$ cd .. |
0c70d888a484
phase: introduce a dedicated requirement for the `archived` phase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49315
diff
changeset
|
1010 |
$ hg clone --quiet --pull internal-phase archived-phase \ |
0c70d888a484
phase: introduce a dedicated requirement for the `archived` phase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49315
diff
changeset
|
1011 |
> --config format.exp-archived-phase=yes \ |
0c70d888a484
phase: introduce a dedicated requirement for the `archived` phase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49315
diff
changeset
|
1012 |
> --config extensions.phasereport='!' \ |
0c70d888a484
phase: introduce a dedicated requirement for the `archived` phase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49315
diff
changeset
|
1013 |
> --config hooks.txnclose-phase.test= |
0c70d888a484
phase: introduce a dedicated requirement for the `archived` phase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49315
diff
changeset
|
1014 |
|
0c70d888a484
phase: introduce a dedicated requirement for the `archived` phase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49315
diff
changeset
|
1015 |
$ cd archived-phase |
0c70d888a484
phase: introduce a dedicated requirement for the `archived` phase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49315
diff
changeset
|
1016 |
|
40417
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1017 |
$ echo B > B |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1018 |
$ hg add B |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1019 |
$ hg status |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1020 |
A B |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1021 |
$ hg --config "phases.new-commit=archived" commit -m "my test archived commit" |
49451
0c70d888a484
phase: introduce a dedicated requirement for the `archived` phase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49315
diff
changeset
|
1022 |
test-debug-phase: new rev 1: x -> 32 |
40417
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1023 |
test-hook-close-phase: 8df5997c3361518f733d1ae67cd3adb9b0eaf125: -> archived |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1024 |
|
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1025 |
The changeset is a working parent descendant. |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1026 |
Per the usual visibility rules, it is made visible. |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1027 |
|
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1028 |
$ hg log -G -l 3 |
49451
0c70d888a484
phase: introduce a dedicated requirement for the `archived` phase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49315
diff
changeset
|
1029 |
@ changeset: 1:8df5997c3361 |
40417
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1030 |
| tag: tip |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1031 |
| user: test |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1032 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1033 |
| summary: my test archived commit |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1034 |
| |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1035 |
o changeset: 0:4a2df7238c3b |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1036 |
user: test |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1037 |
date: Thu Jan 01 00:00:00 1970 +0000 |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1038 |
summary: A |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1039 |
|
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1040 |
|
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1041 |
Commit is hidden as expected |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1042 |
|
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1043 |
$ hg up 0 |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1044 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1045 |
$ hg log -G |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1046 |
@ changeset: 0:4a2df7238c3b |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1047 |
tag: tip |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1048 |
user: test |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1049 |
date: Thu Jan 01 00:00:00 1970 +0000 |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1050 |
summary: A |
49c7b701fdc2
phase: add an archived phase
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
1051 |
|
45757
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1052 |
$ cd .. |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1053 |
|
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1054 |
Recommitting an exact match of a public commit shouldn't change it to |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1055 |
draft: |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1056 |
|
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1057 |
$ cd initialrepo |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1058 |
$ hg phase -r 2 |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1059 |
2: public |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1060 |
$ hg up -C 1 |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1061 |
0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1062 |
$ mkcommit C |
45812
976b26bdd0d8
commit: warn the user when a commit already exists
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45757
diff
changeset
|
1063 |
warning: commit already existed in the repository! |
45757
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1064 |
$ hg phase -r 2 |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1065 |
2: public |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1066 |
|
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1067 |
Same, but for secret: |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1068 |
|
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1069 |
$ hg up 7 |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1070 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1071 |
$ mkcommit F -s |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1072 |
test-debug-phase: new rev 8: x -> 2 |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1073 |
test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a: -> secret |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1074 |
$ hg up 7 |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1075 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1076 |
$ hg phase |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1077 |
7: draft |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1078 |
$ mkcommit F |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1079 |
test-debug-phase: new rev 8: x -> 2 |
45812
976b26bdd0d8
commit: warn the user when a commit already exists
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45757
diff
changeset
|
1080 |
warning: commit already existed in the repository! |
45757
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1081 |
test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a: -> secret |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1082 |
$ hg phase -r tip |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1083 |
8: secret |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1084 |
|
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1085 |
But what about obsoleted changesets? |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1086 |
|
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1087 |
$ hg up 4 |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1088 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1089 |
$ mkcommit H |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1090 |
test-debug-phase: new rev 5: x -> 2 |
45812
976b26bdd0d8
commit: warn the user when a commit already exists
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45757
diff
changeset
|
1091 |
warning: commit already existed in the repository! |
45757
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1092 |
test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: -> secret |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1093 |
$ hg phase -r 5 |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1094 |
5: secret |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1095 |
$ hg par |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1096 |
changeset: 5:a030c6be5127 |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1097 |
user: test |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1098 |
date: Thu Jan 01 00:00:00 1970 +0000 |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1099 |
obsolete: pruned |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1100 |
summary: H |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1101 |
|
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1102 |
$ hg up tip |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1103 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
067707e026b4
commit: don't change phases for preexisting commits
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
45212
diff
changeset
|
1104 |
$ cd .. |
49771
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1105 |
|
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1106 |
Testing that command line flags override configuration |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1107 |
|
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1108 |
$ hg init commit-overrides |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1109 |
$ cd commit-overrides |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1110 |
|
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1111 |
`hg commit --draft` overrides new-commit=secret |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1112 |
|
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1113 |
$ mkcommit A --config phases.new-commit='secret' --draft |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1114 |
test-debug-phase: new rev 0: x -> 1 |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1115 |
test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> draft |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1116 |
$ hglog |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1117 |
@ 0 1 A |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1118 |
|
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1119 |
|
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1120 |
`hg commit --secret` overrides new-commit=draft |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1121 |
|
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1122 |
$ mkcommit B --config phases.new-commit='draft' --secret |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1123 |
test-debug-phase: new rev 1: x -> 2 |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1124 |
test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> secret |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1125 |
$ hglog |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1126 |
@ 1 2 B |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1127 |
| |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1128 |
o 0 1 A |
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1129 |
|
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1130 |
|
f0e9dda408b3
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents:
49770
diff
changeset
|
1131 |
$ cd .. |