Mercurial > public > mercurial-scm > hg-stable
annotate tests/test-censor.t @ 53040:cdd7bf612c7b stable tip
bundle-spec: properly format boolean parameter (issue6960)
This was breaking automatic clone bundle generation. This changeset fixes it and
add a test to catch it in the future.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 11 Mar 2025 02:29:42 +0100 |
parents | 4d2b496cb7b8 |
children |
rev | line source |
---|---|
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
1 #testcases revlogv1 revlogv2 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
2 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
3 #if revlogv2 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
4 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
5 $ cat >> $HGRCPATH <<EOF |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
6 > [experimental] |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
7 > revlogv2=enable-unstable-format-and-corrupt-my-data |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
8 > EOF |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
9 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
10 #endif |
37406
8c37c3220ebc
tests: skip test-censor.t when using simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35400
diff
changeset
|
11 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
12 $ cp $HGRCPATH $HGRCPATH.orig |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
13 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
14 Create repo with unimpeachable content |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
15 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
16 $ hg init r |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
17 $ cd r |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
18 $ echo 'Initially untainted file' > target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
19 $ echo 'Normal file here' > bystander |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
20 $ hg add target bystander |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
21 $ hg ci -m init |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
22 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
23 Clone repo so we can test pull later |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
24 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
25 $ cd .. |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
26 $ hg clone r rpull |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
27 updating to branch default |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
28 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
29 $ cd r |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
30 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
31 Introduce content which will ultimately require censorship. Name the first |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
32 censored node C1, second C2, and so on |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
33 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
34 $ echo 'Tainted file' > target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
35 $ echo 'Passwords: hunter2' >> target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
36 $ hg ci -m taint target |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
37 $ C1=`hg id -r . -T "{node}"` |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
38 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
39 $ echo 'hunter3' >> target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
40 $ echo 'Normal file v2' > bystander |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
41 $ hg ci -m moretaint target bystander |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
42 $ C2=`hg id -r . -T "{node}"` |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
43 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
44 Add a new sanitized versions to correct our mistake. Name the first head H1, |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
45 the second head H2, and so on |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
46 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
47 $ echo 'Tainted file is now sanitized' > target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
48 $ hg ci -m sanitized target |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
49 $ H1=`hg id -r . -T "{node}"` |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
50 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
51 $ hg update -r $C2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
52 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
53 $ echo 'Tainted file now super sanitized' > target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
54 $ hg ci -m 'super sanitized' target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
55 created new head |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
56 $ H2=`hg id -r . -T "{node}"` |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
57 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
58 Verify target contents before censorship at each revision |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
59 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
60 $ hg cat -r $H1 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
61 Tainted file is now sanitized |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
62 $ hg cat -r $H2 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
63 Tainted file now super sanitized |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
64 $ hg cat -r $C2 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
65 Tainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
66 Passwords: hunter2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
67 hunter3 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
68 $ hg cat -r $C1 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
69 Tainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
70 Passwords: hunter2 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
71 $ hg cat -r 0 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
72 Initially untainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
73 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
74 Censor revision with 2 offenses |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
75 |
25806
5e18f6e39006
censor: make various path forms available like other Mercurial commands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
76 (this also tests file pattern matching: path relative to cwd case) |
5e18f6e39006
censor: make various path forms available like other Mercurial commands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
77 |
5e18f6e39006
censor: make various path forms available like other Mercurial commands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
78 $ mkdir -p foo/bar/baz |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
79 $ hg --config extensions.censor= --cwd foo/bar/baz censor -r $C2 -t "remove password" ../../../target |
51287
195ab99cf791
censor: inform the user that we are spending time checking heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51140
diff
changeset
|
80 checking for the censored content in 2 heads |
51289
db121ddd171e
censor: be more verbose about the other steps too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51288
diff
changeset
|
81 checking for the censored content in the working directory |
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
82 censoring 1 file revisions |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
83 $ hg cat -r $H1 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
84 Tainted file is now sanitized |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
85 $ hg cat -r $H2 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
86 Tainted file now super sanitized |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
87 $ hg cat -r $C2 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
88 abort: censored node: 1e0247a9a4b7 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
89 (set censor.policy to ignore errors) |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
90 $ hg cat -r $C1 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
91 Tainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
92 Passwords: hunter2 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
93 $ hg cat -r 0 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
94 Initially untainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
95 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
96 Censor revision with 1 offense |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
97 |
25806
5e18f6e39006
censor: make various path forms available like other Mercurial commands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
98 (this also tests file pattern matching: with 'path:' scheme) |
5e18f6e39006
censor: make various path forms available like other Mercurial commands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
99 |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
100 $ hg --config extensions.censor= --cwd foo/bar/baz censor -r $C1 path:target |
51287
195ab99cf791
censor: inform the user that we are spending time checking heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51140
diff
changeset
|
101 checking for the censored content in 2 heads |
51289
db121ddd171e
censor: be more verbose about the other steps too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51288
diff
changeset
|
102 checking for the censored content in the working directory |
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
103 censoring 1 file revisions |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
104 $ hg cat -r $H1 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
105 Tainted file is now sanitized |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
106 $ hg cat -r $H2 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
107 Tainted file now super sanitized |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
108 $ hg cat -r $C2 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
109 abort: censored node: 1e0247a9a4b7 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
110 (set censor.policy to ignore errors) |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
111 $ hg cat -r $C1 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
112 abort: censored node: 613bc869fceb |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
113 (set censor.policy to ignore errors) |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
114 $ hg cat -r 0 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
115 Initially untainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
116 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
117 Can only checkout target at uncensored revisions, -X is workaround for --all |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
118 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
119 $ hg revert -r $C2 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
120 abort: censored node: 1e0247a9a4b7 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
121 (set censor.policy to ignore errors) |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
122 $ hg revert -r $C1 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
123 abort: censored node: 613bc869fceb |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
124 (set censor.policy to ignore errors) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
125 $ hg revert -r $C1 --all |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
126 reverting bystander |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
127 reverting target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
128 abort: censored node: 613bc869fceb |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
129 (set censor.policy to ignore errors) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
130 [255] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
131 $ hg revert -r $C1 --all -X target |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
132 $ cat target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
133 Tainted file now super sanitized |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
134 $ hg revert -r 0 --all |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
135 reverting target |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
136 $ cat target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
137 Initially untainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
138 $ hg revert -r $H2 --all |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
139 reverting bystander |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
140 reverting target |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
141 $ cat target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
142 Tainted file now super sanitized |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
143 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
144 Uncensored file can be viewed at any revision |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
145 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
146 $ hg cat -r $H1 bystander | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
147 Normal file v2 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
148 $ hg cat -r $C2 bystander | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
149 Normal file v2 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
150 $ hg cat -r $C1 bystander | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
151 Normal file here |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
152 $ hg cat -r 0 bystander | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
153 Normal file here |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
154 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
155 Can update to children of censored revision |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
156 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
157 $ hg update -r $H1 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
159 $ cat target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
160 Tainted file is now sanitized |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
161 $ hg update -r $H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
162 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
163 $ cat target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
164 Tainted file now super sanitized |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
165 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
166 Set censor policy to abort in trusted $HGRC so hg verify fails |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
167 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
168 $ cp $HGRCPATH.orig $HGRCPATH |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
169 $ cat >> $HGRCPATH <<EOF |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
170 > [censor] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
171 > policy = abort |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
172 > EOF |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
173 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
174 Repo fails verification due to censorship |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
175 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
176 $ hg verify |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
177 checking changesets |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
178 checking manifests |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
179 crosschecking files in changesets and manifests |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
180 checking files |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
181 target@1: censored file data |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
182 target@2: censored file data |
49921
c84844cd523a
verify: also check dirstate
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49920
diff
changeset
|
183 not checking dirstate because of previous errors |
39506
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39497
diff
changeset
|
184 checked 5 changesets with 7 changes to 2 files |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
185 2 integrity errors encountered! |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
186 (first damaged changeset appears to be 1) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
187 [1] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
188 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
189 Cannot update to revision with censored data |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
190 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
191 $ hg update -r $C2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
192 abort: censored node: 1e0247a9a4b7 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
193 (set censor.policy to ignore errors) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
194 [255] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
195 $ hg update -r $C1 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
196 abort: censored node: 613bc869fceb |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
197 (set censor.policy to ignore errors) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
198 [255] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
199 $ hg update -r 0 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
200 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
201 $ hg update -r $H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
202 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
203 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
204 Set censor policy to ignore in trusted $HGRC so hg verify passes |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
205 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
206 $ cp $HGRCPATH.orig $HGRCPATH |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
207 $ cat >> $HGRCPATH <<EOF |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
208 > [censor] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
209 > policy = ignore |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
210 > EOF |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
211 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
212 Repo passes verification with warnings with explicit config |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
213 |
49920
2f2682f40ea0
tests: use the `--quiet` flag for verify when applicable
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49209
diff
changeset
|
214 $ hg verify -q |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
215 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
216 May update to revision with censored data with explicit config |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
217 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
218 $ hg update -r $C2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
219 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
220 $ cat target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
221 $ hg update -r $C1 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
222 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
223 $ cat target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
224 $ hg update -r 0 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
225 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
226 $ cat target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
227 Initially untainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
228 $ hg update -r $H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
229 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
230 $ cat target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
231 Tainted file now super sanitized |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
232 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
233 Can merge in revision with censored data. Test requires one branch of history |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
234 with the file censored, but we can't censor at a head, so advance H1. |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
235 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
236 $ hg update -r $H1 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
237 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
238 $ C3=$H1 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
239 $ echo 'advanced head H1' > target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
240 $ hg ci -m 'advance head H1' target |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
241 $ H1=`hg id -r . -T "{node}"` |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
242 $ hg --config extensions.censor= censor -r $C3 target |
51287
195ab99cf791
censor: inform the user that we are spending time checking heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51140
diff
changeset
|
243 checking for the censored content in 2 heads |
51289
db121ddd171e
censor: be more verbose about the other steps too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51288
diff
changeset
|
244 checking for the censored content in the working directory |
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
245 censoring 1 file revisions |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
246 $ hg update -r $H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
247 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
248 $ hg merge -r $C3 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
249 merging target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
250 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
251 (branch merge, don't forget to commit) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
252 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
253 Revisions present in repository heads may not be censored |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
254 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
255 $ hg update -C -r $H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
256 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
257 $ hg --config extensions.censor= censor -r $H2 target |
51287
195ab99cf791
censor: inform the user that we are spending time checking heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51140
diff
changeset
|
258 checking for the censored content in 2 heads |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
259 abort: cannot censor file in heads (78a8fc215e79) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
260 (clean/delete and commit first) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
261 [255] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
262 $ echo 'twiddling thumbs' > bystander |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
263 $ hg ci -m 'bystander commit' |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
264 $ H2=`hg id -r . -T "{node}"` |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
265 $ hg --config extensions.censor= censor -r "$H2^" target |
51287
195ab99cf791
censor: inform the user that we are spending time checking heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51140
diff
changeset
|
266 checking for the censored content in 2 heads |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
267 abort: cannot censor file in heads (efbe78065929) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
268 (clean/delete and commit first) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
269 [255] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
270 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
271 Cannot censor working directory |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
272 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
273 $ echo 'seriously no passwords' > target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
274 $ hg ci -m 'extend second head arbitrarily' target |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
275 $ H2=`hg id -r . -T "{node}"` |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
276 $ hg update -r "$H2^" |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
277 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
278 $ hg --config extensions.censor= censor -r . target |
51287
195ab99cf791
censor: inform the user that we are spending time checking heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51140
diff
changeset
|
279 checking for the censored content in 2 heads |
51289
db121ddd171e
censor: be more verbose about the other steps too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51288
diff
changeset
|
280 checking for the censored content in the working directory |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
281 abort: cannot censor working directory |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
282 (clean/delete/update first) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
283 [255] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
284 $ hg update -r $H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
285 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
286 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
287 Can re-add file after being deleted + censored |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
288 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
289 $ C4=$H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
290 $ hg rm target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
291 $ hg ci -m 'delete target so it may be censored' |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
292 $ H2=`hg id -r . -T "{node}"` |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
293 $ hg --config extensions.censor= censor -r $C4 target |
51287
195ab99cf791
censor: inform the user that we are spending time checking heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51140
diff
changeset
|
294 checking for the censored content in 2 heads |
51289
db121ddd171e
censor: be more verbose about the other steps too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51288
diff
changeset
|
295 checking for the censored content in the working directory |
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
296 censoring 1 file revisions |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
297 $ hg cat -r $C4 target | head -n 10 |
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
298 $ hg cat -r "$H2^^" target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
299 Tainted file now super sanitized |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
300 $ echo 'fresh start' > target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
301 $ hg add target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
302 $ hg ci -m reincarnated target |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
303 $ H2=`hg id -r . -T "{node}"` |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
304 $ hg cat -r $H2 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
305 fresh start |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
306 $ hg cat -r "$H2^" target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
307 target: no such file in rev 452ec1762369 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
308 $ hg cat -r $C4 target | head -n 10 |
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
309 $ hg cat -r "$H2^^^" target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
310 Tainted file now super sanitized |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
311 |
51137
22d11305f365
censor: show that the `not-inline` ? `inline` test is broken
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
312 Can censor enough revision to move back to inline storage |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
313 |
51137
22d11305f365
censor: show that the `not-inline` ? `inline` test is broken
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
314 $ hg debugrevlogstats | grep target |
22d11305f365
censor: show that the `not-inline` ? `inline` test is broken
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
315 rev-count data-size inl type target |
51140
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
316 8 ??? no file target (glob) (revlogv2 !) |
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
317 8 ??? yes file target (glob) (revlogv1 !) |
51163
e7be2ddfb4c2
tests: use sha256line.py instead of /dev/random in test-censor.t (issue6858)
Anton Shestakov <av6@dwimlabs.net>
parents:
51161
diff
changeset
|
318 $ $TESTDIR/seq.py 4000 | $TESTDIR/sha256line.py > target |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
319 $ hg ci -m 'add 100k passwords' |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
320 $ H2=`hg id -r . -T "{node}"` |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
321 $ C5=$H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
322 $ hg revert -r "$H2^" target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
323 $ hg ci -m 'cleaned 100k passwords' |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
324 $ H2=`hg id -r . -T "{node}"` |
51137
22d11305f365
censor: show that the `not-inline` ? `inline` test is broken
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
325 $ hg debugrevlogstats | grep target |
22d11305f365
censor: show that the `not-inline` ? `inline` test is broken
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
326 rev-count data-size inl type target |
51140
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
327 10 ?????? no file target (glob) |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
328 $ hg --config extensions.censor= censor -r $C5 target |
51287
195ab99cf791
censor: inform the user that we are spending time checking heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51140
diff
changeset
|
329 checking for the censored content in 2 heads |
51289
db121ddd171e
censor: be more verbose about the other steps too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51288
diff
changeset
|
330 checking for the censored content in the working directory |
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
331 censoring 1 file revisions |
51140
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
332 |
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
333 The important part is for the censor operation to not crash and the repository |
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
334 to not be corrupted. Right now this involve keeping the revlog split. |
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
335 |
51137
22d11305f365
censor: show that the `not-inline` ? `inline` test is broken
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
336 $ hg debugrevlogstats | grep target |
22d11305f365
censor: show that the `not-inline` ? `inline` test is broken
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
337 rev-count data-size inl type target |
51140
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
338 10 ??? no file target (glob) |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
339 $ hg cat -r $C5 target | head -n 10 |
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
340 $ hg cat -r $H2 target | head -n 10 |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
341 fresh start |
51140
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
342 $ hg verify |
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
343 checking changesets |
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
344 checking manifests |
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
345 crosschecking files in changesets and manifests |
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
346 checking files |
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
347 checking dirstate |
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
348 checked 12 changesets with 13 changes to 2 files |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
349 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
350 Repo with censored nodes can be cloned and cloned nodes are censored |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
351 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
352 $ cd .. |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
353 $ hg clone r rclone |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
354 updating to branch default |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
355 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
356 $ cd rclone |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
357 $ hg cat -r $H1 target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
358 advanced head H1 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
359 $ hg cat -r $H2~5 target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
360 Tainted file now super sanitized |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
361 $ hg cat -r $C2 target | head -n 10 |
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
362 $ hg cat -r $C1 target | head -n 10 |
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
363 $ hg cat -r 0 target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
364 Initially untainted file |
49920
2f2682f40ea0
tests: use the `--quiet` flag for verify when applicable
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49209
diff
changeset
|
365 $ hg verify -q |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
366 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
367 Repo cloned before tainted content introduced can pull censored nodes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
368 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
369 $ cd ../rpull |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
370 $ hg cat -r tip target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
371 Initially untainted file |
49920
2f2682f40ea0
tests: use the `--quiet` flag for verify when applicable
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49209
diff
changeset
|
372 $ hg verify -q |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
373 $ hg pull -r $H1 -r $H2 |
35400
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
374 pulling from $TESTTMP/r |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
375 searching for changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
376 adding changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
377 adding manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
378 adding file changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
379 added 11 changesets with 11 changes to 2 files (+1 heads) |
51140
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
380 new changesets * (glob) |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
381 (run 'hg heads' to see heads, 'hg merge' to merge) |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
382 $ hg update 4 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
383 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
384 $ cat target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
385 Tainted file now super sanitized |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
386 $ hg cat -r $H1 target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
387 advanced head H1 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
388 $ hg cat -r $H2~5 target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
389 Tainted file now super sanitized |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
390 $ hg cat -r $C2 target | head -n 10 |
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
391 $ hg cat -r $C1 target | head -n 10 |
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
392 $ hg cat -r 0 target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
393 Initially untainted file |
49920
2f2682f40ea0
tests: use the `--quiet` flag for verify when applicable
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49209
diff
changeset
|
394 $ hg verify -q |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
395 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
396 Censored nodes can be pushed if they censor previously unexchanged nodes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
397 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
398 $ echo 'Passwords: hunter2hunter2' > target |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
399 $ hg ci -m 're-add password from clone' target |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
400 created new head |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
401 $ H3=`hg id -r . -T "{node}"` |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
402 $ REV=$H3 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
403 $ echo 'Re-sanitized; nothing to see here' > target |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
404 $ hg ci -m 're-sanitized' target |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
405 $ H2=`hg id -r . -T "{node}"` |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
406 $ CLEANREV=$H2 |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
407 $ hg cat -r $REV target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
408 Passwords: hunter2hunter2 |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
409 $ hg --config extensions.censor= censor -r $REV target |
51287
195ab99cf791
censor: inform the user that we are spending time checking heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51140
diff
changeset
|
410 checking for the censored content in 3 heads |
51289
db121ddd171e
censor: be more verbose about the other steps too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51288
diff
changeset
|
411 checking for the censored content in the working directory |
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
412 censoring 1 file revisions |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
413 $ hg cat -r $REV target | head -n 10 |
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
414 $ hg cat -r $CLEANREV target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
415 Re-sanitized; nothing to see here |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
416 $ hg push -f -r $H2 |
35400
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
417 pushing to $TESTTMP/r |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
418 searching for changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
419 adding changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
420 adding manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
421 adding file changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
422 added 2 changesets with 2 changes to 1 files (+1 heads) |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
423 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
424 $ cd ../r |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
425 $ hg cat -r $REV target | head -n 10 |
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
426 $ hg cat -r $CLEANREV target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
427 Re-sanitized; nothing to see here |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
428 $ hg update $CLEANREV |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
429 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
430 $ cat target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
431 Re-sanitized; nothing to see here |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
432 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
433 Censored nodes can be bundled up and unbundled in another repo |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
434 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
435 $ hg bundle --base 0 ../pwbundle |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
436 13 changesets found |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
437 $ cd ../rclone |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
438 $ hg unbundle ../pwbundle |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
439 adding changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
440 adding manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
441 adding file changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
442 added 2 changesets with 2 changes to 2 files (+1 heads) |
51140
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
443 new changesets * (glob) |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
444 (run 'hg heads .' to see heads, 'hg merge' to merge) |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
445 $ hg cat -r $REV target | head -n 10 |
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
446 $ hg cat -r $CLEANREV target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
447 Re-sanitized; nothing to see here |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
448 $ hg update $CLEANREV |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
449 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
450 $ cat target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
451 Re-sanitized; nothing to see here |
49920
2f2682f40ea0
tests: use the `--quiet` flag for verify when applicable
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49209
diff
changeset
|
452 $ hg verify -q |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
453 |
43485
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
454 Grepping only warns, doesn't error out |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
455 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
456 $ cd ../rpull |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
457 $ hg grep 'Normal file' |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
458 bystander:Normal file v2 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
459 $ hg grep nothing |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
460 target:Re-sanitized; nothing to see here |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
461 $ hg grep --diff 'Normal file' |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
462 cannot search in censored file: target:7 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
463 cannot search in censored file: target:10 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
464 cannot search in censored file: target:12 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
465 bystander:6:-:Normal file v2 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
466 cannot search in censored file: target:1 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
467 cannot search in censored file: target:2 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
468 cannot search in censored file: target:3 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
469 bystander:2:-:Normal file here |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
470 bystander:2:+:Normal file v2 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
471 bystander:0:+:Normal file here |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
472 $ hg grep --diff nothing |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
473 cannot search in censored file: target:7 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
474 cannot search in censored file: target:10 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
475 cannot search in censored file: target:12 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
476 target:13:+:Re-sanitized; nothing to see here |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
477 cannot search in censored file: target:1 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
478 cannot search in censored file: target:2 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
479 cannot search in censored file: target:3 |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
480 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
481 Censored nodes can be imported on top of censored nodes, consecutively |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
482 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
483 $ hg init ../rimport |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
484 $ hg bundle --base 1 ../rimport/splitbundle |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
485 12 changesets found |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
486 $ cd ../rimport |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
487 $ hg pull -r $H1 -r $H2 ../r |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
488 pulling from ../r |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
489 adding changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
490 adding manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
491 adding file changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
492 added 8 changesets with 10 changes to 2 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32958
diff
changeset
|
493 new changesets e97f55b2665a:dcbaf17bf3a1 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
494 (run 'hg heads' to see heads, 'hg merge' to merge) |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
495 $ hg unbundle splitbundle |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
496 adding changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
497 adding manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
498 adding file changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
499 added 6 changesets with 5 changes to 2 files (+1 heads) |
51140
3e2a878fb96f
censor: fix things around inlining
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51137
diff
changeset
|
500 new changesets * (glob) |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
501 (run 'hg heads .' to see heads, 'hg merge' to merge) |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
502 $ hg update $H2 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
503 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
504 $ cat target | head -n 10 |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
505 Re-sanitized; nothing to see here |
49920
2f2682f40ea0
tests: use the `--quiet` flag for verify when applicable
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49209
diff
changeset
|
506 $ hg verify -q |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
507 $ cd ../r |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
508 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
509 Can import bundle where first revision of a file is censored |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
510 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
511 $ hg init ../rinit |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
512 $ hg --config extensions.censor= censor -r 0 target |
51287
195ab99cf791
censor: inform the user that we are spending time checking heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51140
diff
changeset
|
513 checking for the censored content in 3 heads |
51289
db121ddd171e
censor: be more verbose about the other steps too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51288
diff
changeset
|
514 checking for the censored content in the working directory |
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
515 censoring 1 file revisions |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
516 $ hg bundle -r 0 --base null ../rinit/initbundle |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
517 1 changesets found |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
518 $ cd ../rinit |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
519 $ hg unbundle initbundle |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
520 adding changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
521 adding manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
522 adding file changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
523 added 1 changesets with 2 changes to 2 files |
39497
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
37406
diff
changeset
|
524 new changesets e97f55b2665a (1 drafts) |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
525 (run 'hg update' to get a working copy) |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
526 $ hg cat -r 0 target | head -n 10 |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
527 |
51288
622f00b350be
censor: add a command flag to skip the head checks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51287
diff
changeset
|
528 Can skip the head checking steps |
622f00b350be
censor: add a command flag to skip the head checks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51287
diff
changeset
|
529 |
622f00b350be
censor: add a command flag to skip the head checks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51287
diff
changeset
|
530 $ hg --config extensions.censor= censor -r 0 --no-check-heads target |
51289
db121ddd171e
censor: be more verbose about the other steps too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51288
diff
changeset
|
531 checking for the censored content in the working directory |
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
532 censoring 1 file revisions |
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
533 |
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
534 Can censor multiple revision in one go. |
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
535 |
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
536 $ cd ../r |
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
537 $ hg --config extensions.censor= censor -r 0+1 target |
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
538 checking for the censored content in 3 heads |
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
539 checking for the censored content in the working directory |
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
540 censoring 2 file revisions |
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
541 |
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
542 |
51288
622f00b350be
censor: add a command flag to skip the head checks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51287
diff
changeset
|
543 |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
544 #if revlogv2 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
545 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
546 Testing feature that does not work in revlog v1 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
547 =============================================== |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
548 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
549 Censoring a revision that is used as delta base |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
550 ----------------------------------------------- |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
551 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
552 $ cd .. |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
553 $ hg init censor-with-delta |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
554 $ cd censor-with-delta |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
555 $ echo root > target |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
556 $ hg add target |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
557 $ hg commit -m root |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
558 $ B0=`hg id -r . -T "{node}"` |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
559 $ for x in `"$PYTHON" $TESTDIR/seq.py 0 50000` |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
560 > do |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
561 > echo "Password: hunter$x" >> target |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
562 > done |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
563 $ hg ci -m 'write a long file' |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
564 $ B1=`hg id -r . -T "{node}"` |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
565 $ echo 'small change (should create a delta)' >> target |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
566 $ hg ci -m 'create a delta over the password' |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
567 (should show that the last revision is a delta, not a snapshot) |
51980
2eeca9a8f4a7
tests: replace `hg id --debug -i` command substitution with non-debug command
Matt Harbison <matt_harbison@yahoo.com>
parents:
51371
diff
changeset
|
568 $ B2=`hg id -r . -T "{node}"` |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
569 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
570 Make sure the last revision is a delta against the revision we will censor |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
571 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
572 $ hg debugdeltachain target -T '{rev} {chainid} {chainlen} {prevrev}\n' |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
573 0 1 1 -1 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
574 1 2 1 -1 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
575 2 2 2 1 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
576 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
577 Censor the file |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
578 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
579 $ hg cat -r $B1 target | wc -l |
48322
95ea181d9bdd
tests: fix test-censor by improving regexp (issue6585)
Thomas Klausner <wiz@gatalith.at>
parents:
47463
diff
changeset
|
580 *50002 (re) |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
581 $ hg --config extensions.censor= censor -r $B1 target |
51287
195ab99cf791
censor: inform the user that we are spending time checking heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51140
diff
changeset
|
582 checking for the censored content in 1 heads |
51289
db121ddd171e
censor: be more verbose about the other steps too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51288
diff
changeset
|
583 checking for the censored content in the working directory |
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51289
diff
changeset
|
584 censoring 1 file revisions |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
585 $ hg cat -r $B1 target | wc -l |
48322
95ea181d9bdd
tests: fix test-censor by improving regexp (issue6585)
Thomas Klausner <wiz@gatalith.at>
parents:
47463
diff
changeset
|
586 *0 (re) |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
587 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
588 Check the children is fine |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
589 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
590 $ hg cat -r $B2 target | wc -l |
48322
95ea181d9bdd
tests: fix test-censor by improving regexp (issue6585)
Thomas Klausner <wiz@gatalith.at>
parents:
47463
diff
changeset
|
591 *50003 (re) |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
592 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
593 #endif |
50790
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
594 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
595 Testing repository upgrade with censors revision |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
596 ================================================ |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
597 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
598 $ cd ../rclone |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
599 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
600 With the "abort" policy |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
601 ======================= |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
602 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
603 $ hg verify --config censor.policy=ignore |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
604 checking changesets |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
605 checking manifests |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
606 crosschecking files in changesets and manifests |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
607 checking files |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
608 checking dirstate |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
609 checked 14 changesets with 15 changes to 2 files |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
610 $ hg debugupgraderepo --run --quiet \ |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
611 > --optimize re-delta-parent \ |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
612 > --config censor.policy=abort |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
613 upgrade will perform the following actions: |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
614 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
615 requirements |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
616 preserved: * (glob) |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
617 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
618 optimisations: re-delta-parent |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
619 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
620 processed revlogs: |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
621 - all-filelogs |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
622 - changelog |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
623 - manifest |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
624 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
625 $ hg verify --config censor.policy=ignore |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
626 checking changesets |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
627 checking manifests |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
628 crosschecking files in changesets and manifests |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
629 checking files |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
630 checking dirstate |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
631 checked 14 changesets with 15 changes to 2 files |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
632 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
633 With the "ignore" policy |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
634 ======================== |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
635 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
636 $ hg verify --config censor.policy=ignore |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
637 checking changesets |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
638 checking manifests |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
639 crosschecking files in changesets and manifests |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
640 checking files |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
641 checking dirstate |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
642 checked 14 changesets with 15 changes to 2 files |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
643 $ hg debugupgraderepo --run --quiet \ |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
644 > --optimize re-delta-parent \ |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
645 > --config censor.policy=ignore |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
646 upgrade will perform the following actions: |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
647 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
648 requirements |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
649 preserved: * (glob) |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
650 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
651 optimisations: re-delta-parent |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
652 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
653 processed revlogs: |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
654 - all-filelogs |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
655 - changelog |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
656 - manifest |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
657 |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
658 $ hg verify --config censor.policy=ignore |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
659 checking changesets |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
660 checking manifests |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
661 crosschecking files in changesets and manifests |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
662 checking files |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
663 checking dirstate |
8d574691d915
censor: show that censored revision prevent repository upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49921
diff
changeset
|
664 checked 14 changesets with 15 changes to 2 files |