annotate tests/test-strip-cross.t @ 51395:a0d88b021a98

unbundle: faster computation of changed heads To compute the set of changed heads it's sufficient to look at the recent commits, instead of looking at all heads currently in existence.
author Arseniy Alekseyev <aalekseyev@janestreet.com>
date Thu, 21 Dec 2023 17:38:04 +0000
parents 2f2682f40ea0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
1 test stripping of filelogs where the linkrev doesn't always increase
5909
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
2
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
3 $ echo '[extensions]' >> $HGRCPATH
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 20115
diff changeset
4 $ echo 'strip =' >> $HGRCPATH
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
5 $ commit()
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
6 > {
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
7 > hg up -qC null
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
8 > count=1
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
9 > for i in "$@"; do
12537
5df8ef0f3f51 tests: fix tabs/indentation in test-strip-cross.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 12492
diff changeset
10 > for f in $i; do
42911
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
11 > mkdir -p `dirname $f`
12537
5df8ef0f3f51 tests: fix tabs/indentation in test-strip-cross.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 12492
diff changeset
12 > echo $count > $f
5df8ef0f3f51 tests: fix tabs/indentation in test-strip-cross.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 12492
diff changeset
13 > done
5df8ef0f3f51 tests: fix tabs/indentation in test-strip-cross.t
Adrian Buehlmann <adrian@cadifra.com>
parents: 12492
diff changeset
14 > count=`expr $count + 1`
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
15 > done
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
16 > hg commit -qAm "$*"
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
17 > }
5909
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
18
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
19 2 1 0 2 0 1 2
5909
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
20
42910
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
21 $ mkdir files
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
22 $ cd files
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
23 $ hg init orig
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
24 $ cd orig
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
25 $ commit '201 210'
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
26 $ commit '102 120' '210'
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
27 $ commit '021'
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
28 $ commit '201' '021 120'
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
29 $ commit '012 021' '102 201' '120 210'
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
30 $ commit '102 120' '012 210' '021 201'
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
31 $ commit '201 210' '021 120' '012 102'
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
32 $ cd ..
42910
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
33 $ hg clone -q -U -r 4 -r 5 -r 6 orig crossed
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
34 $ cd crossed
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
35
42909
32fdbc952bdd tests: don't log manifest-file in test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42908
diff changeset
36 $ for i in 012 021 102 120 201 210; do
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
37 > echo $i
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
38 > hg debugindex $i
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
39 > echo
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
40 > done
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
41 012
49252
4141951dacff debugindex: rename the parent column to mention nodeid
Pierre-Yves DAVID <pierre-yves.david@octobus.net>
parents: 49251
diff changeset
42 rev linkrev nodeid p1-nodeid p2-nodeid
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
43 0 0 b8e02f643373 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
44 1 1 5d9299349fc0 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
45 2 2 2661d26c6496 000000000000 000000000000
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
46
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
47 021
49252
4141951dacff debugindex: rename the parent column to mention nodeid
Pierre-Yves DAVID <pierre-yves.david@octobus.net>
parents: 49251
diff changeset
48 rev linkrev nodeid p1-nodeid p2-nodeid
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
49 0 0 b8e02f643373 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
50 1 2 5d9299349fc0 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
51 2 1 2661d26c6496 000000000000 000000000000
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
52
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
53 102
49252
4141951dacff debugindex: rename the parent column to mention nodeid
Pierre-Yves DAVID <pierre-yves.david@octobus.net>
parents: 49251
diff changeset
54 rev linkrev nodeid p1-nodeid p2-nodeid
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
55 0 1 b8e02f643373 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
56 1 0 5d9299349fc0 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
57 2 2 2661d26c6496 000000000000 000000000000
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
58
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
59 120
49252
4141951dacff debugindex: rename the parent column to mention nodeid
Pierre-Yves DAVID <pierre-yves.david@octobus.net>
parents: 49251
diff changeset
60 rev linkrev nodeid p1-nodeid p2-nodeid
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
61 0 1 b8e02f643373 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
62 1 2 5d9299349fc0 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
63 2 0 2661d26c6496 000000000000 000000000000
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
64
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
65 201
49252
4141951dacff debugindex: rename the parent column to mention nodeid
Pierre-Yves DAVID <pierre-yves.david@octobus.net>
parents: 49251
diff changeset
66 rev linkrev nodeid p1-nodeid p2-nodeid
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
67 0 2 b8e02f643373 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
68 1 0 5d9299349fc0 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
69 2 1 2661d26c6496 000000000000 000000000000
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
70
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
71 210
49252
4141951dacff debugindex: rename the parent column to mention nodeid
Pierre-Yves DAVID <pierre-yves.david@octobus.net>
parents: 49251
diff changeset
72 rev linkrev nodeid p1-nodeid p2-nodeid
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
73 0 2 b8e02f643373 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
74 1 1 5d9299349fc0 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
75 2 0 2661d26c6496 000000000000 000000000000
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
76
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 12640
diff changeset
77 $ cd ..
42910
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
78 $ for i in 0 1 2; do
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
79 > hg clone -q -U --pull crossed $i
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
80 > echo "% Trying to strip revision $i"
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12537
diff changeset
81 > hg --cwd $i strip $i
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
82 > echo "% Verifying"
49825
2f2682f40ea0 tests: use the `--quiet` flag for verify when applicable
Raphaël Gomès <rgomes@octobus.net>
parents: 49252
diff changeset
83 > hg --cwd $i verify -q
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
84 > echo
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
85 > done
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
86 % Trying to strip revision 0
42910
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
87 saved backup bundle to $TESTTMP/files/0/.hg/strip-backup/cbb8c2f0a2e3-239800b9-backup.hg
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
88 % Verifying
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
89
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
90 % Trying to strip revision 1
42910
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
91 saved backup bundle to $TESTTMP/files/1/.hg/strip-backup/124ecc0cbec9-6104543f-backup.hg
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
92 % Verifying
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
93
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
94 % Trying to strip revision 2
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
95 saved backup bundle to $TESTTMP/files/2/.hg/strip-backup/f6439b304a1a-c6505a5f-backup.hg
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
96 % Verifying
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
97
42910
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
98 $ cd ..
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
99
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
100 Do a similar test where the manifest revlog has unordered linkrevs
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
101 $ mkdir manifests
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
102 $ cd manifests
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
103 $ hg init orig
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
104 $ cd orig
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
105 $ commit 'file'
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
106 $ commit 'other'
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
107 $ commit '' 'other'
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
108 $ HGUSER=another-user; export HGUSER
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
109 $ commit 'file'
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
110 $ commit 'other' 'file'
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
111 $ cd ..
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
112 $ hg clone -q -U -r 1 -r 2 -r 3 -r 4 orig crossed
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
113 $ cd crossed
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
114 $ hg debugindex --manifest
49252
4141951dacff debugindex: rename the parent column to mention nodeid
Pierre-Yves DAVID <pierre-yves.david@octobus.net>
parents: 49251
diff changeset
115 rev linkrev nodeid p1-nodeid p2-nodeid
42910
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
116 0 2 6bbc6fee55c2 000000000000 000000000000
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
117 1 0 1c556153fe54 000000000000 000000000000
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
118 2 1 1f76dba919fd 000000000000 000000000000
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
119 3 3 bbee06ad59d5 000000000000 000000000000
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
120
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
121 $ cd ..
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
122 $ for i in 2 3; do
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
123 > hg clone -q -U --pull crossed $i
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
124 > echo "% Trying to strip revision $i"
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
125 > hg --cwd $i strip $i
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
126 > echo "% Verifying"
49825
2f2682f40ea0 tests: use the `--quiet` flag for verify when applicable
Raphaël Gomès <rgomes@octobus.net>
parents: 49252
diff changeset
127 > hg --cwd $i verify -q
42910
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
128 > echo
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
129 > done
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
130 % Trying to strip revision 2
42910
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
131 saved backup bundle to $TESTTMP/manifests/2/.hg/strip-backup/f3015ad03c03-4d98bdc2-backup.hg
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
132 % Verifying
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
133
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
134 % Trying to strip revision 3
42910
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
135 saved backup bundle to $TESTTMP/manifests/3/.hg/strip-backup/9632aa303aa4-69192e3f-backup.hg
12492
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
136 % Verifying
72be1ab55d62 tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents: 11208
diff changeset
137
42910
5e0b1ce2f4a2 tests: split out manifest case from test-strip-cross.t
Martin von Zweigbergk <martinvonz@google.com>
parents: 42909
diff changeset
138 $ cd ..
42911
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
139
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
140 Now a similar test for a non-root manifest revlog
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
141 $ cat >> $HGRCPATH <<EOF
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
142 > [experimental]
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
143 > treemanifests = yes
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
144 > EOF
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
145 $ mkdir treemanifests
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
146 $ cd treemanifests
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
147 $
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
148 $ hg --config experimental.treemanifest=True init orig
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
149 $ cd orig
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
150 $ commit 'dir/file'
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
151 $ commit 'dir/other'
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
152 $ commit '' 'dir/other'
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
153 $ HGUSER=yet-another-user; export HGUSER
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
154 $ commit 'otherdir dir/file'
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
155 $ commit 'otherdir dir/other' 'otherdir dir/file'
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
156 $ cd ..
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
157 $ hg --config experimental.treemanifest=True clone -q -U -r 1 -r 2 -r 3 -r 4 orig crossed
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
158 $ cd crossed
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
159 $ hg debugindex --dir dir
49252
4141951dacff debugindex: rename the parent column to mention nodeid
Pierre-Yves DAVID <pierre-yves.david@octobus.net>
parents: 49251
diff changeset
160 rev linkrev nodeid p1-nodeid p2-nodeid
42911
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
161 0 2 6bbc6fee55c2 000000000000 000000000000
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
162 1 0 1c556153fe54 000000000000 000000000000
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
163 2 1 1f76dba919fd 000000000000 000000000000
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
164 3 3 bbee06ad59d5 000000000000 000000000000
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
165
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
166 $ cd ..
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
167 $ for i in 2 3; do
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
168 > hg --config experimental.treemanifest=True clone -q -U --pull crossed $i
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
169 > echo "% Trying to strip revision $i"
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
170 > hg --cwd $i strip $i
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
171 > echo "% Verifying"
49825
2f2682f40ea0 tests: use the `--quiet` flag for verify when applicable
Raphaël Gomès <rgomes@octobus.net>
parents: 49252
diff changeset
172 > hg --cwd $i verify -q
42911
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
173 > echo
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
174 > done
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
175 % Trying to strip revision 2
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
176 saved backup bundle to $TESTTMP/treemanifests/2/.hg/strip-backup/145f5c75f9ac-a105cfbe-backup.hg
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
177 % Verifying
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
178
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
179 % Trying to strip revision 3
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
180 saved backup bundle to $TESTTMP/treemanifests/3/.hg/strip-backup/e4e3de5c3cb2-f4c70376-backup.hg
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
181 % Verifying
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
182
49825
2f2682f40ea0 tests: use the `--quiet` flag for verify when applicable
Raphaël Gomès <rgomes@octobus.net>
parents: 49252
diff changeset
183
42911
31dcd9b8ef40 tests: show broken strip with treemanifests and unordered linkrevs
Martin von Zweigbergk <martinvonz@google.com>
parents: 42910
diff changeset
184 $ cd ..