author | Manuel Jacob <me@manueljacob.de> |
Tue, 14 Jul 2020 10:25:41 +0200 | |
branch | stable |
changeset 45092 | e699cebc3ae9 |
parent 44545 | bd7b2c8d06cc |
child 45828 | e0dbfbd4062c |
permissions | -rw-r--r-- |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
1 |
$ cat >> $HGRCPATH << EOF |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
2 |
> [extensions] |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
3 |
> drawdag=$TESTDIR/drawdag.py |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
4 |
> 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
|
5 |
> EOF |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
6 |
|
16013
2a1d97630f7f
tests: don't use alias
Mads Kiilerich <mads@kiilerich.com>
parents:
15956
diff
changeset
|
7 |
$ 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
|
8 |
|
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
9 |
$ mkcommit() { |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
10 |
> echo "$1" > "$1" |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
11 |
> hg add "$1" |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
12 |
> message="$1" |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
13 |
> shift |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
14 |
> 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
|
15 |
> } |
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 |
$ hg init alpha |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
18 |
$ cd alpha |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 |
$ mkcommit a-A |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
20 |
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
|
21 |
$ mkcommit a-B |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
22 |
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
|
23 |
$ mkcommit a-C |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
24 |
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
|
25 |
$ mkcommit a-D |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
26 |
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
|
27 |
$ 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
|
28 |
@ 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
|
29 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
30 |
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
|
31 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
32 |
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
|
33 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
34 |
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
|
35 |
|
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
36 |
|
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
37 |
$ hg init ../beta |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
38 |
$ 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
|
39 |
pushing to ../beta |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
40 |
searching for changes |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
41 |
adding changesets |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
42 |
adding manifests |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
43 |
adding file changes |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
44 |
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
|
45 |
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
|
46 |
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
|
47 |
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
|
48 |
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
|
49 |
$ 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
|
50 |
@ 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
|
51 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
52 |
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
|
53 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
54 |
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
|
55 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
56 |
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
|
57 |
|
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
|
58 |
|
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
59 |
$ cd ../beta |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
60 |
$ 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
|
61 |
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
|
62 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
63 |
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
|
64 |
|
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
65 |
$ hg up -q |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
66 |
$ mkcommit b-A |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
67 |
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
|
68 |
$ 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
|
69 |
@ 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
|
70 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
71 |
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
|
72 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
73 |
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
|
74 |
|
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
75 |
$ hg pull ../alpha |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
76 |
pulling from ../alpha |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
77 |
searching for changes |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
78 |
adding changesets |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
79 |
adding manifests |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
80 |
adding file changes |
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
81 |
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
|
82 |
new changesets 54acac6f23ab:b555f63b6063 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
83 |
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
|
84 |
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
|
85 |
(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
|
86 |
$ 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
|
87 |
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
|
88 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
89 |
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
|
90 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
91 |
| @ 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
|
92 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
93 |
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
|
94 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
95 |
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
|
96 |
|
15484
a44446ff9ad8
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
97 |
|
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
|
98 |
pull did not updated ../alpha state. |
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
16539
diff
changeset
|
99 |
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
|
100 |
|
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
|
101 |
$ 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
|
102 |
$ 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
|
103 |
@ 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
|
104 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
105 |
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
|
106 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
107 |
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
|
108 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
109 |
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
|
110 |
|
20314
b396032e1bb8
phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20117
diff
changeset
|
111 |
$ 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
|
112 |
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
|
113 |
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
|
114 |
no changes found |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
115 |
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
|
116 |
[1] |
b396032e1bb8
phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20117
diff
changeset
|
117 |
$ hgph |
b396032e1bb8
phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20117
diff
changeset
|
118 |
@ 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
|
119 |
| |
b396032e1bb8
phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20117
diff
changeset
|
120 |
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
|
121 |
| |
b396032e1bb8
phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20117
diff
changeset
|
122 |
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
|
123 |
| |
b396032e1bb8
phase: properly compute ancestors of --rev on push (issue3786)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
20117
diff
changeset
|
124 |
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
|
125 |
|
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
|
126 |
$ 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
|
127 |
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
|
128 |
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
|
129 |
no changes found |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
130 |
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
|
131 |
[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
|
132 |
$ 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
|
133 |
@ 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
|
134 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
135 |
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
|
136 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
137 |
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
|
138 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
139 |
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
|
140 |
|
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
|
141 |
|
15486
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
142 |
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
|
143 |
|
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
144 |
$ 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
|
145 |
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
|
146 |
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
|
147 |
adding changesets |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
148 |
adding manifests |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
149 |
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
|
150 |
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
|
151 |
new changesets f54f1bb90ff3 |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
152 |
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
|
153 |
(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
|
154 |
|
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
155 |
$ cd ../beta |
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
156 |
$ 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
|
157 |
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
|
158 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
159 |
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
|
160 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
161 |
| @ 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
|
162 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
163 |
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
|
164 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
165 |
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
|
166 |
|
15486
1eefa4451c56
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15485
diff
changeset
|
167 |
$ 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
|
168 |
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
|
169 |
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
|
170 |
no changes found |
38250
d0abd7949ea3
phases: use "published" in the phase movement message
Boris Feld <boris.feld@octobus.net>
parents:
38249
diff
changeset
|
171 |
1 local changesets published |
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) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38682
diff
changeset
|
207 |
new changesets 054250a37db4:b555f63b6063 (5 drafts) |
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 |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38682
diff
changeset
|
241 |
new changesets 054250a37db4:54acac6f23ab (3 drafts) |
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) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38682
diff
changeset
|
263 |
new changesets f54f1bb90ff3 (1 drafts) |
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 |
38250
d0abd7949ea3
phases: use "published" in the phase movement message
Boris Feld <boris.feld@octobus.net>
parents:
38249
diff
changeset
|
288 |
3 local changesets published |
33459
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 0: 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 1: 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: move rev 2: 1 -> 0 |
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
292 |
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
|
293 |
(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
|
294 |
$ 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
|
295 |
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
|
296 |
| |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
297 |
| 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
|
298 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
299 |
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
|
300 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
301 |
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
|
302 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
303 |
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
|
304 |
|
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
305 |
|
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
306 |
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
|
307 |
|
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
308 |
$ hg up -q f54f1bb90ff3 |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
309 |
$ mkcommit n-A |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
310 |
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
|
311 |
$ mkcommit n-B |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
312 |
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
|
313 |
$ 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
|
314 |
@ 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
|
315 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
316 |
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
|
317 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
318 |
| 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
|
319 |
| | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
320 |
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
|
321 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
322 |
| 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
|
323 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
324 |
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
|
325 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
326 |
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
|
327 |
|
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
328 |
$ cd ../mu |
44545
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
40767
diff
changeset
|
329 |
$ hg pull ../nu --confirm --config ui.interactive=True<<EOF |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
40767
diff
changeset
|
330 |
> y |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
40767
diff
changeset
|
331 |
> EOF |
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
332 |
pulling from ../nu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
333 |
searching for changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
334 |
adding changesets |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
335 |
adding manifests |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
336 |
adding file changes |
44545
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
40767
diff
changeset
|
337 |
adding 2 changesets with 2 changes to 2 files |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
40767
diff
changeset
|
338 |
new changesets d6bcb4f74035:145e75495359 (2 drafts) |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
40767
diff
changeset
|
339 |
4 local changesets will be published |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
40767
diff
changeset
|
340 |
accept incoming changes (yn)? y |
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
341 |
added 2 changesets with 2 changes to 2 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38682
diff
changeset
|
342 |
new changesets d6bcb4f74035:145e75495359 (2 drafts) |
38250
d0abd7949ea3
phases: use "published" in the phase movement message
Boris Feld <boris.feld@octobus.net>
parents:
38249
diff
changeset
|
343 |
4 local changesets published |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
344 |
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
|
345 |
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
|
346 |
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
|
347 |
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
|
348 |
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
|
349 |
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
|
350 |
(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
|
351 |
$ 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
|
352 |
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
|
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 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
|
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 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
|
357 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
358 |
| 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
|
359 |
| | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
360 |
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
|
361 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
362 |
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
|
363 |
| |
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 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
|
365 |
|
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
366 |
$ cd .. |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
367 |
|
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
368 |
pulling into publish=True |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
369 |
|
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
370 |
$ cd alpha |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
371 |
$ 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
|
372 |
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
|
373 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
374 |
| @ 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
|
375 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
376 |
| 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
|
377 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
378 |
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
|
379 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
380 |
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
|
381 |
|
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
382 |
$ hg pull ../mu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
383 |
pulling from ../mu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
384 |
searching for changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
385 |
adding changesets |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
386 |
adding manifests |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
387 |
adding file changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
388 |
added 2 changesets with 2 changes to 2 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38682
diff
changeset
|
389 |
new changesets d6bcb4f74035:145e75495359 (2 drafts) |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
390 |
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
|
391 |
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
|
392 |
(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
|
393 |
$ 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
|
394 |
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
|
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 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
|
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 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
|
399 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
400 |
| @ 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
|
401 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
402 |
| 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
|
403 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
404 |
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
|
405 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
406 |
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
|
407 |
|
15650
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
408 |
$ cd .. |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
409 |
|
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
410 |
pulling back into original repo |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
411 |
|
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
412 |
$ cd nu |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
413 |
$ hg pull ../alpha |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
414 |
pulling from ../alpha |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
415 |
searching for changes |
5b26667fc4d3
phases: exchange phase boundaries on pull
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15647
diff
changeset
|
416 |
no changes found |
38250
d0abd7949ea3
phases: use "published" in the phase movement message
Boris Feld <boris.feld@octobus.net>
parents:
38249
diff
changeset
|
417 |
3 local changesets published |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
418 |
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
|
419 |
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
|
420 |
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
|
421 |
$ 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
|
422 |
@ 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
|
423 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
424 |
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
|
425 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
426 |
| 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
|
427 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
428 |
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
|
429 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
430 |
| 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
|
431 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
432 |
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
|
433 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
434 |
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
|
435 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
436 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
437 |
Push |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
438 |
```` |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
439 |
|
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
|
440 |
(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
|
441 |
|
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
442 |
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
|
443 |
(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
|
444 |
|
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 |
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
|
446 |
|
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 |
$ 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
|
448 |
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
|
449 |
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
|
450 |
no changes found |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
451 |
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
|
452 |
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
|
453 |
[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
|
454 |
$ 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
|
455 |
$ 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
|
456 |
$ 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
|
457 |
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
|
458 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
459 |
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
|
460 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
461 |
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
|
462 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
463 |
| @ 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
|
464 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
465 |
| 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
|
466 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
467 |
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
|
468 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
469 |
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
|
470 |
|
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
|
471 |
|
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
472 |
(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
|
473 |
|
7fba5a245acc
phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15651
diff
changeset
|
474 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
475 |
initial setup |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
476 |
|
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20008
diff
changeset
|
477 |
$ 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
|
478 |
o changeset: 6:145e75495359 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
479 |
| tag: tip |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
480 |
| user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
481 |
| 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
|
482 |
| summary: n-B |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
483 |
| |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
484 |
o changeset: 5:d6bcb4f74035 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
485 |
| user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
486 |
| 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
|
487 |
| summary: n-A |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
488 |
| |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
489 |
o changeset: 4:f54f1bb90ff3 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
490 |
| parent: 1:548a3d25dbf0 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
491 |
| user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
492 |
| 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
|
493 |
| summary: b-A |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
494 |
| |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
495 |
| @ changeset: 3:b555f63b6063 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
496 |
| | user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
497 |
| | 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
|
498 |
| | summary: a-D |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
499 |
| | |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
500 |
| o changeset: 2:54acac6f23ab |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
501 |
|/ user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
502 |
| 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
|
503 |
| summary: a-C |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
504 |
| |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
505 |
o changeset: 1:548a3d25dbf0 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
506 |
| user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
507 |
| 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
|
508 |
| summary: a-B |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
509 |
| |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
510 |
o changeset: 0:054250a37db4 |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
511 |
user: test |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
512 |
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
|
513 |
summary: a-A |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
514 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
515 |
$ mkcommit a-E |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
516 |
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
|
517 |
$ mkcommit a-F |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
518 |
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
|
519 |
$ mkcommit a-G |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
520 |
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
|
521 |
$ hg up d6bcb4f74035 -q |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
522 |
$ mkcommit a-H |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
523 |
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
|
524 |
created new head |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
525 |
$ 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
|
526 |
@ 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
|
527 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
528 |
| 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
|
529 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
530 |
| 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
|
531 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
532 |
| 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
|
533 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
534 |
+---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
|
535 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
536 |
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
|
537 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
538 |
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
|
539 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
540 |
| 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
|
541 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
542 |
| 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
|
543 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
544 |
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
|
545 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
546 |
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
|
547 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
548 |
|
16195
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
549 |
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
|
550 |
|
37416
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34661
diff
changeset
|
551 |
#if repobundlerepo |
16195
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
552 |
$ 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
|
553 |
5 changesets found |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
554 |
$ 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
|
555 |
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
|
556 |
searching for changes |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
557 |
no changes found |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
558 |
$ hgph |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
559 |
@ 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
|
560 |
| |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
561 |
| 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
|
562 |
| | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
563 |
| 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
|
564 |
| | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
565 |
| 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
|
566 |
| | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
567 |
+---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
|
568 |
| | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
569 |
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
|
570 |
| | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
571 |
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
|
572 |
| | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
573 |
| 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
|
574 |
| | |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
575 |
| 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
|
576 |
|/ |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
577 |
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
|
578 |
| |
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
579 |
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
|
580 |
|
37416
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34661
diff
changeset
|
581 |
#endif |
16195
40cc20042fb4
bundlerepo: bundle repos should be non-publishing (issue3266)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16107
diff
changeset
|
582 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
583 |
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
|
584 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
585 |
$ 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
|
586 |
pushing to ../mu |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
587 |
searching for changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
588 |
adding changesets |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
589 |
adding manifests |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
590 |
adding file changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
591 |
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
|
592 |
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
|
593 |
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
|
594 |
$ 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
|
595 |
@ 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
|
596 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
597 |
| 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
|
598 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
599 |
| 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
|
600 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
601 |
| 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
|
602 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
603 |
+---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
|
604 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
605 |
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
|
606 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
607 |
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
|
608 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
609 |
| 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
|
610 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
611 |
| 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
|
612 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
613 |
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
|
614 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
615 |
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
|
616 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
617 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
618 |
$ 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
|
619 |
$ 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
|
620 |
> # 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
|
621 |
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
|
622 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
623 |
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
|
624 |
| |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
625 |
| 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
|
626 |
| | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
627 |
| 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
|
628 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
629 |
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
|
630 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
631 |
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
|
632 |
| | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
633 |
| 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
|
634 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
635 |
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
|
636 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
637 |
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
|
638 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
639 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
640 |
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
|
641 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
642 |
$ hg push ../beta -r b740e3e5c05d |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
643 |
pushing to ../beta |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
644 |
searching for changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
645 |
adding changesets |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
646 |
adding manifests |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
647 |
adding file changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
648 |
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
|
649 |
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
|
650 |
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
|
651 |
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
|
652 |
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
|
653 |
$ 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
|
654 |
> # 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
|
655 |
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
|
656 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
657 |
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
|
658 |
| |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
659 |
| 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
|
660 |
| | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
661 |
| 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
|
662 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
663 |
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
|
664 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
665 |
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
|
666 |
| | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
667 |
| 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
|
668 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
669 |
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
|
670 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
671 |
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
|
672 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
673 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
674 |
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
|
675 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
676 |
$ cd ../beta |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
677 |
$ hg push ../alpha |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
678 |
pushing to ../alpha |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
679 |
searching for changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
680 |
no changes found |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
681 |
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
|
682 |
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
|
683 |
[1] |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
684 |
$ 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
|
685 |
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
|
686 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
687 |
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
|
688 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
689 |
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
|
690 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
691 |
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
|
692 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
693 |
| @ 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
|
694 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
695 |
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
|
696 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
697 |
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
|
698 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
699 |
$ 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
|
700 |
$ 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
|
701 |
@ 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
|
702 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
703 |
| 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
|
704 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
705 |
| 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
|
706 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
707 |
| 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
|
708 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
709 |
+---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
|
710 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
711 |
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
|
712 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
713 |
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
|
714 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
715 |
| 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
|
716 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
717 |
| 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
|
718 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
719 |
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
|
720 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
721 |
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
|
722 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
723 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
724 |
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
|
725 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
726 |
$ 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
|
727 |
pushing to ../mu |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
728 |
searching for changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
729 |
adding changesets |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
730 |
adding manifests |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
731 |
adding file changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
732 |
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
|
733 |
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
|
734 |
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
|
735 |
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
|
736 |
$ 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
|
737 |
@ 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
|
738 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
739 |
| 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
|
740 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
741 |
| 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
|
742 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
743 |
| 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
|
744 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
745 |
+---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
|
746 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
747 |
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
|
748 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
749 |
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
|
750 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
751 |
| 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
|
752 |
| | |
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 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
|
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 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
|
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 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
|
758 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
759 |
$ cd ../mu |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
760 |
$ 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
|
761 |
> # 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
|
762 |
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
|
763 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
764 |
| 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
|
765 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
766 |
| 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
|
767 |
| | |
15956
5653f2d166ea
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15891
diff
changeset
|
768 |
+---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
|
769 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
770 |
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
|
771 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
772 |
| 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
|
773 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
774 |
| 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
|
775 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
776 |
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
|
777 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
778 |
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
|
779 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
780 |
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
|
781 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
782 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
783 |
|
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
784 |
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
|
785 |
|
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
786 |
(in mu) |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
787 |
$ hg push ../alpha |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
788 |
pushing to ../alpha |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
789 |
searching for changes |
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
790 |
no changes found |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
791 |
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
|
792 |
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
|
793 |
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
|
794 |
[1] |
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
795 |
$ 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
|
796 |
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
|
797 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
798 |
| 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
|
799 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
800 |
| 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
|
801 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
802 |
+---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
|
803 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
804 |
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
|
805 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
806 |
| 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
|
807 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
808 |
| 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
|
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 | 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
|
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 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
|
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 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
|
815 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
816 |
$ 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
|
817 |
@ 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
|
818 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
819 |
| 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
|
820 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
821 |
| 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
|
822 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
823 |
| 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
|
824 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
825 |
+---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
|
826 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
827 |
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
|
828 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
829 |
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
|
830 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
831 |
| 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
|
832 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
833 |
| 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
|
834 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
835 |
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
|
836 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
837 |
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
|
838 |
|
15651
e69a3cdad37e
phases: exchange phase boundaries on push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15650
diff
changeset
|
839 |
|
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
840 |
|
21010
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
841 |
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
|
842 |
|
23139
e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
22046
diff
changeset
|
843 |
(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
|
844 |
|
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
845 |
$ 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
|
846 |
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
|
847 |
$ 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
|
848 |
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
|
849 |
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
|
850 |
$ hg push -fv ../alpha |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
851 |
pushing to ../alpha |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
852 |
searching for changes |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
853 |
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
|
854 |
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
|
855 |
178 (changelog) |
27752
29cfc474c5fd
changegroup3: introduce experimental.changegroup3 boolean config
Martin von Zweigbergk <martinvonz@google.com>
parents:
27433
diff
changeset
|
856 |
165 (manifests) |
29cfc474c5fd
changegroup3: introduce experimental.changegroup3 boolean config
Martin von Zweigbergk <martinvonz@google.com>
parents:
27433
diff
changeset
|
857 |
131 a-H |
21010
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
858 |
adding changesets |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
859 |
adding manifests |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
860 |
adding file changes |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
861 |
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
|
862 |
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
|
863 |
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
|
864 |
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
|
865 |
$ hgph |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
866 |
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
|
867 |
| |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
868 |
| 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
|
869 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
870 |
| 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
|
871 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
872 |
+---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
|
873 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
874 |
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
|
875 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
876 |
| 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
|
877 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
878 |
| 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
|
879 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
880 |
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
|
881 |
|/ |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
882 |
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
|
883 |
| |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
884 |
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
|
885 |
|
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 |
$ 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
|
888 |
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
|
889 |
$ hgph -R ../alpha |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
890 |
@ 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
|
891 |
| |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
892 |
| 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
|
893 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
894 |
| 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
|
895 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
896 |
| 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
|
897 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
898 |
+---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
|
899 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
900 |
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
|
901 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
902 |
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
|
903 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
904 |
| 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
|
905 |
| | |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
906 |
| 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
|
907 |
|/ |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
908 |
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
|
909 |
| |
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
910 |
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
|
911 |
|
3d4b54a6f346
phase: add a passing test for (issue3575)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20314
diff
changeset
|
912 |
|
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
913 |
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
|
914 |
|
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
915 |
- 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
|
916 |
|
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
917 |
$ cd ../alpha |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
918 |
$ 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
|
919 |
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
|
920 |
$ 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
|
921 |
@ 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
|
922 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
923 |
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
|
924 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
925 |
| 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
|
926 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
927 |
| 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
|
928 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
929 |
| 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
|
930 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
931 |
+---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
|
932 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
933 |
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
|
934 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
935 |
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
|
936 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
937 |
| 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
|
938 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
939 |
| 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
|
940 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
941 |
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
|
942 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
943 |
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
|
944 |
|
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
945 |
$ 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
|
946 |
1 changesets found |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
947 |
$ 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
|
948 |
adding changesets |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
949 |
adding manifests |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
950 |
adding file changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
951 |
added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38682
diff
changeset
|
952 |
new changesets 435b5d83910c (1 drafts) |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
953 |
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
|
954 |
(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
|
955 |
$ 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
|
956 |
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
|
957 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
958 |
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
|
959 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
960 |
| 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
|
961 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
962 |
| 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
|
963 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
964 |
+---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
|
965 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
966 |
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
|
967 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
968 |
| 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
|
969 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
970 |
| 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
|
971 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
972 |
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
|
973 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
974 |
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
|
975 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
976 |
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
|
977 |
|
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
978 |
$ hg pull ../mu |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
979 |
pulling from ../mu |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
980 |
searching for changes |
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
981 |
no changes found |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
982 |
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
|
983 |
$ 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
|
984 |
@ 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
|
985 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
986 |
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
|
987 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
988 |
| 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
|
989 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
990 |
| 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
|
991 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
992 |
| 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
|
993 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
994 |
+---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
|
995 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
996 |
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
|
997 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
998 |
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
|
999 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1000 |
| 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
|
1001 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1002 |
| 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
|
1003 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1004 |
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
|
1005 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1006 |
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
|
1007 |
|
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1008 |
|
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
21010
diff
changeset
|
1009 |
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
|
1010 |
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
|
1011 |
|
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
|
1012 |
$ 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
|
1013 |
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
|
1014 |
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
|
1015 |
$ 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
|
1016 |
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
|
1017 |
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
|
1018 |
abort: push creates new remote head 435b5d83910c! |
29973
4ddb05751b12
discovery: use single quotes in use warning
timeless <timeless@mozdev.org>
parents:
29688
diff
changeset
|
1019 |
(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
|
1020 |
[255] |
39d1f83eb05d
branchmap: server should not advertise secret changeset in branchmap (Issue3303)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16195
diff
changeset
|
1021 |
$ 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
|
1022 |
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
|
1023 |
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
|
1024 |
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
|
1025 |
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
|
1026 |
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
|
1027 |
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
|
1028 |
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
|
1029 |
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
|
1030 |
$ 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
|
1031 |
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
|
1032 |
| |
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 |
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
|
1034 |
| |
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 |
| 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
|
1036 |
| | |
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 |
| 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
|
1038 |
| | |
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 |
+---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
|
1040 |
| | |
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 |
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
|
1042 |
| | |
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 |
| 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
|
1044 |
| | |
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
|
1045 |
| 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
|
1046 |
| | |
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
|
1047 |
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
|
1048 |
|/ |
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
|
1049 |
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
|
1050 |
| |
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
|
1051 |
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
|
1052 |
|
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
|
1053 |
|
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1054 |
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
|
1055 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1056 |
$ 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
|
1057 |
$ mkcommit 'alpha-more' |
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 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
|
1059 |
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
|
1060 |
$ 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
|
1061 |
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
|
1062 |
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
|
1063 |
adding changesets |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1064 |
adding manifests |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1065 |
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
|
1066 |
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
|
1067 |
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
|
1068 |
$ cd ../mu |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1069 |
$ 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
|
1070 |
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
|
1071 |
$ 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
|
1072 |
$ mkcommit 'mu-more' |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
1073 |
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
|
1074 |
$ cd ../alpha |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1075 |
$ 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
|
1076 |
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
|
1077 |
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
|
1078 |
adding changesets |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1079 |
adding manifests |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1080 |
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
|
1081 |
added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38682
diff
changeset
|
1082 |
new changesets 5237fb433fc8 (1 drafts) |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
1083 |
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
|
1084 |
(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
|
1085 |
$ hgph |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1086 |
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
|
1087 |
| |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1088 |
| @ 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
|
1089 |
| | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1090 |
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
|
1091 |
|/ |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1092 |
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
|
1093 |
| |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1094 |
| 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
|
1095 |
| | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1096 |
| 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
|
1097 |
| | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1098 |
| 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
|
1099 |
| | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1100 |
+---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
|
1101 |
| | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1102 |
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
|
1103 |
| | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1104 |
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
|
1105 |
| | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1106 |
| 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
|
1107 |
| | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1108 |
| 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
|
1109 |
|/ |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1110 |
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
|
1111 |
| |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1112 |
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
|
1113 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1114 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1115 |
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
|
1116 |
|
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
1117 |
$ cd .. |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1118 |
$ 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
|
1119 |
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
|
1120 |
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
|
1121 |
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
|
1122 |
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
|
1123 |
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
|
1124 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1125 |
# 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
|
1126 |
# |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1127 |
# * secret remotely |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1128 |
# * known locally |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1129 |
# * 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
|
1130 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1131 |
$ 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
|
1132 |
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
|
1133 |
$ 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
|
1134 |
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
|
1135 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1136 |
$ cd gamma |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1137 |
$ 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
|
1138 |
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
|
1139 |
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
|
1140 |
adding changesets |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1141 |
adding manifests |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1142 |
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
|
1143 |
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
|
1144 |
new changesets e9f537e46dea:b740e3e5c05d |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
1145 |
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
|
1146 |
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
|
1147 |
(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
|
1148 |
$ 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
|
1149 |
2: draft |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1150 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1151 |
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
|
1152 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1153 |
$ cd ../beta |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1154 |
$ 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
|
1155 |
$ 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
|
1156 |
$ cd ../gamma |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1157 |
|
29688
30c59bdd4f41
tests: remove all remaining usage of experimental.bundle2-exp
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29687
diff
changeset
|
1158 |
$ 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
|
1159 |
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
|
1160 |
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
|
1161 |
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
|
1162 |
$ 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
|
1163 |
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
|
1164 |
|
d49328038b38
test: explicitly test wire protocol discovery with bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25355
diff
changeset
|
1165 |
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
|
1166 |
|
29687
ac9b85079122
tests: use 'legacy.exchange' option in various mixed tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29658
diff
changeset
|
1167 |
$ 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
|
1168 |
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
|
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 |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1171 |
$ 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
|
1172 |
2: draft |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1173 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1174 |
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
|
1175 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1176 |
$ 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
|
1177 |
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
|
1178 |
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
|
1179 |
no changes found |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
16013
diff
changeset
|
1180 |
[1] |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1181 |
$ 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
|
1182 |
2: draft |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1183 |
|
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1184 |
$ killdaemons.py |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1185 |
|
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1186 |
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
|
1187 |
(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
|
1188 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1189 |
$ cd .. |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1190 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1191 |
|
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
1192 |
Test Clone behavior |
15713
cff25e4b37d2
phases: do not exchange secret changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15659
diff
changeset
|
1193 |
|
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
1194 |
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
|
1195 |
|
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
1196 |
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
|
1197 |
(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
|
1198 |
|
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1199 |
# 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
|
1200 |
|
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1201 |
$ 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
|
1202 |
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
|
1203 |
|
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
1204 |
$ 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
|
1205 |
$ 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
|
1206 |
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
|
1207 |
| |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1208 |
| 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
|
1209 |
| | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1210 |
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
|
1211 |
|/ |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1212 |
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
|
1213 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1214 |
| 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
|
1215 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1216 |
| 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
|
1217 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1218 |
+---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
|
1219 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1220 |
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
|
1221 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1222 |
| 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
|
1223 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1224 |
| 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
|
1225 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1226 |
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
|
1227 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1228 |
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
|
1229 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1230 |
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
|
1231 |
|
15740
62aa9305399d
phases: copy phases data on local clone
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15713
diff
changeset
|
1232 |
|
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
|
1233 |
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
|
1234 |
|
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
|
1235 |
(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
|
1236 |
|
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
|
1237 |
$ 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
|
1238 |
$ 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
|
1239 |
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
|
1240 |
| |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1241 |
| 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
|
1242 |
| | |
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1243 |
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
|
1244 |
|/ |
15824
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1245 |
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
|
1246 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1247 |
| 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
|
1248 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1249 |
| 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
|
1250 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1251 |
| 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
|
1252 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1253 |
+---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
|
1254 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1255 |
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
|
1256 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1257 |
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
|
1258 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1259 |
| 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
|
1260 |
| | |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1261 |
| 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
|
1262 |
|/ |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1263 |
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
|
1264 |
| |
94a4748db392
phases: use graph and phase name in exchange test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15823
diff
changeset
|
1265 |
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
|
1266 |
|
20008
e54a078153f7
tests: skip tests that require not having root (issue4089)
Matt Mackall <mpm@selenic.com>
parents:
19934
diff
changeset
|
1267 |
#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
|
1268 |
|
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1269 |
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
|
1270 |
-------------------------------- |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1271 |
(issue3684) |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1272 |
|
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1273 |
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
|
1274 |
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
|
1275 |
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
|
1276 |
|
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1277 |
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
|
1278 |
|
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1279 |
$ hg init Phi |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1280 |
$ cd Upsilon |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1281 |
$ chmod -R -w .hg |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1282 |
$ hg push ../Phi |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1283 |
pushing to ../Phi |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1284 |
searching for changes |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1285 |
adding changesets |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1286 |
adding manifests |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1287 |
adding file changes |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1288 |
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
|
1289 |
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
|
1290 |
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
|
1291 |
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
|
1292 |
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
|
1293 |
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
|
1294 |
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
|
1295 |
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
|
1296 |
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
|
1297 |
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
|
1298 |
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
|
1299 |
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
|
1300 |
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
|
1301 |
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
|
1302 |
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
|
1303 |
$ chmod -R +w .hg |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1304 |
|
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1305 |
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
|
1306 |
|
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1307 |
$ 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
|
1308 |
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
|
1309 |
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
|
1310 |
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
|
1311 |
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
|
1312 |
$ chmod -R -w .hg |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1313 |
$ hg push ../Phi |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1314 |
pushing to ../Phi |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1315 |
searching for changes |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1316 |
no changes found |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1317 |
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
|
1318 |
[1] |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1319 |
$ chmod -R +w .hg |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1320 |
|
38000
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1321 |
3. Test that push is prevented if lock was already acquired (not a permission |
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1322 |
error, but EEXIST) |
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1323 |
|
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1324 |
$ touch .hg/store/lock |
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1325 |
$ hg push ../Phi --config ui.timeout=1 |
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1326 |
pushing to ../Phi |
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1327 |
waiting for lock on repository $TESTTMP/Upsilon held by '' |
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1328 |
abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by '' |
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1329 |
(lock might be very busy) |
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1330 |
[255] |
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1331 |
$ rm .hg/store/lock |
7c05198cd1ca
push: continue without locking on lock failure other than EEXIST (issue5882)
Yuya Nishihara <yuya@tcha.org>
parents:
37416
diff
changeset
|
1332 |
|
19097
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1333 |
$ cd .. |
3f5e75c22585
push: make locking of source optional (issue3684)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17565
diff
changeset
|
1334 |
|
30198
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1335 |
#endif |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1336 |
|
33508
d09de637cbc8
test-phase-exchange: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33459
diff
changeset
|
1337 |
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
|
1338 |
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
|
1339 |
above. |
30198
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1340 |
|
33563
da94a99df96b
test-phases-exchange: properly conditionalize output
Matt Harbison <matt_harbison@yahoo.com>
parents:
33508
diff
changeset
|
1341 |
#if unix-permissions no-root |
da94a99df96b
test-phases-exchange: properly conditionalize output
Matt Harbison <matt_harbison@yahoo.com>
parents:
33508
diff
changeset
|
1342 |
$ 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
|
1343 |
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
|
1344 |
#else |
30198
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1345 |
$ 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
|
1346 |
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
|
1347 |
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
|
1348 |
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
|
1349 |
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
|
1350 |
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
|
1351 |
#endif |
33508
d09de637cbc8
test-phase-exchange: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33459
diff
changeset
|
1352 |
|
30198
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1353 |
$ 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
|
1354 |
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
|
1355 |
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
|
1356 |
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
|
1357 |
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
|
1358 |
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
|
1359 |
$ 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
|
1360 |
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
|
1361 |
| |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1362 |
~ |
15889
816209eaf963
phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15824
diff
changeset
|
1363 |
|
30198
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1364 |
$ 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
|
1365 |
pushing to Pi |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1366 |
searching for changes |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1367 |
no changes found |
33459
67a3204c83c1
phases: test phases tracking at the transaction level
Boris Feld <boris.feld@octobus.net>
parents:
30211
diff
changeset
|
1368 |
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
|
1369 |
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
|
1370 |
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
|
1371 |
[1] |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1372 |
$ 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
|
1373 |
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
|
1374 |
| |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1375 |
~ |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1376 |
|
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1377 |
$ 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
|
1378 |
pushing to Pi |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1379 |
searching for changes |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1380 |
adding changesets |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1381 |
adding manifests |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1382 |
adding file changes |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1383 |
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
|
1384 |
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
|
1385 |
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
|
1386 |
|
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1387 |
$ 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
|
1388 |
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
|
1389 |
| |
145482f505a5
tests: add more test coverage of phase changes when pushing
Mads Kiilerich <madski@unity3d.com>
parents:
29973
diff
changeset
|
1390 |
~ |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1391 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1392 |
Test phases exchange when a phaseroot is on a merge |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1393 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1394 |
$ hg init mergetest |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1395 |
$ cd mergetest |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1396 |
> cat > .hg/hgrc << EOF |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1397 |
> [phases] |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1398 |
> publish = false |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1399 |
> EOF |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1400 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1401 |
$ hg debugdrawdag << EOF |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1402 |
> E Z |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1403 |
> |\| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1404 |
> D Y |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1405 |
> | | |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1406 |
> C X |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1407 |
> |/ |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1408 |
> B |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1409 |
> | |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1410 |
> A |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1411 |
> EOF |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1412 |
test-debug-phase: new rev 0: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1413 |
test-debug-phase: new rev 1: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1414 |
test-debug-phase: new rev 2: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1415 |
test-debug-phase: new rev 3: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1416 |
test-debug-phase: new rev 4: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1417 |
test-debug-phase: new rev 5: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1418 |
test-debug-phase: new rev 6: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1419 |
test-debug-phase: new rev 7: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1420 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1421 |
$ hg phase --public -r D |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1422 |
test-debug-phase: move rev 0: 1 -> 0 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1423 |
test-debug-phase: move rev 1: 1 -> 0 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1424 |
test-debug-phase: move rev 2: 1 -> 0 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1425 |
test-debug-phase: move rev 4: 1 -> 0 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1426 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1427 |
$ hg log -G -T '{shortest(node, 5)} {phase}' |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1428 |
o bb947 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1429 |
| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1430 |
| o 5ac28 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1431 |
|/| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1432 |
o | 13b7b draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1433 |
| | |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1434 |
| o f5853 public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1435 |
| | |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1436 |
o | c67c4 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1437 |
| | |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1438 |
| o 26805 public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1439 |
|/ |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1440 |
o 11247 public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1441 |
| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1442 |
o 426ba public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1443 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1444 |
$ cd .. |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1445 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1446 |
Works with default settings |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1447 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1448 |
$ hg -R mergetest serve -p $HGPORT -d --pid-file=hg.pid |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1449 |
$ cat hg.pid >> $DAEMON_PIDS |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1450 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1451 |
$ hg clone -U http://localhost:$HGPORT mergetest-normal |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1452 |
requesting all changes |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1453 |
adding changesets |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1454 |
adding manifests |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1455 |
adding file changes |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1456 |
added 8 changesets with 7 changes to 7 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38682
diff
changeset
|
1457 |
new changesets 426bada5c675:bb94757e651a (4 drafts) |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1458 |
test-debug-phase: new rev 0: x -> 0 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1459 |
test-debug-phase: new rev 1: x -> 0 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1460 |
test-debug-phase: new rev 2: x -> 0 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1461 |
test-debug-phase: new rev 3: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1462 |
test-debug-phase: new rev 4: x -> 0 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1463 |
test-debug-phase: new rev 5: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1464 |
test-debug-phase: new rev 6: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1465 |
test-debug-phase: new rev 7: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1466 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1467 |
$ hg -R mergetest-normal log -G -T '{shortest(node, 5)} {phase}' |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1468 |
o bb947 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1469 |
| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1470 |
| o 5ac28 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1471 |
|/| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1472 |
o | 13b7b draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1473 |
| | |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1474 |
| o f5853 public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1475 |
| | |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1476 |
o | c67c4 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1477 |
| | |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1478 |
| o 26805 public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1479 |
|/ |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1480 |
o 11247 public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1481 |
| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1482 |
o 426ba public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1483 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1484 |
$ killdaemons.py |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1485 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1486 |
With legacy listkeys over bundle2 |
38682
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1487 |
(issue 5939: public phase was lost on 26805 and f5853 before, due to a bug |
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1488 |
of phase heads computation) |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1489 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1490 |
$ hg -R mergetest --config devel.legacy.exchange=phases serve -p $HGPORT -d --pid-file=hg.pid |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1491 |
$ cat hg.pid >> $DAEMON_PIDS |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1492 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1493 |
$ hg clone -U http://localhost:$HGPORT mergetest-nobinarypart |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1494 |
requesting all changes |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1495 |
adding changesets |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1496 |
adding manifests |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1497 |
adding file changes |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1498 |
added 8 changesets with 7 changes to 7 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38682
diff
changeset
|
1499 |
new changesets 426bada5c675:bb94757e651a (4 drafts) |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1500 |
test-debug-phase: new rev 0: x -> 0 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1501 |
test-debug-phase: new rev 1: x -> 0 |
38682
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1502 |
test-debug-phase: new rev 2: x -> 0 |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1503 |
test-debug-phase: new rev 3: x -> 1 |
38682
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1504 |
test-debug-phase: new rev 4: x -> 0 |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1505 |
test-debug-phase: new rev 5: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1506 |
test-debug-phase: new rev 6: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1507 |
test-debug-phase: new rev 7: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1508 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1509 |
$ hg -R mergetest-nobinarypart log -G -T '{shortest(node, 5)} {phase}' |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1510 |
o bb947 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1511 |
| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1512 |
| o 5ac28 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1513 |
|/| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1514 |
o | 13b7b draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1515 |
| | |
38682
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1516 |
| o f5853 public |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1517 |
| | |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1518 |
o | c67c4 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1519 |
| | |
38682
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1520 |
| o 26805 public |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1521 |
|/ |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1522 |
o 11247 public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1523 |
| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1524 |
o 426ba public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1525 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1526 |
$ killdaemons.py |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1527 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1528 |
Without bundle2 |
38682
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1529 |
(issue 5939: public phase was lost on 26805 and f5853 before, due to a bug |
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1530 |
of phase heads computation) |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1531 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1532 |
$ hg -R mergetest serve -p $HGPORT -d --pid-file=hg.pid |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1533 |
$ cat hg.pid >> $DAEMON_PIDS |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1534 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1535 |
$ hg --config devel.legacy.exchange=bundle1 clone -U http://localhost:$HGPORT mergetest-bundle1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1536 |
requesting all changes |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1537 |
adding changesets |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1538 |
adding manifests |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1539 |
adding file changes |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1540 |
added 8 changesets with 7 changes to 7 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38682
diff
changeset
|
1541 |
new changesets 426bada5c675:bb94757e651a (4 drafts) |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1542 |
test-debug-phase: new rev 0: x -> 0 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1543 |
test-debug-phase: new rev 1: x -> 0 |
38682
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1544 |
test-debug-phase: new rev 2: x -> 0 |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1545 |
test-debug-phase: new rev 3: x -> 1 |
38682
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1546 |
test-debug-phase: new rev 4: x -> 0 |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1547 |
test-debug-phase: new rev 5: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1548 |
test-debug-phase: new rev 6: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1549 |
test-debug-phase: new rev 7: x -> 1 |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1550 |
|
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1551 |
$ hg -R mergetest-bundle1 log -G -T '{shortest(node, 5)} {phase}' |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1552 |
o bb947 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1553 |
| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1554 |
| o 5ac28 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1555 |
|/| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1556 |
o | 13b7b draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1557 |
| | |
38682
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1558 |
| o f5853 public |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1559 |
| | |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1560 |
o | c67c4 draft |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1561 |
| | |
38682
88efb7d6bcb6
phases: remove excessive optimization from newheads() (issue5939)
Yuya Nishihara <yuya@tcha.org>
parents:
38677
diff
changeset
|
1562 |
| o 26805 public |
38677
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1563 |
|/ |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1564 |
o 11247 public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1565 |
| |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1566 |
o 426ba public |
2a227782e754
tests: add test demonstrating phase loss when cloning (issue5939)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38250
diff
changeset
|
1567 |
|
40686
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1568 |
$ killdaemons.py |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1569 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1570 |
|
40767
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1571 |
auto-publish config |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1572 |
------------------- |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1573 |
|
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1574 |
$ hg init auto-publish-orig |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1575 |
$ hg clone -q auto-publish-orig auto-publish-clone |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1576 |
$ cd auto-publish-clone |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1577 |
$ mkcommit a-p-A |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1578 |
test-debug-phase: new rev 0: x -> 1 |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1579 |
$ mkcommit a-p-B |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1580 |
test-debug-phase: new rev 1: x -> 1 |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1581 |
|
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1582 |
abort behavior |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1583 |
|
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1584 |
$ hg push --config experimental.auto-publish=abort |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1585 |
pushing to $TESTTMP/auto-publish-orig |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1586 |
abort: push would publish 2 changesets |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1587 |
(use --publish or adjust 'experimental.auto-publish' config) |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1588 |
[255] |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1589 |
$ hg push -r '.^' --config experimental.auto-publish=abort |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1590 |
pushing to $TESTTMP/auto-publish-orig |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1591 |
abort: push would publish 1 changesets |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1592 |
(use --publish or adjust 'experimental.auto-publish' config) |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1593 |
[255] |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1594 |
|
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1595 |
--publish flag makes push succeed |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1596 |
|
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1597 |
$ hg push -r '.^' --publish --config experimental.auto-publish=abort |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1598 |
pushing to $TESTTMP/auto-publish-orig |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1599 |
searching for changes |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1600 |
adding changesets |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1601 |
adding manifests |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1602 |
adding file changes |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1603 |
added 1 changesets with 1 changes to 1 files |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1604 |
test-debug-phase: new rev 0: x -> 0 |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1605 |
test-debug-phase: move rev 0: 1 -> 0 |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1606 |
|
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1607 |
warn behavior |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1608 |
|
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1609 |
$ hg push --config experimental.auto-publish=warn |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1610 |
pushing to $TESTTMP/auto-publish-orig |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1611 |
1 changesets about to be published |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1612 |
searching for changes |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1613 |
adding changesets |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1614 |
adding manifests |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1615 |
adding file changes |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1616 |
added 1 changesets with 1 changes to 1 files |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1617 |
test-debug-phase: new rev 1: x -> 0 |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1618 |
test-debug-phase: move rev 1: 1 -> 0 |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1619 |
|
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1620 |
confirm behavior |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1621 |
|
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1622 |
$ mkcommit a-p-C |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1623 |
test-debug-phase: new rev 2: x -> 1 |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1624 |
$ hg push --config experimental.auto-publish=confirm |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1625 |
pushing to $TESTTMP/auto-publish-orig |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1626 |
push and publish 1 changesets (yn)? y |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1627 |
searching for changes |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1628 |
adding changesets |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1629 |
adding manifests |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1630 |
adding file changes |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1631 |
added 1 changesets with 1 changes to 1 files |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1632 |
test-debug-phase: new rev 2: x -> 0 |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1633 |
test-debug-phase: move rev 2: 1 -> 0 |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1634 |
|
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1635 |
$ cd .. |
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1636 |
|
33d30fb1e4ae
push: config option to control behavior when pushing to a publishing server
Anton Shestakov <av6@dwimlabs.net>
parents:
40686
diff
changeset
|
1637 |
|
40686
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1638 |
--publish flag |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1639 |
-------------- |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1640 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1641 |
$ hg init doesnt-publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1642 |
$ cd doesnt-publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1643 |
$ cat > .hg/hgrc << EOF |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1644 |
> [phases] |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1645 |
> publish=0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1646 |
> EOF |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1647 |
$ mkcommit orig-root |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1648 |
test-debug-phase: new rev 0: x -> 1 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1649 |
$ hg phase --public -r 'all()' |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1650 |
test-debug-phase: move rev 0: 1 -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1651 |
$ cd .. |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1652 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1653 |
$ hg clone -q doesnt-publish client |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1654 |
$ cd client |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1655 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1656 |
pushing nothing |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1657 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1658 |
$ mkcommit new-A |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1659 |
test-debug-phase: new rev 1: x -> 1 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1660 |
$ mkcommit new-B |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1661 |
test-debug-phase: new rev 2: x -> 1 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1662 |
$ hg push --publish -r null |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1663 |
pushing to $TESTTMP/doesnt-publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1664 |
searching for changes |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1665 |
no changes found |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1666 |
[1] |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1667 |
$ hgph |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1668 |
@ 2 draft new-B - 89512e87d697 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1669 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1670 |
o 1 draft new-A - 4826e44e690e |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1671 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1672 |
o 0 public orig-root - c48edaf99a10 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1673 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1674 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1675 |
pushing a new changeset (selective) |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1676 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1677 |
$ hg push --publish -r 'desc("new-A")' |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1678 |
pushing to $TESTTMP/doesnt-publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1679 |
searching for changes |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1680 |
adding changesets |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1681 |
adding manifests |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1682 |
adding file changes |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1683 |
added 1 changesets with 1 changes to 1 files |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1684 |
test-debug-phase: new rev 1: x -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1685 |
test-debug-phase: move rev 1: 1 -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1686 |
$ hgph |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1687 |
@ 2 draft new-B - 89512e87d697 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1688 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1689 |
o 1 public new-A - 4826e44e690e |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1690 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1691 |
o 0 public orig-root - c48edaf99a10 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1692 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1693 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1694 |
pushing a new changeset (linear) |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1695 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1696 |
$ hg push --publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1697 |
pushing to $TESTTMP/doesnt-publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1698 |
searching for changes |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1699 |
adding changesets |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1700 |
adding manifests |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1701 |
adding file changes |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1702 |
added 1 changesets with 1 changes to 1 files |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1703 |
test-debug-phase: new rev 2: x -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1704 |
test-debug-phase: move rev 2: 1 -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1705 |
$ hgph |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1706 |
@ 2 public new-B - 89512e87d697 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1707 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1708 |
o 1 public new-A - 4826e44e690e |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1709 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1710 |
o 0 public orig-root - c48edaf99a10 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1711 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1712 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1713 |
pushing new changesets (different branches) |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1714 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1715 |
$ mkcommit new-C |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1716 |
test-debug-phase: new rev 3: x -> 1 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1717 |
$ hg update -q '.^' |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1718 |
$ hg branch -q another |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1719 |
$ mkcommit new-D |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1720 |
test-debug-phase: new rev 4: x -> 1 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1721 |
$ hg push --new-branch --publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1722 |
pushing to $TESTTMP/doesnt-publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1723 |
searching for changes |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1724 |
adding changesets |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1725 |
adding manifests |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1726 |
adding file changes |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1727 |
added 2 changesets with 2 changes to 2 files (+1 heads) |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1728 |
test-debug-phase: new rev 3: x -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1729 |
test-debug-phase: new rev 4: x -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1730 |
test-debug-phase: move rev 3: 1 -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1731 |
test-debug-phase: move rev 4: 1 -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1732 |
$ hgph |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1733 |
@ 4 public new-D - 5e53dcafd13c |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1734 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1735 |
| o 3 public new-C - 1665482cc06d |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1736 |
|/ |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1737 |
o 2 public new-B - 89512e87d697 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1738 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1739 |
o 1 public new-A - 4826e44e690e |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1740 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1741 |
o 0 public orig-root - c48edaf99a10 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1742 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1743 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1744 |
pushing a shared changeset |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1745 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1746 |
$ mkcommit new-E |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1747 |
test-debug-phase: new rev 5: x -> 1 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1748 |
$ hg push |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1749 |
pushing to $TESTTMP/doesnt-publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1750 |
searching for changes |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1751 |
adding changesets |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1752 |
adding manifests |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1753 |
adding file changes |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1754 |
added 1 changesets with 1 changes to 1 files |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1755 |
test-debug-phase: new rev 5: x -> 1 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1756 |
$ hg push --publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1757 |
pushing to $TESTTMP/doesnt-publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1758 |
searching for changes |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1759 |
no changes found |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1760 |
test-debug-phase: move rev 5: 1 -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1761 |
test-debug-phase: move rev 5: 1 -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1762 |
[1] |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1763 |
$ hgph |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1764 |
@ 5 public new-E - 48931ee3529c |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1765 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1766 |
o 4 public new-D - 5e53dcafd13c |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1767 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1768 |
| o 3 public new-C - 1665482cc06d |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1769 |
|/ |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1770 |
o 2 public new-B - 89512e87d697 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1771 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1772 |
o 1 public new-A - 4826e44e690e |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1773 |
| |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1774 |
o 0 public orig-root - c48edaf99a10 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1775 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1776 |
$ cd .. |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1777 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1778 |
--publish with subrepos (doesn't propagate to subrepos currently) |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1779 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1780 |
$ hg init with-subrepo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1781 |
$ cd with-subrepo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1782 |
$ cat > .hg/hgrc << EOF |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1783 |
> [phases] |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1784 |
> publish=0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1785 |
> EOF |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1786 |
$ hg init subrepo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1787 |
$ cd subrepo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1788 |
$ cat > .hg/hgrc << EOF |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1789 |
> [phases] |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1790 |
> publish=0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1791 |
> EOF |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1792 |
$ echo foo > foo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1793 |
$ hg ci -qAm0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1794 |
test-debug-phase: new rev 0: x -> 1 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1795 |
$ cd .. |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1796 |
$ echo 'subrepo = subrepo' > .hgsub |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1797 |
$ hg add .hgsub |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1798 |
$ hg ci -m 'Adding subrepo' |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1799 |
test-debug-phase: new rev 0: x -> 1 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1800 |
$ hgph |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1801 |
@ 0 draft Adding subrepo - 74d5b62379c0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1802 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1803 |
$ hgph -R subrepo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1804 |
@ 0 draft 0 - 4b3f578e3344 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1805 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1806 |
$ cd .. |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1807 |
$ hg clone with-subrepo client-with-subrepo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1808 |
updating to branch default |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1809 |
cloning subrepo subrepo from $TESTTMP/with-subrepo/subrepo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1810 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1811 |
$ cd client-with-subrepo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1812 |
$ hg push --publish |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1813 |
pushing to $TESTTMP/with-subrepo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1814 |
no changes made to subrepo subrepo since last push to $TESTTMP/with-subrepo/subrepo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1815 |
searching for changes |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1816 |
no changes found |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1817 |
test-debug-phase: move rev 0: 1 -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1818 |
test-debug-phase: move rev 0: 1 -> 0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1819 |
[1] |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1820 |
$ hgph |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1821 |
@ 0 public Adding subrepo - 74d5b62379c0 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1822 |
|
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1823 |
$ hgph -R subrepo |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1824 |
@ 0 draft 0 - 4b3f578e3344 |
9b8d1ad851f8
push: add --publish flag to change phase of pushed changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
39480
diff
changeset
|
1825 |