##// END OF EJS Templates
error: fix up test-hgrc
Matt Mackall -
r11292:037d9107 default
parent child Browse files
Show More
@@ -103,10 +103,9 b' class config(object):'
103 try:
103 try:
104 include(inc, remap=remap, sections=sections)
104 include(inc, remap=remap, sections=sections)
105 except IOError, inst:
105 except IOError, inst:
106 raise error.ParseError(
106 raise error.ParseError(_("cannot include %s (%s)")
107 _("cannot include %s (%s)")
108 % (inc, inst.strerror),
107 % (inc, inst.strerror),
109 msg, "%s:%s" % (src, line))
108 "%s:%s" % (src, line))
110 continue
109 continue
111 if emptyre.match(l):
110 if emptyre.match(l):
112 continue
111 continue
@@ -36,7 +36,7 b' class Abort(Exception):'
36 class ConfigError(Abort):
36 class ConfigError(Abort):
37 'Exception raised when parsing config files'
37 'Exception raised when parsing config files'
38
38
39 class ParseError(Abort):
39 class ParseError(Exception):
40 'Exception raised when parsing config files (msg[, pos])'
40 'Exception raised when parsing config files (msg[, pos])'
41
41
42 class RepoError(Exception):
42 class RepoError(Exception):
@@ -1,4 +1,4 b''
1 hg: config error at $HGRCPATH:1: 'invalid'
1 hg: parse error at $HGRCPATH:1: invalid
2 updating to branch default
2 updating to branch default
3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 [paths]
4 [paths]
@@ -6,10 +6,10 b' default = .../foo%bar'
6 default = .../foo%bar
6 default = .../foo%bar
7 bundle.mainreporoot=.../foobar
7 bundle.mainreporoot=.../foobar
8 paths.default=.../foo%bar
8 paths.default=.../foo%bar
9 hg: config error at $HGRCPATH:2: ' x = y'
9 hg: parse error at $HGRCPATH:2: x = y
10 foo.bar=a\nb\nc\nde\nfg
10 foo.bar=a\nb\nc\nde\nfg
11 foo.baz=bif cb
11 foo.baz=bif cb
12 hg: config error at $HGRCPATH:1: cannot include /path/to/nowhere/no-such-file (No such file or directory)
12 hg: parse error at $HGRCPATH:1: cannot include /path/to/nowhere/no-such-file (No such file or directory)
13 % username expansion
13 % username expansion
14 John Doe
14 John Doe
15 ui.username=$FAKEUSER
15 ui.username=$FAKEUSER
General Comments 0
You need to be logged in to leave comments. Login now