Show More
@@ -56,8 +56,8 b' def parseconfig(ui, raw, action):' | |||
|
56 | 56 | elif line == '[include]': |
|
57 | 57 | if havesection and current != includes: |
|
58 | 58 | # TODO pass filename into this API so we can report it. |
|
59 | raise error.Abort(_('%s config cannot have includes ' | |
|
60 | 'after excludes') % action) | |
|
59 | raise error.Abort(_('%(action)s config cannot have includes ' | |
|
60 | 'after excludes') % {'action': action}) | |
|
61 | 61 | havesection = True |
|
62 | 62 | current = includes |
|
63 | 63 | continue |
@@ -66,15 +66,16 b' def parseconfig(ui, raw, action):' | |||
|
66 | 66 | current = excludes |
|
67 | 67 | elif line: |
|
68 | 68 | if current is None: |
|
69 | raise error.Abort(_('%s config entry outside of ' | |
|
70 |
'section: %s') |
|
|
69 | raise error.Abort(_('%(action)s config entry outside of ' | |
|
70 | 'section: %(line)s') | |
|
71 | % {'action': action, 'line': line}, | |
|
71 | 72 | hint=_('add an [include] or [exclude] line ' |
|
72 | 73 | 'to declare the entry type')) |
|
73 | 74 | |
|
74 | 75 | if line.strip().startswith('/'): |
|
75 | ui.warn(_('warning: %s profile cannot use' | |
|
76 | ' paths starting with /, ignoring %s\n') | |
|
77 |
% |
|
|
76 | ui.warn(_('warning: %(action)s profile cannot use' | |
|
77 | ' paths starting with /, ignoring %(line)s\n') | |
|
78 | % {'action': action, 'line': line}) | |
|
78 | 79 | continue |
|
79 | 80 | current.add(line) |
|
80 | 81 |
General Comments 0
You need to be logged in to leave comments.
Login now