Show More
@@ -52,18 +52,18 b' the second head H2, and so on' | |||
|
52 | 52 | |
|
53 | 53 | Verify target contents before censorship at each revision |
|
54 | 54 | |
|
55 | $ hg cat -r $H1 target | |
|
55 | $ hg cat -r $H1 target | head -n 10 | |
|
56 | 56 | Tainted file is now sanitized |
|
57 | $ hg cat -r $H2 target | |
|
57 | $ hg cat -r $H2 target | head -n 10 | |
|
58 | 58 | Tainted file now super sanitized |
|
59 | $ hg cat -r $C2 target | |
|
59 | $ hg cat -r $C2 target | head -n 10 | |
|
60 | 60 | Tainted file |
|
61 | 61 | Passwords: hunter2 |
|
62 | 62 | hunter3 |
|
63 | $ hg cat -r $C1 target | |
|
63 | $ hg cat -r $C1 target | head -n 10 | |
|
64 | 64 | Tainted file |
|
65 | 65 | Passwords: hunter2 |
|
66 | $ hg cat -r 0 target | |
|
66 | $ hg cat -r 0 target | head -n 10 | |
|
67 | 67 | Initially untainted file |
|
68 | 68 | |
|
69 | 69 | Try to censor revision with too large of a tombstone message |
@@ -78,18 +78,17 b' Censor revision with 2 offenses' | |||
|
78 | 78 | |
|
79 | 79 | $ mkdir -p foo/bar/baz |
|
80 | 80 | $ hg --cwd foo/bar/baz censor -r $C2 -t "remove password" ../../../target |
|
81 | $ hg cat -r $H1 target | |
|
81 | $ hg cat -r $H1 target | head -n 10 | |
|
82 | 82 | Tainted file is now sanitized |
|
83 | $ hg cat -r $H2 target | |
|
83 | $ hg cat -r $H2 target | head -n 10 | |
|
84 | 84 | Tainted file now super sanitized |
|
85 | $ hg cat -r $C2 target | |
|
85 | $ hg cat -r $C2 target | head -n 10 | |
|
86 | 86 | abort: censored node: 1e0247a9a4b7 |
|
87 | 87 | (set censor.policy to ignore errors) |
|
88 | [255] | |
|
89 | $ hg cat -r $C1 target | |
|
88 | $ hg cat -r $C1 target | head -n 10 | |
|
90 | 89 | Tainted file |
|
91 | 90 | Passwords: hunter2 |
|
92 | $ hg cat -r 0 target | |
|
91 | $ hg cat -r 0 target | head -n 10 | |
|
93 | 92 | Initially untainted file |
|
94 | 93 | |
|
95 | 94 | Censor revision with 1 offense |
@@ -97,31 +96,27 b' Censor revision with 1 offense' | |||
|
97 | 96 | (this also tests file pattern matching: with 'path:' scheme) |
|
98 | 97 | |
|
99 | 98 | $ hg --cwd foo/bar/baz censor -r $C1 path:target |
|
100 | $ hg cat -r $H1 target | |
|
99 | $ hg cat -r $H1 target | head -n 10 | |
|
101 | 100 | Tainted file is now sanitized |
|
102 | $ hg cat -r $H2 target | |
|
101 | $ hg cat -r $H2 target | head -n 10 | |
|
103 | 102 | Tainted file now super sanitized |
|
104 | $ hg cat -r $C2 target | |
|
103 | $ hg cat -r $C2 target | head -n 10 | |
|
105 | 104 | abort: censored node: 1e0247a9a4b7 |
|
106 | 105 | (set censor.policy to ignore errors) |
|
107 | [255] | |
|
108 | $ hg cat -r $C1 target | |
|
106 | $ hg cat -r $C1 target | head -n 10 | |
|
109 | 107 | abort: censored node: 613bc869fceb |
|
110 | 108 | (set censor.policy to ignore errors) |
|
111 | [255] | |
|
112 | $ hg cat -r 0 target | |
|
109 | $ hg cat -r 0 target | head -n 10 | |
|
113 | 110 | Initially untainted file |
|
114 | 111 | |
|
115 | 112 | Can only checkout target at uncensored revisions, -X is workaround for --all |
|
116 | 113 | |
|
117 | $ hg revert -r $C2 target | |
|
114 | $ hg revert -r $C2 target | head -n 10 | |
|
118 | 115 | abort: censored node: 1e0247a9a4b7 |
|
119 | 116 | (set censor.policy to ignore errors) |
|
120 | [255] | |
|
121 | $ hg revert -r $C1 target | |
|
117 | $ hg revert -r $C1 target | head -n 10 | |
|
122 | 118 | abort: censored node: 613bc869fceb |
|
123 | 119 | (set censor.policy to ignore errors) |
|
124 | [255] | |
|
125 | 120 | $ hg revert -r $C1 --all |
|
126 | 121 | reverting bystander |
|
127 | 122 | reverting target |
@@ -129,38 +124,38 b' Can only checkout target at uncensored r' | |||
|
129 | 124 | (set censor.policy to ignore errors) |
|
130 | 125 | [255] |
|
131 | 126 | $ hg revert -r $C1 --all -X target |
|
132 | $ cat target | |
|
127 | $ cat target | head -n 10 | |
|
133 | 128 | Tainted file now super sanitized |
|
134 | 129 | $ hg revert -r 0 --all |
|
135 | 130 | reverting target |
|
136 | $ cat target | |
|
131 | $ cat target | head -n 10 | |
|
137 | 132 | Initially untainted file |
|
138 | 133 | $ hg revert -r $H2 --all |
|
139 | 134 | reverting bystander |
|
140 | 135 | reverting target |
|
141 | $ cat target | |
|
136 | $ cat target | head -n 10 | |
|
142 | 137 | Tainted file now super sanitized |
|
143 | 138 | |
|
144 | 139 | Uncensored file can be viewed at any revision |
|
145 | 140 | |
|
146 | $ hg cat -r $H1 bystander | |
|
141 | $ hg cat -r $H1 bystander | head -n 10 | |
|
147 | 142 | Normal file v2 |
|
148 | $ hg cat -r $C2 bystander | |
|
143 | $ hg cat -r $C2 bystander | head -n 10 | |
|
149 | 144 | Normal file v2 |
|
150 | $ hg cat -r $C1 bystander | |
|
145 | $ hg cat -r $C1 bystander | head -n 10 | |
|
151 | 146 | Normal file here |
|
152 | $ hg cat -r 0 bystander | |
|
147 | $ hg cat -r 0 bystander | head -n 10 | |
|
153 | 148 | Normal file here |
|
154 | 149 | |
|
155 | 150 | Can update to children of censored revision |
|
156 | 151 | |
|
157 | 152 | $ hg update -r $H1 |
|
158 | 153 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
159 | $ cat target | |
|
154 | $ cat target | head -n 10 | |
|
160 | 155 | Tainted file is now sanitized |
|
161 | 156 | $ hg update -r $H2 |
|
162 | 157 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
163 | $ cat target | |
|
158 | $ cat target | head -n 10 | |
|
164 | 159 | Tainted file now super sanitized |
|
165 | 160 | |
|
166 | 161 | Set censor policy to abort in trusted $HGRC so hg verify fails |
@@ -221,17 +216,17 b' May update to revision with censored dat' | |||
|
221 | 216 | |
|
222 | 217 | $ hg update -r $C2 |
|
223 | 218 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
224 | $ cat target | |
|
219 | $ cat target | head -n 10 | |
|
225 | 220 | $ hg update -r $C1 |
|
226 | 221 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
227 | $ cat target | |
|
222 | $ cat target | head -n 10 | |
|
228 | 223 | $ hg update -r 0 |
|
229 | 224 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
230 | $ cat target | |
|
225 | $ cat target | head -n 10 | |
|
231 | 226 | Initially untainted file |
|
232 | 227 | $ hg update -r $H2 |
|
233 | 228 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
234 | $ cat target | |
|
229 | $ cat target | head -n 10 | |
|
235 | 230 | Tainted file now super sanitized |
|
236 | 231 | |
|
237 | 232 | Can merge in revision with censored data. Test requires one branch of history |
@@ -288,20 +283,19 b' Can re-add file after being deleted + ce' | |||
|
288 | 283 | $ hg ci -m 'delete target so it may be censored' |
|
289 | 284 | $ H2=`hg id --debug -i` |
|
290 | 285 | $ hg censor -r $C4 target |
|
291 | $ hg cat -r $C4 target | |
|
292 | $ hg cat -r "$H2^^" target | |
|
286 | $ hg cat -r $C4 target | head -n 10 | |
|
287 | $ hg cat -r "$H2^^" target | head -n 10 | |
|
293 | 288 | Tainted file now super sanitized |
|
294 | 289 | $ echo 'fresh start' > target |
|
295 | 290 | $ hg add target |
|
296 | 291 | $ hg ci -m reincarnated target |
|
297 | 292 | $ H2=`hg id --debug -i` |
|
298 | $ hg cat -r $H2 target | |
|
293 | $ hg cat -r $H2 target | head -n 10 | |
|
299 | 294 | fresh start |
|
300 | $ hg cat -r "$H2^" target | |
|
295 | $ hg cat -r "$H2^" target | head -n 10 | |
|
301 | 296 | target: no such file in rev 452ec1762369 |
|
302 | [1] | |
|
303 |
$ hg cat -r |
|
|
304 | $ hg cat -r "$H2^^^" target | |
|
297 | $ hg cat -r $C4 target | head -n 10 | |
|
298 | $ hg cat -r "$H2^^^" target | head -n 10 | |
|
305 | 299 | Tainted file now super sanitized |
|
306 | 300 | |
|
307 | 301 | Can censor after revlog has expanded to no longer permit inline storage |
@@ -317,8 +311,8 b' Can censor after revlog has expanded to ' | |||
|
317 | 311 | $ hg ci -m 'cleaned 100k passwords' |
|
318 | 312 | $ H2=`hg id --debug -i` |
|
319 | 313 | $ hg censor -r $C5 target |
|
320 | $ hg cat -r $C5 target | |
|
321 | $ hg cat -r $H2 target | |
|
314 | $ hg cat -r $C5 target | head -n 10 | |
|
315 | $ hg cat -r $H2 target | head -n 10 | |
|
322 | 316 | fresh start |
|
323 | 317 | |
|
324 | 318 | Repo with censored nodes can be cloned and cloned nodes are censored |
@@ -328,13 +322,13 b' Repo with censored nodes can be cloned a' | |||
|
328 | 322 | updating to branch default |
|
329 | 323 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
330 | 324 | $ cd rclone |
|
331 | $ hg cat -r $H1 target | |
|
325 | $ hg cat -r $H1 target | head -n 10 | |
|
332 | 326 | advanced head H1 |
|
333 | $ hg cat -r $H2~5 target | |
|
327 | $ hg cat -r $H2~5 target | head -n 10 | |
|
334 | 328 | Tainted file now super sanitized |
|
335 | $ hg cat -r $C2 target | |
|
336 | $ hg cat -r $C1 target | |
|
337 | $ hg cat -r 0 target | |
|
329 | $ hg cat -r $C2 target | head -n 10 | |
|
330 | $ hg cat -r $C1 target | head -n 10 | |
|
331 | $ hg cat -r 0 target | head -n 10 | |
|
338 | 332 | Initially untainted file |
|
339 | 333 | $ hg verify |
|
340 | 334 | checking changesets |
@@ -346,7 +340,7 b' Repo with censored nodes can be cloned a' | |||
|
346 | 340 | Repo cloned before tainted content introduced can pull censored nodes |
|
347 | 341 | |
|
348 | 342 | $ cd ../rpull |
|
349 | $ hg cat -r tip target | |
|
343 | $ hg cat -r tip target | head -n 10 | |
|
350 | 344 | Initially untainted file |
|
351 | 345 | $ hg verify |
|
352 | 346 | checking changesets |
@@ -365,15 +359,15 b' Repo cloned before tainted content intro' | |||
|
365 | 359 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
366 | 360 | $ hg update 4 |
|
367 | 361 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
368 | $ cat target | |
|
362 | $ cat target | head -n 10 | |
|
369 | 363 | Tainted file now super sanitized |
|
370 | $ hg cat -r $H1 target | |
|
364 | $ hg cat -r $H1 target | head -n 10 | |
|
371 | 365 | advanced head H1 |
|
372 | $ hg cat -r $H2~5 target | |
|
366 | $ hg cat -r $H2~5 target | head -n 10 | |
|
373 | 367 | Tainted file now super sanitized |
|
374 | $ hg cat -r $C2 target | |
|
375 | $ hg cat -r $C1 target | |
|
376 | $ hg cat -r 0 target | |
|
368 | $ hg cat -r $C2 target | head -n 10 | |
|
369 | $ hg cat -r $C1 target | head -n 10 | |
|
370 | $ hg cat -r 0 target | head -n 10 | |
|
377 | 371 | Initially untainted file |
|
378 | 372 | $ hg verify |
|
379 | 373 | checking changesets |
@@ -393,11 +387,11 b' Censored nodes can be pushed if they cen' | |||
|
393 | 387 | $ hg ci -m 're-sanitized' target |
|
394 | 388 | $ H2=`hg id --debug -i` |
|
395 | 389 | $ CLEANREV=$H2 |
|
396 | $ hg cat -r $REV target | |
|
390 | $ hg cat -r $REV target | head -n 10 | |
|
397 | 391 | Passwords: hunter2hunter2 |
|
398 | 392 | $ hg censor -r $REV target |
|
399 | $ hg cat -r $REV target | |
|
400 | $ hg cat -r $CLEANREV target | |
|
393 | $ hg cat -r $REV target | head -n 10 | |
|
394 | $ hg cat -r $CLEANREV target | head -n 10 | |
|
401 | 395 | Re-sanitized; nothing to see here |
|
402 | 396 | $ hg push -f -r $H2 |
|
403 | 397 | pushing to $TESTTMP/r |
@@ -408,12 +402,12 b' Censored nodes can be pushed if they cen' | |||
|
408 | 402 | added 2 changesets with 2 changes to 1 files (+1 heads) |
|
409 | 403 | |
|
410 | 404 | $ cd ../r |
|
411 | $ hg cat -r $REV target | |
|
412 | $ hg cat -r $CLEANREV target | |
|
405 | $ hg cat -r $REV target | head -n 10 | |
|
406 | $ hg cat -r $CLEANREV target | head -n 10 | |
|
413 | 407 | Re-sanitized; nothing to see here |
|
414 | 408 | $ hg update $CLEANREV |
|
415 | 409 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
416 | $ cat target | |
|
410 | $ cat target | head -n 10 | |
|
417 | 411 | Re-sanitized; nothing to see here |
|
418 | 412 | |
|
419 | 413 | Censored nodes can be bundled up and unbundled in another repo |
@@ -428,12 +422,12 b' Censored nodes can be bundled up and unb' | |||
|
428 | 422 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
429 | 423 | new changesets 075be80ac777:dcbaf17bf3a1 (2 drafts) |
|
430 | 424 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
431 | $ hg cat -r $REV target | |
|
432 | $ hg cat -r $CLEANREV target | |
|
425 | $ hg cat -r $REV target | head -n 10 | |
|
426 | $ hg cat -r $CLEANREV target | head -n 10 | |
|
433 | 427 | Re-sanitized; nothing to see here |
|
434 | 428 | $ hg update $CLEANREV |
|
435 | 429 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
436 | $ cat target | |
|
430 | $ cat target | head -n 10 | |
|
437 | 431 | Re-sanitized; nothing to see here |
|
438 | 432 | $ hg verify |
|
439 | 433 | checking changesets |
@@ -492,7 +486,7 b' Censored nodes can be imported on top of' | |||
|
492 | 486 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
493 | 487 | $ hg update $H2 |
|
494 | 488 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
495 | $ cat target | |
|
489 | $ cat target | head -n 10 | |
|
496 | 490 | Re-sanitized; nothing to see here |
|
497 | 491 | $ hg verify |
|
498 | 492 | checking changesets |
@@ -516,4 +510,4 b' Can import bundle where first revision o' | |||
|
516 | 510 | added 1 changesets with 2 changes to 2 files |
|
517 | 511 | new changesets e97f55b2665a (1 drafts) |
|
518 | 512 | (run 'hg update' to get a working copy) |
|
519 | $ hg cat -r 0 target | |
|
513 | $ hg cat -r 0 target | head -n 10 |
General Comments 0
You need to be logged in to leave comments.
Login now