Show More
@@ -1,413 +1,470 b'' | |||
|
1 | 1 | ================================================== |
|
2 | 2 | Test obsmarkers interaction with bundle and strip |
|
3 | 3 | ================================================== |
|
4 | 4 | |
|
5 | In practice, this file does not yet contains any tests for bundle and strip. | |
|
6 |
|
|
|
7 | ||
|
8 | For now this test check the logic computing markers relevant to a set of | |
|
9 | revision. That logic will be use by "hg bundle" to select the markers to | |
|
10 | include, and strip to find the markers to backup. | |
|
5 | The file currently only contains test for bundle. | |
|
6 | Testing of strip will happen some time soon (tm). | |
|
11 | 7 | |
|
12 | 8 | Setup a repository with various case |
|
13 | 9 | ==================================== |
|
14 | 10 | |
|
15 | 11 | Config setup |
|
16 | 12 | ------------ |
|
17 | 13 | |
|
18 | 14 | $ cat >> $HGRCPATH <<EOF |
|
19 | 15 | > [ui] |
|
20 | 16 | > # simpler log output |
|
21 | 17 | > logtemplate = "{node|short}: {desc}\n" |
|
22 | 18 | > |
|
23 | 19 | > [experimental] |
|
24 | 20 | > # enable evolution |
|
25 | 21 | > evolution = all |
|
26 | 22 | > |
|
27 | 23 | > # include obsmarkers in bundle |
|
28 | 24 | > evolution.bundle-obsmarker = yes |
|
29 | 25 | > |
|
30 | 26 | > [extensions] |
|
31 | 27 | > # needed for some tests |
|
32 | 28 | > strip = |
|
33 | 29 | > [defaults] |
|
34 | 30 | > # we'll query many hidden changeset |
|
35 | 31 | > debugobsolete = --hidden |
|
36 | 32 | > EOF |
|
37 | 33 | |
|
38 | 34 | $ mkcommit() { |
|
39 | 35 | > echo "$1" > "$1" |
|
40 | 36 | > hg add "$1" |
|
41 | 37 | > hg ci -m "$1" |
|
42 | 38 | > } |
|
43 | 39 | |
|
44 | 40 | $ getid() { |
|
45 | 41 | > hg log --hidden --template '{node}\n' --rev "$1" |
|
46 | 42 | > } |
|
47 | 43 | |
|
48 | 44 | $ mktestrepo () { |
|
49 | 45 | > [ -n "$1" ] || exit 1 |
|
50 | 46 | > cd $TESTTMP |
|
51 | 47 | > hg init $1 |
|
52 | 48 | > cd $1 |
|
53 | 49 | > mkcommit ROOT |
|
54 | 50 | > } |
|
55 | 51 | |
|
52 | Function to compare the expected bundled obsmarkers with the actually bundled | |
|
53 | obsmarkers. | |
|
54 | ||
|
55 | $ testrevs () { | |
|
56 | > revs="$1" | |
|
57 | > testname=`basename \`pwd\`` | |
|
58 | > revsname=`hg --hidden log -T '-{desc}\n' --rev "${revs}"` | |
|
59 | > prefix="${TESTTMP}/${testname}${revsname}" | |
|
60 | > markersfile="${prefix}-relevant-markers.txt" | |
|
61 | > bundlefile="${prefix}-bundle.hg" | |
|
62 | > contentfile="${prefix}-bundle-markers.hg" | |
|
63 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" | |
|
64 | > echo '### Matched revisions###' | |
|
65 | > hg log --hidden --rev "${revs}" | sort | |
|
66 | > echo '### Relevant markers ###' | |
|
67 | > cat "${markersfile}" | |
|
68 | > printf "# bundling: " | |
|
69 | > hg bundle --hidden --base "parents(roots(${revs}))" --rev "${revs}" "${bundlefile}" | |
|
70 | > hg debugbundle "${bundlefile}" | grep "obsmarkers --" -A 100 | sed 1,2d > "${contentfile}" | |
|
71 | > echo '### Bundled markers ###' | |
|
72 | > cat "${contentfile}" | |
|
73 | > echo '### diff <relevant> <bundled> ###' | |
|
74 | > cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}" | |
|
75 | > echo '#################################' | |
|
76 | > } | |
|
77 | ||
|
56 | 78 | root setup |
|
57 | 79 | ------------- |
|
58 | 80 | |
|
59 | 81 | simple chain |
|
60 | 82 | ============ |
|
61 | 83 | |
|
62 | 84 | . A0 |
|
63 | 85 | . β ΓΈβ β A1 |
|
64 | 86 | . |/ |
|
65 | 87 | . β |
|
66 | 88 | |
|
67 | 89 | setup |
|
68 | 90 | ----- |
|
69 | 91 | |
|
70 | 92 | $ mktestrepo simple-chain |
|
71 | 93 | $ mkcommit 'C-A0' |
|
72 | 94 | $ hg up 'desc("ROOT")' |
|
73 | 95 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
74 | 96 | $ mkcommit 'C-A1' |
|
75 | 97 | created new head |
|
76 | 98 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
77 | 99 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 |
|
78 | 100 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` |
|
79 | 101 | |
|
80 | 102 | $ hg up 'desc("ROOT")' |
|
81 | 103 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
82 | 104 | $ hg log --hidden -G |
|
83 | 105 | o cf2c22470d67: C-A1 |
|
84 | 106 | | |
|
85 | 107 | | x 84fcb0dfe17b: C-A0 |
|
86 | 108 | |/ |
|
87 | 109 | @ ea207398892e: ROOT |
|
88 | 110 | |
|
89 | 111 | $ hg debugobsolete |
|
90 | 112 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
91 | 113 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
92 | 114 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
93 | 115 | |
|
94 | 116 | Actual testing |
|
95 | 117 | -------------- |
|
96 | 118 | |
|
97 |
$ |
|
|
98 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
99 | $ hg debugobsolete --rev 'desc("C-A1")' | |
|
100 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
101 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
102 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
119 | $ testrevs 'desc("C-A0")' | |
|
120 | ### Matched revisions### | |
|
121 | 84fcb0dfe17b: C-A0 | |
|
122 | ### Relevant markers ### | |
|
123 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
124 | # bundling: 1 changesets found | |
|
125 | ### Bundled markers ### | |
|
126 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
127 | ### diff <relevant> <bundled> ### | |
|
128 | ################################# | |
|
129 | ||
|
130 | $ testrevs 'desc("C-A1")' | |
|
131 | ### Matched revisions### | |
|
132 | cf2c22470d67: C-A1 | |
|
133 | ### Relevant markers ### | |
|
134 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
135 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
136 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
137 | # bundling: 1 changesets found | |
|
138 | ### Bundled markers ### | |
|
139 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
140 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
141 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
142 | ### diff <relevant> <bundled> ### | |
|
143 | ################################# | |
|
144 | ||
|
145 | $ testrevs 'desc("C-A")' | |
|
146 | ### Matched revisions### | |
|
147 | 84fcb0dfe17b: C-A0 | |
|
148 | cf2c22470d67: C-A1 | |
|
149 | ### Relevant markers ### | |
|
150 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
151 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
152 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
153 | # bundling: 2 changesets found | |
|
154 | ### Bundled markers ### | |
|
155 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
156 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
157 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
158 | ### diff <relevant> <bundled> ### | |
|
159 | ################################# | |
|
103 | 160 | |
|
104 | 161 | chain with prune children |
|
105 | 162 | ========================= |
|
106 | 163 | |
|
107 | 164 | . β β B0 |
|
108 | 165 | . | |
|
109 | 166 | . β ΓΈβ β A1 |
|
110 | 167 | . | |
|
111 | 168 | . β |
|
112 | 169 | |
|
113 | 170 | setup |
|
114 | 171 | ----- |
|
115 | 172 | |
|
116 | 173 | $ mktestrepo prune |
|
117 | 174 | $ mkcommit 'C-A0' |
|
118 | 175 | $ mkcommit 'C-B0' |
|
119 | 176 | $ hg up 'desc("ROOT")' |
|
120 | 177 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
121 | 178 | $ mkcommit 'C-A1' |
|
122 | 179 | created new head |
|
123 | 180 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
124 | 181 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
125 | 182 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
126 | 183 | $ hg up 'desc("ROOT")' |
|
127 | 184 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
128 | 185 | $ hg log --hidden -G |
|
129 | 186 | o cf2c22470d67: C-A1 |
|
130 | 187 | | |
|
131 | 188 | | x 29f93b1df87b: C-B0 |
|
132 | 189 | | | |
|
133 | 190 | | x 84fcb0dfe17b: C-A0 |
|
134 | 191 | |/ |
|
135 | 192 | @ ea207398892e: ROOT |
|
136 | 193 | |
|
137 | 194 | $ hg debugobsolete |
|
138 | 195 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
139 | 196 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
140 | 197 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
141 | 198 | |
|
142 | 199 | Actual testing |
|
143 | 200 | -------------- |
|
144 | 201 | |
|
145 | 202 | $ hg debugobsolete --rev 'desc("C-A0")' |
|
146 | 203 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
147 | 204 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
148 | 205 | $ hg debugobsolete --rev 'desc("C-B0")' |
|
149 | 206 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
150 | 207 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
151 | 208 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
152 | 209 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
153 | 210 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
154 | 211 | |
|
155 | 212 | chain with precursors also pruned |
|
156 | 213 | ================================= |
|
157 | 214 | |
|
158 | 215 | . A0 (also pruned) |
|
159 | 216 | . β ΓΈβ β A1 |
|
160 | 217 | . | |
|
161 | 218 | . β |
|
162 | 219 | |
|
163 | 220 | setup |
|
164 | 221 | ----- |
|
165 | 222 | |
|
166 | 223 | $ mktestrepo prune-inline |
|
167 | 224 | $ mkcommit 'C-A0' |
|
168 | 225 | $ hg up 'desc("ROOT")' |
|
169 | 226 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
170 | 227 | $ mkcommit 'C-A1' |
|
171 | 228 | created new head |
|
172 | 229 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
173 | 230 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
174 | 231 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
175 | 232 | $ hg up 'desc("ROOT")' |
|
176 | 233 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
177 | 234 | $ hg log --hidden -G |
|
178 | 235 | o cf2c22470d67: C-A1 |
|
179 | 236 | | |
|
180 | 237 | | x 84fcb0dfe17b: C-A0 |
|
181 | 238 | |/ |
|
182 | 239 | @ ea207398892e: ROOT |
|
183 | 240 | |
|
184 | 241 | $ hg debugobsolete |
|
185 | 242 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
186 | 243 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
187 | 244 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
188 | 245 | |
|
189 | 246 | Actual testing |
|
190 | 247 | -------------- |
|
191 | 248 | |
|
192 | 249 | $ hg debugobsolete --rev 'desc("C-A0")' |
|
193 | 250 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
194 | 251 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
195 | 252 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
196 | 253 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
197 | 254 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
198 | 255 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
199 | 256 | |
|
200 | 257 | chain with missing prune |
|
201 | 258 | ======================== |
|
202 | 259 | |
|
203 | 260 | . β B |
|
204 | 261 | . | |
|
205 | 262 | . β ββ β A1 |
|
206 | 263 | . | |
|
207 | 264 | . β |
|
208 | 265 | |
|
209 | 266 | setup |
|
210 | 267 | ----- |
|
211 | 268 | |
|
212 | 269 | $ mktestrepo missing-prune |
|
213 | 270 | $ mkcommit 'C-A0' |
|
214 | 271 | $ mkcommit 'C-B0' |
|
215 | 272 | $ hg up 'desc("ROOT")' |
|
216 | 273 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
217 | 274 | $ mkcommit 'C-A1' |
|
218 | 275 | created new head |
|
219 | 276 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
220 | 277 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
221 | 278 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
222 | 279 | |
|
223 | 280 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
224 | 281 | |
|
225 | 282 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
|
226 | 283 | |
|
227 | 284 | $ hg up 'desc("ROOT")' |
|
228 | 285 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
229 | 286 | $ hg log --hidden -G |
|
230 | 287 | o cf2c22470d67: C-A1 |
|
231 | 288 | | |
|
232 | 289 | @ ea207398892e: ROOT |
|
233 | 290 | |
|
234 | 291 | $ hg debugobsolete |
|
235 | 292 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
236 | 293 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
237 | 294 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
238 | 295 | |
|
239 | 296 | Actual testing |
|
240 | 297 | -------------- |
|
241 | 298 | |
|
242 | 299 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
243 | 300 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
244 | 301 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
245 | 302 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
246 | 303 | |
|
247 | 304 | chain with precursors also pruned |
|
248 | 305 | ================================= |
|
249 | 306 | |
|
250 | 307 | . A0 (also pruned) |
|
251 | 308 | . β ββ β A1 |
|
252 | 309 | . | |
|
253 | 310 | . β |
|
254 | 311 | |
|
255 | 312 | setup |
|
256 | 313 | ----- |
|
257 | 314 | |
|
258 | 315 | $ mktestrepo prune-inline-missing |
|
259 | 316 | $ mkcommit 'C-A0' |
|
260 | 317 | $ hg up 'desc("ROOT")' |
|
261 | 318 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
262 | 319 | $ mkcommit 'C-A1' |
|
263 | 320 | created new head |
|
264 | 321 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
265 | 322 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
266 | 323 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
267 | 324 | |
|
268 | 325 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
269 | 326 | |
|
270 | 327 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
|
271 | 328 | |
|
272 | 329 | $ hg up 'desc("ROOT")' |
|
273 | 330 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
274 | 331 | $ hg log --hidden -G |
|
275 | 332 | o cf2c22470d67: C-A1 |
|
276 | 333 | | |
|
277 | 334 | @ ea207398892e: ROOT |
|
278 | 335 | |
|
279 | 336 | $ hg debugobsolete |
|
280 | 337 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
281 | 338 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
282 | 339 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
283 | 340 | |
|
284 | 341 | Actual testing |
|
285 | 342 | -------------- |
|
286 | 343 | |
|
287 | 344 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
288 | 345 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
289 | 346 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
290 | 347 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
291 | 348 | |
|
292 | 349 | Chain with fold and split |
|
293 | 350 | ========================= |
|
294 | 351 | |
|
295 | 352 | setup |
|
296 | 353 | ----- |
|
297 | 354 | |
|
298 | 355 | $ mktestrepo split-fold |
|
299 | 356 | $ mkcommit 'C-A' |
|
300 | 357 | $ hg up 'desc("ROOT")' |
|
301 | 358 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
302 | 359 | $ mkcommit 'C-B' |
|
303 | 360 | created new head |
|
304 | 361 | $ hg up 'desc("ROOT")' |
|
305 | 362 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
306 | 363 | $ mkcommit 'C-C' |
|
307 | 364 | created new head |
|
308 | 365 | $ hg up 'desc("ROOT")' |
|
309 | 366 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
310 | 367 | $ mkcommit 'C-D' |
|
311 | 368 | created new head |
|
312 | 369 | $ hg up 'desc("ROOT")' |
|
313 | 370 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
314 | 371 | $ mkcommit 'C-E' |
|
315 | 372 | created new head |
|
316 | 373 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` |
|
317 | 374 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split |
|
318 | 375 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
|
319 | 376 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 |
|
320 | 377 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` |
|
321 | 378 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` |
|
322 | 379 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` |
|
323 | 380 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` |
|
324 | 381 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` |
|
325 | 382 | |
|
326 | 383 | $ hg up 'desc("ROOT")' |
|
327 | 384 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
328 | 385 | $ hg log --hidden -G |
|
329 | 386 | o 2f20ff6509f0: C-E |
|
330 | 387 | | |
|
331 | 388 | | x 06dc9da25ef0: C-D |
|
332 | 389 | |/ |
|
333 | 390 | | x 27ec657ca21d: C-C |
|
334 | 391 | |/ |
|
335 | 392 | | x a9b9da38ed96: C-B |
|
336 | 393 | |/ |
|
337 | 394 | | x 9ac430e15fca: C-A |
|
338 | 395 | |/ |
|
339 | 396 | @ ea207398892e: ROOT |
|
340 | 397 | |
|
341 | 398 | $ hg debugobsolete |
|
342 | 399 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
343 | 400 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
344 | 401 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
345 | 402 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
346 | 403 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
347 | 404 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
348 | 405 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
349 | 406 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
350 | 407 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
351 | 408 | |
|
352 | 409 | Actual testing |
|
353 | 410 | -------------- |
|
354 | 411 | |
|
355 | 412 | $ hg debugobsolete --rev 'desc("C-A")' |
|
356 | 413 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
357 | 414 | $ hg debugobsolete --rev 'desc("C-B")' |
|
358 | 415 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
359 | 416 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
360 | 417 | $ hg debugobsolete --rev 'desc("C-C")' |
|
361 | 418 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
362 | 419 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
363 | 420 | $ hg debugobsolete --rev 'desc("C-D")' |
|
364 | 421 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
365 | 422 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
366 | 423 | $ hg debugobsolete --rev 'desc("C-E")' |
|
367 | 424 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
368 | 425 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
369 | 426 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
370 | 427 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
371 | 428 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
372 | 429 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
373 | 430 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
374 | 431 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
375 | 432 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
376 | 433 | |
|
377 | 434 | changeset pruned on its own |
|
378 | 435 | =========================== |
|
379 | 436 | |
|
380 | 437 | . β B |
|
381 | 438 | . | |
|
382 | 439 | . β A |
|
383 | 440 | . | |
|
384 | 441 | . β |
|
385 | 442 | |
|
386 | 443 | setup |
|
387 | 444 | ----- |
|
388 | 445 | |
|
389 | 446 | $ mktestrepo lonely-prune |
|
390 | 447 | $ hg up 'desc("ROOT")' |
|
391 | 448 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
392 | 449 | $ mkcommit 'C-A' |
|
393 | 450 | $ mkcommit 'C-B' |
|
394 | 451 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` |
|
395 | 452 | |
|
396 | 453 | $ hg up 'desc("ROOT")' |
|
397 | 454 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
398 | 455 | $ hg log --hidden -G |
|
399 | 456 | x cefb651fc2fd: C-B |
|
400 | 457 | | |
|
401 | 458 | o 9ac430e15fca: C-A |
|
402 | 459 | | |
|
403 | 460 | @ ea207398892e: ROOT |
|
404 | 461 | |
|
405 | 462 | $ hg debugobsolete |
|
406 | 463 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
407 | 464 | |
|
408 | 465 | Actual testing |
|
409 | 466 | -------------- |
|
410 | 467 | $ hg debugobsolete --rev 'desc("C-A")' |
|
411 | 468 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
412 | 469 | $ hg debugobsolete --hidden --rev 'desc("C-B")' |
|
413 | 470 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
General Comments 0
You need to be logged in to leave comments.
Login now