Show More
@@ -73,10 +73,10 b' class config(object):' | |||||
73 | def parse(self, src, data, sections=None, remap=None, include=None): |
|
73 | def parse(self, src, data, sections=None, remap=None, include=None): | |
74 | sectionre = re.compile(r'\[([^\[]+)\]') |
|
74 | sectionre = re.compile(r'\[([^\[]+)\]') | |
75 | itemre = re.compile(r'([^=\s][^=]*?)\s*=\s*(.*\S|)') |
|
75 | itemre = re.compile(r'([^=\s][^=]*?)\s*=\s*(.*\S|)') | |
76 | contre = re.compile(r'\s+(\S.*\S)') |
|
76 | contre = re.compile(r'\s+(\S|\S.*\S)\s*$') | |
77 | emptyre = re.compile(r'(;|#|\s*$)') |
|
77 | emptyre = re.compile(r'(;|#|\s*$)') | |
78 | unsetre = re.compile(r'%unset\s+(\S+)') |
|
78 | unsetre = re.compile(r'%unset\s+(\S+)') | |
79 | includere = re.compile(r'%include\s+(\S.*\S)') |
|
79 | includere = re.compile(r'%include\s+(\S|\S.*\S)\s*$') | |
80 | section = "" |
|
80 | section = "" | |
81 | item = None |
|
81 | item = None | |
82 | line = 0 |
|
82 | line = 0 |
@@ -23,5 +23,9 b" echo '[foo]' >> $HGRCPATH" | |||||
23 | echo ' x = y' >> $HGRCPATH |
|
23 | echo ' x = y' >> $HGRCPATH | |
24 | hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" |
|
24 | hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" | |
25 |
|
25 | |||
|
26 | python -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \ | |||
|
27 | > $HGRCPATH | |||
|
28 | hg showconfig foo | |||
|
29 | ||||
26 | echo '%include /no-such-file' > $HGRCPATH |
|
30 | echo '%include /no-such-file' > $HGRCPATH | |
27 | hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" |
|
31 | hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" |
@@ -11,4 +11,6 b' defaults.tag=-d "0 0"' | |||||
11 | paths.default=.../foo%bar |
|
11 | paths.default=.../foo%bar | |
12 | ui.slash=True |
|
12 | ui.slash=True | |
13 | hg: config error at $HGRCPATH:8: ' x = y' |
|
13 | hg: config error at $HGRCPATH:8: ' x = y' | |
|
14 | foo.bar=a\nb\nc\nde\nfg | |||
|
15 | foo.baz=bif cb | |||
14 | hg: config error at $HGRCPATH:1: cannot include /no-such-file (No such file or directory) |
|
16 | hg: config error at $HGRCPATH:1: cannot include /no-such-file (No such file or directory) |
General Comments 0
You need to be logged in to leave comments.
Login now