Show More
@@ -124,7 +124,7 b' def convert(ui, src, dest=None, revmapfi' | |||
|
124 | 124 | --config convert.cvsps=builtin |
|
125 | 125 | and has a few more configurable options: |
|
126 | 126 | --config convert.cvsps.cache=True (boolean) |
|
127 |
Set to False to disable remote log caching, for testing and |
|
|
127 | Set to False to disable remote log caching, for testing and | |
|
128 | 128 | debugging purposes. |
|
129 | 129 | --config convert.cvsps.fuzz=60 (integer) |
|
130 | 130 | Specify the maximum time (in seconds) that is allowed |
@@ -222,7 +222,7 b' def rebasenode(repo, rev, target, state,' | |||
|
222 | 222 | repo.dirstate.copy(v, k) |
|
223 | 223 | if v in m2 and v not in m1: |
|
224 | 224 | repo.dirstate.remove(v) |
|
225 | ||
|
225 | ||
|
226 | 226 | newrev = concludenode(repo, rev, p1, p2, state, collapse, |
|
227 | 227 | extrafn=extrafn) |
|
228 | 228 |
@@ -20,7 +20,7 b' class sortdict(dict):' | |||
|
20 | 20 | for k in src: |
|
21 | 21 | self[k] = src[k] |
|
22 | 22 | def items(self): |
|
23 | return [(k,self[k]) for k in self._list] | |
|
23 | return [(k, self[k]) for k in self._list] | |
|
24 | 24 | def __delitem__(self, key): |
|
25 | 25 | dict.__delitem__(self, key) |
|
26 | 26 | self._list.remove(key) |
@@ -9,8 +9,8 b' from i18n import _' | |||
|
9 | 9 | import errno, getpass, os, re, socket, sys, tempfile |
|
10 | 10 | import config, traceback, util, error |
|
11 | 11 | |
|
12 | _booleans = {'1':True, 'yes':True, 'true':True, 'on':True, | |
|
13 | '0':False, 'no':False, 'false':False, 'off':False} | |
|
12 | _booleans = {'1': True, 'yes': True, 'true': True, 'on': True, | |
|
13 | '0': False, 'no': False, 'false': False, 'off': False} | |
|
14 | 14 | |
|
15 | 15 | class ui(object): |
|
16 | 16 | def __init__(self, src=None): |
@@ -34,6 +34,7 b' class ui(object):' | |||
|
34 | 34 | # we always trust global config files |
|
35 | 35 | for f in util.rcpath(): |
|
36 | 36 | self.readconfig(f, trust=True) |
|
37 | ||
|
37 | 38 | def copy(self): |
|
38 | 39 | return self.__class__(self) |
|
39 | 40 | |
@@ -57,7 +58,7 b' class ui(object):' | |||
|
57 | 58 | return False |
|
58 | 59 | |
|
59 | 60 | def readconfig(self, filename, root=None, trust=False, |
|
60 |
sections |
|
|
61 | sections=None): | |
|
61 | 62 | try: |
|
62 | 63 | fp = open(filename) |
|
63 | 64 | except IOError: |
@@ -125,7 +126,7 b' class ui(object):' | |||
|
125 | 126 | uvalue = self._ucfg.get(section, name) |
|
126 | 127 | if uvalue is not None and uvalue != value: |
|
127 | 128 | self.debug(_("ignoring untrusted configuration option " |
|
128 | "%s.%s = %s\n") % (section, name, uvalue)) | |
|
129 | "%s.%s = %s\n") % (section, name, uvalue)) | |
|
129 | 130 | return value |
|
130 | 131 | |
|
131 | 132 | def configbool(self, section, name, default=False, untrusted=False): |
@@ -153,7 +154,7 b' class ui(object):' | |||
|
153 | 154 | def configitems(self, section, untrusted=False): |
|
154 | 155 | items = self._data(untrusted).items(section) |
|
155 | 156 | if self.debugflag and not untrusted and self._reportuntrusted: |
|
156 | for k,v in self._ucfg.items(section): | |
|
157 | for k, v in self._ucfg.items(section): | |
|
157 | 158 | if self._tcfg.get(section, k) != v: |
|
158 | 159 | self.debug(_("ignoring untrusted configuration option " |
|
159 | 160 | "%s.%s = %s\n") % (section, k, v)) |
@@ -109,7 +109,7 b' convert a foreign SCM repository to a Me' | |||
|
109 | 109 | --config convert.cvsps=builtin |
|
110 | 110 | and has a few more configurable options: |
|
111 | 111 | --config convert.cvsps.cache=True (boolean) |
|
112 |
Set to False to disable remote log caching, for testing and |
|
|
112 | Set to False to disable remote log caching, for testing and | |
|
113 | 113 | debugging purposes. |
|
114 | 114 | --config convert.cvsps.fuzz=60 (integer) |
|
115 | 115 | Specify the maximum time (in seconds) that is allowed |
General Comments 0
You need to be logged in to leave comments.
Login now