Mercurial > public > mercurial-scm > hg
annotate mercurial/config.py @ 15063:c20688b7c061 stable
setdiscovery: fix hang when #heads>200 (issue2971)
When setting up the next sample, we always add all of the heads, regardless
of the desired max sample size. But if the number of heads exceeds this
size, then we don't add any more nodes from the still undecided set.
(This is debatable per se, and I'll investigate it, but it's how we designed
it at the moment.)
The bug was that we always added the overall heads, not the heads of the
remaining undecided set. Thus, if #heads>200 (desired sample size), we
did not make progress any longer.
| author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
|---|---|
| date | Thu, 25 Aug 2011 21:25:14 +0200 |
| parents | 5fb3cb7266e5 |
| children | 69e792cf7851 |
| rev | line source |
|---|---|
|
8229
ddf3d6656e7c
config: add copyright and license header
Martin Geisler <mg@lazybytes.net>
parents:
8222
diff
changeset
|
1 # config.py - configuration parsing for Mercurial |
|
ddf3d6656e7c
config: add copyright and license header
Martin Geisler <mg@lazybytes.net>
parents:
8222
diff
changeset
|
2 # |
|
ddf3d6656e7c
config: add copyright and license header
Martin Geisler <mg@lazybytes.net>
parents:
8222
diff
changeset
|
3 # Copyright 2009 Matt Mackall <mpm@selenic.com> and others |
|
ddf3d6656e7c
config: add copyright and license header
Martin Geisler <mg@lazybytes.net>
parents:
8222
diff
changeset
|
4 # |
|
ddf3d6656e7c
config: add copyright and license header
Martin Geisler <mg@lazybytes.net>
parents:
8222
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
| 10263 | 6 # GNU General Public License version 2 or any later version. |
|
8229
ddf3d6656e7c
config: add copyright and license header
Martin Geisler <mg@lazybytes.net>
parents:
8222
diff
changeset
|
7 |
| 8144 | 8 from i18n import _ |
|
11224
f23f87462c18
config: expand hgrc %include paths
Chad Dombrova <chadrik@gmail.com>
parents:
10295
diff
changeset
|
9 import error, util |
|
14486
4e3eda05189b
config: ignore include errors for nonexistent files
Matt Mackall <mpm@selenic.com>
parents:
13664
diff
changeset
|
10 import re, os, errno |
| 8144 | 11 |
| 12 class sortdict(dict): | |
|
8184
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
13 'a simple sorted dictionary' |
| 8144 | 14 def __init__(self, data=None): |
| 15 self._list = [] | |
| 16 if data: | |
| 17 self.update(data) | |
| 18 def copy(self): | |
| 19 return sortdict(self) | |
| 20 def __setitem__(self, key, val): | |
| 21 if key in self: | |
| 22 self._list.remove(key) | |
| 23 self._list.append(key) | |
| 24 dict.__setitem__(self, key, val) | |
| 25 def __iter__(self): | |
| 26 return self._list.__iter__() | |
| 27 def update(self, src): | |
| 28 for k in src: | |
| 29 self[k] = src[k] | |
|
14696
5fb3cb7266e5
config.sortdict: override clear method
Sune Foldager <cryo@cyanite.org>
parents:
14659
diff
changeset
|
30 def clear(self): |
|
5fb3cb7266e5
config.sortdict: override clear method
Sune Foldager <cryo@cyanite.org>
parents:
14659
diff
changeset
|
31 dict.clear(self) |
|
5fb3cb7266e5
config.sortdict: override clear method
Sune Foldager <cryo@cyanite.org>
parents:
14659
diff
changeset
|
32 self._list = [] |
| 8144 | 33 def items(self): |
|
8222
d30a21594812
more whitespace cleanup and some other style nits
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8198
diff
changeset
|
34 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
|
35 def __delitem__(self, key): |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
36 dict.__delitem__(self, key) |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
37 self._list.remove(key) |
| 8144 | 38 |
|
8186
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
39 class config(object): |
| 8144 | 40 def __init__(self, data=None): |
| 41 self._data = {} | |
|
8185
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
42 self._source = {} |
| 8144 | 43 if data: |
| 44 for k in data._data: | |
| 45 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
|
46 self._source = data._source.copy() |
| 8144 | 47 def copy(self): |
| 48 return config(self) | |
| 49 def __contains__(self, section): | |
| 50 return section in self._data | |
|
8186
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
51 def __getitem__(self, section): |
|
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
52 return self._data.get(section, {}) |
|
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
53 def __iter__(self): |
|
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
54 for d in self.sections(): |
|
6a0018cdb2fe
config: add some helper methods
Matt Mackall <mpm@selenic.com>
parents:
8185
diff
changeset
|
55 yield d |
|
8193
94246e90081e
config: add section filter to read
Matt Mackall <mpm@selenic.com>
parents:
8192
diff
changeset
|
56 def update(self, src): |
|
94246e90081e
config: add section filter to read
Matt Mackall <mpm@selenic.com>
parents:
8192
diff
changeset
|
57 for s in src: |
| 8144 | 58 if s not in self: |
| 59 self._data[s] = sortdict() | |
|
8193
94246e90081e
config: add section filter to read
Matt Mackall <mpm@selenic.com>
parents:
8192
diff
changeset
|
60 self._data[s].update(src._data[s]) |
|
94246e90081e
config: add section filter to read
Matt Mackall <mpm@selenic.com>
parents:
8192
diff
changeset
|
61 self._source.update(src._source) |
| 8144 | 62 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
|
63 return self._data.get(section, {}).get(item, default) |
|
8198
cf9accffd0b3
config: getsource -> source
Matt Mackall <mpm@selenic.com>
parents:
8193
diff
changeset
|
64 def source(self, section, item): |
|
8185
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
65 return self._source.get((section, item), "") |
| 8144 | 66 def sections(self): |
| 67 return sorted(self._data.keys()) | |
| 68 def items(self, section): | |
|
8185
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
69 return self._data.get(section, {}).items() |
| 8144 | 70 def set(self, section, item, value, source=""): |
| 71 if section not in self: | |
| 72 self._data[section] = sortdict() | |
|
8185
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
73 self._data[section][item] = value |
|
dc10a7a3f1d4
config: split source data out into separate map
Matt Mackall <mpm@selenic.com>
parents:
8184
diff
changeset
|
74 self._source[(section, item)] = source |
| 8144 | 75 |
|
8265
52c5be55af82
config: add parse interface
Matt Mackall <mpm@selenic.com>
parents:
8263
diff
changeset
|
76 def parse(self, src, data, sections=None, remap=None, include=None): |
| 8144 | 77 sectionre = re.compile(r'\[([^\[]+)\]') |
|
8263
41031699550a
config: allow spaces in key portion of items
Matt Mackall <mpm@selenic.com>
parents:
8229
diff
changeset
|
78 itemre = re.compile(r'([^=\s][^=]*?)\s*=\s*(.*\S|)') |
|
10295
44c923eeb81d
config: handle short continuations (issue1999)
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
79 contre = re.compile(r'\s+(\S|\S.*\S)\s*$') |
|
14659
4392594746f6
config: undo change of empty line definition
Matt Mackall <mpm@selenic.com>
parents:
14642
diff
changeset
|
80 emptyre = re.compile(r'(;|#|\s*$)') |
|
14642
fdcdb221a922
config: handle comment lines in continuations (issue2854)
Matt Mackall <mpm@selenic.com>
parents:
14486
diff
changeset
|
81 commentre = re.compile(r'(;|#)') |
|
8192
5fd8e60a935d
config: deal with spaces at end of line more carefully
Matt Mackall <mpm@selenic.com>
parents:
8187
diff
changeset
|
82 unsetre = re.compile(r'%unset\s+(\S+)') |
|
10295
44c923eeb81d
config: handle short continuations (issue1999)
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
83 includere = re.compile(r'%include\s+(\S|\S.*\S)\s*$') |
| 8144 | 84 section = "" |
| 85 item = None | |
| 86 line = 0 | |
|
9339
9be91129c96e
config: improve code readability
Andrey <py4fun@gmail.com>
parents:
9136
diff
changeset
|
87 cont = False |
| 8180 | 88 |
|
9136
31177742f54a
for calls expecting bool args, pass bool instead of int
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8312
diff
changeset
|
89 for l in data.splitlines(True): |
| 8144 | 90 line += 1 |
| 91 if cont: | |
|
14642
fdcdb221a922
config: handle comment lines in continuations (issue2854)
Matt Mackall <mpm@selenic.com>
parents:
14486
diff
changeset
|
92 if commentre.match(l): |
|
fdcdb221a922
config: handle comment lines in continuations (issue2854)
Matt Mackall <mpm@selenic.com>
parents:
14486
diff
changeset
|
93 continue |
| 8144 | 94 m = contre.match(l) |
| 95 if m: | |
|
8193
94246e90081e
config: add section filter to read
Matt Mackall <mpm@selenic.com>
parents:
8192
diff
changeset
|
96 if sections and section not in sections: |
|
94246e90081e
config: add section filter to read
Matt Mackall <mpm@selenic.com>
parents:
8192
diff
changeset
|
97 continue |
| 8144 | 98 v = self.get(section, item) + "\n" + m.group(1) |
|
8265
52c5be55af82
config: add parse interface
Matt Mackall <mpm@selenic.com>
parents:
8263
diff
changeset
|
99 self.set(section, item, v, "%s:%d" % (src, line)) |
| 8144 | 100 continue |
| 101 item = None | |
|
9469
7f0f882af23d
config: abort on indented non-continuation lines (issue1829)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8312
diff
changeset
|
102 cont = False |
|
8183
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
103 m = includere.match(l) |
|
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
104 if m: |
|
11224
f23f87462c18
config: expand hgrc %include paths
Chad Dombrova <chadrik@gmail.com>
parents:
10295
diff
changeset
|
105 inc = util.expandpath(m.group(1)) |
|
8265
52c5be55af82
config: add parse interface
Matt Mackall <mpm@selenic.com>
parents:
8263
diff
changeset
|
106 base = os.path.dirname(src) |
|
8183
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
107 inc = os.path.normpath(os.path.join(base, inc)) |
|
8265
52c5be55af82
config: add parse interface
Matt Mackall <mpm@selenic.com>
parents:
8263
diff
changeset
|
108 if include: |
|
10042
7cdd2a7db2c2
config: raise ConfigError on non-existing include files
Martin Geisler <mg@lazybytes.net>
parents:
9471
diff
changeset
|
109 try: |
|
7cdd2a7db2c2
config: raise ConfigError on non-existing include files
Martin Geisler <mg@lazybytes.net>
parents:
9471
diff
changeset
|
110 include(inc, remap=remap, sections=sections) |
|
7cdd2a7db2c2
config: raise ConfigError on non-existing include files
Martin Geisler <mg@lazybytes.net>
parents:
9471
diff
changeset
|
111 except IOError, inst: |
|
14486
4e3eda05189b
config: ignore include errors for nonexistent files
Matt Mackall <mpm@selenic.com>
parents:
13664
diff
changeset
|
112 if inst.errno != errno.ENOENT: |
|
4e3eda05189b
config: ignore include errors for nonexistent files
Matt Mackall <mpm@selenic.com>
parents:
13664
diff
changeset
|
113 raise error.ParseError(_("cannot include %s (%s)") |
|
4e3eda05189b
config: ignore include errors for nonexistent files
Matt Mackall <mpm@selenic.com>
parents:
13664
diff
changeset
|
114 % (inc, inst.strerror), |
|
4e3eda05189b
config: ignore include errors for nonexistent files
Matt Mackall <mpm@selenic.com>
parents:
13664
diff
changeset
|
115 "%s:%s" % (src, line)) |
|
8183
2858ab754995
config: allow including other config files
Matt Mackall <mpm@selenic.com>
parents:
8180
diff
changeset
|
116 continue |
| 8144 | 117 if emptyre.match(l): |
| 118 continue | |
| 119 m = sectionre.match(l) | |
| 120 if m: | |
| 121 section = m.group(1) | |
|
8298
9542f4c3fa1b
config: make remap actually work
Matt Mackall <mpm@selenic.com>
parents:
8265
diff
changeset
|
122 if remap: |
|
9542f4c3fa1b
config: make remap actually work
Matt Mackall <mpm@selenic.com>
parents:
8265
diff
changeset
|
123 section = remap.get(section, section) |
| 8144 | 124 if section not in self: |
| 125 self._data[section] = sortdict() | |
| 126 continue | |
| 127 m = itemre.match(l) | |
| 128 if m: | |
| 129 item = m.group(1) | |
|
9339
9be91129c96e
config: improve code readability
Andrey <py4fun@gmail.com>
parents:
9136
diff
changeset
|
130 cont = True |
|
8193
94246e90081e
config: add section filter to read
Matt Mackall <mpm@selenic.com>
parents:
8192
diff
changeset
|
131 if sections and section not in sections: |
|
94246e90081e
config: add section filter to read
Matt Mackall <mpm@selenic.com>
parents:
8192
diff
changeset
|
132 continue |
|
8265
52c5be55af82
config: add parse interface
Matt Mackall <mpm@selenic.com>
parents:
8263
diff
changeset
|
133 self.set(section, item, m.group(2), "%s:%d" % (src, line)) |
| 8144 | 134 continue |
|
8184
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
135 m = unsetre.match(l) |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
136 if m: |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
137 name = m.group(1) |
|
8193
94246e90081e
config: add section filter to read
Matt Mackall <mpm@selenic.com>
parents:
8192
diff
changeset
|
138 if sections and section not in sections: |
|
94246e90081e
config: add section filter to read
Matt Mackall <mpm@selenic.com>
parents:
8192
diff
changeset
|
139 continue |
|
13031
3da456d0c885
code style: prefer 'is' and 'is not' tests with singletons
Martin Geisler <mg@aragost.com>
parents:
11292
diff
changeset
|
140 if self.get(section, name) is not None: |
|
8184
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
141 del self._data[section][name] |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
142 continue |
|
9189afe1eba3
config: add %unset name support
Matt Mackall <mpm@selenic.com>
parents:
8183
diff
changeset
|
143 |
|
11288
2123aad24d56
error: add new ParseError for various parsing errors
Matt Mackall <mpm@selenic.com>
parents:
11224
diff
changeset
|
144 raise error.ParseError(l.rstrip(), ("%s:%s" % (src, line))) |
|
8265
52c5be55af82
config: add parse interface
Matt Mackall <mpm@selenic.com>
parents:
8263
diff
changeset
|
145 |
|
52c5be55af82
config: add parse interface
Matt Mackall <mpm@selenic.com>
parents:
8263
diff
changeset
|
146 def read(self, path, fp=None, sections=None, remap=None): |
|
52c5be55af82
config: add parse interface
Matt Mackall <mpm@selenic.com>
parents:
8263
diff
changeset
|
147 if not fp: |
|
13664
53db4e2026ab
config: use util.posixfile
Adrian Buehlmann <adrian@cadifra.com>
parents:
13031
diff
changeset
|
148 fp = util.posixfile(path) |
|
8265
52c5be55af82
config: add parse interface
Matt Mackall <mpm@selenic.com>
parents:
8263
diff
changeset
|
149 self.parse(path, fp.read(), sections, remap, self.read) |