author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Thu, 01 Dec 2022 01:57:14 +0100 | |
changeset 49820 | 0df2cff04291 |
parent 49209 | 3f86ee422095 |
child 49920 | 2f2682f40ea0 |
permissions | -rw-r--r-- |
37406
8c37c3220ebc
tests: skip test-censor.t when using simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35400
diff
changeset
|
1 |
#require no-reposimplestore |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
2 |
#testcases revlogv1 revlogv2 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
3 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
4 |
#if revlogv2 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
5 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
6 |
$ cat >> $HGRCPATH <<EOF |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
7 |
> [experimental] |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
8 |
> 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
|
9 |
> EOF |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
10 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
11 |
#endif |
37406
8c37c3220ebc
tests: skip test-censor.t when using simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35400
diff
changeset
|
12 |
|
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
13 |
$ cp $HGRCPATH $HGRCPATH.orig |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
14 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
15 |
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
|
16 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
17 |
$ hg init r |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
18 |
$ cd r |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
19 |
$ 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
|
20 |
$ 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
|
21 |
$ hg add target bystander |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
22 |
$ hg ci -m init |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
23 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
24 |
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
|
25 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
26 |
$ cd .. |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
27 |
$ hg clone r rpull |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
28 |
updating to branch default |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
29 |
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
|
30 |
$ cd r |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
31 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
32 |
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
|
33 |
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
|
34 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
35 |
$ echo 'Tainted file' > target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
36 |
$ echo 'Passwords: hunter2' >> target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
37 |
$ hg ci -m taint target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
38 |
$ C1=`hg id --debug -i` |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
39 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
40 |
$ echo 'hunter3' >> target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
41 |
$ 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
|
42 |
$ hg ci -m moretaint target bystander |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
43 |
$ C2=`hg id --debug -i` |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
44 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
45 |
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
|
46 |
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
|
47 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
48 |
$ 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
|
49 |
$ hg ci -m sanitized target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
50 |
$ H1=`hg id --debug -i` |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
51 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
52 |
$ hg update -r $C2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
53 |
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
|
54 |
$ 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
|
55 |
$ 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
|
56 |
created new head |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
57 |
$ H2=`hg id --debug -i` |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
58 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
59 |
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
|
60 |
|
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
61 |
$ 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
|
62 |
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
|
63 |
$ 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
|
64 |
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
|
65 |
$ 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
|
66 |
Tainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
67 |
Passwords: hunter2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
68 |
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
|
69 |
$ 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
|
70 |
Tainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
71 |
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
|
72 |
$ 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
|
73 |
Initially untainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
74 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
75 |
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
|
76 |
|
25806
5e18f6e39006
censor: make various path forms available like other Mercurial commands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
77 |
(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
|
78 |
|
5e18f6e39006
censor: make various path forms available like other Mercurial commands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
79 |
$ 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
|
80 |
$ hg --config extensions.censor= --cwd foo/bar/baz censor -r $C2 -t "remove password" ../../../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
|
81 |
$ 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
|
82 |
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
|
83 |
$ 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
|
84 |
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
|
85 |
$ 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
|
86 |
abort: censored node: 1e0247a9a4b7 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
87 |
(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
|
88 |
$ 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
|
89 |
Tainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
90 |
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
|
91 |
$ 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
|
92 |
Initially untainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
93 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
94 |
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
|
95 |
|
25806
5e18f6e39006
censor: make various path forms available like other Mercurial commands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24361
diff
changeset
|
96 |
(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
|
97 |
|
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
98 |
$ hg --config extensions.censor= --cwd foo/bar/baz censor -r $C1 path: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
|
99 |
$ 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
|
100 |
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
|
101 |
$ 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
|
102 |
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
|
103 |
$ 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
|
104 |
abort: censored node: 1e0247a9a4b7 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
105 |
(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
|
106 |
$ 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
|
107 |
abort: censored node: 613bc869fceb |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
108 |
(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
|
109 |
$ 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
|
110 |
Initially untainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
111 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
112 |
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
|
113 |
|
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 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
|
115 |
abort: censored node: 1e0247a9a4b7 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
116 |
(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
|
117 |
$ 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
|
118 |
abort: censored node: 613bc869fceb |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
119 |
(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
|
120 |
$ 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
|
121 |
reverting bystander |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
122 |
reverting target |
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 |
[255] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
126 |
$ 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
|
127 |
$ 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
|
128 |
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
|
129 |
$ 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
|
130 |
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
|
131 |
$ 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
|
132 |
Initially untainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
133 |
$ 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
|
134 |
reverting bystander |
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 |
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
|
138 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
139 |
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
|
140 |
|
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 |
$ 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
|
142 |
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
|
143 |
$ 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
|
144 |
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
|
145 |
$ 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
|
146 |
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
|
147 |
$ 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
|
148 |
Normal file here |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
149 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
150 |
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
|
151 |
|
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
152 |
$ 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
|
153 |
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
|
154 |
$ 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
|
155 |
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
|
156 |
$ hg update -r $H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
157 |
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
|
158 |
$ 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
|
159 |
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
|
160 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
161 |
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
|
162 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
163 |
$ cp $HGRCPATH.orig $HGRCPATH |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
164 |
$ cat >> $HGRCPATH <<EOF |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
165 |
> [censor] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
166 |
> policy = abort |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
167 |
> EOF |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
168 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
169 |
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
|
170 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
171 |
$ hg verify |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
172 |
checking changesets |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
173 |
checking manifests |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
174 |
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
|
175 |
checking files |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
176 |
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
|
177 |
target@2: censored file data |
39506
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39497
diff
changeset
|
178 |
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
|
179 |
2 integrity errors encountered! |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
180 |
(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
|
181 |
[1] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
182 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
183 |
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
|
184 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
185 |
$ hg update -r $C2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
186 |
abort: censored node: 1e0247a9a4b7 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
187 |
(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
|
188 |
[255] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
189 |
$ hg update -r $C1 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
190 |
abort: censored node: 613bc869fceb |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
191 |
(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
|
192 |
[255] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
193 |
$ hg update -r 0 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
194 |
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
|
195 |
$ hg update -r $H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
196 |
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
|
197 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
198 |
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
|
199 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
200 |
$ cp $HGRCPATH.orig $HGRCPATH |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
201 |
$ cat >> $HGRCPATH <<EOF |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
202 |
> [censor] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
203 |
> policy = ignore |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
204 |
> EOF |
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 |
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
|
207 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
208 |
$ hg verify |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
209 |
checking changesets |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
210 |
checking manifests |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
211 |
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
|
212 |
checking files |
39506
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39497
diff
changeset
|
213 |
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
|
214 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
215 |
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
|
216 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
217 |
$ hg update -r $C2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
218 |
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
|
219 |
$ 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
|
220 |
$ hg update -r $C1 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
221 |
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
|
222 |
$ 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
|
223 |
$ hg update -r 0 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
224 |
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
|
225 |
$ 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
|
226 |
Initially untainted file |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
227 |
$ hg update -r $H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
228 |
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
|
229 |
$ 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
|
230 |
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
|
231 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
232 |
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
|
233 |
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
|
234 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
235 |
$ hg update -r $H1 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
236 |
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
|
237 |
$ C3=$H1 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
238 |
$ 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
|
239 |
$ hg ci -m 'advance head H1' target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
240 |
$ H1=`hg id --debug -i` |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
241 |
$ hg --config extensions.censor= censor -r $C3 target |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
242 |
$ hg update -r $H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
243 |
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
|
244 |
$ hg merge -r $C3 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
245 |
merging target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
246 |
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
|
247 |
(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
|
248 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
249 |
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
|
250 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
251 |
$ 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
|
252 |
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
|
253 |
$ hg --config extensions.censor= censor -r $H2 target |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
254 |
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
|
255 |
(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
|
256 |
[255] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
257 |
$ echo 'twiddling thumbs' > bystander |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
258 |
$ hg ci -m 'bystander commit' |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
259 |
$ H2=`hg id --debug -i` |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
260 |
$ hg --config extensions.censor= censor -r "$H2^" target |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
261 |
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
|
262 |
(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
|
263 |
[255] |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
264 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
265 |
Cannot censor working directory |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
266 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
267 |
$ 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
|
268 |
$ hg ci -m 'extend second head arbitrarily' target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
269 |
$ H2=`hg id --debug -i` |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
270 |
$ hg update -r "$H2^" |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
271 |
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
|
272 |
$ hg --config extensions.censor= censor -r . target |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
273 |
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
|
274 |
(clean/delete/update first) |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
275 |
[255] |
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 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
278 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
279 |
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
|
280 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
281 |
$ C4=$H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
282 |
$ hg rm target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
283 |
$ hg ci -m 'delete target so it may be censored' |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
284 |
$ H2=`hg id --debug -i` |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
285 |
$ hg --config extensions.censor= censor -r $C4 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
|
286 |
$ 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
|
287 |
$ 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
|
288 |
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
|
289 |
$ echo 'fresh start' > target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
290 |
$ hg add 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 reincarnated target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
292 |
$ H2=`hg id --debug -i` |
47396
65b86f516ba2
censor: reduce risk of censor test blowing up output limit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43485
diff
changeset
|
293 |
$ 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
|
294 |
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
|
295 |
$ 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
|
296 |
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
|
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 |
|
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
301 |
Can censor after revlog has expanded to no longer permit inline storage |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
302 |
|
39723
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39506
diff
changeset
|
303 |
$ for x in `"$PYTHON" $TESTDIR/seq.py 0 50000` |
24347
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
304 |
> do |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
305 |
> echo "Password: hunter$x" >> target |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
306 |
> done |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
307 |
$ hg ci -m 'add 100k passwords' |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
308 |
$ H2=`hg id --debug -i` |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
309 |
$ C5=$H2 |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
310 |
$ 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
|
311 |
$ hg ci -m 'cleaned 100k passwords' |
1bcfecbbf569
censor: add censor command to hgext with basic client-side tests
Mike Edgar <adgar@google.com>
parents:
diff
changeset
|
312 |
$ H2=`hg id --debug -i` |
49209
3f86ee422095
censor: make rhg fall back to python when encountering a censored node
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48322
diff
changeset
|
313 |
$ hg --config extensions.censor= censor -r $C5 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
|
314 |
$ 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
|
315 |
$ 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
|
316 |
fresh start |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
317 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
318 |
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
|
319 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
320 |
$ cd .. |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
321 |
$ 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
|
322 |
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
|
323 |
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
|
324 |
$ 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
|
325 |
$ 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
|
326 |
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
|
327 |
$ 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
|
328 |
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
|
329 |
$ 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
|
330 |
$ 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
|
331 |
$ 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
|
332 |
Initially untainted file |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
333 |
$ hg verify |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
334 |
checking changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
335 |
checking manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
336 |
crosschecking files in changesets and manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
337 |
checking files |
39506
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39497
diff
changeset
|
338 |
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
|
339 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
340 |
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
|
341 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
342 |
$ 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
|
343 |
$ 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
|
344 |
Initially untainted file |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
345 |
$ hg verify |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
346 |
checking changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
347 |
checking manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
348 |
crosschecking files in changesets and manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
349 |
checking files |
39506
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39497
diff
changeset
|
350 |
checked 1 changesets with 2 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
|
351 |
$ 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
|
352 |
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
|
353 |
searching for changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
354 |
adding changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
355 |
adding manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
356 |
adding file changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
357 |
added 11 changesets with 11 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
|
358 |
new changesets 186fb27560c3:683e4645fded |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
359 |
(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
|
360 |
$ hg update 4 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
361 |
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
|
362 |
$ 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
|
363 |
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
|
364 |
$ 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
|
365 |
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
|
366 |
$ 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
|
367 |
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
|
368 |
$ 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
|
369 |
$ 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
|
370 |
$ 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
|
371 |
Initially untainted file |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
372 |
$ hg verify |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
373 |
checking changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
374 |
checking manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
375 |
crosschecking files in changesets and manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
376 |
checking files |
39506
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39497
diff
changeset
|
377 |
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
|
378 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
379 |
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
|
380 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
381 |
$ 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
|
382 |
$ 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
|
383 |
created new head |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
384 |
$ H3=`hg id --debug -i` |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
385 |
$ REV=$H3 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
386 |
$ 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
|
387 |
$ hg ci -m 're-sanitized' target |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
388 |
$ H2=`hg id --debug -i` |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
389 |
$ 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
|
390 |
$ 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
|
391 |
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
|
392 |
$ hg --config extensions.censor= censor -r $REV 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
|
393 |
$ 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
|
394 |
$ 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
|
395 |
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
|
396 |
$ 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
|
397 |
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
|
398 |
searching for changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
399 |
adding changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
400 |
adding manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
401 |
adding file changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
402 |
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
|
403 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
404 |
$ 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
|
405 |
$ 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
|
406 |
$ 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
|
407 |
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
|
408 |
$ hg update $CLEANREV |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
409 |
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
|
410 |
$ 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
|
411 |
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
|
412 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
413 |
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
|
414 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
415 |
$ 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
|
416 |
13 changesets found |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
417 |
$ cd ../rclone |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
418 |
$ hg unbundle ../pwbundle |
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 2 files (+1 heads) |
39497
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
37406
diff
changeset
|
423 |
new changesets 075be80ac777:dcbaf17bf3a1 (2 drafts) |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
424 |
(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
|
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 |
$ hg verify |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
433 |
checking changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
434 |
checking manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
435 |
crosschecking files in changesets and manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
436 |
checking files |
39506
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39497
diff
changeset
|
437 |
checked 14 changesets with 15 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
|
438 |
|
43485
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
439 |
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
|
440 |
|
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
441 |
$ cd ../rpull |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
442 |
$ 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
|
443 |
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
|
444 |
$ hg grep nothing |
13b8097dccbf
grep: warn on censored revisions instead of erroring out
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
39723
diff
changeset
|
445 |
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
|
446 |
$ 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
|
447 |
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
|
448 |
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
|
449 |
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
|
450 |
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
|
451 |
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
|
452 |
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
|
453 |
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
|
454 |
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
|
455 |
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
|
456 |
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
|
457 |
$ 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
|
458 |
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
|
459 |
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
|
460 |
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
|
461 |
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
|
462 |
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
|
463 |
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
|
464 |
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
|
465 |
|
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
466 |
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
|
467 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
468 |
$ hg init ../rimport |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
469 |
$ 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
|
470 |
12 changesets found |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
471 |
$ cd ../rimport |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
472 |
$ 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
|
473 |
pulling from ../r |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
474 |
adding changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
475 |
adding manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
476 |
adding file changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
477 |
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
|
478 |
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
|
479 |
(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
|
480 |
$ hg unbundle splitbundle |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
481 |
adding changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
482 |
adding manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
483 |
adding file changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
484 |
added 6 changesets with 5 changes to 2 files (+1 heads) |
39497
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
37406
diff
changeset
|
485 |
new changesets efbe78065929:683e4645fded (6 drafts) |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
486 |
(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
|
487 |
$ hg update $H2 |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
488 |
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
|
489 |
$ 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
|
490 |
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
|
491 |
$ hg verify |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
492 |
checking changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
493 |
checking manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
494 |
crosschecking files in changesets and manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
495 |
checking files |
39506
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39497
diff
changeset
|
496 |
checked 14 changesets with 15 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
|
497 |
$ cd ../r |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
498 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
499 |
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
|
500 |
|
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
501 |
$ 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
|
502 |
$ hg --config extensions.censor= censor -r 0 target |
24348
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
503 |
$ 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
|
504 |
1 changesets found |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
505 |
$ cd ../rinit |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
506 |
$ hg unbundle initbundle |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
507 |
adding changesets |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
508 |
adding manifests |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
509 |
adding file changes |
b7f936f47f2b
censor: add exchange tests, via local push/pull and bundle/unbundle
Mike Edgar <adgar@google.com>
parents:
24347
diff
changeset
|
510 |
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
|
511 |
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
|
512 |
(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
|
513 |
$ 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
|
514 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
515 |
#if revlogv2 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
516 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
517 |
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
|
518 |
=============================================== |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
519 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
520 |
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
|
521 |
----------------------------------------------- |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
522 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
523 |
$ cd .. |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
524 |
$ hg init censor-with-delta |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
525 |
$ cd censor-with-delta |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
526 |
$ echo root > target |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
527 |
$ hg add target |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
528 |
$ hg commit -m root |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
529 |
$ B0=`hg id --debug -i` |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
530 |
$ 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
|
531 |
> do |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
532 |
> echo "Password: hunter$x" >> target |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
533 |
> done |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
534 |
$ hg ci -m 'write a long file' |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
535 |
$ B1=`hg id --debug -i` |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
536 |
$ 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
|
537 |
$ 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
|
538 |
(should show that the last revision is a delta, not a snapshot) |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
539 |
$ B2=`hg id --debug -i` |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
540 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
541 |
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
|
542 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
543 |
$ 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
|
544 |
0 1 1 -1 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
545 |
1 2 1 -1 |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
546 |
2 2 2 1 |
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 |
Censor the file |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
549 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
550 |
$ 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
|
551 |
*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
|
552 |
$ hg --config extensions.censor= censor -r $B1 target |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
553 |
$ 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
|
554 |
*0 (re) |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
555 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
556 |
Check the children is fine |
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
557 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
558 |
$ 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
|
559 |
*50003 (re) |
47463
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
560 |
|
f8330a3fc39f
censor: implement censoring for revlogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47398
diff
changeset
|
561 |
#endif |