Show More
@@ -64,7 +64,7 b' class ui(object):' | |||
|
64 | 64 | return True |
|
65 | 65 | |
|
66 | 66 | if self._reportuntrusted: |
|
67 |
self.warn(_(' |
|
|
67 | self.warn(_('not trusting file %s from untrusted ' | |
|
68 | 68 | 'user %s, group %s\n') % (f, user, group)) |
|
69 | 69 | return False |
|
70 | 70 |
@@ -15,7 +15,7 b' untrusted' | |||
|
15 | 15 | . . local = /another/path |
|
16 | 16 | |
|
17 | 17 | # different user, same group |
|
18 |
|
|
|
18 | not trusting file .hg/hgrc from untrusted user abc, group bar | |
|
19 | 19 | trusted |
|
20 | 20 | global = /some/path |
|
21 | 21 | untrusted |
@@ -31,7 +31,7 b' untrusted' | |||
|
31 | 31 | . . local = /another/path |
|
32 | 32 | |
|
33 | 33 | # different user, different group |
|
34 |
|
|
|
34 | not trusting file .hg/hgrc from untrusted user abc, group def | |
|
35 | 35 | trusted |
|
36 | 36 | global = /some/path |
|
37 | 37 | untrusted |
@@ -91,7 +91,7 b' untrusted' | |||
|
91 | 91 | |
|
92 | 92 | # we don't get confused by users and groups with the same name |
|
93 | 93 | # different user, different group |
|
94 |
|
|
|
94 | not trusting file .hg/hgrc from untrusted user abc, group def | |
|
95 | 95 | trusted |
|
96 | 96 | global = /some/path |
|
97 | 97 | untrusted |
@@ -118,7 +118,7 b' untrusted' | |||
|
118 | 118 | |
|
119 | 119 | # Can't figure out the name of the user running this process |
|
120 | 120 | # different user, different group |
|
121 |
|
|
|
121 | not trusting file .hg/hgrc from untrusted user abc, group def | |
|
122 | 122 | trusted |
|
123 | 123 | global = /some/path |
|
124 | 124 | untrusted |
@@ -127,7 +127,7 b' untrusted' | |||
|
127 | 127 | |
|
128 | 128 | # prints debug warnings |
|
129 | 129 | # different user, different group |
|
130 |
|
|
|
130 | not trusting file .hg/hgrc from untrusted user abc, group def | |
|
131 | 131 | trusted |
|
132 | 132 | ignoring untrusted configuration option paths.local = /another/path |
|
133 | 133 | global = /some/path |
@@ -146,7 +146,7 b' untrusted' | |||
|
146 | 146 | |
|
147 | 147 | # report_untrusted enabled with debug shows warnings |
|
148 | 148 | # different user, different group |
|
149 |
|
|
|
149 | not trusting file .hg/hgrc from untrusted user abc, group def | |
|
150 | 150 | trusted |
|
151 | 151 | ignoring untrusted configuration option paths.local = /another/path |
|
152 | 152 | global = /some/path |
@@ -159,7 +159,7 b' untrusted' | |||
|
159 | 159 | quux |
|
160 | 160 | |
|
161 | 161 | # read trusted, untrusted, new ui, trusted |
|
162 |
|
|
|
162 | not trusting file foobar from untrusted user abc, group def | |
|
163 | 163 | trusted: |
|
164 | 164 | ignoring untrusted configuration option foobar.baz = quux |
|
165 | 165 | None |
@@ -173,7 +173,7 b' quux' | |||
|
173 | 173 | |
|
174 | 174 | # parse error |
|
175 | 175 | # different user, different group |
|
176 |
|
|
|
176 | not trusting file .hg/hgrc from untrusted user abc, group def | |
|
177 | 177 | ('foo', '.hg/hgrc:1') |
|
178 | 178 | # same user, same group |
|
179 | 179 | ('foo', '.hg/hgrc:1') |
General Comments 0
You need to be logged in to leave comments.
Login now