Show More
@@ -4552,7 +4552,7 b' def showconfig(ui, repo, *values, **opts' | |||||
4552 | """ |
|
4552 | """ | |
4553 |
|
4553 | |||
4554 | for f in scmutil.rcpath(): |
|
4554 | for f in scmutil.rcpath(): | |
4555 |
ui.debug |
|
4555 | ui.debug('read config from: %s\n' % f) | |
4556 | untrusted = bool(opts.get('untrusted')) |
|
4556 | untrusted = bool(opts.get('untrusted')) | |
4557 | if values: |
|
4557 | if values: | |
4558 | sections = [v for v in values if '.' not in v] |
|
4558 | sections = [v for v in values if '.' not in v] |
@@ -267,8 +267,8 b' class cmdalias(object):' | |||||
267 | elif int(m.groups()[0]) <= len(args): |
|
267 | elif int(m.groups()[0]) <= len(args): | |
268 | return m.group() |
|
268 | return m.group() | |
269 | else: |
|
269 | else: | |
270 |
ui.debug( |
|
270 | ui.debug("No argument found for substitution " | |
271 |
|
|
271 | "of %i variable in alias '%s' definition." | |
272 | % (int(m.groups()[0]), self.name)) |
|
272 | % (int(m.groups()[0]), self.name)) | |
273 | return '' |
|
273 | return '' | |
274 | cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:]) |
|
274 | cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:]) |
@@ -159,8 +159,8 b' class ui(object):' | |||||
159 | if self.debugflag and not untrusted and self._reportuntrusted: |
|
159 | if self.debugflag and not untrusted and self._reportuntrusted: | |
160 | uvalue = self._ucfg.get(section, name) |
|
160 | uvalue = self._ucfg.get(section, name) | |
161 | if uvalue is not None and uvalue != value: |
|
161 | if uvalue is not None and uvalue != value: | |
162 |
self.debug( |
|
162 | self.debug("ignoring untrusted configuration option " | |
163 |
|
|
163 | "%s.%s = %s\n" % (section, name, uvalue)) | |
164 | return value |
|
164 | return value | |
165 |
|
165 | |||
166 | def configpath(self, section, name, default=None, untrusted=False): |
|
166 | def configpath(self, section, name, default=None, untrusted=False): | |
@@ -330,8 +330,8 b' class ui(object):' | |||||
330 | if self.debugflag and not untrusted and self._reportuntrusted: |
|
330 | if self.debugflag and not untrusted and self._reportuntrusted: | |
331 | for k, v in self._ucfg.items(section): |
|
331 | for k, v in self._ucfg.items(section): | |
332 | if self._tcfg.get(section, k) != v: |
|
332 | if self._tcfg.get(section, k) != v: | |
333 |
self.debug( |
|
333 | self.debug("ignoring untrusted configuration option " | |
334 |
|
|
334 | "%s.%s = %s\n" % (section, k, v)) | |
335 | return items |
|
335 | return items | |
336 |
|
336 | |||
337 | def walkconfig(self, untrusted=False): |
|
337 | def walkconfig(self, untrusted=False): |
General Comments 0
You need to be logged in to leave comments.
Login now