annotate tests/test-phases-exchange.t @ 37533:df4985497986

wireproto: implement capabilities for wire protocol v2 The capabilities mechanism for wire protocol version 2 represents a clean break from version 1. Instead of effectively exchanging a set of capabilities, we're exchanging a rich data structure. This data structure currently contains information about every available command, including its accepted arguments. It also contains information about supported compression formats. Exposing information about supported commands will allow clients to automatically generate bindings to the server. Clients will be able to do things like detect when they are attempting to run a command that isn't known to the server. Exposing the required permissions to run a command can be used by clients to determine if they have privileges to call a command before actually calling it. We could potentially even have clients send credentials preemptively without waiting for the server to deny the command request. Lots of potential here. The data returned by this command will likely evolve heavily. So we shouldn't bikeshed the implementation just yet. Differential Revision: https://phab.mercurial-scm.org/D3200
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 09 Apr 2018 11:52:31 -0700
parents 7542e97c7867
children b4b7427b5786 7c05198cd1ca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 21024
diff changeset
1 #require killdaemons
16539
249542ded278 tests: skip new tests with requirements not available on windows
Mads Kiilerich <mads@kiilerich.com>
parents: 16535
diff changeset
2
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
3 $ cat >> $HGRCPATH << EOF
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
4 > [extensions]
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
5 > phasereport=$TESTDIR/testlib/ext-phase-report.py
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
6 > EOF
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
7
16013
2a1d97630f7f tests: don't use alias
Mads Kiilerich <mads@kiilerich.com>
parents: 15956
diff changeset
8 $ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; }
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
9
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
10 $ mkcommit() {
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
11 > echo "$1" > "$1"
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
12 > hg add "$1"
15713
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
13 > message="$1"
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
14 > shift
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
15 > hg ci -m "$message" $*
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
16 > }
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
17
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
18 $ hg init alpha
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
19 $ cd alpha
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
20 $ mkcommit a-A
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
21 test-debug-phase: new rev 0: x -> 1
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
22 $ mkcommit a-B
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
23 test-debug-phase: new rev 1: x -> 1
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
24 $ mkcommit a-C
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
25 test-debug-phase: new rev 2: x -> 1
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
26 $ mkcommit a-D
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
27 test-debug-phase: new rev 3: x -> 1
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
28 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
29 @ 3 draft a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
30 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
31 o 2 draft a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
32 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
33 o 1 draft a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
34 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
35 o 0 draft a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
36
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
37
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
38 $ hg init ../beta
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
39 $ hg push -r 1 ../beta
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
40 pushing to ../beta
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
41 searching for changes
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
42 adding changesets
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
43 adding manifests
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
44 adding file changes
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
45 added 2 changesets with 2 changes to 2 files
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
46 test-debug-phase: new rev 0: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
47 test-debug-phase: new rev 1: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
48 test-debug-phase: move rev 0: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
49 test-debug-phase: move rev 1: 1 -> 0
15485
fa47291b3f1f phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15484
diff changeset
50 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
51 @ 3 draft a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
52 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
53 o 2 draft a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
54 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
55 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
56 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
57 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
58
15485
fa47291b3f1f phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15484
diff changeset
59
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
60 $ cd ../beta
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
61 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
62 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
63 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
64 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
65
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
66 $ hg up -q
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
67 $ mkcommit b-A
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
68 test-debug-phase: new rev 2: x -> 1
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
69 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
70 @ 2 draft b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
71 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
72 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
73 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
74 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
75
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
76 $ hg pull ../alpha
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
77 pulling from ../alpha
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
78 searching for changes
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
79 adding changesets
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
80 adding manifests
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
81 adding file changes
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
82 added 2 changesets with 2 changes to 2 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33563
diff changeset
83 new changesets 54acac6f23ab:b555f63b6063
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
84 test-debug-phase: new rev 3: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
85 test-debug-phase: new rev 4: x -> 0
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
86 (run 'hg heads' to see heads, 'hg merge' to merge)
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
87 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
88 o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
89 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
90 o 3 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
91 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
92 | @ 2 draft b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
93 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
94 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
95 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
96 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
97
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
98
15485
fa47291b3f1f phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15484
diff changeset
99 pull did not updated ../alpha state.
17424
e7cfe3587ea4 fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents: 16539
diff changeset
100 push from alpha to beta should update phase even if nothing is transferred
15484
a44446ff9ad8 phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
101
15485
fa47291b3f1f phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15484
diff changeset
102 $ cd ../alpha
fa47291b3f1f phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15484
diff changeset
103 $ hgph # not updated by remote pull
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
104 @ 3 draft a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
105 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
106 o 2 draft a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
107 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
108 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
109 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
110 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
111
20314
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
112 $ hg push -r 2 ../beta
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
113 pushing to ../beta
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
114 searching for changes
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
115 no changes found
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
116 test-debug-phase: move rev 2: 1 -> 0
20314
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
117 [1]
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
118 $ hgph
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
119 @ 3 draft a-D - b555f63b6063
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
120 |
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
121 o 2 public a-C - 54acac6f23ab
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
122 |
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
123 o 1 public a-B - 548a3d25dbf0
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
124 |
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
125 o 0 public a-A - 054250a37db4
b396032e1bb8 phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 20117
diff changeset
126
15485
fa47291b3f1f phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15484
diff changeset
127 $ hg push ../beta
fa47291b3f1f phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15484
diff changeset
128 pushing to ../beta
fa47291b3f1f phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15484
diff changeset
129 searching for changes
fa47291b3f1f phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15484
diff changeset
130 no changes found
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
131 test-debug-phase: move rev 3: 1 -> 0
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 16013
diff changeset
132 [1]
15485
fa47291b3f1f phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15484
diff changeset
133 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
134 @ 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
135 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
136 o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
137 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
138 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
139 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
140 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
141
15485
fa47291b3f1f phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15484
diff changeset
142
15486
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
143 update must update phase of common changeset too
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
144
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
145 $ hg pull ../beta # getting b-A
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
146 pulling from ../beta
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
147 searching for changes
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
148 adding changesets
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
149 adding manifests
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
150 adding file changes
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
151 added 1 changesets with 1 changes to 1 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33563
diff changeset
152 new changesets f54f1bb90ff3
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
153 test-debug-phase: new rev 4: x -> 0
15486
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
154 (run 'hg heads' to see heads, 'hg merge' to merge)
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
155
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
156 $ cd ../beta
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
157 $ hgph # not updated by remote pull
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
158 o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
159 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
160 o 3 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
161 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
162 | @ 2 draft b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
163 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
164 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
165 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
166 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
167
15486
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
168 $ hg pull ../alpha
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
169 pulling from ../alpha
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
170 searching for changes
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
171 no changes found
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
172 test-debug-phase: move rev 2: 1 -> 0
15486
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
173 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
174 o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
175 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
176 o 3 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
177 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
178 | @ 2 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
179 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
180 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
181 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
182 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
183
15486
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
184
15646
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
185 Publish configuration option
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
186 ----------------------------
15486
1eefa4451c56 phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15485
diff changeset
187
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
188 Pull
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
189 ````
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
190
15646
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
191 changegroup are added without phase movement
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
192
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
193 $ hg bundle -a ../base.bundle
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
194 5 changesets found
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
195 $ cd ..
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
196 $ hg init mu
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
197 $ cd mu
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
198 $ cat > .hg/hgrc << EOF
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
199 > [phases]
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
200 > publish=0
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
201 > EOF
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
202 $ hg unbundle ../base.bundle
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
203 adding changesets
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
204 adding manifests
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
205 adding file changes
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
206 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: 33563
diff changeset
207 new changesets 054250a37db4:b555f63b6063
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
208 test-debug-phase: new rev 0: x -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
209 test-debug-phase: new rev 1: x -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
210 test-debug-phase: new rev 2: x -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
211 test-debug-phase: new rev 3: x -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
212 test-debug-phase: new rev 4: x -> 1
15646
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
213 (run 'hg heads' to see heads, 'hg merge' to merge)
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
214 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
215 o 4 draft a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
216 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
217 o 3 draft a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
218 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
219 | o 2 draft b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
220 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
221 o 1 draft a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
222 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
223 o 0 draft a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
224
15647
ce193147f492 phases: update exchange test to include node hash.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15646
diff changeset
225 $ cd ..
15646
218ec96c45d7 phases: add a phases.publish option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15486
diff changeset
226
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
227 Pulling from publish=False to publish=False does not move boundary.
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
228
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
229 $ hg init nu
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
230 $ cd nu
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
231 $ cat > .hg/hgrc << EOF
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
232 > [phases]
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
233 > publish=0
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
234 > EOF
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
235 $ hg pull ../mu -r 54acac6f23ab
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
236 pulling from ../mu
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
237 adding changesets
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
238 adding manifests
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
239 adding file changes
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
240 added 3 changesets with 3 changes to 3 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33563
diff changeset
241 new changesets 054250a37db4:54acac6f23ab
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
242 test-debug-phase: new rev 0: x -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
243 test-debug-phase: new rev 1: x -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
244 test-debug-phase: new rev 2: x -> 1
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
245 (run 'hg update' to get a working copy)
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
246 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
247 o 2 draft a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
248 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
249 o 1 draft a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
250 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
251 o 0 draft a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
252
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
253
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
254 Even for common
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
255
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
256 $ hg pull ../mu -r f54f1bb90ff3
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
257 pulling from ../mu
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
258 searching for changes
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
259 adding changesets
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
260 adding manifests
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
261 adding file changes
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
262 added 1 changesets with 1 changes to 1 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33563
diff changeset
263 new changesets f54f1bb90ff3
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
264 test-debug-phase: new rev 3: x -> 1
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
265 (run 'hg heads' to see heads, 'hg merge' to merge)
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
266 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
267 o 3 draft b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
268 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
269 | o 2 draft a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
270 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
271 o 1 draft a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
272 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
273 o 0 draft a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
274
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
275
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
276
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
277 Pulling from Publish=True to Publish=False move boundary in common set.
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
278 we are in nu
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
279
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
280 $ hg pull ../alpha -r b555f63b6063
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
281 pulling from ../alpha
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
282 searching for changes
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
283 adding changesets
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
284 adding manifests
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
285 adding file changes
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
286 added 1 changesets with 1 changes to 1 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33563
diff changeset
287 new changesets b555f63b6063
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
288 test-debug-phase: move rev 0: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
289 test-debug-phase: move rev 1: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
290 test-debug-phase: move rev 2: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
291 test-debug-phase: new rev 4: x -> 0
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
292 (run 'hg update' to get a working copy)
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
293 $ hgph # f54f1bb90ff3 stay draft, not ancestor of -r
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
294 o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
295 |
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
296 | o 3 draft b-A - f54f1bb90ff3
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
297 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
298 o | 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
299 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
300 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
301 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
302 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
303
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
304
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
305 pulling from Publish=False to publish=False with some public
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
306
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
307 $ hg up -q f54f1bb90ff3
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
308 $ mkcommit n-A
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
309 test-debug-phase: new rev 5: x -> 1
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
310 $ mkcommit n-B
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
311 test-debug-phase: new rev 6: x -> 1
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
312 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
313 @ 6 draft n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
314 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
315 o 5 draft n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
316 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
317 | o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
318 | |
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
319 o | 3 draft b-A - f54f1bb90ff3
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
320 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
321 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
322 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
323 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
324 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
325 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
326
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
327 $ cd ../mu
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
328 $ hg pull ../nu
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
329 pulling from ../nu
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
330 searching for changes
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
331 adding changesets
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
332 adding manifests
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
333 adding file changes
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
334 added 2 changesets with 2 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33563
diff changeset
335 new changesets d6bcb4f74035:145e75495359
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
336 test-debug-phase: move rev 0: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
337 test-debug-phase: move rev 1: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
338 test-debug-phase: move rev 3: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
339 test-debug-phase: move rev 4: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
340 test-debug-phase: new rev 5: x -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
341 test-debug-phase: new rev 6: x -> 1
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
342 (run 'hg update' to get a working copy)
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
343 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
344 o 6 draft n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
345 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
346 o 5 draft n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
347 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
348 | o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
349 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
350 | o 3 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
351 | |
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
352 o | 2 draft b-A - f54f1bb90ff3
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
353 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
354 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
355 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
356 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
357
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
358 $ cd ..
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
359
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
360 pulling into publish=True
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
361
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
362 $ cd alpha
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
363 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
364 o 4 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
365 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
366 | @ 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
367 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
368 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
369 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
370 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
371 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
372 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
373
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
374 $ hg pull ../mu
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
375 pulling from ../mu
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
376 searching for changes
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
377 adding changesets
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
378 adding manifests
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
379 adding file changes
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
380 added 2 changesets with 2 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33563
diff changeset
381 new changesets d6bcb4f74035:145e75495359
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
382 test-debug-phase: new rev 5: x -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
383 test-debug-phase: new rev 6: x -> 1
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
384 (run 'hg update' to get a working copy)
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
385 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
386 o 6 draft n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
387 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
388 o 5 draft n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
389 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
390 o 4 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
391 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
392 | @ 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
393 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
394 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
395 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
396 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
397 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
398 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
399
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
400 $ cd ..
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
401
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
402 pulling back into original repo
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
403
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
404 $ cd nu
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
405 $ hg pull ../alpha
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
406 pulling from ../alpha
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
407 searching for changes
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
408 no changes found
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
409 test-debug-phase: move rev 3: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
410 test-debug-phase: move rev 5: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
411 test-debug-phase: move rev 6: 1 -> 0
15650
5b26667fc4d3 phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15647
diff changeset
412 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
413 @ 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
414 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
415 o 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
416 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
417 | o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
418 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
419 o | 3 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
420 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
421 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
422 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
423 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
424 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
425 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
426
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
427
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
428 Push
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
429 ````
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
430
15659
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
431 (inserted)
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
432
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
433 Test that phase are pushed even when they are nothing to pus
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
434 (this might be tested later bu are very convenient to not alter too much test)
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
435
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
436 Push back to alpha
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
437
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
438 $ hg push ../alpha # from nu
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
439 pushing to ../alpha
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
440 searching for changes
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
441 no changes found
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
442 test-debug-phase: move rev 5: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
443 test-debug-phase: move rev 6: 1 -> 0
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 16013
diff changeset
444 [1]
15659
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
445 $ cd ..
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
446 $ cd alpha
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
447 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
448 o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
449 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
450 o 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
451 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
452 o 4 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
453 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
454 | @ 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
455 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
456 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
457 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
458 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
459 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
460 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
461
15659
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
462
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
463 (end insertion)
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
464
7fba5a245acc phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15651
diff changeset
465
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
466 initial setup
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
467
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 20008
diff changeset
468 $ hg log -G # of alpha
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
469 o changeset: 6:145e75495359
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
470 | tag: tip
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
471 | user: test
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
472 | date: Thu Jan 01 00:00:00 1970 +0000
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
473 | summary: n-B
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
474 |
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
475 o changeset: 5:d6bcb4f74035
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
476 | user: test
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
477 | date: Thu Jan 01 00:00:00 1970 +0000
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
478 | summary: n-A
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
479 |
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
480 o changeset: 4:f54f1bb90ff3
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
481 | parent: 1:548a3d25dbf0
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
482 | user: test
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
483 | date: Thu Jan 01 00:00:00 1970 +0000
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
484 | summary: b-A
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
485 |
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
486 | @ changeset: 3:b555f63b6063
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
487 | | user: test
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
488 | | date: Thu Jan 01 00:00:00 1970 +0000
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
489 | | summary: a-D
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
490 | |
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
491 | o changeset: 2:54acac6f23ab
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
492 |/ user: test
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
493 | date: Thu Jan 01 00:00:00 1970 +0000
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
494 | summary: a-C
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
495 |
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
496 o changeset: 1:548a3d25dbf0
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
497 | user: test
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
498 | date: Thu Jan 01 00:00:00 1970 +0000
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
499 | summary: a-B
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
500 |
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
501 o changeset: 0:054250a37db4
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
502 user: test
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
503 date: Thu Jan 01 00:00:00 1970 +0000
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
504 summary: a-A
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
505
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
506 $ mkcommit a-E
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
507 test-debug-phase: new rev 7: x -> 1
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
508 $ mkcommit a-F
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
509 test-debug-phase: new rev 8: x -> 1
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
510 $ mkcommit a-G
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
511 test-debug-phase: new rev 9: x -> 1
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
512 $ hg up d6bcb4f74035 -q
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
513 $ mkcommit a-H
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
514 test-debug-phase: new rev 10: x -> 1
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
515 created new head
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
516 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
517 @ 10 draft a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
518 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
519 | o 9 draft a-G - 3e27b6f1eee1
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
520 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
521 | o 8 draft a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
522 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
523 | o 7 draft a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
524 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
525 +---o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
526 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
527 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
528 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
529 o | 4 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
530 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
531 | o 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
532 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
533 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
534 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
535 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
536 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
537 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
538
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
539
16195
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
540 Pulling from bundle does not alter phases of changeset not present in the bundle
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
541
37416
7542e97c7867 tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents: 34661
diff changeset
542 #if repobundlerepo
16195
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
543 $ hg bundle --base 1 -r 6 -r 3 ../partial-bundle.hg
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
544 5 changesets found
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
545 $ hg pull ../partial-bundle.hg
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
546 pulling from ../partial-bundle.hg
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
547 searching for changes
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
548 no changes found
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
549 $ hgph
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
550 @ 10 draft a-H - 967b449fbc94
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
551 |
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
552 | o 9 draft a-G - 3e27b6f1eee1
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
553 | |
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
554 | o 8 draft a-F - b740e3e5c05d
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
555 | |
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
556 | o 7 draft a-E - e9f537e46dea
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
557 | |
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
558 +---o 6 public n-B - 145e75495359
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
559 | |
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
560 o | 5 public n-A - d6bcb4f74035
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
561 | |
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
562 o | 4 public b-A - f54f1bb90ff3
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
563 | |
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
564 | o 3 public a-D - b555f63b6063
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
565 | |
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
566 | o 2 public a-C - 54acac6f23ab
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
567 |/
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
568 o 1 public a-B - 548a3d25dbf0
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
569 |
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
570 o 0 public a-A - 054250a37db4
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
571
37416
7542e97c7867 tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents: 34661
diff changeset
572 #endif
16195
40cc20042fb4 bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16107
diff changeset
573
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
574 Pushing to Publish=False (unknown changeset)
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
575
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
576 $ hg push ../mu -r b740e3e5c05d # a-F
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
577 pushing to ../mu
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
578 searching for changes
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
579 adding changesets
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
580 adding manifests
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
581 adding file changes
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
582 added 2 changesets with 2 changes to 2 files
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
583 test-debug-phase: new rev 7: x -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
584 test-debug-phase: new rev 8: x -> 1
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
585 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
586 @ 10 draft a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
587 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
588 | o 9 draft a-G - 3e27b6f1eee1
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
589 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
590 | o 8 draft a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
591 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
592 | o 7 draft a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
593 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
594 +---o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
595 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
596 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
597 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
598 o | 4 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
599 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
600 | o 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
601 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
602 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
603 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
604 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
605 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
606 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
607
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
608
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
609 $ cd ../mu
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
610 $ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft,
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
611 > # not ancestor of -r
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
612 o 8 draft a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
613 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
614 o 7 draft a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
615 |
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
616 | o 6 draft n-B - 145e75495359
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
617 | |
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
618 | o 5 draft n-A - d6bcb4f74035
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
619 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
620 o | 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
621 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
622 o | 3 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
623 | |
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
624 | o 2 draft b-A - f54f1bb90ff3
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
625 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
626 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
627 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
628 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
629
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
630
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
631 Pushing to Publish=True (unknown changeset)
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
632
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
633 $ hg push ../beta -r b740e3e5c05d
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
634 pushing to ../beta
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
635 searching for changes
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
636 adding changesets
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
637 adding manifests
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
638 adding file changes
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
639 added 2 changesets with 2 changes to 2 files
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
640 test-debug-phase: new rev 5: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
641 test-debug-phase: new rev 6: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
642 test-debug-phase: move rev 7: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
643 test-debug-phase: move rev 8: 1 -> 0
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
644 $ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft,
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
645 > # not ancestor of -r
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
646 o 8 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
647 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
648 o 7 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
649 |
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
650 | o 6 draft n-B - 145e75495359
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
651 | |
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
652 | o 5 draft n-A - d6bcb4f74035
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
653 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
654 o | 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
655 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
656 o | 3 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
657 | |
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
658 | o 2 draft b-A - f54f1bb90ff3
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
659 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
660 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
661 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
662 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
663
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
664
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
665 Pushing to Publish=True (common changeset)
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
666
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
667 $ cd ../beta
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
668 $ hg push ../alpha
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
669 pushing to ../alpha
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
670 searching for changes
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
671 no changes found
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
672 test-debug-phase: move rev 7: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
673 test-debug-phase: move rev 8: 1 -> 0
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 16013
diff changeset
674 [1]
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
675 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
676 o 6 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
677 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
678 o 5 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
679 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
680 o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
681 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
682 o 3 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
683 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
684 | @ 2 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
685 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
686 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
687 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
688 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
689
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
690 $ cd ../alpha
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
691 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
692 @ 10 draft a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
693 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
694 | o 9 draft a-G - 3e27b6f1eee1
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
695 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
696 | o 8 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
697 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
698 | o 7 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
699 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
700 +---o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
701 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
702 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
703 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
704 o | 4 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
705 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
706 | o 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
707 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
708 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
709 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
710 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
711 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
712 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
713
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
714
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
715 Pushing to Publish=False (common changeset that change phase + unknown one)
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
716
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
717 $ hg push ../mu -r 967b449fbc94 -f
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
718 pushing to ../mu
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
719 searching for changes
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
720 adding changesets
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
721 adding manifests
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
722 adding file changes
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
723 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: 30211
diff changeset
724 test-debug-phase: move rev 2: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
725 test-debug-phase: move rev 5: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
726 test-debug-phase: new rev 9: x -> 1
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
727 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
728 @ 10 draft a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
729 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
730 | o 9 draft a-G - 3e27b6f1eee1
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
731 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
732 | o 8 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
733 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
734 | o 7 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
735 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
736 +---o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
737 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
738 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
739 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
740 o | 4 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
741 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
742 | o 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
743 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
744 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
745 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
746 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
747 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
748 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
749
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
750 $ cd ../mu
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
751 $ hgph # d6bcb4f74035 should have changed phase
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
752 > # 145e75495359 is still draft. not ancestor of -r
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
753 o 9 draft a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
754 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
755 | o 8 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
756 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
757 | o 7 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
758 | |
15956
5653f2d166ea push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15891
diff changeset
759 +---o 6 draft n-B - 145e75495359
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
760 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
761 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
762 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
763 | o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
764 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
765 | o 3 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
766 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
767 o | 2 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
768 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
769 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
770 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
771 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
772
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
773
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
774
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
775 Pushing to Publish=True (common changeset from publish=False)
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
776
15713
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
777 (in mu)
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
778 $ hg push ../alpha
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
779 pushing to ../alpha
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
780 searching for changes
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
781 no changes found
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
782 test-debug-phase: move rev 10: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
783 test-debug-phase: move rev 6: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
784 test-debug-phase: move rev 9: 1 -> 0
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 16013
diff changeset
785 [1]
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
786 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
787 o 9 public a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
788 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
789 | o 8 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
790 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
791 | o 7 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
792 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
793 +---o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
794 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
795 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
796 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
797 | o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
798 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
799 | o 3 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
800 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
801 o | 2 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
802 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
803 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
804 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
805 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
806
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
807 $ hgph -R ../alpha # a-H should have been synced to 0
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
808 @ 10 public a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
809 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
810 | o 9 draft a-G - 3e27b6f1eee1
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
811 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
812 | o 8 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
813 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
814 | o 7 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
815 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
816 +---o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
817 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
818 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
819 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
820 o | 4 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
821 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
822 | o 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
823 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
824 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
825 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
826 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
827 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
828 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
829
15651
e69a3cdad37e phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15650
diff changeset
830
15713
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
831
21010
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
832 Bare push with next changeset and common changeset needing sync (issue3575)
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
833
23139
e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
834 (reset some stat on remote repo to avoid confusing other tests)
21010
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
835
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
836 $ hg -R ../alpha --config extensions.strip= strip --no-backup 967b449fbc94
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
837 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
838 $ hg phase --force --draft b740e3e5c05d 967b449fbc94
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
839 test-debug-phase: move rev 8: 0 -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
840 test-debug-phase: move rev 9: 0 -> 1
21010
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
841 $ hg push -fv ../alpha
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
842 pushing to ../alpha
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
843 searching for changes
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
844 1 changesets found
23748
4ab66de46a96 bundle: when verbose, show what takes up the space in the generated bundle
Mads Kiilerich <madski@unity3d.com>
parents: 23139
diff changeset
845 uncompressed size of bundle content:
30211
6b0741d6d234 changegroup: skip delta when the underlying revlog do not use them
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30198
diff changeset
846 178 (changelog)
27752
29cfc474c5fd changegroup3: introduce experimental.changegroup3 boolean config
Martin von Zweigbergk <martinvonz@google.com>
parents: 27433
diff changeset
847 165 (manifests)
29cfc474c5fd changegroup3: introduce experimental.changegroup3 boolean config
Martin von Zweigbergk <martinvonz@google.com>
parents: 27433
diff changeset
848 131 a-H
21010
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
849 adding changesets
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
850 adding manifests
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
851 adding file changes
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
852 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: 30211
diff changeset
853 test-debug-phase: new rev 10: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
854 test-debug-phase: move rev 8: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
855 test-debug-phase: move rev 9: 1 -> 0
21010
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
856 $ hgph
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
857 o 9 public a-H - 967b449fbc94
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
858 |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
859 | o 8 public a-F - b740e3e5c05d
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
860 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
861 | o 7 public a-E - e9f537e46dea
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
862 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
863 +---o 6 public n-B - 145e75495359
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
864 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
865 o | 5 public n-A - d6bcb4f74035
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
866 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
867 | o 4 public a-D - b555f63b6063
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
868 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
869 | o 3 public a-C - 54acac6f23ab
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
870 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
871 o | 2 public b-A - f54f1bb90ff3
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
872 |/
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
873 o 1 public a-B - 548a3d25dbf0
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
874 |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
875 o 0 public a-A - 054250a37db4
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
876
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
877
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
878 $ hg -R ../alpha update 967b449fbc94 #for latter test consistency
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
879 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
880 $ hgph -R ../alpha
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
881 @ 10 public a-H - 967b449fbc94
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
882 |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
883 | o 9 draft a-G - 3e27b6f1eee1
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
884 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
885 | o 8 public a-F - b740e3e5c05d
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
886 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
887 | o 7 public a-E - e9f537e46dea
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
888 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
889 +---o 6 public n-B - 145e75495359
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
890 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
891 o | 5 public n-A - d6bcb4f74035
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
892 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
893 o | 4 public b-A - f54f1bb90ff3
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
894 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
895 | o 3 public a-D - b555f63b6063
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
896 | |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
897 | o 2 public a-C - 54acac6f23ab
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
898 |/
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
899 o 1 public a-B - 548a3d25dbf0
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
900 |
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
901 o 0 public a-A - 054250a37db4
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
902
3d4b54a6f346 phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 20314
diff changeset
903
15713
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
904 Discovery locally secret changeset on a remote repository:
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
905
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
906 - should make it non-secret
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
907
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
908 $ cd ../alpha
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
909 $ mkcommit A-secret --config phases.new-commit=2
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
910 test-debug-phase: new rev 11: x -> 2
15713
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
911 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
912 @ 11 secret A-secret - 435b5d83910c
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
913 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
914 o 10 public a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
915 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
916 | o 9 draft a-G - 3e27b6f1eee1
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
917 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
918 | o 8 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
919 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
920 | o 7 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
921 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
922 +---o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
923 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
924 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
925 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
926 o | 4 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
927 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
928 | o 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
929 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
930 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
931 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
932 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
933 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
934 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
935
15713
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
936 $ hg bundle --base 'parents(.)' -r . ../secret-bundle.hg
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
937 1 changesets found
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
938 $ hg -R ../mu unbundle ../secret-bundle.hg
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
939 adding changesets
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
940 adding manifests
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
941 adding file changes
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
942 added 1 changesets with 1 changes to 1 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33563
diff changeset
943 new changesets 435b5d83910c
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
944 test-debug-phase: new rev 10: x -> 1
15713
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
945 (run 'hg update' to get a working copy)
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
946 $ hgph -R ../mu
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
947 o 10 draft A-secret - 435b5d83910c
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
948 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
949 o 9 public a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
950 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
951 | o 8 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
952 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
953 | o 7 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
954 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
955 +---o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
956 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
957 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
958 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
959 | o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
960 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
961 | o 3 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
962 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
963 o | 2 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
964 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
965 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
966 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
967 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
968
15713
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
969 $ hg pull ../mu
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
970 pulling from ../mu
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
971 searching for changes
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
972 no changes found
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
973 test-debug-phase: move rev 11: 2 -> 1
15713
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
974 $ hgph
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
975 @ 11 draft A-secret - 435b5d83910c
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
976 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
977 o 10 public a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
978 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
979 | o 9 draft a-G - 3e27b6f1eee1
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
980 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
981 | o 8 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
982 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
983 | o 7 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
984 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
985 +---o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
986 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
987 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
988 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
989 o | 4 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
990 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
991 | o 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
992 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
993 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
994 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
995 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
996 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
997 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
998
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
999
21024
7731a2281cf0 spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents: 21010
diff changeset
1000 pushing a locally public and draft changesets remotely secret should make them
16535
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16195
diff changeset
1001 appear on the remote side.
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16195
diff changeset
1002
15891
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1003 $ hg -R ../mu phase --secret --force 967b449fbc94
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1004 test-debug-phase: move rev 9: 0 -> 2
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1005 test-debug-phase: move rev 10: 1 -> 2
15891
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1006 $ hg push -r 435b5d83910c ../mu
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1007 pushing to ../mu
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1008 searching for changes
16535
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16195
diff changeset
1009 abort: push creates new remote head 435b5d83910c!
29973
4ddb05751b12 discovery: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 29688
diff changeset
1010 (merge or see 'hg help push' for details about pushing new heads)
16535
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16195
diff changeset
1011 [255]
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16195
diff changeset
1012 $ hg push -fr 435b5d83910c ../mu # because the push will create new visible head
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16195
diff changeset
1013 pushing to ../mu
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16195
diff changeset
1014 searching for changes
15891
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1015 adding changesets
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1016 adding manifests
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1017 adding file changes
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1018 added 0 changesets with 0 changes to 2 files
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1019 test-debug-phase: move rev 9: 2 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1020 test-debug-phase: move rev 10: 2 -> 1
15891
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1021 $ hgph -R ../mu
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1022 o 10 draft A-secret - 435b5d83910c
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1023 |
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1024 o 9 public a-H - 967b449fbc94
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1025 |
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1026 | o 8 public a-F - b740e3e5c05d
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1027 | |
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1028 | o 7 public a-E - e9f537e46dea
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1029 | |
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1030 +---o 6 public n-B - 145e75495359
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1031 | |
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1032 o | 5 public n-A - d6bcb4f74035
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1033 | |
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1034 | o 4 public a-D - b555f63b6063
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1035 | |
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1036 | o 3 public a-C - 54acac6f23ab
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1037 | |
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1038 o | 2 public b-A - f54f1bb90ff3
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1039 |/
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1040 o 1 public a-B - 548a3d25dbf0
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1041 |
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1042 o 0 public a-A - 054250a37db4
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1043
249d3420ec9c phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15889
diff changeset
1044
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1045 pull new changeset with common draft locally
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1046
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1047 $ hg up -q 967b449fbc94 # create a new root for draft
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1048 $ mkcommit 'alpha-more'
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1049 test-debug-phase: new rev 12: x -> 1
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1050 created new head
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1051 $ hg push -fr . ../mu
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1052 pushing to ../mu
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1053 searching for changes
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1054 adding changesets
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1055 adding manifests
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1056 adding file changes
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1057 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: 30211
diff changeset
1058 test-debug-phase: new rev 11: x -> 1
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1059 $ cd ../mu
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1060 $ hg phase --secret --force 1c5cfd894796
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1061 test-debug-phase: move rev 11: 1 -> 2
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1062 $ hg up -q 435b5d83910c
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1063 $ mkcommit 'mu-more'
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1064 test-debug-phase: new rev 12: x -> 1
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1065 $ cd ../alpha
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1066 $ hg pull ../mu
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1067 pulling from ../mu
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1068 searching for changes
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1069 adding changesets
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1070 adding manifests
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1071 adding file changes
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1072 added 1 changesets with 1 changes to 1 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33563
diff changeset
1073 new changesets 5237fb433fc8
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1074 test-debug-phase: new rev 13: x -> 1
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1075 (run 'hg update' to get a working copy)
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1076 $ hgph
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1077 o 13 draft mu-more - 5237fb433fc8
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1078 |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1079 | @ 12 draft alpha-more - 1c5cfd894796
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1080 | |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1081 o | 11 draft A-secret - 435b5d83910c
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1082 |/
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1083 o 10 public a-H - 967b449fbc94
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1084 |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1085 | o 9 draft a-G - 3e27b6f1eee1
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1086 | |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1087 | o 8 public a-F - b740e3e5c05d
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1088 | |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1089 | o 7 public a-E - e9f537e46dea
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1090 | |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1091 +---o 6 public n-B - 145e75495359
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1092 | |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1093 o | 5 public n-A - d6bcb4f74035
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1094 | |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1095 o | 4 public b-A - f54f1bb90ff3
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1096 | |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1097 | o 3 public a-D - b555f63b6063
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1098 | |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1099 | o 2 public a-C - 54acac6f23ab
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1100 |/
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1101 o 1 public a-B - 548a3d25dbf0
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1102 |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1103 o 0 public a-A - 054250a37db4
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1104
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1105
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1106 Test that test are properly ignored on remote event when existing locally
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1107
15740
62aa9305399d phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15713
diff changeset
1108 $ cd ..
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1109 $ hg clone -qU -r b555f63b6063 -r f54f1bb90ff3 beta gamma
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1110 test-debug-phase: new rev 0: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1111 test-debug-phase: new rev 1: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1112 test-debug-phase: new rev 2: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1113 test-debug-phase: new rev 3: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1114 test-debug-phase: new rev 4: x -> 0
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1115
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1116 # pathological case are
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1117 #
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1118 # * secret remotely
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1119 # * known locally
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1120 # * repo have uncommon changeset
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1121
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1122 $ hg -R beta phase --secret --force f54f1bb90ff3
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1123 test-debug-phase: move rev 2: 0 -> 2
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1124 $ hg -R gamma phase --draft --force f54f1bb90ff3
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1125 test-debug-phase: move rev 2: 0 -> 1
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1126
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1127 $ cd gamma
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1128 $ hg pull ../beta
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1129 pulling from ../beta
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1130 searching for changes
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1131 adding changesets
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1132 adding manifests
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1133 adding file changes
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1134 added 2 changesets with 2 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33563
diff changeset
1135 new changesets e9f537e46dea:b740e3e5c05d
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1136 test-debug-phase: new rev 5: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1137 test-debug-phase: new rev 6: x -> 0
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1138 (run 'hg update' to get a working copy)
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1139 $ hg phase f54f1bb90ff3
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1140 2: draft
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1141
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1142 same over the wire
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1143
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1144 $ cd ../beta
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1145 $ hg serve -p $HGPORT -d --pid-file=../beta.pid -E ../beta-error.log
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1146 $ cat ../beta.pid >> $DAEMON_PIDS
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1147 $ cd ../gamma
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1148
29688
30c59bdd4f41 tests: remove all remaining usage of experimental.bundle2-exp
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29687
diff changeset
1149 $ hg pull http://localhost:$HGPORT/ # bundle2+
25356
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25355
diff changeset
1150 pulling from http://localhost:$HGPORT/
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25355
diff changeset
1151 searching for changes
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25355
diff changeset
1152 no changes found
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25355
diff changeset
1153 $ hg phase f54f1bb90ff3
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25355
diff changeset
1154 2: draft
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25355
diff changeset
1155
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25355
diff changeset
1156 enforce bundle1
d49328038b38 test: explicitly test wire protocol discovery with bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25355
diff changeset
1157
29687
ac9b85079122 tests: use 'legacy.exchange' option in various mixed tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29658
diff changeset
1158 $ hg pull http://localhost:$HGPORT/ --config devel.legacy.exchange=bundle1
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1159 pulling from http://localhost:$HGPORT/
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1160 searching for changes
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1161 no changes found
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1162 $ hg phase f54f1bb90ff3
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1163 2: draft
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1164
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1165 check that secret local on both side are not synced to public
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1166
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1167 $ hg push -r b555f63b6063 http://localhost:$HGPORT/
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1168 pushing to http://localhost:$HGPORT/
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1169 searching for changes
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1170 no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 16013
diff changeset
1171 [1]
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1172 $ hg phase f54f1bb90ff3
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1173 2: draft
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1174
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1175 put the changeset in the draft state again
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1176 (first test after this one expect to be able to copy)
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1177
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1178 $ cd ..
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1179
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1180
15740
62aa9305399d phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15713
diff changeset
1181 Test Clone behavior
15713
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
1182
15740
62aa9305399d phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15713
diff changeset
1183 A. Clone without secret changeset
15713
cff25e4b37d2 phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15659
diff changeset
1184
15740
62aa9305399d phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15713
diff changeset
1185 1. cloning non-publishing repository
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1186 (Phase should be preserved)
15740
62aa9305399d phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15713
diff changeset
1187
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1188 # make sure there is no secret so we can use a copy clone
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1189
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1190 $ hg -R mu phase --draft 'secret()'
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1191 test-debug-phase: move rev 11: 2 -> 1
15740
62aa9305399d phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15713
diff changeset
1192
62aa9305399d phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15713
diff changeset
1193 $ hg clone -U mu Tau
62aa9305399d phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15713
diff changeset
1194 $ hgph -R Tau
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1195 o 12 draft mu-more - 5237fb433fc8
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1196 |
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1197 | o 11 draft alpha-more - 1c5cfd894796
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1198 | |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1199 o | 10 draft A-secret - 435b5d83910c
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1200 |/
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1201 o 9 public a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1202 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1203 | o 8 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1204 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1205 | o 7 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1206 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1207 +---o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1208 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1209 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1210 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1211 | o 4 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1212 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1213 | o 3 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1214 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1215 o | 2 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1216 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1217 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1218 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1219 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1220
15740
62aa9305399d phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15713
diff changeset
1221
15741
60344b83e442 phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15740
diff changeset
1222 2. cloning publishing repository
60344b83e442 phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15740
diff changeset
1223
60344b83e442 phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15740
diff changeset
1224 (everything should be public)
60344b83e442 phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15740
diff changeset
1225
60344b83e442 phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15740
diff changeset
1226 $ hg clone -U alpha Upsilon
60344b83e442 phases: on copy clone, do not copy phases data if repote is publishing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15740
diff changeset
1227 $ hgph -R Upsilon
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1228 o 13 public mu-more - 5237fb433fc8
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1229 |
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1230 | o 12 public alpha-more - 1c5cfd894796
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1231 | |
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1232 o | 11 public A-secret - 435b5d83910c
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1233 |/
15824
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1234 o 10 public a-H - 967b449fbc94
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1235 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1236 | o 9 public a-G - 3e27b6f1eee1
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1237 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1238 | o 8 public a-F - b740e3e5c05d
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1239 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1240 | o 7 public a-E - e9f537e46dea
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1241 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1242 +---o 6 public n-B - 145e75495359
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1243 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1244 o | 5 public n-A - d6bcb4f74035
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1245 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1246 o | 4 public b-A - f54f1bb90ff3
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1247 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1248 | o 3 public a-D - b555f63b6063
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1249 | |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1250 | o 2 public a-C - 54acac6f23ab
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1251 |/
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1252 o 1 public a-B - 548a3d25dbf0
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1253 |
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1254 o 0 public a-A - 054250a37db4
94a4748db392 phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15823
diff changeset
1255
20008
e54a078153f7 tests: skip tests that require not having root (issue4089)
Matt Mackall <mpm@selenic.com>
parents: 19934
diff changeset
1256 #if unix-permissions no-root
19097
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1257
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1258 Pushing From an unlockable repo
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1259 --------------------------------
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1260 (issue3684)
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1261
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1262 Unability to lock the source repo should not prevent the push. It will prevent
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1263 the retrieval of remote phase during push. For example, pushing to a publishing
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1264 server won't turn changeset public.
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1265
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1266 1. Test that push is not prevented
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1267
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1268 $ hg init Phi
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1269 $ cd Upsilon
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1270 $ chmod -R -w .hg
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1271 $ hg push ../Phi
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1272 pushing to ../Phi
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1273 searching for changes
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1274 adding changesets
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1275 adding manifests
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1276 adding file changes
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1277 added 14 changesets with 14 changes to 14 files (+3 heads)
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1278 test-debug-phase: new rev 0: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1279 test-debug-phase: new rev 1: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1280 test-debug-phase: new rev 2: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1281 test-debug-phase: new rev 3: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1282 test-debug-phase: new rev 4: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1283 test-debug-phase: new rev 5: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1284 test-debug-phase: new rev 6: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1285 test-debug-phase: new rev 7: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1286 test-debug-phase: new rev 8: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1287 test-debug-phase: new rev 9: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1288 test-debug-phase: new rev 10: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1289 test-debug-phase: new rev 11: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1290 test-debug-phase: new rev 12: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1291 test-debug-phase: new rev 13: x -> 0
19097
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1292 $ chmod -R +w .hg
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1293
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1294 2. Test that failed phases movement are reported
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1295
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1296 $ hg phase --force --draft 3
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1297 test-debug-phase: move rev 3: 0 -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1298 test-debug-phase: move rev 7: 0 -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1299 test-debug-phase: move rev 8: 0 -> 1
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1300 test-debug-phase: move rev 9: 0 -> 1
19097
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1301 $ chmod -R -w .hg
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1302 $ hg push ../Phi
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1303 pushing to ../Phi
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1304 searching for changes
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1305 no changes found
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1306 cannot lock source repo, skipping local public phase update
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1307 [1]
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1308 $ chmod -R +w .hg
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1309
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1310 $ cd ..
3f5e75c22585 push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17565
diff changeset
1311
30198
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1312 #endif
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1313
33508
d09de637cbc8 test-phase-exchange: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 33459
diff changeset
1314 Test that clone behaves like pull and doesn't publish changesets as plain push
d09de637cbc8 test-phase-exchange: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 33459
diff changeset
1315 does. The conditional output accounts for changes in the conditional block
d09de637cbc8 test-phase-exchange: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 33459
diff changeset
1316 above.
30198
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1317
33563
da94a99df96b test-phases-exchange: properly conditionalize output
Matt Harbison <matt_harbison@yahoo.com>
parents: 33508
diff changeset
1318 #if unix-permissions no-root
da94a99df96b test-phases-exchange: properly conditionalize output
Matt Harbison <matt_harbison@yahoo.com>
parents: 33508
diff changeset
1319 $ hg -R Upsilon phase -q --force --draft 2
da94a99df96b test-phases-exchange: properly conditionalize output
Matt Harbison <matt_harbison@yahoo.com>
parents: 33508
diff changeset
1320 test-debug-phase: move rev 2: 0 -> 1
da94a99df96b test-phases-exchange: properly conditionalize output
Matt Harbison <matt_harbison@yahoo.com>
parents: 33508
diff changeset
1321 #else
30198
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1322 $ hg -R Upsilon phase -q --force --draft 2
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1323 test-debug-phase: move rev 2: 0 -> 1
33563
da94a99df96b test-phases-exchange: properly conditionalize output
Matt Harbison <matt_harbison@yahoo.com>
parents: 33508
diff changeset
1324 test-debug-phase: move rev 3: 0 -> 1
da94a99df96b test-phases-exchange: properly conditionalize output
Matt Harbison <matt_harbison@yahoo.com>
parents: 33508
diff changeset
1325 test-debug-phase: move rev 7: 0 -> 1
da94a99df96b test-phases-exchange: properly conditionalize output
Matt Harbison <matt_harbison@yahoo.com>
parents: 33508
diff changeset
1326 test-debug-phase: move rev 8: 0 -> 1
da94a99df96b test-phases-exchange: properly conditionalize output
Matt Harbison <matt_harbison@yahoo.com>
parents: 33508
diff changeset
1327 test-debug-phase: move rev 9: 0 -> 1
da94a99df96b test-phases-exchange: properly conditionalize output
Matt Harbison <matt_harbison@yahoo.com>
parents: 33508
diff changeset
1328 #endif
33508
d09de637cbc8 test-phase-exchange: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 33459
diff changeset
1329
30198
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1330 $ hg clone -q Upsilon Pi -r 7
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1331 test-debug-phase: new rev 0: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1332 test-debug-phase: new rev 1: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1333 test-debug-phase: new rev 2: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1334 test-debug-phase: new rev 3: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1335 test-debug-phase: new rev 4: x -> 0
30198
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1336 $ hgph Upsilon -r 'min(draft())'
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1337 o 2 draft a-C - 54acac6f23ab
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1338 |
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1339 ~
15889
816209eaf963 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15824
diff changeset
1340
30198
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1341 $ hg -R Upsilon push Pi -r 7
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1342 pushing to Pi
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1343 searching for changes
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1344 no changes found
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1345 test-debug-phase: move rev 2: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1346 test-debug-phase: move rev 3: 1 -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1347 test-debug-phase: move rev 7: 1 -> 0
30198
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1348 [1]
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1349 $ hgph Upsilon -r 'min(draft())'
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1350 o 8 draft a-F - b740e3e5c05d
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1351 |
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1352 ~
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1353
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1354 $ hg -R Upsilon push Pi -r 8
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1355 pushing to Pi
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1356 searching for changes
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1357 adding changesets
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1358 adding manifests
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1359 adding file changes
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1360 added 1 changesets with 1 changes to 1 files
33459
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1361 test-debug-phase: new rev 5: x -> 0
67a3204c83c1 phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents: 30211
diff changeset
1362 test-debug-phase: move rev 8: 1 -> 0
30198
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1363
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1364 $ hgph Upsilon -r 'min(draft())'
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1365 o 9 draft a-G - 3e27b6f1eee1
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1366 |
145482f505a5 tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
1367 ~