Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/config.py @ 8192:5fd8e60a935d
config: deal with spaces at end of line more carefully
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 26 Apr 2009 16:50:43 -0500 |
| parents | d2504744e7a5 |
| children | 94246e90081e |
| rev | line source |
|---|---|
| 8144 | 1 from i18n import _ |
|
8183
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
2 import re, error, os |
| 8144 | 3 |
| 4 class sortdict(dict): | |
|
8184
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
5 'a simple sorted dictionary' |
| 8144 | 6 def __init__(self, data=None): |
| 7 self._list = [] | |
| 8 if data: | |
| 9 self.update(data) | |
| 10 def copy(self): | |
| 11 return sortdict(self) | |
| 12 def __setitem__(self, key, val): | |
| 13 if key in self: | |
| 14 self._list.remove(key) | |
| 15 self._list.append(key) | |
| 16 dict.__setitem__(self, key, val) | |
| 17 def __iter__(self): | |
| 18 return self._list.__iter__() | |
| 19 def update(self, src): | |
| 20 for k in src: | |
| 21 self[k] = src[k] | |
| 22 def items(self): | |
| 23 return [(k,self[k]) for k in self._list] | |
|
8184
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
24 def __delitem__(self, key): |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
25 dict.__delitem__(self, key) |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
26 self._list.remove(key) |
| 8144 | 27 |
|
8186
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
28 class config(object): |
| 8144 | 29 def __init__(self, data=None): |
| 30 self._data = {} | |
|
8185
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
31 self._source = {} |
| 8144 | 32 if data: |
| 33 for k in data._data: | |
| 34 self._data[k] = data[k].copy() | |
|
8185
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
35 self._source = data._source.copy() |
| 8144 | 36 def copy(self): |
| 37 return config(self) | |
| 38 def __contains__(self, section): | |
| 39 return section in self._data | |
|
8186
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
40 def __getitem__(self, section): |
|
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
41 return self._data.get(section, {}) |
|
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
42 def __iter__(self): |
|
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
43 for d in self.sections(): |
|
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
44 yield d |
| 8144 | 45 def update(self, src, sections=None): |
| 46 if not sections: | |
| 47 sections = src.sections() | |
| 48 for s in sections: | |
| 49 if s not in src: | |
| 50 continue | |
| 51 if s not in self: | |
| 52 self._data[s] = sortdict() | |
| 53 for k in src._data[s]: | |
| 54 self._data[s][k] = src._data[s][k] | |
|
8185
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
55 self._source[(s, k)] = src._source[(s, k)] |
| 8144 | 56 def get(self, section, item, default=None): |
|
8185
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
57 return self._data.get(section, {}).get(item, default) |
| 8144 | 58 def getsource(self, section, item): |
|
8185
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
59 return self._source.get((section, item), "") |
| 8144 | 60 def sections(self): |
| 61 return sorted(self._data.keys()) | |
| 62 def items(self, section): | |
|
8185
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
63 return self._data.get(section, {}).items() |
| 8144 | 64 def set(self, section, item, value, source=""): |
| 65 if section not in self: | |
| 66 self._data[section] = sortdict() | |
|
8185
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
67 self._data[section][item] = value |
|
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
68 self._source[(section, item)] = source |
| 8144 | 69 |
| 8180 | 70 def read(self, path, fp=None): |
| 8144 | 71 sectionre = re.compile(r'\[([^\[]+)\]') |
|
8192
5fd8e60a935d
config: deal with spaces at end of line more carefully
Matt Mackall <mpm@selenic.com>
parents:
8187
diff
changeset
|
72 itemre = re.compile(r'([^=\s]+)\s*=\s*(.*\S|)') |
|
5fd8e60a935d
config: deal with spaces at end of line more carefully
Matt Mackall <mpm@selenic.com>
parents:
8187
diff
changeset
|
73 contre = re.compile(r'\s+(\S.*\S)') |
| 8144 | 74 emptyre = re.compile(r'(;|#|\s*$)') |
|
8192
5fd8e60a935d
config: deal with spaces at end of line more carefully
Matt Mackall <mpm@selenic.com>
parents:
8187
diff
changeset
|
75 unsetre = re.compile(r'%unset\s+(\S+)') |
|
5fd8e60a935d
config: deal with spaces at end of line more carefully
Matt Mackall <mpm@selenic.com>
parents:
8187
diff
changeset
|
76 includere = re.compile(r'%include\s+(\S.*\S)') |
| 8144 | 77 section = "" |
| 78 item = None | |
| 79 line = 0 | |
| 80 cont = 0 | |
| 8180 | 81 |
| 82 if not fp: | |
| 83 fp = open(path) | |
| 84 | |
| 8144 | 85 for l in fp: |
| 86 line += 1 | |
| 87 if cont: | |
| 88 m = contre.match(l) | |
| 89 if m: | |
| 90 v = self.get(section, item) + "\n" + m.group(1) | |
| 91 self.set(section, item, v, "%s:%d" % (path, line)) | |
| 92 continue | |
| 93 item = None | |
|
8183
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
94 m = includere.match(l) |
|
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
95 if m: |
|
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
96 inc = m.group(1) |
|
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
97 base = os.path.dirname(path) |
|
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
98 inc = os.path.normpath(os.path.join(base, inc)) |
|
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
99 incfp = open(inc) |
|
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
100 self.read(inc, incfp) |
|
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
101 continue |
| 8144 | 102 if emptyre.match(l): |
| 103 continue | |
| 104 m = sectionre.match(l) | |
| 105 if m: | |
| 106 section = m.group(1) | |
| 107 if section not in self: | |
| 108 self._data[section] = sortdict() | |
| 109 continue | |
| 110 m = itemre.match(l) | |
| 111 if m: | |
| 112 item = m.group(1) | |
| 113 self.set(section, item, m.group(2), "%s:%d" % (path, line)) | |
| 114 cont = 1 | |
| 115 continue | |
|
8184
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
116 m = unsetre.match(l) |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
117 if m: |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
118 name = m.group(1) |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
119 if self.get(section, name) != None: |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
120 del self._data[section][name] |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
121 continue |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
122 |
| 8144 | 123 raise error.ConfigError(_('config error at %s:%d: \'%s\'') |
| 124 % (path, line, l.rstrip())) |