Mercurial > hg-stable
annotate tests/test-phases.t @ 34710:cdf833d7de98
phase: add a dedicated txnclose-phase hook
The new 'txnclose-phase' hook expose the phase movement information stored in
'tr.changes['phases]'. To provide a simple and straightforward hook API to the
users, we introduce a new hook called for each revision affected. Since a
transaction can affect the phase of multiple changesets, updating the existing
'txnclose' hook to expose that information would be more complex. The data for
all moves will not fit in environment variables and iterations over each move
would be cumbersome. So the introduction of a new dedicated hook is
preferred in this changesets.
This does not exclude the addition of the full phase movement information to
the existing 'txnclose' in the future to help write more complex hooks.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Sun, 08 Oct 2017 17:50:46 +0200 |
parents | eb586ed5d8ce |
children | f6d17075608f |
rev | line source |
---|---|
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
1 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
2 $ cat >> $HGRCPATH << EOF |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
3 > [extensions] |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
4 > 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
|
5 > [hooks] |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
6 > txnclose-phase.test = echo "test-hook-close-phase: \$HG_NODE: \$HG_OLDPHASE -> \$HG_PHASE" |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
7 > EOF |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
8 |
16013
2a1d97630f7f
tests: don't use alias
Mads Kiilerich <mads@kiilerich.com>
parents:
15907
diff
changeset
|
9 $ hglog() { hg log --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
|
10 $ 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
|
11 > 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
|
12 > 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
|
13 > 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
|
14 > 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
|
15 > 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
|
16 > } |
15423
ea5b346024e1
phases: add a very simple test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 |
ea5b346024e1
phases: add a very simple test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
18 $ hg init initialrepo |
ea5b346024e1
phases: add a very simple test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 $ cd initialrepo |
16622
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
20 |
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
21 Cannot change null revision phase |
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
22 |
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
23 $ 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
|
24 abort: cannot change null revision phase |
16622
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
25 [255] |
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
26 $ hg phase null |
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
27 -1: public |
e4451d7432fa
test-phases: test changing null revision phase
Patrick Mezard <patrick@mezard.eu>
parents:
16535
diff
changeset
|
28 |
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
|
29 $ mkcommit A |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
30 test-debug-phase: new rev 0: x -> 1 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
31 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> 1 |
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 |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
33 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
|
34 |
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 $ hglog |
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 0 1 A |
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 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
|
39 |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
40 $ mkcommit B |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
41 test-debug-phase: new rev 1: x -> 1 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
42 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> 1 |
15423
ea5b346024e1
phases: add a very simple test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
43 |
ea5b346024e1
phases: add a very simple test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
44 $ hglog |
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
|
45 1 1 B |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
46 0 1 A |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
47 |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
48 Draft commit are properly created over public one: |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
49 |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
50 $ hg phase --public . |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
51 test-debug-phase: move rev 0: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
52 test-debug-phase: move rev 1: 1 -> 0 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
53 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: 1 -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
54 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: 1 -> 0 |
25120
a7701001c829
phase: default to current revision if no rev is provided (issue4666)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
55 $ hg phase |
a7701001c829
phase: default to current revision if no rev is provided (issue4666)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
56 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
|
57 $ hglog |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
58 1 0 B |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
59 0 0 A |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
60 |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
61 $ mkcommit C |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
62 test-debug-phase: new rev 2: x -> 1 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
63 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> 1 |
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
|
64 $ mkcommit D |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
65 test-debug-phase: new rev 3: x -> 1 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
66 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> 1 |
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
|
67 |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
68 $ hglog |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
69 3 1 D |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
70 2 1 C |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
71 1 0 B |
1e4e49c58b94
phases: add a bit more test for local phase movement.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15483
diff
changeset
|
72 0 0 A |
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
|
73 |
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
|
74 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
|
75 |
16030
308406677e9d
phases: allow phase name in phases.new-commit settings
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16013
diff
changeset
|
76 $ mkcommit E --config phases.new-commit='secret' |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
77 test-debug-phase: new rev 4: x -> 2 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
78 test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: -> 2 |
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
|
79 $ hglog |
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
|
80 4 2 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
|
81 3 1 D |
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
|
82 2 1 C |
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
|
83 1 0 B |
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
|
84 0 0 A |
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
|
85 |
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
|
86 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
|
87 |
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
|
88 $ mkcommit H |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
89 test-debug-phase: new rev 5: x -> 2 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
90 test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: -> 2 |
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
|
91 $ hglog |
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
|
92 5 2 H |
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
|
93 4 2 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
|
94 3 1 D |
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
|
95 2 1 C |
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
|
96 1 0 B |
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
|
97 0 0 A |
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
|
98 |
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
|
99 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
|
100 |
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
|
101 $ 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
|
102 $ mkcommit "B'" |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
103 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
|
104 created new head |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
105 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> 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
|
106 $ hglog |
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
|
107 6 1 B' |
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
|
108 5 2 H |
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
|
109 4 2 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
|
110 3 1 D |
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
|
111 2 1 C |
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
|
112 1 0 B |
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
|
113 0 0 A |
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
|
114 $ 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
|
115 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
|
116 (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
|
117 $ hg phase |
a7701001c829
phase: default to current revision if no rev is provided (issue4666)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
118 6: draft |
a7701001c829
phase: default to current revision if no rev is provided (issue4666)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
119 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
|
120 $ hg ci -m "merge B' and E" |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
121 test-debug-phase: new rev 7: x -> 2 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
122 test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: -> 2 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
123 |
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
|
124 $ hglog |
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
|
125 7 2 merge B' and 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
|
126 6 1 B' |
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
|
127 5 2 H |
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
|
128 4 2 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
|
129 3 1 D |
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 2 1 C |
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 1 0 B |
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 0 0 A |
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
|
133 |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
134 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
|
135 |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
136 $ 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
|
137 $ 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
|
138 > [phases] |
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
139 > publish=False |
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
140 > 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
|
141 $ 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
|
142 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
|
143 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
|
144 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
|
145 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
|
146 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
|
147 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
|
148 6 draft B' |
17198
ecde35a1af9e
outgoing: accept revset argument for --rev
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
149 $ 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
|
150 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
|
151 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
|
152 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
|
153 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
|
154 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
|
155 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
|
156 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
|
157 |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
158 $ 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
|
159 pushing to ../push-dest |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
160 searching for changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
161 adding changesets |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
162 adding manifests |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
163 adding file changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
164 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:
32308
diff
changeset
|
165 test-debug-phase: new rev 0: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
166 test-debug-phase: new rev 1: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
167 test-debug-phase: new rev 2: x -> 1 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
168 test-debug-phase: new rev 3: x -> 1 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
169 test-debug-phase: new rev 4: x -> 1 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
170 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
171 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
172 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> 1 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
173 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> 1 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
174 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> 1 |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
175 $ hglog |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
176 7 2 merge B' and E |
15820
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
177 6 1 B' |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
178 5 2 H |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
179 4 2 E |
15820
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
180 3 1 D |
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
181 2 1 C |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
182 1 0 B |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
183 0 0 A |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
184 $ cd ../push-dest |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
185 $ hglog |
15820
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
186 4 1 B' |
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
187 3 1 D |
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
188 2 1 C |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
189 1 0 B |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
190 0 0 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
|
191 |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
192 (Issue3303) |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
193 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
|
194 |
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20530
diff
changeset
|
195 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
|
196 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
|
197 |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
198 $ 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
|
199 $ mkcommit Z --config phases.new-commit=secret |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
200 test-debug-phase: new rev 5: x -> 2 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
201 test-hook-close-phase: 2713879da13d6eea1ff22b442a5a87cb31a7ce6a: -> 2 |
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
202 $ 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
|
203 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
|
204 |
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20530
diff
changeset
|
205 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
|
206 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
|
207 |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
208 $ 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
|
209 $ 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
|
210 $ mkcommit I |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
211 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
|
212 created new head |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
213 test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061: -> 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
|
214 $ 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
|
215 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
|
216 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
|
217 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
|
218 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
|
219 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
|
220 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:
32308
diff
changeset
|
221 test-debug-phase: new rev 6: x -> 1 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
222 test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061: -> 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
|
223 |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
224 :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
|
225 |
18462
593eb3786165
documentation: update to new filter names
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18394
diff
changeset
|
226 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
|
227 |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
228 $ ls ../push-dest/.hg/cache/branch2* |
32308
24f55686a63d
caches: stop warming the cache after changegroup application
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31770
diff
changeset
|
229 ../push-dest/.hg/cache/branch2-base |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
230 ../push-dest/.hg/cache/branch2-served |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
231 $ 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
|
232 6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722 |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
233 b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
234 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
|
235 $ 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
|
236 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
|
237 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
|
238 3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e draft |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
239 $ ls ../push-dest/.hg/cache/branch2* |
32308
24f55686a63d
caches: stop warming the cache after changegroup application
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31770
diff
changeset
|
240 ../push-dest/.hg/cache/branch2-base |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
241 ../push-dest/.hg/cache/branch2-served |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
242 ../push-dest/.hg/cache/branch2-visible |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
243 $ 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
|
244 6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722 |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
245 b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
246 6d6770faffce199f1fddd1cf87f6f026138cf061 o default |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
247 $ 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
|
248 6d6770faffce199f1fddd1cf87f6f026138cf061 6 |
20185
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
249 b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
250 2713879da13d6eea1ff22b442a5a87cb31a7ce6a o default |
7d4219512823
branchmap: cache open/closed branch head information
Brodie Rao <brodie@sf.io>
parents:
20117
diff
changeset
|
251 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
|
252 |
16535
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
253 |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16097
diff
changeset
|
254 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
|
255 $ 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
|
256 $ 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
|
257 $ cd .. |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
258 |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
259 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
|
260 |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
261 $ hg init pull-dest |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
262 $ cd pull-dest |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
263 $ hg pull ../initialrepo |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
264 pulling from ../initialrepo |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
265 requesting all changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
266 adding changesets |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
267 adding manifests |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
268 adding file changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
269 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:
33794
diff
changeset
|
270 new changesets 4a2df7238c3b:cf9fe039dfd6 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
271 test-debug-phase: new rev 0: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
272 test-debug-phase: new rev 1: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
273 test-debug-phase: new rev 2: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
274 test-debug-phase: new rev 3: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
275 test-debug-phase: new rev 4: x -> 0 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
276 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
277 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
278 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
279 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
280 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> 0 |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
281 (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
|
282 $ hglog |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
283 4 0 B' |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
284 3 0 D |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
285 2 0 C |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
286 1 0 B |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15712
diff
changeset
|
287 0 0 A |
15819
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
288 $ cd .. |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
289 |
15838
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
290 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
|
291 |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
292 $ 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
|
293 $ 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
|
294 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
|
295 $ cd .. |
7299e09a85a2
phases: make outgoing object and discovery aware of exclusion
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15830
diff
changeset
|
296 |
15888
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
297 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
|
298 (during local clone) |
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
299 |
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
300 $ hg clone -qU initialrepo clone-dest |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
301 test-debug-phase: new rev 0: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
302 test-debug-phase: new rev 1: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
303 test-debug-phase: new rev 2: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
304 test-debug-phase: new rev 3: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
305 test-debug-phase: new rev 4: x -> 0 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
306 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
307 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
308 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
309 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
310 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> 0 |
15888
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
311 $ hglog -R clone-dest |
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
312 4 0 B' |
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
313 3 0 D |
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
314 2 0 C |
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
315 1 0 B |
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
316 0 0 A |
2072e4031994
phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15838
diff
changeset
|
317 |
25111
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
318 Test summary |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
319 |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
320 $ 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
|
321 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
|
322 branch: default |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
323 commit: (clean) |
1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
Gilles Moris <gilles.moris@free.fr>
parents:
24520
diff
changeset
|
324 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
|
325 $ 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
|
326 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
|
327 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
|
328 branch: default |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25120
diff
changeset
|
329 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
|
330 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
|
331 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
|
332 $ 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
|
333 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
|
334 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
|
335 |
15819
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
336 Test revset |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
337 |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
338 $ cd initialrepo |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
339 $ hglog -r 'public()' |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
340 0 0 A |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
341 1 0 B |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
342 $ hglog -r 'draft()' |
15820
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
343 2 1 C |
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
344 3 1 D |
2673006f7989
phases: fix phase synchronization on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15819
diff
changeset
|
345 6 1 B' |
15819
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
346 $ hglog -r 'secret()' |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
347 4 2 E |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
348 5 2 H |
33ca11b010e2
phases: implements simple revset symbol
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
349 7 2 merge B' and E |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
350 |
15907
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
351 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
|
352 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
353 $ 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
|
354 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
|
355 tag: tip |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
356 phase: secret |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
357 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
|
358 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
|
359 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
|
360 user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
361 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
|
362 files+: C D E |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
363 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
|
364 description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
365 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
|
366 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
367 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
368 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
|
369 phase: draft |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
370 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
|
371 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
|
372 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
|
373 user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
374 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
|
375 files+: B' |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
376 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
|
377 description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
378 B' |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
379 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
380 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
381 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
|
382 phase: secret |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
383 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
|
384 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
|
385 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
|
386 user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
387 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
|
388 files+: H |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
389 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
|
390 description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
391 H |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
392 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
393 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
394 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
|
395 phase: secret |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
396 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
|
397 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
|
398 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
|
399 user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
400 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
|
401 files+: E |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
402 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
|
403 description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
404 E |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
405 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
406 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
407 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
|
408 phase: draft |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
409 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
|
410 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
|
411 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
|
412 user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
413 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
|
414 files+: D |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
415 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
|
416 description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
417 D |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
418 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
419 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
420 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
|
421 phase: draft |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
422 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
|
423 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
|
424 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
|
425 user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
426 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
|
427 files+: C |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
428 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
|
429 description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
430 C |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
431 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
432 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
433 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
|
434 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
|
435 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
|
436 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
|
437 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
|
438 user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
439 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
|
440 files+: B |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
441 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
|
442 description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
443 B |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
444 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
445 |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
446 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
|
447 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
|
448 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
|
449 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
|
450 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
|
451 user: test |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
452 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
|
453 files+: A |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
454 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
|
455 description: |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
456 A |
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15888
diff
changeset
|
457 |
17985
f94ead934067
tests: fix broken fix of test-phases output
Matt Mackall <mpm@selenic.com>
parents:
17979
diff
changeset
|
458 |
17979
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
459 |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
460 |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
461 (Issue3707) |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
462 test invalid phase name |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
463 |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
464 $ 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
|
465 transaction abort! |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
466 rollback completed |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
467 abort: phases.new-commit: not a valid phase name ('babar') |
b3ec0b5fd777
phases: fix missing "error" module import (issue3707)
André Sintzoff <andre.sintzoff@gmail.com>
parents:
17198
diff
changeset
|
468 [255] |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
469 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
|
470 =================== |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
471 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
472 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
|
473 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
474 $ 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
|
475 @ 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
|
476 |\ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
477 | 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
|
478 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
479 +---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
|
480 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
481 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
|
482 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
483 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
|
484 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
485 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
|
486 |/ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
487 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
|
488 | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
489 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
|
490 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
491 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
492 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
|
493 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
494 (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
|
495 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
496 $ 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
|
497 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
|
498 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
|
499 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
|
500 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
|
501 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
|
502 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
503 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
504 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
|
505 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
506 (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
|
507 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
508 $ hg phase --public -r 2 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
509 test-debug-phase: move rev 2: 1 -> 0 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
510 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: 1 -> 0 |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
511 $ 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
|
512 @ 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
|
513 |\ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
514 | 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
|
515 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
516 +---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
|
517 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
518 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
|
519 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
520 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
|
521 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
522 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
|
523 |/ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
524 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
|
525 | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
526 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
|
527 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
528 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
529 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
|
530 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
531 (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
|
532 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
533 $ hg phase --draft --force 2 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
534 test-debug-phase: move rev 2: 0 -> 1 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
535 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: 0 -> 1 |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
536 $ 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
|
537 @ 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
|
538 |\ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
539 | 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
|
540 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
541 +---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
|
542 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
543 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
|
544 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
545 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
|
546 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
547 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
|
548 |/ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
549 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
|
550 | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
551 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
|
552 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
553 |
31162
b7cef987356d
phases: remove experimental.nativephaseskillswitch
Jun Wu <quark@fb.com>
parents:
31073
diff
changeset
|
554 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
|
555 |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
556 $ hg phase --draft --force 1::4 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
557 test-debug-phase: move rev 1: 0 -> 1 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
558 test-debug-phase: move rev 4: 2 -> 1 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
559 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: 0 -> 1 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
560 test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: 2 -> 1 |
15830
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
561 $ 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
|
562 @ 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
|
563 |\ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
564 | 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
|
565 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
566 +---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
|
567 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
568 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
|
569 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
570 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
|
571 | | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
572 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
|
573 |/ |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
574 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
|
575 | |
8ed112ed774a
phases: add a phases command to display and manipulate phases
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15823
diff
changeset
|
576 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
|
577 |
16097
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
578 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
|
579 |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
580 $ hg phase --public 7 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
581 test-debug-phase: move rev 1: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
582 test-debug-phase: move rev 2: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
583 test-debug-phase: move rev 3: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
584 test-debug-phase: move rev 4: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
585 test-debug-phase: move rev 6: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
586 test-debug-phase: move rev 7: 2 -> 0 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
587 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: 1 -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
588 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: 1 -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
589 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: 1 -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
590 test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: 1 -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
591 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: 1 -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
592 test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: 2 -> 0 |
16097
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
593 $ hg phase --draft '5 or 7' |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
594 test-debug-phase: move rev 5: 2 -> 1 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
595 test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: 2 -> 1 |
20093
1dee888b22f7
phase: better error message when --force is needed
Martin Geisler <martin@geisler.net>
parents:
18462
diff
changeset
|
596 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
|
597 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
|
598 [1] |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
599 $ 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
|
600 @ 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
|
601 |\ |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
602 | 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
|
603 | | |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
604 +---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
|
605 | | |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
606 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
|
607 | | |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
608 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
|
609 | | |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
610 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
|
611 |/ |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
612 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
|
613 | |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
614 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
|
615 |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
616 |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
617 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
|
618 |
8dc573a9c5e5
phase: when phase cannot be reduced, hint at --force and return 1 (BC)
Patrick Mezard <patrick@mezard.eu>
parents:
16030
diff
changeset
|
619 $ hg phase --draft 7 |
20093
1dee888b22f7
phase: better error message when --force is needed
Martin Geisler <martin@geisler.net>
parents:
18462
diff
changeset
|
620 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
|
621 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
|
622 [1] |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16659
diff
changeset
|
623 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16659
diff
changeset
|
624 $ 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
|
625 |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
626 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
|
627 |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
628 $ 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
|
629 |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
630 (enabling evolution) |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22765
diff
changeset
|
631 $ cat >> $HGRCPATH << EOF |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22765
diff
changeset
|
632 > [experimental] |
33794
6c1a9fd8361b
test: update evolution config
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
633 > stabilization=createmarkers |
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
|
634 > 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
|
635 |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
636 (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
|
637 $ hg debugobsolete `hg id --debug -r 5` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33459
diff
changeset
|
638 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
|
639 |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
640 $ 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
|
641 $ 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
|
642 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
|
643 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
|
644 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
|
645 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
|
646 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:
33794
diff
changeset
|
647 new changesets 4a2df7238c3b:17a481b3bccb |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
648 test-debug-phase: new rev 0: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
649 test-debug-phase: new rev 1: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
650 test-debug-phase: new rev 2: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
651 test-debug-phase: new rev 3: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
652 test-debug-phase: new rev 4: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
653 test-debug-phase: new rev 5: x -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
32308
diff
changeset
|
654 test-debug-phase: new rev 6: x -> 0 |
34710
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
655 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
656 test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
657 test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
658 test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
659 test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
660 test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> 0 |
cdf833d7de98
phase: add a dedicated txnclose-phase hook
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
661 test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: -> 0 |
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
|
662 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
|
663 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
|
664 $ 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
|
665 $ 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
|
666 @ 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
|
667 |\ |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
668 | 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
|
669 | | |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
670 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
|
671 | | |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
672 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
|
673 | | |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
674 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
|
675 |/ |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
676 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
|
677 | |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
678 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
|
679 |
a959f7167077
clone: do not turn hidden changeset public on publishing clone (issue3935)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20185
diff
changeset
|
680 |
20530
78f547cdc362
verify: do not prevent verify repository containing hidden changesets
Yuya Nishihara <yuya@tcha.org>
parents:
20332
diff
changeset
|
681 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
|
682 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
|
683 |
20530
78f547cdc362
verify: do not prevent verify repository containing hidden changesets
Yuya Nishihara <yuya@tcha.org>
parents:
20332
diff
changeset
|
684 $ cd ../initialrepo |
78f547cdc362
verify: do not prevent verify repository containing hidden changesets
Yuya Nishihara <yuya@tcha.org>
parents:
20332
diff
changeset
|
685 $ hg verify |
78f547cdc362
verify: do not prevent verify repository containing hidden changesets
Yuya Nishihara <yuya@tcha.org>
parents:
20332
diff
changeset
|
686 checking changesets |
78f547cdc362
verify: do not prevent verify repository containing hidden changesets
Yuya Nishihara <yuya@tcha.org>
parents:
20332
diff
changeset
|
687 checking manifests |
78f547cdc362
verify: do not prevent verify repository containing hidden changesets
Yuya Nishihara <yuya@tcha.org>
parents:
20332
diff
changeset
|
688 crosschecking files in changesets and manifests |
78f547cdc362
verify: do not prevent verify repository containing hidden changesets
Yuya Nishihara <yuya@tcha.org>
parents:
20332
diff
changeset
|
689 checking files |
78f547cdc362
verify: do not prevent verify repository containing hidden changesets
Yuya Nishihara <yuya@tcha.org>
parents:
20332
diff
changeset
|
690 7 files, 8 changesets, 7 total revisions |
31073
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
691 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
692 $ cd .. |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
693 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
694 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
|
695 repositories visible to an external hook. |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
696 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
697 (emulate a transaction running concurrently by copied |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
698 .hg/phaseroots.pending in subsequent test) |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
699 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
700 $ cat > $TESTTMP/savepending.sh <<EOF |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
701 > 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
|
702 > 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
|
703 > EOF |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
704 $ cd push-dest |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
705 $ hg phase 6 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
706 6: draft |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
707 $ 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
|
708 transaction abort! |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
709 rollback completed |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
710 abort: pretxnclose hook exited with status 1 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
711 [255] |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
712 $ 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
|
713 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
714 (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
|
715 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
716 $ cat > $TESTTMP/checkpending.sh <<EOF |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
717 > echo '@initialrepo' |
31770
6c800688afe1
tests: quote paths in shell script hooks
Matt Harbison <matt_harbison@yahoo.com>
parents:
31162
diff
changeset
|
718 > hg -R "$TESTTMP/initialrepo" phase 7 |
31073
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
719 > echo '@push-dest' |
31770
6c800688afe1
tests: quote paths in shell script hooks
Matt Harbison <matt_harbison@yahoo.com>
parents:
31162
diff
changeset
|
720 > hg -R "$TESTTMP/push-dest" phase 6 |
31073
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
721 > 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
|
722 > EOF |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
723 $ cd ../initialrepo |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
724 $ hg phase 7 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
725 7: public |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
726 $ 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
|
727 @initialrepo |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
728 7: secret |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
729 @push-dest |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
730 6: draft |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
731 transaction abort! |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
732 rollback completed |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
733 abort: pretxnclose hook exited with status 1 |
6afd8a87a657
phases: check HG_PENDING strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25382
diff
changeset
|
734 [255] |