##// END OF EJS Templates
config: clean up message about ignored untrusted config...
Martin von Zweigbergk -
r46501:e5a0efd2 default
parent child Browse files
Show More
@@ -469,7 +469,9 b' class ui(object):'
469 except error.ParseError as inst:
469 except error.ParseError as inst:
470 if trusted:
470 if trusted:
471 raise
471 raise
472 self.warn(_(b'ignored: %s\n') % stringutil.forcebytestr(inst))
472 self.warn(
473 _(b'ignored %s: %s\n') % (inst.location, inst.message)
474 )
473
475
474 self._applyconfig(cfg, trusted, root)
476 self._applyconfig(cfg, trusted, root)
475
477
@@ -174,7 +174,7 b' quux'
174 # parse error
174 # parse error
175 # different user, different group
175 # different user, different group
176 not trusting file .hg/hgrc from untrusted user abc, group def
176 not trusting file .hg/hgrc from untrusted user abc, group def
177 ignored: ('foo', '.hg/hgrc:1')
177 ignored .hg/hgrc:1: foo
178 # same user, same group
178 # same user, same group
179 hg: parse error at .hg/hgrc:1: foo
179 hg: parse error at .hg/hgrc:1: foo
180
180
General Comments 0
You need to be logged in to leave comments. Login now