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