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