Show More
@@ -1,1119 +1,1118 b'' | |||||
1 | # Mercurial bookmark support code |
|
1 | # Mercurial bookmark support code | |
2 | # |
|
2 | # | |
3 | # Copyright 2008 David Soria Parra <dsp@php.net> |
|
3 | # Copyright 2008 David Soria Parra <dsp@php.net> | |
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 struct |
|
11 | import struct | |
12 |
|
12 | |||
13 | from .i18n import _ |
|
13 | from .i18n import _ | |
14 | from .node import ( |
|
14 | from .node import ( | |
15 | bin, |
|
15 | bin, | |
16 | hex, |
|
16 | hex, | |
17 | short, |
|
17 | short, | |
18 | ) |
|
18 | ) | |
19 | from .pycompat import getattr |
|
19 | from .pycompat import getattr | |
20 | from . import ( |
|
20 | from . import ( | |
21 | encoding, |
|
21 | encoding, | |
22 | error, |
|
22 | error, | |
23 | obsutil, |
|
23 | obsutil, | |
24 | pycompat, |
|
24 | pycompat, | |
|
25 | requirements, | |||
25 | scmutil, |
|
26 | scmutil, | |
26 | txnutil, |
|
27 | txnutil, | |
27 | util, |
|
28 | util, | |
28 | ) |
|
29 | ) | |
29 | from .utils import ( |
|
30 | from .utils import ( | |
30 | urlutil, |
|
31 | urlutil, | |
31 | ) |
|
32 | ) | |
32 |
|
33 | |||
33 | # label constants |
|
34 | # label constants | |
34 | # until 3.5, bookmarks.current was the advertised name, not |
|
35 | # until 3.5, bookmarks.current was the advertised name, not | |
35 | # bookmarks.active, so we must use both to avoid breaking old |
|
36 | # bookmarks.active, so we must use both to avoid breaking old | |
36 | # custom styles |
|
37 | # custom styles | |
37 | activebookmarklabel = b'bookmarks.active bookmarks.current' |
|
38 | activebookmarklabel = b'bookmarks.active bookmarks.current' | |
38 |
|
39 | |||
39 | BOOKMARKS_IN_STORE_REQUIREMENT = b'bookmarksinstore' |
|
|||
40 |
|
||||
41 |
|
40 | |||
42 | def bookmarksinstore(repo): |
|
41 | def bookmarksinstore(repo): | |
43 | return BOOKMARKS_IN_STORE_REQUIREMENT in repo.requirements |
|
42 | return requirements.BOOKMARKS_IN_STORE_REQUIREMENT in repo.requirements | |
44 |
|
43 | |||
45 |
|
44 | |||
46 | def bookmarksvfs(repo): |
|
45 | def bookmarksvfs(repo): | |
47 | return repo.svfs if bookmarksinstore(repo) else repo.vfs |
|
46 | return repo.svfs if bookmarksinstore(repo) else repo.vfs | |
48 |
|
47 | |||
49 |
|
48 | |||
50 | def _getbkfile(repo): |
|
49 | def _getbkfile(repo): | |
51 | """Hook so that extensions that mess with the store can hook bm storage. |
|
50 | """Hook so that extensions that mess with the store can hook bm storage. | |
52 |
|
51 | |||
53 | For core, this just handles wether we should see pending |
|
52 | For core, this just handles wether we should see pending | |
54 | bookmarks or the committed ones. Other extensions (like share) |
|
53 | bookmarks or the committed ones. Other extensions (like share) | |
55 | may need to tweak this behavior further. |
|
54 | may need to tweak this behavior further. | |
56 | """ |
|
55 | """ | |
57 | fp, pending = txnutil.trypending( |
|
56 | fp, pending = txnutil.trypending( | |
58 | repo.root, bookmarksvfs(repo), b'bookmarks' |
|
57 | repo.root, bookmarksvfs(repo), b'bookmarks' | |
59 | ) |
|
58 | ) | |
60 | return fp |
|
59 | return fp | |
61 |
|
60 | |||
62 |
|
61 | |||
63 | class bmstore(object): |
|
62 | class bmstore(object): | |
64 | r"""Storage for bookmarks. |
|
63 | r"""Storage for bookmarks. | |
65 |
|
64 | |||
66 | This object should do all bookmark-related reads and writes, so |
|
65 | This object should do all bookmark-related reads and writes, so | |
67 | that it's fairly simple to replace the storage underlying |
|
66 | that it's fairly simple to replace the storage underlying | |
68 | bookmarks without having to clone the logic surrounding |
|
67 | bookmarks without having to clone the logic surrounding | |
69 | bookmarks. This type also should manage the active bookmark, if |
|
68 | bookmarks. This type also should manage the active bookmark, if | |
70 | any. |
|
69 | any. | |
71 |
|
70 | |||
72 | This particular bmstore implementation stores bookmarks as |
|
71 | This particular bmstore implementation stores bookmarks as | |
73 | {hash}\s{name}\n (the same format as localtags) in |
|
72 | {hash}\s{name}\n (the same format as localtags) in | |
74 | .hg/bookmarks. The mapping is stored as {name: nodeid}. |
|
73 | .hg/bookmarks. The mapping is stored as {name: nodeid}. | |
75 | """ |
|
74 | """ | |
76 |
|
75 | |||
77 | def __init__(self, repo): |
|
76 | def __init__(self, repo): | |
78 | self._repo = repo |
|
77 | self._repo = repo | |
79 | self._refmap = refmap = {} # refspec: node |
|
78 | self._refmap = refmap = {} # refspec: node | |
80 | self._nodemap = nodemap = {} # node: sorted([refspec, ...]) |
|
79 | self._nodemap = nodemap = {} # node: sorted([refspec, ...]) | |
81 | self._clean = True |
|
80 | self._clean = True | |
82 | self._aclean = True |
|
81 | self._aclean = True | |
83 | has_node = repo.changelog.index.has_node |
|
82 | has_node = repo.changelog.index.has_node | |
84 | tonode = bin # force local lookup |
|
83 | tonode = bin # force local lookup | |
85 | try: |
|
84 | try: | |
86 | with _getbkfile(repo) as bkfile: |
|
85 | with _getbkfile(repo) as bkfile: | |
87 | for line in bkfile: |
|
86 | for line in bkfile: | |
88 | line = line.strip() |
|
87 | line = line.strip() | |
89 | if not line: |
|
88 | if not line: | |
90 | continue |
|
89 | continue | |
91 | try: |
|
90 | try: | |
92 | sha, refspec = line.split(b' ', 1) |
|
91 | sha, refspec = line.split(b' ', 1) | |
93 | node = tonode(sha) |
|
92 | node = tonode(sha) | |
94 | if has_node(node): |
|
93 | if has_node(node): | |
95 | refspec = encoding.tolocal(refspec) |
|
94 | refspec = encoding.tolocal(refspec) | |
96 | refmap[refspec] = node |
|
95 | refmap[refspec] = node | |
97 | nrefs = nodemap.get(node) |
|
96 | nrefs = nodemap.get(node) | |
98 | if nrefs is None: |
|
97 | if nrefs is None: | |
99 | nodemap[node] = [refspec] |
|
98 | nodemap[node] = [refspec] | |
100 | else: |
|
99 | else: | |
101 | nrefs.append(refspec) |
|
100 | nrefs.append(refspec) | |
102 | if nrefs[-2] > refspec: |
|
101 | if nrefs[-2] > refspec: | |
103 | # bookmarks weren't sorted before 4.5 |
|
102 | # bookmarks weren't sorted before 4.5 | |
104 | nrefs.sort() |
|
103 | nrefs.sort() | |
105 | except (TypeError, ValueError): |
|
104 | except (TypeError, ValueError): | |
106 | # TypeError: |
|
105 | # TypeError: | |
107 | # - bin(...) |
|
106 | # - bin(...) | |
108 | # ValueError: |
|
107 | # ValueError: | |
109 | # - node in nm, for non-20-bytes entry |
|
108 | # - node in nm, for non-20-bytes entry | |
110 | # - split(...), for string without ' ' |
|
109 | # - split(...), for string without ' ' | |
111 | bookmarkspath = b'.hg/bookmarks' |
|
110 | bookmarkspath = b'.hg/bookmarks' | |
112 | if bookmarksinstore(repo): |
|
111 | if bookmarksinstore(repo): | |
113 | bookmarkspath = b'.hg/store/bookmarks' |
|
112 | bookmarkspath = b'.hg/store/bookmarks' | |
114 | repo.ui.warn( |
|
113 | repo.ui.warn( | |
115 | _(b'malformed line in %s: %r\n') |
|
114 | _(b'malformed line in %s: %r\n') | |
116 | % (bookmarkspath, pycompat.bytestr(line)) |
|
115 | % (bookmarkspath, pycompat.bytestr(line)) | |
117 | ) |
|
116 | ) | |
118 | except IOError as inst: |
|
117 | except IOError as inst: | |
119 | if inst.errno != errno.ENOENT: |
|
118 | if inst.errno != errno.ENOENT: | |
120 | raise |
|
119 | raise | |
121 | self._active = _readactive(repo, self) |
|
120 | self._active = _readactive(repo, self) | |
122 |
|
121 | |||
123 | @property |
|
122 | @property | |
124 | def active(self): |
|
123 | def active(self): | |
125 | return self._active |
|
124 | return self._active | |
126 |
|
125 | |||
127 | @active.setter |
|
126 | @active.setter | |
128 | def active(self, mark): |
|
127 | def active(self, mark): | |
129 | if mark is not None and mark not in self._refmap: |
|
128 | if mark is not None and mark not in self._refmap: | |
130 | raise AssertionError(b'bookmark %s does not exist!' % mark) |
|
129 | raise AssertionError(b'bookmark %s does not exist!' % mark) | |
131 |
|
130 | |||
132 | self._active = mark |
|
131 | self._active = mark | |
133 | self._aclean = False |
|
132 | self._aclean = False | |
134 |
|
133 | |||
135 | def __len__(self): |
|
134 | def __len__(self): | |
136 | return len(self._refmap) |
|
135 | return len(self._refmap) | |
137 |
|
136 | |||
138 | def __iter__(self): |
|
137 | def __iter__(self): | |
139 | return iter(self._refmap) |
|
138 | return iter(self._refmap) | |
140 |
|
139 | |||
141 | def iteritems(self): |
|
140 | def iteritems(self): | |
142 | return pycompat.iteritems(self._refmap) |
|
141 | return pycompat.iteritems(self._refmap) | |
143 |
|
142 | |||
144 | def items(self): |
|
143 | def items(self): | |
145 | return self._refmap.items() |
|
144 | return self._refmap.items() | |
146 |
|
145 | |||
147 | # TODO: maybe rename to allnames()? |
|
146 | # TODO: maybe rename to allnames()? | |
148 | def keys(self): |
|
147 | def keys(self): | |
149 | return self._refmap.keys() |
|
148 | return self._refmap.keys() | |
150 |
|
149 | |||
151 | # TODO: maybe rename to allnodes()? but nodes would have to be deduplicated |
|
150 | # TODO: maybe rename to allnodes()? but nodes would have to be deduplicated | |
152 | # could be self._nodemap.keys() |
|
151 | # could be self._nodemap.keys() | |
153 | def values(self): |
|
152 | def values(self): | |
154 | return self._refmap.values() |
|
153 | return self._refmap.values() | |
155 |
|
154 | |||
156 | def __contains__(self, mark): |
|
155 | def __contains__(self, mark): | |
157 | return mark in self._refmap |
|
156 | return mark in self._refmap | |
158 |
|
157 | |||
159 | def __getitem__(self, mark): |
|
158 | def __getitem__(self, mark): | |
160 | return self._refmap[mark] |
|
159 | return self._refmap[mark] | |
161 |
|
160 | |||
162 | def get(self, mark, default=None): |
|
161 | def get(self, mark, default=None): | |
163 | return self._refmap.get(mark, default) |
|
162 | return self._refmap.get(mark, default) | |
164 |
|
163 | |||
165 | def _set(self, mark, node): |
|
164 | def _set(self, mark, node): | |
166 | self._clean = False |
|
165 | self._clean = False | |
167 | if mark in self._refmap: |
|
166 | if mark in self._refmap: | |
168 | self._del(mark) |
|
167 | self._del(mark) | |
169 | self._refmap[mark] = node |
|
168 | self._refmap[mark] = node | |
170 | nrefs = self._nodemap.get(node) |
|
169 | nrefs = self._nodemap.get(node) | |
171 | if nrefs is None: |
|
170 | if nrefs is None: | |
172 | self._nodemap[node] = [mark] |
|
171 | self._nodemap[node] = [mark] | |
173 | else: |
|
172 | else: | |
174 | nrefs.append(mark) |
|
173 | nrefs.append(mark) | |
175 | nrefs.sort() |
|
174 | nrefs.sort() | |
176 |
|
175 | |||
177 | def _del(self, mark): |
|
176 | def _del(self, mark): | |
178 | if mark not in self._refmap: |
|
177 | if mark not in self._refmap: | |
179 | return |
|
178 | return | |
180 | self._clean = False |
|
179 | self._clean = False | |
181 | node = self._refmap.pop(mark) |
|
180 | node = self._refmap.pop(mark) | |
182 | nrefs = self._nodemap[node] |
|
181 | nrefs = self._nodemap[node] | |
183 | if len(nrefs) == 1: |
|
182 | if len(nrefs) == 1: | |
184 | assert nrefs[0] == mark |
|
183 | assert nrefs[0] == mark | |
185 | del self._nodemap[node] |
|
184 | del self._nodemap[node] | |
186 | else: |
|
185 | else: | |
187 | nrefs.remove(mark) |
|
186 | nrefs.remove(mark) | |
188 |
|
187 | |||
189 | def names(self, node): |
|
188 | def names(self, node): | |
190 | """Return a sorted list of bookmarks pointing to the specified node""" |
|
189 | """Return a sorted list of bookmarks pointing to the specified node""" | |
191 | return self._nodemap.get(node, []) |
|
190 | return self._nodemap.get(node, []) | |
192 |
|
191 | |||
193 | def applychanges(self, repo, tr, changes): |
|
192 | def applychanges(self, repo, tr, changes): | |
194 | """Apply a list of changes to bookmarks""" |
|
193 | """Apply a list of changes to bookmarks""" | |
195 | bmchanges = tr.changes.get(b'bookmarks') |
|
194 | bmchanges = tr.changes.get(b'bookmarks') | |
196 | for name, node in changes: |
|
195 | for name, node in changes: | |
197 | old = self._refmap.get(name) |
|
196 | old = self._refmap.get(name) | |
198 | if node is None: |
|
197 | if node is None: | |
199 | self._del(name) |
|
198 | self._del(name) | |
200 | else: |
|
199 | else: | |
201 | self._set(name, node) |
|
200 | self._set(name, node) | |
202 | if bmchanges is not None: |
|
201 | if bmchanges is not None: | |
203 | # if a previous value exist preserve the "initial" value |
|
202 | # if a previous value exist preserve the "initial" value | |
204 | previous = bmchanges.get(name) |
|
203 | previous = bmchanges.get(name) | |
205 | if previous is not None: |
|
204 | if previous is not None: | |
206 | old = previous[0] |
|
205 | old = previous[0] | |
207 | bmchanges[name] = (old, node) |
|
206 | bmchanges[name] = (old, node) | |
208 | self._recordchange(tr) |
|
207 | self._recordchange(tr) | |
209 |
|
208 | |||
210 | def _recordchange(self, tr): |
|
209 | def _recordchange(self, tr): | |
211 | """record that bookmarks have been changed in a transaction |
|
210 | """record that bookmarks have been changed in a transaction | |
212 |
|
211 | |||
213 | The transaction is then responsible for updating the file content.""" |
|
212 | The transaction is then responsible for updating the file content.""" | |
214 | location = b'' if bookmarksinstore(self._repo) else b'plain' |
|
213 | location = b'' if bookmarksinstore(self._repo) else b'plain' | |
215 | tr.addfilegenerator( |
|
214 | tr.addfilegenerator( | |
216 | b'bookmarks', (b'bookmarks',), self._write, location=location |
|
215 | b'bookmarks', (b'bookmarks',), self._write, location=location | |
217 | ) |
|
216 | ) | |
218 | tr.hookargs[b'bookmark_moved'] = b'1' |
|
217 | tr.hookargs[b'bookmark_moved'] = b'1' | |
219 |
|
218 | |||
220 | def _writerepo(self, repo): |
|
219 | def _writerepo(self, repo): | |
221 | """Factored out for extensibility""" |
|
220 | """Factored out for extensibility""" | |
222 | rbm = repo._bookmarks |
|
221 | rbm = repo._bookmarks | |
223 | if rbm.active not in self._refmap: |
|
222 | if rbm.active not in self._refmap: | |
224 | rbm.active = None |
|
223 | rbm.active = None | |
225 | rbm._writeactive() |
|
224 | rbm._writeactive() | |
226 |
|
225 | |||
227 | if bookmarksinstore(repo): |
|
226 | if bookmarksinstore(repo): | |
228 | vfs = repo.svfs |
|
227 | vfs = repo.svfs | |
229 | lock = repo.lock() |
|
228 | lock = repo.lock() | |
230 | else: |
|
229 | else: | |
231 | vfs = repo.vfs |
|
230 | vfs = repo.vfs | |
232 | lock = repo.wlock() |
|
231 | lock = repo.wlock() | |
233 | with lock: |
|
232 | with lock: | |
234 | with vfs(b'bookmarks', b'w', atomictemp=True, checkambig=True) as f: |
|
233 | with vfs(b'bookmarks', b'w', atomictemp=True, checkambig=True) as f: | |
235 | self._write(f) |
|
234 | self._write(f) | |
236 |
|
235 | |||
237 | def _writeactive(self): |
|
236 | def _writeactive(self): | |
238 | if self._aclean: |
|
237 | if self._aclean: | |
239 | return |
|
238 | return | |
240 | with self._repo.wlock(): |
|
239 | with self._repo.wlock(): | |
241 | if self._active is not None: |
|
240 | if self._active is not None: | |
242 | with self._repo.vfs( |
|
241 | with self._repo.vfs( | |
243 | b'bookmarks.current', b'w', atomictemp=True, checkambig=True |
|
242 | b'bookmarks.current', b'w', atomictemp=True, checkambig=True | |
244 | ) as f: |
|
243 | ) as f: | |
245 | f.write(encoding.fromlocal(self._active)) |
|
244 | f.write(encoding.fromlocal(self._active)) | |
246 | else: |
|
245 | else: | |
247 | self._repo.vfs.tryunlink(b'bookmarks.current') |
|
246 | self._repo.vfs.tryunlink(b'bookmarks.current') | |
248 | self._aclean = True |
|
247 | self._aclean = True | |
249 |
|
248 | |||
250 | def _write(self, fp): |
|
249 | def _write(self, fp): | |
251 | for name, node in sorted(pycompat.iteritems(self._refmap)): |
|
250 | for name, node in sorted(pycompat.iteritems(self._refmap)): | |
252 | fp.write(b"%s %s\n" % (hex(node), encoding.fromlocal(name))) |
|
251 | fp.write(b"%s %s\n" % (hex(node), encoding.fromlocal(name))) | |
253 | self._clean = True |
|
252 | self._clean = True | |
254 | self._repo.invalidatevolatilesets() |
|
253 | self._repo.invalidatevolatilesets() | |
255 |
|
254 | |||
256 | def expandname(self, bname): |
|
255 | def expandname(self, bname): | |
257 | if bname == b'.': |
|
256 | if bname == b'.': | |
258 | if self.active: |
|
257 | if self.active: | |
259 | return self.active |
|
258 | return self.active | |
260 | else: |
|
259 | else: | |
261 | raise error.RepoLookupError(_(b"no active bookmark")) |
|
260 | raise error.RepoLookupError(_(b"no active bookmark")) | |
262 | return bname |
|
261 | return bname | |
263 |
|
262 | |||
264 | def checkconflict(self, mark, force=False, target=None): |
|
263 | def checkconflict(self, mark, force=False, target=None): | |
265 | """check repo for a potential clash of mark with an existing bookmark, |
|
264 | """check repo for a potential clash of mark with an existing bookmark, | |
266 | branch, or hash |
|
265 | branch, or hash | |
267 |
|
266 | |||
268 | If target is supplied, then check that we are moving the bookmark |
|
267 | If target is supplied, then check that we are moving the bookmark | |
269 | forward. |
|
268 | forward. | |
270 |
|
269 | |||
271 | If force is supplied, then forcibly move the bookmark to a new commit |
|
270 | If force is supplied, then forcibly move the bookmark to a new commit | |
272 | regardless if it is a move forward. |
|
271 | regardless if it is a move forward. | |
273 |
|
272 | |||
274 | If divergent bookmark are to be deleted, they will be returned as list. |
|
273 | If divergent bookmark are to be deleted, they will be returned as list. | |
275 | """ |
|
274 | """ | |
276 | cur = self._repo[b'.'].node() |
|
275 | cur = self._repo[b'.'].node() | |
277 | if mark in self._refmap and not force: |
|
276 | if mark in self._refmap and not force: | |
278 | if target: |
|
277 | if target: | |
279 | if self._refmap[mark] == target and target == cur: |
|
278 | if self._refmap[mark] == target and target == cur: | |
280 | # re-activating a bookmark |
|
279 | # re-activating a bookmark | |
281 | return [] |
|
280 | return [] | |
282 | rev = self._repo[target].rev() |
|
281 | rev = self._repo[target].rev() | |
283 | anc = self._repo.changelog.ancestors([rev]) |
|
282 | anc = self._repo.changelog.ancestors([rev]) | |
284 | bmctx = self._repo[self[mark]] |
|
283 | bmctx = self._repo[self[mark]] | |
285 | divs = [ |
|
284 | divs = [ | |
286 | self._refmap[b] |
|
285 | self._refmap[b] | |
287 | for b in self._refmap |
|
286 | for b in self._refmap | |
288 | if b.split(b'@', 1)[0] == mark.split(b'@', 1)[0] |
|
287 | if b.split(b'@', 1)[0] == mark.split(b'@', 1)[0] | |
289 | ] |
|
288 | ] | |
290 |
|
289 | |||
291 | # allow resolving a single divergent bookmark even if moving |
|
290 | # allow resolving a single divergent bookmark even if moving | |
292 | # the bookmark across branches when a revision is specified |
|
291 | # the bookmark across branches when a revision is specified | |
293 | # that contains a divergent bookmark |
|
292 | # that contains a divergent bookmark | |
294 | if bmctx.rev() not in anc and target in divs: |
|
293 | if bmctx.rev() not in anc and target in divs: | |
295 | return divergent2delete(self._repo, [target], mark) |
|
294 | return divergent2delete(self._repo, [target], mark) | |
296 |
|
295 | |||
297 | deletefrom = [ |
|
296 | deletefrom = [ | |
298 | b for b in divs if self._repo[b].rev() in anc or b == target |
|
297 | b for b in divs if self._repo[b].rev() in anc or b == target | |
299 | ] |
|
298 | ] | |
300 | delbms = divergent2delete(self._repo, deletefrom, mark) |
|
299 | delbms = divergent2delete(self._repo, deletefrom, mark) | |
301 | if validdest(self._repo, bmctx, self._repo[target]): |
|
300 | if validdest(self._repo, bmctx, self._repo[target]): | |
302 | self._repo.ui.status( |
|
301 | self._repo.ui.status( | |
303 | _(b"moving bookmark '%s' forward from %s\n") |
|
302 | _(b"moving bookmark '%s' forward from %s\n") | |
304 | % (mark, short(bmctx.node())) |
|
303 | % (mark, short(bmctx.node())) | |
305 | ) |
|
304 | ) | |
306 | return delbms |
|
305 | return delbms | |
307 | raise error.Abort( |
|
306 | raise error.Abort( | |
308 | _(b"bookmark '%s' already exists (use -f to force)") % mark |
|
307 | _(b"bookmark '%s' already exists (use -f to force)") % mark | |
309 | ) |
|
308 | ) | |
310 | if ( |
|
309 | if ( | |
311 | mark in self._repo.branchmap() |
|
310 | mark in self._repo.branchmap() | |
312 | or mark == self._repo.dirstate.branch() |
|
311 | or mark == self._repo.dirstate.branch() | |
313 | ) and not force: |
|
312 | ) and not force: | |
314 | raise error.Abort( |
|
313 | raise error.Abort( | |
315 | _(b"a bookmark cannot have the name of an existing branch") |
|
314 | _(b"a bookmark cannot have the name of an existing branch") | |
316 | ) |
|
315 | ) | |
317 | if len(mark) > 3 and not force: |
|
316 | if len(mark) > 3 and not force: | |
318 | try: |
|
317 | try: | |
319 | shadowhash = scmutil.isrevsymbol(self._repo, mark) |
|
318 | shadowhash = scmutil.isrevsymbol(self._repo, mark) | |
320 | except error.LookupError: # ambiguous identifier |
|
319 | except error.LookupError: # ambiguous identifier | |
321 | shadowhash = False |
|
320 | shadowhash = False | |
322 | if shadowhash: |
|
321 | if shadowhash: | |
323 | self._repo.ui.warn( |
|
322 | self._repo.ui.warn( | |
324 | _( |
|
323 | _( | |
325 | b"bookmark %s matches a changeset hash\n" |
|
324 | b"bookmark %s matches a changeset hash\n" | |
326 | b"(did you leave a -r out of an 'hg bookmark' " |
|
325 | b"(did you leave a -r out of an 'hg bookmark' " | |
327 | b"command?)\n" |
|
326 | b"command?)\n" | |
328 | ) |
|
327 | ) | |
329 | % mark |
|
328 | % mark | |
330 | ) |
|
329 | ) | |
331 | return [] |
|
330 | return [] | |
332 |
|
331 | |||
333 |
|
332 | |||
334 | def _readactive(repo, marks): |
|
333 | def _readactive(repo, marks): | |
335 | """ |
|
334 | """ | |
336 | Get the active bookmark. We can have an active bookmark that updates |
|
335 | Get the active bookmark. We can have an active bookmark that updates | |
337 | itself as we commit. This function returns the name of that bookmark. |
|
336 | itself as we commit. This function returns the name of that bookmark. | |
338 | It is stored in .hg/bookmarks.current |
|
337 | It is stored in .hg/bookmarks.current | |
339 | """ |
|
338 | """ | |
340 | # No readline() in osutil.posixfile, reading everything is |
|
339 | # No readline() in osutil.posixfile, reading everything is | |
341 | # cheap. |
|
340 | # cheap. | |
342 | content = repo.vfs.tryread(b'bookmarks.current') |
|
341 | content = repo.vfs.tryread(b'bookmarks.current') | |
343 | mark = encoding.tolocal((content.splitlines() or [b''])[0]) |
|
342 | mark = encoding.tolocal((content.splitlines() or [b''])[0]) | |
344 | if mark == b'' or mark not in marks: |
|
343 | if mark == b'' or mark not in marks: | |
345 | mark = None |
|
344 | mark = None | |
346 | return mark |
|
345 | return mark | |
347 |
|
346 | |||
348 |
|
347 | |||
349 | def activate(repo, mark): |
|
348 | def activate(repo, mark): | |
350 | """ |
|
349 | """ | |
351 | Set the given bookmark to be 'active', meaning that this bookmark will |
|
350 | Set the given bookmark to be 'active', meaning that this bookmark will | |
352 | follow new commits that are made. |
|
351 | follow new commits that are made. | |
353 | The name is recorded in .hg/bookmarks.current |
|
352 | The name is recorded in .hg/bookmarks.current | |
354 | """ |
|
353 | """ | |
355 | repo._bookmarks.active = mark |
|
354 | repo._bookmarks.active = mark | |
356 | repo._bookmarks._writeactive() |
|
355 | repo._bookmarks._writeactive() | |
357 |
|
356 | |||
358 |
|
357 | |||
359 | def deactivate(repo): |
|
358 | def deactivate(repo): | |
360 | """ |
|
359 | """ | |
361 | Unset the active bookmark in this repository. |
|
360 | Unset the active bookmark in this repository. | |
362 | """ |
|
361 | """ | |
363 | repo._bookmarks.active = None |
|
362 | repo._bookmarks.active = None | |
364 | repo._bookmarks._writeactive() |
|
363 | repo._bookmarks._writeactive() | |
365 |
|
364 | |||
366 |
|
365 | |||
367 | def isactivewdirparent(repo): |
|
366 | def isactivewdirparent(repo): | |
368 | """ |
|
367 | """ | |
369 | Tell whether the 'active' bookmark (the one that follows new commits) |
|
368 | Tell whether the 'active' bookmark (the one that follows new commits) | |
370 | points to one of the parents of the current working directory (wdir). |
|
369 | points to one of the parents of the current working directory (wdir). | |
371 |
|
370 | |||
372 | While this is normally the case, it can on occasion be false; for example, |
|
371 | While this is normally the case, it can on occasion be false; for example, | |
373 | immediately after a pull, the active bookmark can be moved to point |
|
372 | immediately after a pull, the active bookmark can be moved to point | |
374 | to a place different than the wdir. This is solved by running `hg update`. |
|
373 | to a place different than the wdir. This is solved by running `hg update`. | |
375 | """ |
|
374 | """ | |
376 | mark = repo._activebookmark |
|
375 | mark = repo._activebookmark | |
377 | marks = repo._bookmarks |
|
376 | marks = repo._bookmarks | |
378 | parents = [p.node() for p in repo[None].parents()] |
|
377 | parents = [p.node() for p in repo[None].parents()] | |
379 | return mark in marks and marks[mark] in parents |
|
378 | return mark in marks and marks[mark] in parents | |
380 |
|
379 | |||
381 |
|
380 | |||
382 | def divergent2delete(repo, deletefrom, bm): |
|
381 | def divergent2delete(repo, deletefrom, bm): | |
383 | """find divergent versions of bm on nodes in deletefrom. |
|
382 | """find divergent versions of bm on nodes in deletefrom. | |
384 |
|
383 | |||
385 | the list of bookmark to delete.""" |
|
384 | the list of bookmark to delete.""" | |
386 | todelete = [] |
|
385 | todelete = [] | |
387 | marks = repo._bookmarks |
|
386 | marks = repo._bookmarks | |
388 | divergent = [ |
|
387 | divergent = [ | |
389 | b for b in marks if b.split(b'@', 1)[0] == bm.split(b'@', 1)[0] |
|
388 | b for b in marks if b.split(b'@', 1)[0] == bm.split(b'@', 1)[0] | |
390 | ] |
|
389 | ] | |
391 | for mark in divergent: |
|
390 | for mark in divergent: | |
392 | if mark == b'@' or b'@' not in mark: |
|
391 | if mark == b'@' or b'@' not in mark: | |
393 | # can't be divergent by definition |
|
392 | # can't be divergent by definition | |
394 | continue |
|
393 | continue | |
395 | if mark and marks[mark] in deletefrom: |
|
394 | if mark and marks[mark] in deletefrom: | |
396 | if mark != bm: |
|
395 | if mark != bm: | |
397 | todelete.append(mark) |
|
396 | todelete.append(mark) | |
398 | return todelete |
|
397 | return todelete | |
399 |
|
398 | |||
400 |
|
399 | |||
401 | def headsforactive(repo): |
|
400 | def headsforactive(repo): | |
402 | """Given a repo with an active bookmark, return divergent bookmark nodes. |
|
401 | """Given a repo with an active bookmark, return divergent bookmark nodes. | |
403 |
|
402 | |||
404 | Args: |
|
403 | Args: | |
405 | repo: A repository with an active bookmark. |
|
404 | repo: A repository with an active bookmark. | |
406 |
|
405 | |||
407 | Returns: |
|
406 | Returns: | |
408 | A list of binary node ids that is the full list of other |
|
407 | A list of binary node ids that is the full list of other | |
409 | revisions with bookmarks divergent from the active bookmark. If |
|
408 | revisions with bookmarks divergent from the active bookmark. If | |
410 | there were no divergent bookmarks, then this list will contain |
|
409 | there were no divergent bookmarks, then this list will contain | |
411 | only one entry. |
|
410 | only one entry. | |
412 | """ |
|
411 | """ | |
413 | if not repo._activebookmark: |
|
412 | if not repo._activebookmark: | |
414 | raise ValueError( |
|
413 | raise ValueError( | |
415 | b'headsforactive() only makes sense with an active bookmark' |
|
414 | b'headsforactive() only makes sense with an active bookmark' | |
416 | ) |
|
415 | ) | |
417 | name = repo._activebookmark.split(b'@', 1)[0] |
|
416 | name = repo._activebookmark.split(b'@', 1)[0] | |
418 | heads = [] |
|
417 | heads = [] | |
419 | for mark, n in pycompat.iteritems(repo._bookmarks): |
|
418 | for mark, n in pycompat.iteritems(repo._bookmarks): | |
420 | if mark.split(b'@', 1)[0] == name: |
|
419 | if mark.split(b'@', 1)[0] == name: | |
421 | heads.append(n) |
|
420 | heads.append(n) | |
422 | return heads |
|
421 | return heads | |
423 |
|
422 | |||
424 |
|
423 | |||
425 | def calculateupdate(ui, repo): |
|
424 | def calculateupdate(ui, repo): | |
426 | """Return a tuple (activemark, movemarkfrom) indicating the active bookmark |
|
425 | """Return a tuple (activemark, movemarkfrom) indicating the active bookmark | |
427 | and where to move the active bookmark from, if needed.""" |
|
426 | and where to move the active bookmark from, if needed.""" | |
428 | checkout, movemarkfrom = None, None |
|
427 | checkout, movemarkfrom = None, None | |
429 | activemark = repo._activebookmark |
|
428 | activemark = repo._activebookmark | |
430 | if isactivewdirparent(repo): |
|
429 | if isactivewdirparent(repo): | |
431 | movemarkfrom = repo[b'.'].node() |
|
430 | movemarkfrom = repo[b'.'].node() | |
432 | elif activemark: |
|
431 | elif activemark: | |
433 | ui.status(_(b"updating to active bookmark %s\n") % activemark) |
|
432 | ui.status(_(b"updating to active bookmark %s\n") % activemark) | |
434 | checkout = activemark |
|
433 | checkout = activemark | |
435 | return (checkout, movemarkfrom) |
|
434 | return (checkout, movemarkfrom) | |
436 |
|
435 | |||
437 |
|
436 | |||
438 | def update(repo, parents, node): |
|
437 | def update(repo, parents, node): | |
439 | deletefrom = parents |
|
438 | deletefrom = parents | |
440 | marks = repo._bookmarks |
|
439 | marks = repo._bookmarks | |
441 | active = marks.active |
|
440 | active = marks.active | |
442 | if not active: |
|
441 | if not active: | |
443 | return False |
|
442 | return False | |
444 |
|
443 | |||
445 | bmchanges = [] |
|
444 | bmchanges = [] | |
446 | if marks[active] in parents: |
|
445 | if marks[active] in parents: | |
447 | new = repo[node] |
|
446 | new = repo[node] | |
448 | divs = [ |
|
447 | divs = [ | |
449 | repo[marks[b]] |
|
448 | repo[marks[b]] | |
450 | for b in marks |
|
449 | for b in marks | |
451 | if b.split(b'@', 1)[0] == active.split(b'@', 1)[0] |
|
450 | if b.split(b'@', 1)[0] == active.split(b'@', 1)[0] | |
452 | ] |
|
451 | ] | |
453 | anc = repo.changelog.ancestors([new.rev()]) |
|
452 | anc = repo.changelog.ancestors([new.rev()]) | |
454 | deletefrom = [b.node() for b in divs if b.rev() in anc or b == new] |
|
453 | deletefrom = [b.node() for b in divs if b.rev() in anc or b == new] | |
455 | if validdest(repo, repo[marks[active]], new): |
|
454 | if validdest(repo, repo[marks[active]], new): | |
456 | bmchanges.append((active, new.node())) |
|
455 | bmchanges.append((active, new.node())) | |
457 |
|
456 | |||
458 | for bm in divergent2delete(repo, deletefrom, active): |
|
457 | for bm in divergent2delete(repo, deletefrom, active): | |
459 | bmchanges.append((bm, None)) |
|
458 | bmchanges.append((bm, None)) | |
460 |
|
459 | |||
461 | if bmchanges: |
|
460 | if bmchanges: | |
462 | with repo.lock(), repo.transaction(b'bookmark') as tr: |
|
461 | with repo.lock(), repo.transaction(b'bookmark') as tr: | |
463 | marks.applychanges(repo, tr, bmchanges) |
|
462 | marks.applychanges(repo, tr, bmchanges) | |
464 | return bool(bmchanges) |
|
463 | return bool(bmchanges) | |
465 |
|
464 | |||
466 |
|
465 | |||
467 | def isdivergent(b): |
|
466 | def isdivergent(b): | |
468 | return b'@' in b and not b.endswith(b'@') |
|
467 | return b'@' in b and not b.endswith(b'@') | |
469 |
|
468 | |||
470 |
|
469 | |||
471 | def listbinbookmarks(repo): |
|
470 | def listbinbookmarks(repo): | |
472 | # We may try to list bookmarks on a repo type that does not |
|
471 | # We may try to list bookmarks on a repo type that does not | |
473 | # support it (e.g., statichttprepository). |
|
472 | # support it (e.g., statichttprepository). | |
474 | marks = getattr(repo, '_bookmarks', {}) |
|
473 | marks = getattr(repo, '_bookmarks', {}) | |
475 |
|
474 | |||
476 | hasnode = repo.changelog.hasnode |
|
475 | hasnode = repo.changelog.hasnode | |
477 | for k, v in pycompat.iteritems(marks): |
|
476 | for k, v in pycompat.iteritems(marks): | |
478 | # don't expose local divergent bookmarks |
|
477 | # don't expose local divergent bookmarks | |
479 | if hasnode(v) and not isdivergent(k): |
|
478 | if hasnode(v) and not isdivergent(k): | |
480 | yield k, v |
|
479 | yield k, v | |
481 |
|
480 | |||
482 |
|
481 | |||
483 | def listbookmarks(repo): |
|
482 | def listbookmarks(repo): | |
484 | d = {} |
|
483 | d = {} | |
485 | for book, node in listbinbookmarks(repo): |
|
484 | for book, node in listbinbookmarks(repo): | |
486 | d[book] = hex(node) |
|
485 | d[book] = hex(node) | |
487 | return d |
|
486 | return d | |
488 |
|
487 | |||
489 |
|
488 | |||
490 | def pushbookmark(repo, key, old, new): |
|
489 | def pushbookmark(repo, key, old, new): | |
491 | if isdivergent(key): |
|
490 | if isdivergent(key): | |
492 | return False |
|
491 | return False | |
493 | if bookmarksinstore(repo): |
|
492 | if bookmarksinstore(repo): | |
494 | wlock = util.nullcontextmanager() |
|
493 | wlock = util.nullcontextmanager() | |
495 | else: |
|
494 | else: | |
496 | wlock = repo.wlock() |
|
495 | wlock = repo.wlock() | |
497 | with wlock, repo.lock(), repo.transaction(b'bookmarks') as tr: |
|
496 | with wlock, repo.lock(), repo.transaction(b'bookmarks') as tr: | |
498 | marks = repo._bookmarks |
|
497 | marks = repo._bookmarks | |
499 | existing = hex(marks.get(key, b'')) |
|
498 | existing = hex(marks.get(key, b'')) | |
500 | if existing != old and existing != new: |
|
499 | if existing != old and existing != new: | |
501 | return False |
|
500 | return False | |
502 | if new == b'': |
|
501 | if new == b'': | |
503 | changes = [(key, None)] |
|
502 | changes = [(key, None)] | |
504 | else: |
|
503 | else: | |
505 | if new not in repo: |
|
504 | if new not in repo: | |
506 | return False |
|
505 | return False | |
507 | changes = [(key, repo[new].node())] |
|
506 | changes = [(key, repo[new].node())] | |
508 | marks.applychanges(repo, tr, changes) |
|
507 | marks.applychanges(repo, tr, changes) | |
509 | return True |
|
508 | return True | |
510 |
|
509 | |||
511 |
|
510 | |||
512 | def comparebookmarks(repo, srcmarks, dstmarks, targets=None): |
|
511 | def comparebookmarks(repo, srcmarks, dstmarks, targets=None): | |
513 | """Compare bookmarks between srcmarks and dstmarks |
|
512 | """Compare bookmarks between srcmarks and dstmarks | |
514 |
|
513 | |||
515 | This returns tuple "(addsrc, adddst, advsrc, advdst, diverge, |
|
514 | This returns tuple "(addsrc, adddst, advsrc, advdst, diverge, | |
516 | differ, invalid)", each are list of bookmarks below: |
|
515 | differ, invalid)", each are list of bookmarks below: | |
517 |
|
516 | |||
518 | :addsrc: added on src side (removed on dst side, perhaps) |
|
517 | :addsrc: added on src side (removed on dst side, perhaps) | |
519 | :adddst: added on dst side (removed on src side, perhaps) |
|
518 | :adddst: added on dst side (removed on src side, perhaps) | |
520 | :advsrc: advanced on src side |
|
519 | :advsrc: advanced on src side | |
521 | :advdst: advanced on dst side |
|
520 | :advdst: advanced on dst side | |
522 | :diverge: diverge |
|
521 | :diverge: diverge | |
523 | :differ: changed, but changeset referred on src is unknown on dst |
|
522 | :differ: changed, but changeset referred on src is unknown on dst | |
524 | :invalid: unknown on both side |
|
523 | :invalid: unknown on both side | |
525 | :same: same on both side |
|
524 | :same: same on both side | |
526 |
|
525 | |||
527 | Each elements of lists in result tuple is tuple "(bookmark name, |
|
526 | Each elements of lists in result tuple is tuple "(bookmark name, | |
528 | changeset ID on source side, changeset ID on destination |
|
527 | changeset ID on source side, changeset ID on destination | |
529 | side)". Each changeset ID is a binary node or None. |
|
528 | side)". Each changeset ID is a binary node or None. | |
530 |
|
529 | |||
531 | Changeset IDs of tuples in "addsrc", "adddst", "differ" or |
|
530 | Changeset IDs of tuples in "addsrc", "adddst", "differ" or | |
532 | "invalid" list may be unknown for repo. |
|
531 | "invalid" list may be unknown for repo. | |
533 |
|
532 | |||
534 | If "targets" is specified, only bookmarks listed in it are |
|
533 | If "targets" is specified, only bookmarks listed in it are | |
535 | examined. |
|
534 | examined. | |
536 | """ |
|
535 | """ | |
537 |
|
536 | |||
538 | if targets: |
|
537 | if targets: | |
539 | bset = set(targets) |
|
538 | bset = set(targets) | |
540 | else: |
|
539 | else: | |
541 | srcmarkset = set(srcmarks) |
|
540 | srcmarkset = set(srcmarks) | |
542 | dstmarkset = set(dstmarks) |
|
541 | dstmarkset = set(dstmarks) | |
543 | bset = srcmarkset | dstmarkset |
|
542 | bset = srcmarkset | dstmarkset | |
544 |
|
543 | |||
545 | results = ([], [], [], [], [], [], [], []) |
|
544 | results = ([], [], [], [], [], [], [], []) | |
546 | addsrc = results[0].append |
|
545 | addsrc = results[0].append | |
547 | adddst = results[1].append |
|
546 | adddst = results[1].append | |
548 | advsrc = results[2].append |
|
547 | advsrc = results[2].append | |
549 | advdst = results[3].append |
|
548 | advdst = results[3].append | |
550 | diverge = results[4].append |
|
549 | diverge = results[4].append | |
551 | differ = results[5].append |
|
550 | differ = results[5].append | |
552 | invalid = results[6].append |
|
551 | invalid = results[6].append | |
553 | same = results[7].append |
|
552 | same = results[7].append | |
554 |
|
553 | |||
555 | for b in sorted(bset): |
|
554 | for b in sorted(bset): | |
556 | if b not in srcmarks: |
|
555 | if b not in srcmarks: | |
557 | if b in dstmarks: |
|
556 | if b in dstmarks: | |
558 | adddst((b, None, dstmarks[b])) |
|
557 | adddst((b, None, dstmarks[b])) | |
559 | else: |
|
558 | else: | |
560 | invalid((b, None, None)) |
|
559 | invalid((b, None, None)) | |
561 | elif b not in dstmarks: |
|
560 | elif b not in dstmarks: | |
562 | addsrc((b, srcmarks[b], None)) |
|
561 | addsrc((b, srcmarks[b], None)) | |
563 | else: |
|
562 | else: | |
564 | scid = srcmarks[b] |
|
563 | scid = srcmarks[b] | |
565 | dcid = dstmarks[b] |
|
564 | dcid = dstmarks[b] | |
566 | if scid == dcid: |
|
565 | if scid == dcid: | |
567 | same((b, scid, dcid)) |
|
566 | same((b, scid, dcid)) | |
568 | elif scid in repo and dcid in repo: |
|
567 | elif scid in repo and dcid in repo: | |
569 | sctx = repo[scid] |
|
568 | sctx = repo[scid] | |
570 | dctx = repo[dcid] |
|
569 | dctx = repo[dcid] | |
571 | if sctx.rev() < dctx.rev(): |
|
570 | if sctx.rev() < dctx.rev(): | |
572 | if validdest(repo, sctx, dctx): |
|
571 | if validdest(repo, sctx, dctx): | |
573 | advdst((b, scid, dcid)) |
|
572 | advdst((b, scid, dcid)) | |
574 | else: |
|
573 | else: | |
575 | diverge((b, scid, dcid)) |
|
574 | diverge((b, scid, dcid)) | |
576 | else: |
|
575 | else: | |
577 | if validdest(repo, dctx, sctx): |
|
576 | if validdest(repo, dctx, sctx): | |
578 | advsrc((b, scid, dcid)) |
|
577 | advsrc((b, scid, dcid)) | |
579 | else: |
|
578 | else: | |
580 | diverge((b, scid, dcid)) |
|
579 | diverge((b, scid, dcid)) | |
581 | else: |
|
580 | else: | |
582 | # it is too expensive to examine in detail, in this case |
|
581 | # it is too expensive to examine in detail, in this case | |
583 | differ((b, scid, dcid)) |
|
582 | differ((b, scid, dcid)) | |
584 |
|
583 | |||
585 | return results |
|
584 | return results | |
586 |
|
585 | |||
587 |
|
586 | |||
588 | def _diverge(ui, b, path, localmarks, remotenode): |
|
587 | def _diverge(ui, b, path, localmarks, remotenode): | |
589 | """Return appropriate diverged bookmark for specified ``path`` |
|
588 | """Return appropriate diverged bookmark for specified ``path`` | |
590 |
|
589 | |||
591 | This returns None, if it is failed to assign any divergent |
|
590 | This returns None, if it is failed to assign any divergent | |
592 | bookmark name. |
|
591 | bookmark name. | |
593 |
|
592 | |||
594 | This reuses already existing one with "@number" suffix, if it |
|
593 | This reuses already existing one with "@number" suffix, if it | |
595 | refers ``remotenode``. |
|
594 | refers ``remotenode``. | |
596 | """ |
|
595 | """ | |
597 | if b == b'@': |
|
596 | if b == b'@': | |
598 | b = b'' |
|
597 | b = b'' | |
599 | # try to use an @pathalias suffix |
|
598 | # try to use an @pathalias suffix | |
600 | # if an @pathalias already exists, we overwrite (update) it |
|
599 | # if an @pathalias already exists, we overwrite (update) it | |
601 | if path.startswith(b"file:"): |
|
600 | if path.startswith(b"file:"): | |
602 | path = urlutil.url(path).path |
|
601 | path = urlutil.url(path).path | |
603 | for name, p in urlutil.list_paths(ui): |
|
602 | for name, p in urlutil.list_paths(ui): | |
604 | loc = p.rawloc |
|
603 | loc = p.rawloc | |
605 | if loc.startswith(b"file:"): |
|
604 | if loc.startswith(b"file:"): | |
606 | loc = urlutil.url(loc).path |
|
605 | loc = urlutil.url(loc).path | |
607 | if path == loc: |
|
606 | if path == loc: | |
608 | return b'%s@%s' % (b, name) |
|
607 | return b'%s@%s' % (b, name) | |
609 |
|
608 | |||
610 | # assign a unique "@number" suffix newly |
|
609 | # assign a unique "@number" suffix newly | |
611 | for x in range(1, 100): |
|
610 | for x in range(1, 100): | |
612 | n = b'%s@%d' % (b, x) |
|
611 | n = b'%s@%d' % (b, x) | |
613 | if n not in localmarks or localmarks[n] == remotenode: |
|
612 | if n not in localmarks or localmarks[n] == remotenode: | |
614 | return n |
|
613 | return n | |
615 |
|
614 | |||
616 | return None |
|
615 | return None | |
617 |
|
616 | |||
618 |
|
617 | |||
619 | def unhexlifybookmarks(marks): |
|
618 | def unhexlifybookmarks(marks): | |
620 | binremotemarks = {} |
|
619 | binremotemarks = {} | |
621 | for name, node in marks.items(): |
|
620 | for name, node in marks.items(): | |
622 | binremotemarks[name] = bin(node) |
|
621 | binremotemarks[name] = bin(node) | |
623 | return binremotemarks |
|
622 | return binremotemarks | |
624 |
|
623 | |||
625 |
|
624 | |||
626 | _binaryentry = struct.Struct(b'>20sH') |
|
625 | _binaryentry = struct.Struct(b'>20sH') | |
627 |
|
626 | |||
628 |
|
627 | |||
629 | def binaryencode(repo, bookmarks): |
|
628 | def binaryencode(repo, bookmarks): | |
630 | """encode a '(bookmark, node)' iterable into a binary stream |
|
629 | """encode a '(bookmark, node)' iterable into a binary stream | |
631 |
|
630 | |||
632 | the binary format is: |
|
631 | the binary format is: | |
633 |
|
632 | |||
634 | <node><bookmark-length><bookmark-name> |
|
633 | <node><bookmark-length><bookmark-name> | |
635 |
|
634 | |||
636 | :node: is a 20 bytes binary node, |
|
635 | :node: is a 20 bytes binary node, | |
637 | :bookmark-length: an unsigned short, |
|
636 | :bookmark-length: an unsigned short, | |
638 | :bookmark-name: the name of the bookmark (of length <bookmark-length>) |
|
637 | :bookmark-name: the name of the bookmark (of length <bookmark-length>) | |
639 |
|
638 | |||
640 | wdirid (all bits set) will be used as a special value for "missing" |
|
639 | wdirid (all bits set) will be used as a special value for "missing" | |
641 | """ |
|
640 | """ | |
642 | binarydata = [] |
|
641 | binarydata = [] | |
643 | for book, node in bookmarks: |
|
642 | for book, node in bookmarks: | |
644 | if not node: # None or '' |
|
643 | if not node: # None or '' | |
645 | node = repo.nodeconstants.wdirid |
|
644 | node = repo.nodeconstants.wdirid | |
646 | binarydata.append(_binaryentry.pack(node, len(book))) |
|
645 | binarydata.append(_binaryentry.pack(node, len(book))) | |
647 | binarydata.append(book) |
|
646 | binarydata.append(book) | |
648 | return b''.join(binarydata) |
|
647 | return b''.join(binarydata) | |
649 |
|
648 | |||
650 |
|
649 | |||
651 | def binarydecode(repo, stream): |
|
650 | def binarydecode(repo, stream): | |
652 | """decode a binary stream into an '(bookmark, node)' iterable |
|
651 | """decode a binary stream into an '(bookmark, node)' iterable | |
653 |
|
652 | |||
654 | the binary format is: |
|
653 | the binary format is: | |
655 |
|
654 | |||
656 | <node><bookmark-length><bookmark-name> |
|
655 | <node><bookmark-length><bookmark-name> | |
657 |
|
656 | |||
658 | :node: is a 20 bytes binary node, |
|
657 | :node: is a 20 bytes binary node, | |
659 | :bookmark-length: an unsigned short, |
|
658 | :bookmark-length: an unsigned short, | |
660 | :bookmark-name: the name of the bookmark (of length <bookmark-length>)) |
|
659 | :bookmark-name: the name of the bookmark (of length <bookmark-length>)) | |
661 |
|
660 | |||
662 | wdirid (all bits set) will be used as a special value for "missing" |
|
661 | wdirid (all bits set) will be used as a special value for "missing" | |
663 | """ |
|
662 | """ | |
664 | entrysize = _binaryentry.size |
|
663 | entrysize = _binaryentry.size | |
665 | books = [] |
|
664 | books = [] | |
666 | while True: |
|
665 | while True: | |
667 | entry = stream.read(entrysize) |
|
666 | entry = stream.read(entrysize) | |
668 | if len(entry) < entrysize: |
|
667 | if len(entry) < entrysize: | |
669 | if entry: |
|
668 | if entry: | |
670 | raise error.Abort(_(b'bad bookmark stream')) |
|
669 | raise error.Abort(_(b'bad bookmark stream')) | |
671 | break |
|
670 | break | |
672 | node, length = _binaryentry.unpack(entry) |
|
671 | node, length = _binaryentry.unpack(entry) | |
673 | bookmark = stream.read(length) |
|
672 | bookmark = stream.read(length) | |
674 | if len(bookmark) < length: |
|
673 | if len(bookmark) < length: | |
675 | if entry: |
|
674 | if entry: | |
676 | raise error.Abort(_(b'bad bookmark stream')) |
|
675 | raise error.Abort(_(b'bad bookmark stream')) | |
677 | if node == repo.nodeconstants.wdirid: |
|
676 | if node == repo.nodeconstants.wdirid: | |
678 | node = None |
|
677 | node = None | |
679 | books.append((bookmark, node)) |
|
678 | books.append((bookmark, node)) | |
680 | return books |
|
679 | return books | |
681 |
|
680 | |||
682 |
|
681 | |||
683 | def mirroring_remote(ui, repo, remotemarks): |
|
682 | def mirroring_remote(ui, repo, remotemarks): | |
684 | """computes the bookmark changes that set the local bookmarks to |
|
683 | """computes the bookmark changes that set the local bookmarks to | |
685 | remotemarks""" |
|
684 | remotemarks""" | |
686 | changed = [] |
|
685 | changed = [] | |
687 | localmarks = repo._bookmarks |
|
686 | localmarks = repo._bookmarks | |
688 | for (b, id) in pycompat.iteritems(remotemarks): |
|
687 | for (b, id) in pycompat.iteritems(remotemarks): | |
689 | if id != localmarks.get(b, None) and id in repo: |
|
688 | if id != localmarks.get(b, None) and id in repo: | |
690 | changed.append((b, id, ui.debug, _(b"updating bookmark %s\n") % b)) |
|
689 | changed.append((b, id, ui.debug, _(b"updating bookmark %s\n") % b)) | |
691 | for b in localmarks: |
|
690 | for b in localmarks: | |
692 | if b not in remotemarks: |
|
691 | if b not in remotemarks: | |
693 | changed.append( |
|
692 | changed.append( | |
694 | (b, None, ui.debug, _(b"removing bookmark %s\n") % b) |
|
693 | (b, None, ui.debug, _(b"removing bookmark %s\n") % b) | |
695 | ) |
|
694 | ) | |
696 | return changed |
|
695 | return changed | |
697 |
|
696 | |||
698 |
|
697 | |||
699 | def merging_from_remote(ui, repo, remotemarks, path, explicit=()): |
|
698 | def merging_from_remote(ui, repo, remotemarks, path, explicit=()): | |
700 | """computes the bookmark changes that merge remote bookmarks into the |
|
699 | """computes the bookmark changes that merge remote bookmarks into the | |
701 | local bookmarks, based on comparebookmarks""" |
|
700 | local bookmarks, based on comparebookmarks""" | |
702 | localmarks = repo._bookmarks |
|
701 | localmarks = repo._bookmarks | |
703 | ( |
|
702 | ( | |
704 | addsrc, |
|
703 | addsrc, | |
705 | adddst, |
|
704 | adddst, | |
706 | advsrc, |
|
705 | advsrc, | |
707 | advdst, |
|
706 | advdst, | |
708 | diverge, |
|
707 | diverge, | |
709 | differ, |
|
708 | differ, | |
710 | invalid, |
|
709 | invalid, | |
711 | same, |
|
710 | same, | |
712 | ) = comparebookmarks(repo, remotemarks, localmarks) |
|
711 | ) = comparebookmarks(repo, remotemarks, localmarks) | |
713 |
|
712 | |||
714 | status = ui.status |
|
713 | status = ui.status | |
715 | warn = ui.warn |
|
714 | warn = ui.warn | |
716 | if ui.configbool(b'ui', b'quietbookmarkmove'): |
|
715 | if ui.configbool(b'ui', b'quietbookmarkmove'): | |
717 | status = warn = ui.debug |
|
716 | status = warn = ui.debug | |
718 |
|
717 | |||
719 | explicit = set(explicit) |
|
718 | explicit = set(explicit) | |
720 | changed = [] |
|
719 | changed = [] | |
721 | for b, scid, dcid in addsrc: |
|
720 | for b, scid, dcid in addsrc: | |
722 | if scid in repo: # add remote bookmarks for changes we already have |
|
721 | if scid in repo: # add remote bookmarks for changes we already have | |
723 | changed.append( |
|
722 | changed.append( | |
724 | (b, scid, status, _(b"adding remote bookmark %s\n") % b) |
|
723 | (b, scid, status, _(b"adding remote bookmark %s\n") % b) | |
725 | ) |
|
724 | ) | |
726 | elif b in explicit: |
|
725 | elif b in explicit: | |
727 | explicit.remove(b) |
|
726 | explicit.remove(b) | |
728 | ui.warn( |
|
727 | ui.warn( | |
729 | _(b"remote bookmark %s points to locally missing %s\n") |
|
728 | _(b"remote bookmark %s points to locally missing %s\n") | |
730 | % (b, hex(scid)[:12]) |
|
729 | % (b, hex(scid)[:12]) | |
731 | ) |
|
730 | ) | |
732 |
|
731 | |||
733 | for b, scid, dcid in advsrc: |
|
732 | for b, scid, dcid in advsrc: | |
734 | changed.append((b, scid, status, _(b"updating bookmark %s\n") % b)) |
|
733 | changed.append((b, scid, status, _(b"updating bookmark %s\n") % b)) | |
735 | # remove normal movement from explicit set |
|
734 | # remove normal movement from explicit set | |
736 | explicit.difference_update(d[0] for d in changed) |
|
735 | explicit.difference_update(d[0] for d in changed) | |
737 |
|
736 | |||
738 | for b, scid, dcid in diverge: |
|
737 | for b, scid, dcid in diverge: | |
739 | if b in explicit: |
|
738 | if b in explicit: | |
740 | explicit.discard(b) |
|
739 | explicit.discard(b) | |
741 | changed.append((b, scid, status, _(b"importing bookmark %s\n") % b)) |
|
740 | changed.append((b, scid, status, _(b"importing bookmark %s\n") % b)) | |
742 | else: |
|
741 | else: | |
743 | db = _diverge(ui, b, path, localmarks, scid) |
|
742 | db = _diverge(ui, b, path, localmarks, scid) | |
744 | if db: |
|
743 | if db: | |
745 | changed.append( |
|
744 | changed.append( | |
746 | ( |
|
745 | ( | |
747 | db, |
|
746 | db, | |
748 | scid, |
|
747 | scid, | |
749 | warn, |
|
748 | warn, | |
750 | _(b"divergent bookmark %s stored as %s\n") % (b, db), |
|
749 | _(b"divergent bookmark %s stored as %s\n") % (b, db), | |
751 | ) |
|
750 | ) | |
752 | ) |
|
751 | ) | |
753 | else: |
|
752 | else: | |
754 | warn( |
|
753 | warn( | |
755 | _( |
|
754 | _( | |
756 | b"warning: failed to assign numbered name " |
|
755 | b"warning: failed to assign numbered name " | |
757 | b"to divergent bookmark %s\n" |
|
756 | b"to divergent bookmark %s\n" | |
758 | ) |
|
757 | ) | |
759 | % b |
|
758 | % b | |
760 | ) |
|
759 | ) | |
761 | for b, scid, dcid in adddst + advdst: |
|
760 | for b, scid, dcid in adddst + advdst: | |
762 | if b in explicit: |
|
761 | if b in explicit: | |
763 | explicit.discard(b) |
|
762 | explicit.discard(b) | |
764 | changed.append((b, scid, status, _(b"importing bookmark %s\n") % b)) |
|
763 | changed.append((b, scid, status, _(b"importing bookmark %s\n") % b)) | |
765 | for b, scid, dcid in differ: |
|
764 | for b, scid, dcid in differ: | |
766 | if b in explicit: |
|
765 | if b in explicit: | |
767 | explicit.remove(b) |
|
766 | explicit.remove(b) | |
768 | ui.warn( |
|
767 | ui.warn( | |
769 | _(b"remote bookmark %s points to locally missing %s\n") |
|
768 | _(b"remote bookmark %s points to locally missing %s\n") | |
770 | % (b, hex(scid)[:12]) |
|
769 | % (b, hex(scid)[:12]) | |
771 | ) |
|
770 | ) | |
772 | return changed |
|
771 | return changed | |
773 |
|
772 | |||
774 |
|
773 | |||
775 | def updatefromremote( |
|
774 | def updatefromremote( | |
776 | ui, repo, remotemarks, path, trfunc, explicit=(), mode=None |
|
775 | ui, repo, remotemarks, path, trfunc, explicit=(), mode=None | |
777 | ): |
|
776 | ): | |
778 | if mode == b'ignore': |
|
777 | if mode == b'ignore': | |
779 | # This should move to an higher level to avoid fetching bookmark at all |
|
778 | # This should move to an higher level to avoid fetching bookmark at all | |
780 | return |
|
779 | return | |
781 | ui.debug(b"checking for updated bookmarks\n") |
|
780 | ui.debug(b"checking for updated bookmarks\n") | |
782 | if mode == b'mirror': |
|
781 | if mode == b'mirror': | |
783 | changed = mirroring_remote(ui, repo, remotemarks) |
|
782 | changed = mirroring_remote(ui, repo, remotemarks) | |
784 | else: |
|
783 | else: | |
785 | changed = merging_from_remote(ui, repo, remotemarks, path, explicit) |
|
784 | changed = merging_from_remote(ui, repo, remotemarks, path, explicit) | |
786 |
|
785 | |||
787 | if changed: |
|
786 | if changed: | |
788 | tr = trfunc() |
|
787 | tr = trfunc() | |
789 | changes = [] |
|
788 | changes = [] | |
790 | key = lambda t: (t[0], t[1] or b'') |
|
789 | key = lambda t: (t[0], t[1] or b'') | |
791 | for b, node, writer, msg in sorted(changed, key=key): |
|
790 | for b, node, writer, msg in sorted(changed, key=key): | |
792 | changes.append((b, node)) |
|
791 | changes.append((b, node)) | |
793 | writer(msg) |
|
792 | writer(msg) | |
794 | repo._bookmarks.applychanges(repo, tr, changes) |
|
793 | repo._bookmarks.applychanges(repo, tr, changes) | |
795 |
|
794 | |||
796 |
|
795 | |||
797 | def incoming(ui, repo, peer, mode=None): |
|
796 | def incoming(ui, repo, peer, mode=None): | |
798 | """Show bookmarks incoming from other to repo""" |
|
797 | """Show bookmarks incoming from other to repo""" | |
799 | if mode == b'ignore': |
|
798 | if mode == b'ignore': | |
800 | ui.status(_(b"bookmarks exchange disabled with this path\n")) |
|
799 | ui.status(_(b"bookmarks exchange disabled with this path\n")) | |
801 | return 0 |
|
800 | return 0 | |
802 | ui.status(_(b"searching for changed bookmarks\n")) |
|
801 | ui.status(_(b"searching for changed bookmarks\n")) | |
803 |
|
802 | |||
804 | with peer.commandexecutor() as e: |
|
803 | with peer.commandexecutor() as e: | |
805 | remotemarks = unhexlifybookmarks( |
|
804 | remotemarks = unhexlifybookmarks( | |
806 | e.callcommand( |
|
805 | e.callcommand( | |
807 | b'listkeys', |
|
806 | b'listkeys', | |
808 | { |
|
807 | { | |
809 | b'namespace': b'bookmarks', |
|
808 | b'namespace': b'bookmarks', | |
810 | }, |
|
809 | }, | |
811 | ).result() |
|
810 | ).result() | |
812 | ) |
|
811 | ) | |
813 |
|
812 | |||
814 | incomings = [] |
|
813 | incomings = [] | |
815 | if ui.debugflag: |
|
814 | if ui.debugflag: | |
816 | getid = lambda id: id |
|
815 | getid = lambda id: id | |
817 | else: |
|
816 | else: | |
818 | getid = lambda id: id[:12] |
|
817 | getid = lambda id: id[:12] | |
819 | if ui.verbose: |
|
818 | if ui.verbose: | |
820 |
|
819 | |||
821 | def add(b, id, st): |
|
820 | def add(b, id, st): | |
822 | incomings.append(b" %-25s %s %s\n" % (b, getid(id), st)) |
|
821 | incomings.append(b" %-25s %s %s\n" % (b, getid(id), st)) | |
823 |
|
822 | |||
824 | else: |
|
823 | else: | |
825 |
|
824 | |||
826 | def add(b, id, st): |
|
825 | def add(b, id, st): | |
827 | incomings.append(b" %-25s %s\n" % (b, getid(id))) |
|
826 | incomings.append(b" %-25s %s\n" % (b, getid(id))) | |
828 |
|
827 | |||
829 | if mode == b'mirror': |
|
828 | if mode == b'mirror': | |
830 | localmarks = repo._bookmarks |
|
829 | localmarks = repo._bookmarks | |
831 | allmarks = set(remotemarks.keys()) | set(localmarks.keys()) |
|
830 | allmarks = set(remotemarks.keys()) | set(localmarks.keys()) | |
832 | for b in sorted(allmarks): |
|
831 | for b in sorted(allmarks): | |
833 | loc = localmarks.get(b) |
|
832 | loc = localmarks.get(b) | |
834 | rem = remotemarks.get(b) |
|
833 | rem = remotemarks.get(b) | |
835 | if loc == rem: |
|
834 | if loc == rem: | |
836 | continue |
|
835 | continue | |
837 | elif loc is None: |
|
836 | elif loc is None: | |
838 | add(b, hex(rem), _(b'added')) |
|
837 | add(b, hex(rem), _(b'added')) | |
839 | elif rem is None: |
|
838 | elif rem is None: | |
840 | add(b, hex(repo.nullid), _(b'removed')) |
|
839 | add(b, hex(repo.nullid), _(b'removed')) | |
841 | else: |
|
840 | else: | |
842 | add(b, hex(rem), _(b'changed')) |
|
841 | add(b, hex(rem), _(b'changed')) | |
843 | else: |
|
842 | else: | |
844 | r = comparebookmarks(repo, remotemarks, repo._bookmarks) |
|
843 | r = comparebookmarks(repo, remotemarks, repo._bookmarks) | |
845 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r |
|
844 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r | |
846 |
|
845 | |||
847 | for b, scid, dcid in addsrc: |
|
846 | for b, scid, dcid in addsrc: | |
848 | # i18n: "added" refers to a bookmark |
|
847 | # i18n: "added" refers to a bookmark | |
849 | add(b, hex(scid), _(b'added')) |
|
848 | add(b, hex(scid), _(b'added')) | |
850 | for b, scid, dcid in advsrc: |
|
849 | for b, scid, dcid in advsrc: | |
851 | # i18n: "advanced" refers to a bookmark |
|
850 | # i18n: "advanced" refers to a bookmark | |
852 | add(b, hex(scid), _(b'advanced')) |
|
851 | add(b, hex(scid), _(b'advanced')) | |
853 | for b, scid, dcid in diverge: |
|
852 | for b, scid, dcid in diverge: | |
854 | # i18n: "diverged" refers to a bookmark |
|
853 | # i18n: "diverged" refers to a bookmark | |
855 | add(b, hex(scid), _(b'diverged')) |
|
854 | add(b, hex(scid), _(b'diverged')) | |
856 | for b, scid, dcid in differ: |
|
855 | for b, scid, dcid in differ: | |
857 | # i18n: "changed" refers to a bookmark |
|
856 | # i18n: "changed" refers to a bookmark | |
858 | add(b, hex(scid), _(b'changed')) |
|
857 | add(b, hex(scid), _(b'changed')) | |
859 |
|
858 | |||
860 | if not incomings: |
|
859 | if not incomings: | |
861 | ui.status(_(b"no changed bookmarks found\n")) |
|
860 | ui.status(_(b"no changed bookmarks found\n")) | |
862 | return 1 |
|
861 | return 1 | |
863 |
|
862 | |||
864 | for s in sorted(incomings): |
|
863 | for s in sorted(incomings): | |
865 | ui.write(s) |
|
864 | ui.write(s) | |
866 |
|
865 | |||
867 | return 0 |
|
866 | return 0 | |
868 |
|
867 | |||
869 |
|
868 | |||
870 | def outgoing(ui, repo, other): |
|
869 | def outgoing(ui, repo, other): | |
871 | """Show bookmarks outgoing from repo to other""" |
|
870 | """Show bookmarks outgoing from repo to other""" | |
872 | ui.status(_(b"searching for changed bookmarks\n")) |
|
871 | ui.status(_(b"searching for changed bookmarks\n")) | |
873 |
|
872 | |||
874 | remotemarks = unhexlifybookmarks(other.listkeys(b'bookmarks')) |
|
873 | remotemarks = unhexlifybookmarks(other.listkeys(b'bookmarks')) | |
875 | r = comparebookmarks(repo, repo._bookmarks, remotemarks) |
|
874 | r = comparebookmarks(repo, repo._bookmarks, remotemarks) | |
876 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r |
|
875 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r | |
877 |
|
876 | |||
878 | outgoings = [] |
|
877 | outgoings = [] | |
879 | if ui.debugflag: |
|
878 | if ui.debugflag: | |
880 | getid = lambda id: id |
|
879 | getid = lambda id: id | |
881 | else: |
|
880 | else: | |
882 | getid = lambda id: id[:12] |
|
881 | getid = lambda id: id[:12] | |
883 | if ui.verbose: |
|
882 | if ui.verbose: | |
884 |
|
883 | |||
885 | def add(b, id, st): |
|
884 | def add(b, id, st): | |
886 | outgoings.append(b" %-25s %s %s\n" % (b, getid(id), st)) |
|
885 | outgoings.append(b" %-25s %s %s\n" % (b, getid(id), st)) | |
887 |
|
886 | |||
888 | else: |
|
887 | else: | |
889 |
|
888 | |||
890 | def add(b, id, st): |
|
889 | def add(b, id, st): | |
891 | outgoings.append(b" %-25s %s\n" % (b, getid(id))) |
|
890 | outgoings.append(b" %-25s %s\n" % (b, getid(id))) | |
892 |
|
891 | |||
893 | for b, scid, dcid in addsrc: |
|
892 | for b, scid, dcid in addsrc: | |
894 | # i18n: "added refers to a bookmark |
|
893 | # i18n: "added refers to a bookmark | |
895 | add(b, hex(scid), _(b'added')) |
|
894 | add(b, hex(scid), _(b'added')) | |
896 | for b, scid, dcid in adddst: |
|
895 | for b, scid, dcid in adddst: | |
897 | # i18n: "deleted" refers to a bookmark |
|
896 | # i18n: "deleted" refers to a bookmark | |
898 | add(b, b' ' * 40, _(b'deleted')) |
|
897 | add(b, b' ' * 40, _(b'deleted')) | |
899 | for b, scid, dcid in advsrc: |
|
898 | for b, scid, dcid in advsrc: | |
900 | # i18n: "advanced" refers to a bookmark |
|
899 | # i18n: "advanced" refers to a bookmark | |
901 | add(b, hex(scid), _(b'advanced')) |
|
900 | add(b, hex(scid), _(b'advanced')) | |
902 | for b, scid, dcid in diverge: |
|
901 | for b, scid, dcid in diverge: | |
903 | # i18n: "diverged" refers to a bookmark |
|
902 | # i18n: "diverged" refers to a bookmark | |
904 | add(b, hex(scid), _(b'diverged')) |
|
903 | add(b, hex(scid), _(b'diverged')) | |
905 | for b, scid, dcid in differ: |
|
904 | for b, scid, dcid in differ: | |
906 | # i18n: "changed" refers to a bookmark |
|
905 | # i18n: "changed" refers to a bookmark | |
907 | add(b, hex(scid), _(b'changed')) |
|
906 | add(b, hex(scid), _(b'changed')) | |
908 |
|
907 | |||
909 | if not outgoings: |
|
908 | if not outgoings: | |
910 | ui.status(_(b"no changed bookmarks found\n")) |
|
909 | ui.status(_(b"no changed bookmarks found\n")) | |
911 | return 1 |
|
910 | return 1 | |
912 |
|
911 | |||
913 | for s in sorted(outgoings): |
|
912 | for s in sorted(outgoings): | |
914 | ui.write(s) |
|
913 | ui.write(s) | |
915 |
|
914 | |||
916 | return 0 |
|
915 | return 0 | |
917 |
|
916 | |||
918 |
|
917 | |||
919 | def summary(repo, peer): |
|
918 | def summary(repo, peer): | |
920 | """Compare bookmarks between repo and other for "hg summary" output |
|
919 | """Compare bookmarks between repo and other for "hg summary" output | |
921 |
|
920 | |||
922 | This returns "(# of incoming, # of outgoing)" tuple. |
|
921 | This returns "(# of incoming, # of outgoing)" tuple. | |
923 | """ |
|
922 | """ | |
924 | with peer.commandexecutor() as e: |
|
923 | with peer.commandexecutor() as e: | |
925 | remotemarks = unhexlifybookmarks( |
|
924 | remotemarks = unhexlifybookmarks( | |
926 | e.callcommand( |
|
925 | e.callcommand( | |
927 | b'listkeys', |
|
926 | b'listkeys', | |
928 | { |
|
927 | { | |
929 | b'namespace': b'bookmarks', |
|
928 | b'namespace': b'bookmarks', | |
930 | }, |
|
929 | }, | |
931 | ).result() |
|
930 | ).result() | |
932 | ) |
|
931 | ) | |
933 |
|
932 | |||
934 | r = comparebookmarks(repo, remotemarks, repo._bookmarks) |
|
933 | r = comparebookmarks(repo, remotemarks, repo._bookmarks) | |
935 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r |
|
934 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r | |
936 | return (len(addsrc), len(adddst)) |
|
935 | return (len(addsrc), len(adddst)) | |
937 |
|
936 | |||
938 |
|
937 | |||
939 | def validdest(repo, old, new): |
|
938 | def validdest(repo, old, new): | |
940 | """Is the new bookmark destination a valid update from the old one""" |
|
939 | """Is the new bookmark destination a valid update from the old one""" | |
941 | repo = repo.unfiltered() |
|
940 | repo = repo.unfiltered() | |
942 | if old == new: |
|
941 | if old == new: | |
943 | # Old == new -> nothing to update. |
|
942 | # Old == new -> nothing to update. | |
944 | return False |
|
943 | return False | |
945 | elif not old: |
|
944 | elif not old: | |
946 | # old is nullrev, anything is valid. |
|
945 | # old is nullrev, anything is valid. | |
947 | # (new != nullrev has been excluded by the previous check) |
|
946 | # (new != nullrev has been excluded by the previous check) | |
948 | return True |
|
947 | return True | |
949 | elif repo.obsstore: |
|
948 | elif repo.obsstore: | |
950 | return new.node() in obsutil.foreground(repo, [old.node()]) |
|
949 | return new.node() in obsutil.foreground(repo, [old.node()]) | |
951 | else: |
|
950 | else: | |
952 | # still an independent clause as it is lazier (and therefore faster) |
|
951 | # still an independent clause as it is lazier (and therefore faster) | |
953 | return old.isancestorof(new) |
|
952 | return old.isancestorof(new) | |
954 |
|
953 | |||
955 |
|
954 | |||
956 | def checkformat(repo, mark): |
|
955 | def checkformat(repo, mark): | |
957 | """return a valid version of a potential bookmark name |
|
956 | """return a valid version of a potential bookmark name | |
958 |
|
957 | |||
959 | Raises an abort error if the bookmark name is not valid. |
|
958 | Raises an abort error if the bookmark name is not valid. | |
960 | """ |
|
959 | """ | |
961 | mark = mark.strip() |
|
960 | mark = mark.strip() | |
962 | if not mark: |
|
961 | if not mark: | |
963 | raise error.InputError( |
|
962 | raise error.InputError( | |
964 | _(b"bookmark names cannot consist entirely of whitespace") |
|
963 | _(b"bookmark names cannot consist entirely of whitespace") | |
965 | ) |
|
964 | ) | |
966 | scmutil.checknewlabel(repo, mark, b'bookmark') |
|
965 | scmutil.checknewlabel(repo, mark, b'bookmark') | |
967 | return mark |
|
966 | return mark | |
968 |
|
967 | |||
969 |
|
968 | |||
970 | def delete(repo, tr, names): |
|
969 | def delete(repo, tr, names): | |
971 | """remove a mark from the bookmark store |
|
970 | """remove a mark from the bookmark store | |
972 |
|
971 | |||
973 | Raises an abort error if mark does not exist. |
|
972 | Raises an abort error if mark does not exist. | |
974 | """ |
|
973 | """ | |
975 | marks = repo._bookmarks |
|
974 | marks = repo._bookmarks | |
976 | changes = [] |
|
975 | changes = [] | |
977 | for mark in names: |
|
976 | for mark in names: | |
978 | if mark not in marks: |
|
977 | if mark not in marks: | |
979 | raise error.InputError(_(b"bookmark '%s' does not exist") % mark) |
|
978 | raise error.InputError(_(b"bookmark '%s' does not exist") % mark) | |
980 | if mark == repo._activebookmark: |
|
979 | if mark == repo._activebookmark: | |
981 | deactivate(repo) |
|
980 | deactivate(repo) | |
982 | changes.append((mark, None)) |
|
981 | changes.append((mark, None)) | |
983 | marks.applychanges(repo, tr, changes) |
|
982 | marks.applychanges(repo, tr, changes) | |
984 |
|
983 | |||
985 |
|
984 | |||
986 | def rename(repo, tr, old, new, force=False, inactive=False): |
|
985 | def rename(repo, tr, old, new, force=False, inactive=False): | |
987 | """rename a bookmark from old to new |
|
986 | """rename a bookmark from old to new | |
988 |
|
987 | |||
989 | If force is specified, then the new name can overwrite an existing |
|
988 | If force is specified, then the new name can overwrite an existing | |
990 | bookmark. |
|
989 | bookmark. | |
991 |
|
990 | |||
992 | If inactive is specified, then do not activate the new bookmark. |
|
991 | If inactive is specified, then do not activate the new bookmark. | |
993 |
|
992 | |||
994 | Raises an abort error if old is not in the bookmark store. |
|
993 | Raises an abort error if old is not in the bookmark store. | |
995 | """ |
|
994 | """ | |
996 | marks = repo._bookmarks |
|
995 | marks = repo._bookmarks | |
997 | mark = checkformat(repo, new) |
|
996 | mark = checkformat(repo, new) | |
998 | if old not in marks: |
|
997 | if old not in marks: | |
999 | raise error.InputError(_(b"bookmark '%s' does not exist") % old) |
|
998 | raise error.InputError(_(b"bookmark '%s' does not exist") % old) | |
1000 | changes = [] |
|
999 | changes = [] | |
1001 | for bm in marks.checkconflict(mark, force): |
|
1000 | for bm in marks.checkconflict(mark, force): | |
1002 | changes.append((bm, None)) |
|
1001 | changes.append((bm, None)) | |
1003 | changes.extend([(mark, marks[old]), (old, None)]) |
|
1002 | changes.extend([(mark, marks[old]), (old, None)]) | |
1004 | marks.applychanges(repo, tr, changes) |
|
1003 | marks.applychanges(repo, tr, changes) | |
1005 | if repo._activebookmark == old and not inactive: |
|
1004 | if repo._activebookmark == old and not inactive: | |
1006 | activate(repo, mark) |
|
1005 | activate(repo, mark) | |
1007 |
|
1006 | |||
1008 |
|
1007 | |||
1009 | def addbookmarks(repo, tr, names, rev=None, force=False, inactive=False): |
|
1008 | def addbookmarks(repo, tr, names, rev=None, force=False, inactive=False): | |
1010 | """add a list of bookmarks |
|
1009 | """add a list of bookmarks | |
1011 |
|
1010 | |||
1012 | If force is specified, then the new name can overwrite an existing |
|
1011 | If force is specified, then the new name can overwrite an existing | |
1013 | bookmark. |
|
1012 | bookmark. | |
1014 |
|
1013 | |||
1015 | If inactive is specified, then do not activate any bookmark. Otherwise, the |
|
1014 | If inactive is specified, then do not activate any bookmark. Otherwise, the | |
1016 | first bookmark is activated. |
|
1015 | first bookmark is activated. | |
1017 |
|
1016 | |||
1018 | Raises an abort error if old is not in the bookmark store. |
|
1017 | Raises an abort error if old is not in the bookmark store. | |
1019 | """ |
|
1018 | """ | |
1020 | marks = repo._bookmarks |
|
1019 | marks = repo._bookmarks | |
1021 | cur = repo[b'.'].node() |
|
1020 | cur = repo[b'.'].node() | |
1022 | newact = None |
|
1021 | newact = None | |
1023 | changes = [] |
|
1022 | changes = [] | |
1024 |
|
1023 | |||
1025 | # unhide revs if any |
|
1024 | # unhide revs if any | |
1026 | if rev: |
|
1025 | if rev: | |
1027 | repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') |
|
1026 | repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') | |
1028 |
|
1027 | |||
1029 | ctx = scmutil.revsingle(repo, rev, None) |
|
1028 | ctx = scmutil.revsingle(repo, rev, None) | |
1030 | # bookmarking wdir means creating a bookmark on p1 and activating it |
|
1029 | # bookmarking wdir means creating a bookmark on p1 and activating it | |
1031 | activatenew = not inactive and ctx.rev() is None |
|
1030 | activatenew = not inactive and ctx.rev() is None | |
1032 | if ctx.node() is None: |
|
1031 | if ctx.node() is None: | |
1033 | ctx = ctx.p1() |
|
1032 | ctx = ctx.p1() | |
1034 | tgt = ctx.node() |
|
1033 | tgt = ctx.node() | |
1035 | assert tgt |
|
1034 | assert tgt | |
1036 |
|
1035 | |||
1037 | for mark in names: |
|
1036 | for mark in names: | |
1038 | mark = checkformat(repo, mark) |
|
1037 | mark = checkformat(repo, mark) | |
1039 | if newact is None: |
|
1038 | if newact is None: | |
1040 | newact = mark |
|
1039 | newact = mark | |
1041 | if inactive and mark == repo._activebookmark: |
|
1040 | if inactive and mark == repo._activebookmark: | |
1042 | deactivate(repo) |
|
1041 | deactivate(repo) | |
1043 | continue |
|
1042 | continue | |
1044 | for bm in marks.checkconflict(mark, force, tgt): |
|
1043 | for bm in marks.checkconflict(mark, force, tgt): | |
1045 | changes.append((bm, None)) |
|
1044 | changes.append((bm, None)) | |
1046 | changes.append((mark, tgt)) |
|
1045 | changes.append((mark, tgt)) | |
1047 |
|
1046 | |||
1048 | # nothing changed but for the one deactivated above |
|
1047 | # nothing changed but for the one deactivated above | |
1049 | if not changes: |
|
1048 | if not changes: | |
1050 | return |
|
1049 | return | |
1051 |
|
1050 | |||
1052 | if ctx.hidden(): |
|
1051 | if ctx.hidden(): | |
1053 | repo.ui.warn(_(b"bookmarking hidden changeset %s\n") % ctx.hex()[:12]) |
|
1052 | repo.ui.warn(_(b"bookmarking hidden changeset %s\n") % ctx.hex()[:12]) | |
1054 |
|
1053 | |||
1055 | if ctx.obsolete(): |
|
1054 | if ctx.obsolete(): | |
1056 | msg = obsutil._getfilteredreason(repo, ctx.hex()[:12], ctx) |
|
1055 | msg = obsutil._getfilteredreason(repo, ctx.hex()[:12], ctx) | |
1057 | repo.ui.warn(b"(%s)\n" % msg) |
|
1056 | repo.ui.warn(b"(%s)\n" % msg) | |
1058 |
|
1057 | |||
1059 | marks.applychanges(repo, tr, changes) |
|
1058 | marks.applychanges(repo, tr, changes) | |
1060 | if activatenew and cur == marks[newact]: |
|
1059 | if activatenew and cur == marks[newact]: | |
1061 | activate(repo, newact) |
|
1060 | activate(repo, newact) | |
1062 | elif cur != tgt and newact == repo._activebookmark: |
|
1061 | elif cur != tgt and newact == repo._activebookmark: | |
1063 | deactivate(repo) |
|
1062 | deactivate(repo) | |
1064 |
|
1063 | |||
1065 |
|
1064 | |||
1066 | def _printbookmarks(ui, repo, fm, bmarks): |
|
1065 | def _printbookmarks(ui, repo, fm, bmarks): | |
1067 | """private method to print bookmarks |
|
1066 | """private method to print bookmarks | |
1068 |
|
1067 | |||
1069 | Provides a way for extensions to control how bookmarks are printed (e.g. |
|
1068 | Provides a way for extensions to control how bookmarks are printed (e.g. | |
1070 | prepend or postpend names) |
|
1069 | prepend or postpend names) | |
1071 | """ |
|
1070 | """ | |
1072 | hexfn = fm.hexfunc |
|
1071 | hexfn = fm.hexfunc | |
1073 | if len(bmarks) == 0 and fm.isplain(): |
|
1072 | if len(bmarks) == 0 and fm.isplain(): | |
1074 | ui.status(_(b"no bookmarks set\n")) |
|
1073 | ui.status(_(b"no bookmarks set\n")) | |
1075 | for bmark, (n, prefix, label) in sorted(pycompat.iteritems(bmarks)): |
|
1074 | for bmark, (n, prefix, label) in sorted(pycompat.iteritems(bmarks)): | |
1076 | fm.startitem() |
|
1075 | fm.startitem() | |
1077 | fm.context(repo=repo) |
|
1076 | fm.context(repo=repo) | |
1078 | if not ui.quiet: |
|
1077 | if not ui.quiet: | |
1079 | fm.plain(b' %s ' % prefix, label=label) |
|
1078 | fm.plain(b' %s ' % prefix, label=label) | |
1080 | fm.write(b'bookmark', b'%s', bmark, label=label) |
|
1079 | fm.write(b'bookmark', b'%s', bmark, label=label) | |
1081 | pad = b" " * (25 - encoding.colwidth(bmark)) |
|
1080 | pad = b" " * (25 - encoding.colwidth(bmark)) | |
1082 | fm.condwrite( |
|
1081 | fm.condwrite( | |
1083 | not ui.quiet, |
|
1082 | not ui.quiet, | |
1084 | b'rev node', |
|
1083 | b'rev node', | |
1085 | pad + b' %d:%s', |
|
1084 | pad + b' %d:%s', | |
1086 | repo.changelog.rev(n), |
|
1085 | repo.changelog.rev(n), | |
1087 | hexfn(n), |
|
1086 | hexfn(n), | |
1088 | label=label, |
|
1087 | label=label, | |
1089 | ) |
|
1088 | ) | |
1090 | fm.data(active=(activebookmarklabel in label)) |
|
1089 | fm.data(active=(activebookmarklabel in label)) | |
1091 | fm.plain(b'\n') |
|
1090 | fm.plain(b'\n') | |
1092 |
|
1091 | |||
1093 |
|
1092 | |||
1094 | def printbookmarks(ui, repo, fm, names=None): |
|
1093 | def printbookmarks(ui, repo, fm, names=None): | |
1095 | """print bookmarks by the given formatter |
|
1094 | """print bookmarks by the given formatter | |
1096 |
|
1095 | |||
1097 | Provides a way for extensions to control how bookmarks are printed. |
|
1096 | Provides a way for extensions to control how bookmarks are printed. | |
1098 | """ |
|
1097 | """ | |
1099 | marks = repo._bookmarks |
|
1098 | marks = repo._bookmarks | |
1100 | bmarks = {} |
|
1099 | bmarks = {} | |
1101 | for bmark in names or marks: |
|
1100 | for bmark in names or marks: | |
1102 | if bmark not in marks: |
|
1101 | if bmark not in marks: | |
1103 | raise error.InputError(_(b"bookmark '%s' does not exist") % bmark) |
|
1102 | raise error.InputError(_(b"bookmark '%s' does not exist") % bmark) | |
1104 | active = repo._activebookmark |
|
1103 | active = repo._activebookmark | |
1105 | if bmark == active: |
|
1104 | if bmark == active: | |
1106 | prefix, label = b'*', activebookmarklabel |
|
1105 | prefix, label = b'*', activebookmarklabel | |
1107 | else: |
|
1106 | else: | |
1108 | prefix, label = b' ', b'' |
|
1107 | prefix, label = b' ', b'' | |
1109 |
|
1108 | |||
1110 | bmarks[bmark] = (marks[bmark], prefix, label) |
|
1109 | bmarks[bmark] = (marks[bmark], prefix, label) | |
1111 | _printbookmarks(ui, repo, fm, bmarks) |
|
1110 | _printbookmarks(ui, repo, fm, bmarks) | |
1112 |
|
1111 | |||
1113 |
|
1112 | |||
1114 | def preparehookargs(name, old, new): |
|
1113 | def preparehookargs(name, old, new): | |
1115 | if new is None: |
|
1114 | if new is None: | |
1116 | new = b'' |
|
1115 | new = b'' | |
1117 | if old is None: |
|
1116 | if old is None: | |
1118 | old = b'' |
|
1117 | old = b'' | |
1119 | return {b'bookmark': name, b'node': hex(new), b'oldnode': hex(old)} |
|
1118 | return {b'bookmark': name, b'node': hex(new), b'oldnode': hex(old)} |
@@ -1,3918 +1,3918 b'' | |||||
1 | # localrepo.py - read/write repository class for mercurial |
|
1 | # localrepo.py - read/write repository class for mercurial | |
2 | # coding: utf-8 |
|
2 | # coding: utf-8 | |
3 | # |
|
3 | # | |
4 | # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> |
|
4 | # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> | |
5 | # |
|
5 | # | |
6 | # This software may be used and distributed according to the terms of the |
|
6 | # This software may be used and distributed according to the terms of the | |
7 | # GNU General Public License version 2 or any later version. |
|
7 | # GNU General Public License version 2 or any later version. | |
8 |
|
8 | |||
9 | from __future__ import absolute_import |
|
9 | from __future__ import absolute_import | |
10 |
|
10 | |||
11 | import errno |
|
11 | import errno | |
12 | import functools |
|
12 | import functools | |
13 | import os |
|
13 | import os | |
14 | import random |
|
14 | import random | |
15 | import sys |
|
15 | import sys | |
16 | import time |
|
16 | import time | |
17 | import weakref |
|
17 | import weakref | |
18 |
|
18 | |||
19 | from .i18n import _ |
|
19 | from .i18n import _ | |
20 | from .node import ( |
|
20 | from .node import ( | |
21 | bin, |
|
21 | bin, | |
22 | hex, |
|
22 | hex, | |
23 | nullrev, |
|
23 | nullrev, | |
24 | sha1nodeconstants, |
|
24 | sha1nodeconstants, | |
25 | short, |
|
25 | short, | |
26 | ) |
|
26 | ) | |
27 | from .pycompat import ( |
|
27 | from .pycompat import ( | |
28 | delattr, |
|
28 | delattr, | |
29 | getattr, |
|
29 | getattr, | |
30 | ) |
|
30 | ) | |
31 | from . import ( |
|
31 | from . import ( | |
32 | bookmarks, |
|
32 | bookmarks, | |
33 | branchmap, |
|
33 | branchmap, | |
34 | bundle2, |
|
34 | bundle2, | |
35 | bundlecaches, |
|
35 | bundlecaches, | |
36 | changegroup, |
|
36 | changegroup, | |
37 | color, |
|
37 | color, | |
38 | commit, |
|
38 | commit, | |
39 | context, |
|
39 | context, | |
40 | dirstate, |
|
40 | dirstate, | |
41 | dirstateguard, |
|
41 | dirstateguard, | |
42 | discovery, |
|
42 | discovery, | |
43 | encoding, |
|
43 | encoding, | |
44 | error, |
|
44 | error, | |
45 | exchange, |
|
45 | exchange, | |
46 | extensions, |
|
46 | extensions, | |
47 | filelog, |
|
47 | filelog, | |
48 | hook, |
|
48 | hook, | |
49 | lock as lockmod, |
|
49 | lock as lockmod, | |
50 | match as matchmod, |
|
50 | match as matchmod, | |
51 | mergestate as mergestatemod, |
|
51 | mergestate as mergestatemod, | |
52 | mergeutil, |
|
52 | mergeutil, | |
53 | namespaces, |
|
53 | namespaces, | |
54 | narrowspec, |
|
54 | narrowspec, | |
55 | obsolete, |
|
55 | obsolete, | |
56 | pathutil, |
|
56 | pathutil, | |
57 | phases, |
|
57 | phases, | |
58 | pushkey, |
|
58 | pushkey, | |
59 | pycompat, |
|
59 | pycompat, | |
60 | rcutil, |
|
60 | rcutil, | |
61 | repoview, |
|
61 | repoview, | |
62 | requirements as requirementsmod, |
|
62 | requirements as requirementsmod, | |
63 | revlog, |
|
63 | revlog, | |
64 | revset, |
|
64 | revset, | |
65 | revsetlang, |
|
65 | revsetlang, | |
66 | scmutil, |
|
66 | scmutil, | |
67 | sparse, |
|
67 | sparse, | |
68 | store as storemod, |
|
68 | store as storemod, | |
69 | subrepoutil, |
|
69 | subrepoutil, | |
70 | tags as tagsmod, |
|
70 | tags as tagsmod, | |
71 | transaction, |
|
71 | transaction, | |
72 | txnutil, |
|
72 | txnutil, | |
73 | util, |
|
73 | util, | |
74 | vfs as vfsmod, |
|
74 | vfs as vfsmod, | |
75 | wireprototypes, |
|
75 | wireprototypes, | |
76 | ) |
|
76 | ) | |
77 |
|
77 | |||
78 | from .interfaces import ( |
|
78 | from .interfaces import ( | |
79 | repository, |
|
79 | repository, | |
80 | util as interfaceutil, |
|
80 | util as interfaceutil, | |
81 | ) |
|
81 | ) | |
82 |
|
82 | |||
83 | from .utils import ( |
|
83 | from .utils import ( | |
84 | hashutil, |
|
84 | hashutil, | |
85 | procutil, |
|
85 | procutil, | |
86 | stringutil, |
|
86 | stringutil, | |
87 | urlutil, |
|
87 | urlutil, | |
88 | ) |
|
88 | ) | |
89 |
|
89 | |||
90 | from .revlogutils import ( |
|
90 | from .revlogutils import ( | |
91 | concurrency_checker as revlogchecker, |
|
91 | concurrency_checker as revlogchecker, | |
92 | constants as revlogconst, |
|
92 | constants as revlogconst, | |
93 | sidedata as sidedatamod, |
|
93 | sidedata as sidedatamod, | |
94 | ) |
|
94 | ) | |
95 |
|
95 | |||
96 | release = lockmod.release |
|
96 | release = lockmod.release | |
97 | urlerr = util.urlerr |
|
97 | urlerr = util.urlerr | |
98 | urlreq = util.urlreq |
|
98 | urlreq = util.urlreq | |
99 |
|
99 | |||
100 | # set of (path, vfs-location) tuples. vfs-location is: |
|
100 | # set of (path, vfs-location) tuples. vfs-location is: | |
101 | # - 'plain for vfs relative paths |
|
101 | # - 'plain for vfs relative paths | |
102 | # - '' for svfs relative paths |
|
102 | # - '' for svfs relative paths | |
103 | _cachedfiles = set() |
|
103 | _cachedfiles = set() | |
104 |
|
104 | |||
105 |
|
105 | |||
106 | class _basefilecache(scmutil.filecache): |
|
106 | class _basefilecache(scmutil.filecache): | |
107 | """All filecache usage on repo are done for logic that should be unfiltered""" |
|
107 | """All filecache usage on repo are done for logic that should be unfiltered""" | |
108 |
|
108 | |||
109 | def __get__(self, repo, type=None): |
|
109 | def __get__(self, repo, type=None): | |
110 | if repo is None: |
|
110 | if repo is None: | |
111 | return self |
|
111 | return self | |
112 | # proxy to unfiltered __dict__ since filtered repo has no entry |
|
112 | # proxy to unfiltered __dict__ since filtered repo has no entry | |
113 | unfi = repo.unfiltered() |
|
113 | unfi = repo.unfiltered() | |
114 | try: |
|
114 | try: | |
115 | return unfi.__dict__[self.sname] |
|
115 | return unfi.__dict__[self.sname] | |
116 | except KeyError: |
|
116 | except KeyError: | |
117 | pass |
|
117 | pass | |
118 | return super(_basefilecache, self).__get__(unfi, type) |
|
118 | return super(_basefilecache, self).__get__(unfi, type) | |
119 |
|
119 | |||
120 | def set(self, repo, value): |
|
120 | def set(self, repo, value): | |
121 | return super(_basefilecache, self).set(repo.unfiltered(), value) |
|
121 | return super(_basefilecache, self).set(repo.unfiltered(), value) | |
122 |
|
122 | |||
123 |
|
123 | |||
124 | class repofilecache(_basefilecache): |
|
124 | class repofilecache(_basefilecache): | |
125 | """filecache for files in .hg but outside of .hg/store""" |
|
125 | """filecache for files in .hg but outside of .hg/store""" | |
126 |
|
126 | |||
127 | def __init__(self, *paths): |
|
127 | def __init__(self, *paths): | |
128 | super(repofilecache, self).__init__(*paths) |
|
128 | super(repofilecache, self).__init__(*paths) | |
129 | for path in paths: |
|
129 | for path in paths: | |
130 | _cachedfiles.add((path, b'plain')) |
|
130 | _cachedfiles.add((path, b'plain')) | |
131 |
|
131 | |||
132 | def join(self, obj, fname): |
|
132 | def join(self, obj, fname): | |
133 | return obj.vfs.join(fname) |
|
133 | return obj.vfs.join(fname) | |
134 |
|
134 | |||
135 |
|
135 | |||
136 | class storecache(_basefilecache): |
|
136 | class storecache(_basefilecache): | |
137 | """filecache for files in the store""" |
|
137 | """filecache for files in the store""" | |
138 |
|
138 | |||
139 | def __init__(self, *paths): |
|
139 | def __init__(self, *paths): | |
140 | super(storecache, self).__init__(*paths) |
|
140 | super(storecache, self).__init__(*paths) | |
141 | for path in paths: |
|
141 | for path in paths: | |
142 | _cachedfiles.add((path, b'')) |
|
142 | _cachedfiles.add((path, b'')) | |
143 |
|
143 | |||
144 | def join(self, obj, fname): |
|
144 | def join(self, obj, fname): | |
145 | return obj.sjoin(fname) |
|
145 | return obj.sjoin(fname) | |
146 |
|
146 | |||
147 |
|
147 | |||
148 | class changelogcache(storecache): |
|
148 | class changelogcache(storecache): | |
149 | """filecache for the changelog""" |
|
149 | """filecache for the changelog""" | |
150 |
|
150 | |||
151 | def __init__(self): |
|
151 | def __init__(self): | |
152 | super(changelogcache, self).__init__() |
|
152 | super(changelogcache, self).__init__() | |
153 | _cachedfiles.add((b'00changelog.i', b'')) |
|
153 | _cachedfiles.add((b'00changelog.i', b'')) | |
154 | _cachedfiles.add((b'00changelog.n', b'')) |
|
154 | _cachedfiles.add((b'00changelog.n', b'')) | |
155 |
|
155 | |||
156 | def tracked_paths(self, obj): |
|
156 | def tracked_paths(self, obj): | |
157 | paths = [self.join(obj, b'00changelog.i')] |
|
157 | paths = [self.join(obj, b'00changelog.i')] | |
158 | if obj.store.opener.options.get(b'persistent-nodemap', False): |
|
158 | if obj.store.opener.options.get(b'persistent-nodemap', False): | |
159 | paths.append(self.join(obj, b'00changelog.n')) |
|
159 | paths.append(self.join(obj, b'00changelog.n')) | |
160 | return paths |
|
160 | return paths | |
161 |
|
161 | |||
162 |
|
162 | |||
163 | class manifestlogcache(storecache): |
|
163 | class manifestlogcache(storecache): | |
164 | """filecache for the manifestlog""" |
|
164 | """filecache for the manifestlog""" | |
165 |
|
165 | |||
166 | def __init__(self): |
|
166 | def __init__(self): | |
167 | super(manifestlogcache, self).__init__() |
|
167 | super(manifestlogcache, self).__init__() | |
168 | _cachedfiles.add((b'00manifest.i', b'')) |
|
168 | _cachedfiles.add((b'00manifest.i', b'')) | |
169 | _cachedfiles.add((b'00manifest.n', b'')) |
|
169 | _cachedfiles.add((b'00manifest.n', b'')) | |
170 |
|
170 | |||
171 | def tracked_paths(self, obj): |
|
171 | def tracked_paths(self, obj): | |
172 | paths = [self.join(obj, b'00manifest.i')] |
|
172 | paths = [self.join(obj, b'00manifest.i')] | |
173 | if obj.store.opener.options.get(b'persistent-nodemap', False): |
|
173 | if obj.store.opener.options.get(b'persistent-nodemap', False): | |
174 | paths.append(self.join(obj, b'00manifest.n')) |
|
174 | paths.append(self.join(obj, b'00manifest.n')) | |
175 | return paths |
|
175 | return paths | |
176 |
|
176 | |||
177 |
|
177 | |||
178 | class mixedrepostorecache(_basefilecache): |
|
178 | class mixedrepostorecache(_basefilecache): | |
179 | """filecache for a mix files in .hg/store and outside""" |
|
179 | """filecache for a mix files in .hg/store and outside""" | |
180 |
|
180 | |||
181 | def __init__(self, *pathsandlocations): |
|
181 | def __init__(self, *pathsandlocations): | |
182 | # scmutil.filecache only uses the path for passing back into our |
|
182 | # scmutil.filecache only uses the path for passing back into our | |
183 | # join(), so we can safely pass a list of paths and locations |
|
183 | # join(), so we can safely pass a list of paths and locations | |
184 | super(mixedrepostorecache, self).__init__(*pathsandlocations) |
|
184 | super(mixedrepostorecache, self).__init__(*pathsandlocations) | |
185 | _cachedfiles.update(pathsandlocations) |
|
185 | _cachedfiles.update(pathsandlocations) | |
186 |
|
186 | |||
187 | def join(self, obj, fnameandlocation): |
|
187 | def join(self, obj, fnameandlocation): | |
188 | fname, location = fnameandlocation |
|
188 | fname, location = fnameandlocation | |
189 | if location == b'plain': |
|
189 | if location == b'plain': | |
190 | return obj.vfs.join(fname) |
|
190 | return obj.vfs.join(fname) | |
191 | else: |
|
191 | else: | |
192 | if location != b'': |
|
192 | if location != b'': | |
193 | raise error.ProgrammingError( |
|
193 | raise error.ProgrammingError( | |
194 | b'unexpected location: %s' % location |
|
194 | b'unexpected location: %s' % location | |
195 | ) |
|
195 | ) | |
196 | return obj.sjoin(fname) |
|
196 | return obj.sjoin(fname) | |
197 |
|
197 | |||
198 |
|
198 | |||
199 | def isfilecached(repo, name): |
|
199 | def isfilecached(repo, name): | |
200 | """check if a repo has already cached "name" filecache-ed property |
|
200 | """check if a repo has already cached "name" filecache-ed property | |
201 |
|
201 | |||
202 | This returns (cachedobj-or-None, iscached) tuple. |
|
202 | This returns (cachedobj-or-None, iscached) tuple. | |
203 | """ |
|
203 | """ | |
204 | cacheentry = repo.unfiltered()._filecache.get(name, None) |
|
204 | cacheentry = repo.unfiltered()._filecache.get(name, None) | |
205 | if not cacheentry: |
|
205 | if not cacheentry: | |
206 | return None, False |
|
206 | return None, False | |
207 | return cacheentry.obj, True |
|
207 | return cacheentry.obj, True | |
208 |
|
208 | |||
209 |
|
209 | |||
210 | class unfilteredpropertycache(util.propertycache): |
|
210 | class unfilteredpropertycache(util.propertycache): | |
211 | """propertycache that apply to unfiltered repo only""" |
|
211 | """propertycache that apply to unfiltered repo only""" | |
212 |
|
212 | |||
213 | def __get__(self, repo, type=None): |
|
213 | def __get__(self, repo, type=None): | |
214 | unfi = repo.unfiltered() |
|
214 | unfi = repo.unfiltered() | |
215 | if unfi is repo: |
|
215 | if unfi is repo: | |
216 | return super(unfilteredpropertycache, self).__get__(unfi) |
|
216 | return super(unfilteredpropertycache, self).__get__(unfi) | |
217 | return getattr(unfi, self.name) |
|
217 | return getattr(unfi, self.name) | |
218 |
|
218 | |||
219 |
|
219 | |||
220 | class filteredpropertycache(util.propertycache): |
|
220 | class filteredpropertycache(util.propertycache): | |
221 | """propertycache that must take filtering in account""" |
|
221 | """propertycache that must take filtering in account""" | |
222 |
|
222 | |||
223 | def cachevalue(self, obj, value): |
|
223 | def cachevalue(self, obj, value): | |
224 | object.__setattr__(obj, self.name, value) |
|
224 | object.__setattr__(obj, self.name, value) | |
225 |
|
225 | |||
226 |
|
226 | |||
227 | def hasunfilteredcache(repo, name): |
|
227 | def hasunfilteredcache(repo, name): | |
228 | """check if a repo has an unfilteredpropertycache value for <name>""" |
|
228 | """check if a repo has an unfilteredpropertycache value for <name>""" | |
229 | return name in vars(repo.unfiltered()) |
|
229 | return name in vars(repo.unfiltered()) | |
230 |
|
230 | |||
231 |
|
231 | |||
232 | def unfilteredmethod(orig): |
|
232 | def unfilteredmethod(orig): | |
233 | """decorate method that always need to be run on unfiltered version""" |
|
233 | """decorate method that always need to be run on unfiltered version""" | |
234 |
|
234 | |||
235 | @functools.wraps(orig) |
|
235 | @functools.wraps(orig) | |
236 | def wrapper(repo, *args, **kwargs): |
|
236 | def wrapper(repo, *args, **kwargs): | |
237 | return orig(repo.unfiltered(), *args, **kwargs) |
|
237 | return orig(repo.unfiltered(), *args, **kwargs) | |
238 |
|
238 | |||
239 | return wrapper |
|
239 | return wrapper | |
240 |
|
240 | |||
241 |
|
241 | |||
242 | moderncaps = { |
|
242 | moderncaps = { | |
243 | b'lookup', |
|
243 | b'lookup', | |
244 | b'branchmap', |
|
244 | b'branchmap', | |
245 | b'pushkey', |
|
245 | b'pushkey', | |
246 | b'known', |
|
246 | b'known', | |
247 | b'getbundle', |
|
247 | b'getbundle', | |
248 | b'unbundle', |
|
248 | b'unbundle', | |
249 | } |
|
249 | } | |
250 | legacycaps = moderncaps.union({b'changegroupsubset'}) |
|
250 | legacycaps = moderncaps.union({b'changegroupsubset'}) | |
251 |
|
251 | |||
252 |
|
252 | |||
253 | @interfaceutil.implementer(repository.ipeercommandexecutor) |
|
253 | @interfaceutil.implementer(repository.ipeercommandexecutor) | |
254 | class localcommandexecutor(object): |
|
254 | class localcommandexecutor(object): | |
255 | def __init__(self, peer): |
|
255 | def __init__(self, peer): | |
256 | self._peer = peer |
|
256 | self._peer = peer | |
257 | self._sent = False |
|
257 | self._sent = False | |
258 | self._closed = False |
|
258 | self._closed = False | |
259 |
|
259 | |||
260 | def __enter__(self): |
|
260 | def __enter__(self): | |
261 | return self |
|
261 | return self | |
262 |
|
262 | |||
263 | def __exit__(self, exctype, excvalue, exctb): |
|
263 | def __exit__(self, exctype, excvalue, exctb): | |
264 | self.close() |
|
264 | self.close() | |
265 |
|
265 | |||
266 | def callcommand(self, command, args): |
|
266 | def callcommand(self, command, args): | |
267 | if self._sent: |
|
267 | if self._sent: | |
268 | raise error.ProgrammingError( |
|
268 | raise error.ProgrammingError( | |
269 | b'callcommand() cannot be used after sendcommands()' |
|
269 | b'callcommand() cannot be used after sendcommands()' | |
270 | ) |
|
270 | ) | |
271 |
|
271 | |||
272 | if self._closed: |
|
272 | if self._closed: | |
273 | raise error.ProgrammingError( |
|
273 | raise error.ProgrammingError( | |
274 | b'callcommand() cannot be used after close()' |
|
274 | b'callcommand() cannot be used after close()' | |
275 | ) |
|
275 | ) | |
276 |
|
276 | |||
277 | # We don't need to support anything fancy. Just call the named |
|
277 | # We don't need to support anything fancy. Just call the named | |
278 | # method on the peer and return a resolved future. |
|
278 | # method on the peer and return a resolved future. | |
279 | fn = getattr(self._peer, pycompat.sysstr(command)) |
|
279 | fn = getattr(self._peer, pycompat.sysstr(command)) | |
280 |
|
280 | |||
281 | f = pycompat.futures.Future() |
|
281 | f = pycompat.futures.Future() | |
282 |
|
282 | |||
283 | try: |
|
283 | try: | |
284 | result = fn(**pycompat.strkwargs(args)) |
|
284 | result = fn(**pycompat.strkwargs(args)) | |
285 | except Exception: |
|
285 | except Exception: | |
286 | pycompat.future_set_exception_info(f, sys.exc_info()[1:]) |
|
286 | pycompat.future_set_exception_info(f, sys.exc_info()[1:]) | |
287 | else: |
|
287 | else: | |
288 | f.set_result(result) |
|
288 | f.set_result(result) | |
289 |
|
289 | |||
290 | return f |
|
290 | return f | |
291 |
|
291 | |||
292 | def sendcommands(self): |
|
292 | def sendcommands(self): | |
293 | self._sent = True |
|
293 | self._sent = True | |
294 |
|
294 | |||
295 | def close(self): |
|
295 | def close(self): | |
296 | self._closed = True |
|
296 | self._closed = True | |
297 |
|
297 | |||
298 |
|
298 | |||
299 | @interfaceutil.implementer(repository.ipeercommands) |
|
299 | @interfaceutil.implementer(repository.ipeercommands) | |
300 | class localpeer(repository.peer): |
|
300 | class localpeer(repository.peer): | |
301 | '''peer for a local repo; reflects only the most recent API''' |
|
301 | '''peer for a local repo; reflects only the most recent API''' | |
302 |
|
302 | |||
303 | def __init__(self, repo, caps=None): |
|
303 | def __init__(self, repo, caps=None): | |
304 | super(localpeer, self).__init__() |
|
304 | super(localpeer, self).__init__() | |
305 |
|
305 | |||
306 | if caps is None: |
|
306 | if caps is None: | |
307 | caps = moderncaps.copy() |
|
307 | caps = moderncaps.copy() | |
308 | self._repo = repo.filtered(b'served') |
|
308 | self._repo = repo.filtered(b'served') | |
309 | self.ui = repo.ui |
|
309 | self.ui = repo.ui | |
310 |
|
310 | |||
311 | if repo._wanted_sidedata: |
|
311 | if repo._wanted_sidedata: | |
312 | formatted = bundle2.format_remote_wanted_sidedata(repo) |
|
312 | formatted = bundle2.format_remote_wanted_sidedata(repo) | |
313 | caps.add(b'exp-wanted-sidedata=' + formatted) |
|
313 | caps.add(b'exp-wanted-sidedata=' + formatted) | |
314 |
|
314 | |||
315 | self._caps = repo._restrictcapabilities(caps) |
|
315 | self._caps = repo._restrictcapabilities(caps) | |
316 |
|
316 | |||
317 | # Begin of _basepeer interface. |
|
317 | # Begin of _basepeer interface. | |
318 |
|
318 | |||
319 | def url(self): |
|
319 | def url(self): | |
320 | return self._repo.url() |
|
320 | return self._repo.url() | |
321 |
|
321 | |||
322 | def local(self): |
|
322 | def local(self): | |
323 | return self._repo |
|
323 | return self._repo | |
324 |
|
324 | |||
325 | def peer(self): |
|
325 | def peer(self): | |
326 | return self |
|
326 | return self | |
327 |
|
327 | |||
328 | def canpush(self): |
|
328 | def canpush(self): | |
329 | return True |
|
329 | return True | |
330 |
|
330 | |||
331 | def close(self): |
|
331 | def close(self): | |
332 | self._repo.close() |
|
332 | self._repo.close() | |
333 |
|
333 | |||
334 | # End of _basepeer interface. |
|
334 | # End of _basepeer interface. | |
335 |
|
335 | |||
336 | # Begin of _basewirecommands interface. |
|
336 | # Begin of _basewirecommands interface. | |
337 |
|
337 | |||
338 | def branchmap(self): |
|
338 | def branchmap(self): | |
339 | return self._repo.branchmap() |
|
339 | return self._repo.branchmap() | |
340 |
|
340 | |||
341 | def capabilities(self): |
|
341 | def capabilities(self): | |
342 | return self._caps |
|
342 | return self._caps | |
343 |
|
343 | |||
344 | def clonebundles(self): |
|
344 | def clonebundles(self): | |
345 | return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE) |
|
345 | return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE) | |
346 |
|
346 | |||
347 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
347 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
348 | """Used to test argument passing over the wire""" |
|
348 | """Used to test argument passing over the wire""" | |
349 | return b"%s %s %s %s %s" % ( |
|
349 | return b"%s %s %s %s %s" % ( | |
350 | one, |
|
350 | one, | |
351 | two, |
|
351 | two, | |
352 | pycompat.bytestr(three), |
|
352 | pycompat.bytestr(three), | |
353 | pycompat.bytestr(four), |
|
353 | pycompat.bytestr(four), | |
354 | pycompat.bytestr(five), |
|
354 | pycompat.bytestr(five), | |
355 | ) |
|
355 | ) | |
356 |
|
356 | |||
357 | def getbundle( |
|
357 | def getbundle( | |
358 | self, |
|
358 | self, | |
359 | source, |
|
359 | source, | |
360 | heads=None, |
|
360 | heads=None, | |
361 | common=None, |
|
361 | common=None, | |
362 | bundlecaps=None, |
|
362 | bundlecaps=None, | |
363 | remote_sidedata=None, |
|
363 | remote_sidedata=None, | |
364 | **kwargs |
|
364 | **kwargs | |
365 | ): |
|
365 | ): | |
366 | chunks = exchange.getbundlechunks( |
|
366 | chunks = exchange.getbundlechunks( | |
367 | self._repo, |
|
367 | self._repo, | |
368 | source, |
|
368 | source, | |
369 | heads=heads, |
|
369 | heads=heads, | |
370 | common=common, |
|
370 | common=common, | |
371 | bundlecaps=bundlecaps, |
|
371 | bundlecaps=bundlecaps, | |
372 | remote_sidedata=remote_sidedata, |
|
372 | remote_sidedata=remote_sidedata, | |
373 | **kwargs |
|
373 | **kwargs | |
374 | )[1] |
|
374 | )[1] | |
375 | cb = util.chunkbuffer(chunks) |
|
375 | cb = util.chunkbuffer(chunks) | |
376 |
|
376 | |||
377 | if exchange.bundle2requested(bundlecaps): |
|
377 | if exchange.bundle2requested(bundlecaps): | |
378 | # When requesting a bundle2, getbundle returns a stream to make the |
|
378 | # When requesting a bundle2, getbundle returns a stream to make the | |
379 | # wire level function happier. We need to build a proper object |
|
379 | # wire level function happier. We need to build a proper object | |
380 | # from it in local peer. |
|
380 | # from it in local peer. | |
381 | return bundle2.getunbundler(self.ui, cb) |
|
381 | return bundle2.getunbundler(self.ui, cb) | |
382 | else: |
|
382 | else: | |
383 | return changegroup.getunbundler(b'01', cb, None) |
|
383 | return changegroup.getunbundler(b'01', cb, None) | |
384 |
|
384 | |||
385 | def heads(self): |
|
385 | def heads(self): | |
386 | return self._repo.heads() |
|
386 | return self._repo.heads() | |
387 |
|
387 | |||
388 | def known(self, nodes): |
|
388 | def known(self, nodes): | |
389 | return self._repo.known(nodes) |
|
389 | return self._repo.known(nodes) | |
390 |
|
390 | |||
391 | def listkeys(self, namespace): |
|
391 | def listkeys(self, namespace): | |
392 | return self._repo.listkeys(namespace) |
|
392 | return self._repo.listkeys(namespace) | |
393 |
|
393 | |||
394 | def lookup(self, key): |
|
394 | def lookup(self, key): | |
395 | return self._repo.lookup(key) |
|
395 | return self._repo.lookup(key) | |
396 |
|
396 | |||
397 | def pushkey(self, namespace, key, old, new): |
|
397 | def pushkey(self, namespace, key, old, new): | |
398 | return self._repo.pushkey(namespace, key, old, new) |
|
398 | return self._repo.pushkey(namespace, key, old, new) | |
399 |
|
399 | |||
400 | def stream_out(self): |
|
400 | def stream_out(self): | |
401 | raise error.Abort(_(b'cannot perform stream clone against local peer')) |
|
401 | raise error.Abort(_(b'cannot perform stream clone against local peer')) | |
402 |
|
402 | |||
403 | def unbundle(self, bundle, heads, url): |
|
403 | def unbundle(self, bundle, heads, url): | |
404 | """apply a bundle on a repo |
|
404 | """apply a bundle on a repo | |
405 |
|
405 | |||
406 | This function handles the repo locking itself.""" |
|
406 | This function handles the repo locking itself.""" | |
407 | try: |
|
407 | try: | |
408 | try: |
|
408 | try: | |
409 | bundle = exchange.readbundle(self.ui, bundle, None) |
|
409 | bundle = exchange.readbundle(self.ui, bundle, None) | |
410 | ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) |
|
410 | ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) | |
411 | if util.safehasattr(ret, b'getchunks'): |
|
411 | if util.safehasattr(ret, b'getchunks'): | |
412 | # This is a bundle20 object, turn it into an unbundler. |
|
412 | # This is a bundle20 object, turn it into an unbundler. | |
413 | # This little dance should be dropped eventually when the |
|
413 | # This little dance should be dropped eventually when the | |
414 | # API is finally improved. |
|
414 | # API is finally improved. | |
415 | stream = util.chunkbuffer(ret.getchunks()) |
|
415 | stream = util.chunkbuffer(ret.getchunks()) | |
416 | ret = bundle2.getunbundler(self.ui, stream) |
|
416 | ret = bundle2.getunbundler(self.ui, stream) | |
417 | return ret |
|
417 | return ret | |
418 | except Exception as exc: |
|
418 | except Exception as exc: | |
419 | # If the exception contains output salvaged from a bundle2 |
|
419 | # If the exception contains output salvaged from a bundle2 | |
420 | # reply, we need to make sure it is printed before continuing |
|
420 | # reply, we need to make sure it is printed before continuing | |
421 | # to fail. So we build a bundle2 with such output and consume |
|
421 | # to fail. So we build a bundle2 with such output and consume | |
422 | # it directly. |
|
422 | # it directly. | |
423 | # |
|
423 | # | |
424 | # This is not very elegant but allows a "simple" solution for |
|
424 | # This is not very elegant but allows a "simple" solution for | |
425 | # issue4594 |
|
425 | # issue4594 | |
426 | output = getattr(exc, '_bundle2salvagedoutput', ()) |
|
426 | output = getattr(exc, '_bundle2salvagedoutput', ()) | |
427 | if output: |
|
427 | if output: | |
428 | bundler = bundle2.bundle20(self._repo.ui) |
|
428 | bundler = bundle2.bundle20(self._repo.ui) | |
429 | for out in output: |
|
429 | for out in output: | |
430 | bundler.addpart(out) |
|
430 | bundler.addpart(out) | |
431 | stream = util.chunkbuffer(bundler.getchunks()) |
|
431 | stream = util.chunkbuffer(bundler.getchunks()) | |
432 | b = bundle2.getunbundler(self.ui, stream) |
|
432 | b = bundle2.getunbundler(self.ui, stream) | |
433 | bundle2.processbundle(self._repo, b) |
|
433 | bundle2.processbundle(self._repo, b) | |
434 | raise |
|
434 | raise | |
435 | except error.PushRaced as exc: |
|
435 | except error.PushRaced as exc: | |
436 | raise error.ResponseError( |
|
436 | raise error.ResponseError( | |
437 | _(b'push failed:'), stringutil.forcebytestr(exc) |
|
437 | _(b'push failed:'), stringutil.forcebytestr(exc) | |
438 | ) |
|
438 | ) | |
439 |
|
439 | |||
440 | # End of _basewirecommands interface. |
|
440 | # End of _basewirecommands interface. | |
441 |
|
441 | |||
442 | # Begin of peer interface. |
|
442 | # Begin of peer interface. | |
443 |
|
443 | |||
444 | def commandexecutor(self): |
|
444 | def commandexecutor(self): | |
445 | return localcommandexecutor(self) |
|
445 | return localcommandexecutor(self) | |
446 |
|
446 | |||
447 | # End of peer interface. |
|
447 | # End of peer interface. | |
448 |
|
448 | |||
449 |
|
449 | |||
450 | @interfaceutil.implementer(repository.ipeerlegacycommands) |
|
450 | @interfaceutil.implementer(repository.ipeerlegacycommands) | |
451 | class locallegacypeer(localpeer): |
|
451 | class locallegacypeer(localpeer): | |
452 | """peer extension which implements legacy methods too; used for tests with |
|
452 | """peer extension which implements legacy methods too; used for tests with | |
453 | restricted capabilities""" |
|
453 | restricted capabilities""" | |
454 |
|
454 | |||
455 | def __init__(self, repo): |
|
455 | def __init__(self, repo): | |
456 | super(locallegacypeer, self).__init__(repo, caps=legacycaps) |
|
456 | super(locallegacypeer, self).__init__(repo, caps=legacycaps) | |
457 |
|
457 | |||
458 | # Begin of baselegacywirecommands interface. |
|
458 | # Begin of baselegacywirecommands interface. | |
459 |
|
459 | |||
460 | def between(self, pairs): |
|
460 | def between(self, pairs): | |
461 | return self._repo.between(pairs) |
|
461 | return self._repo.between(pairs) | |
462 |
|
462 | |||
463 | def branches(self, nodes): |
|
463 | def branches(self, nodes): | |
464 | return self._repo.branches(nodes) |
|
464 | return self._repo.branches(nodes) | |
465 |
|
465 | |||
466 | def changegroup(self, nodes, source): |
|
466 | def changegroup(self, nodes, source): | |
467 | outgoing = discovery.outgoing( |
|
467 | outgoing = discovery.outgoing( | |
468 | self._repo, missingroots=nodes, ancestorsof=self._repo.heads() |
|
468 | self._repo, missingroots=nodes, ancestorsof=self._repo.heads() | |
469 | ) |
|
469 | ) | |
470 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
470 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) | |
471 |
|
471 | |||
472 | def changegroupsubset(self, bases, heads, source): |
|
472 | def changegroupsubset(self, bases, heads, source): | |
473 | outgoing = discovery.outgoing( |
|
473 | outgoing = discovery.outgoing( | |
474 | self._repo, missingroots=bases, ancestorsof=heads |
|
474 | self._repo, missingroots=bases, ancestorsof=heads | |
475 | ) |
|
475 | ) | |
476 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
476 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) | |
477 |
|
477 | |||
478 | # End of baselegacywirecommands interface. |
|
478 | # End of baselegacywirecommands interface. | |
479 |
|
479 | |||
480 |
|
480 | |||
481 | # Functions receiving (ui, features) that extensions can register to impact |
|
481 | # Functions receiving (ui, features) that extensions can register to impact | |
482 | # the ability to load repositories with custom requirements. Only |
|
482 | # the ability to load repositories with custom requirements. Only | |
483 | # functions defined in loaded extensions are called. |
|
483 | # functions defined in loaded extensions are called. | |
484 | # |
|
484 | # | |
485 | # The function receives a set of requirement strings that the repository |
|
485 | # The function receives a set of requirement strings that the repository | |
486 | # is capable of opening. Functions will typically add elements to the |
|
486 | # is capable of opening. Functions will typically add elements to the | |
487 | # set to reflect that the extension knows how to handle that requirements. |
|
487 | # set to reflect that the extension knows how to handle that requirements. | |
488 | featuresetupfuncs = set() |
|
488 | featuresetupfuncs = set() | |
489 |
|
489 | |||
490 |
|
490 | |||
491 | def _getsharedvfs(hgvfs, requirements): |
|
491 | def _getsharedvfs(hgvfs, requirements): | |
492 | """returns the vfs object pointing to root of shared source |
|
492 | """returns the vfs object pointing to root of shared source | |
493 | repo for a shared repository |
|
493 | repo for a shared repository | |
494 |
|
494 | |||
495 | hgvfs is vfs pointing at .hg/ of current repo (shared one) |
|
495 | hgvfs is vfs pointing at .hg/ of current repo (shared one) | |
496 | requirements is a set of requirements of current repo (shared one) |
|
496 | requirements is a set of requirements of current repo (shared one) | |
497 | """ |
|
497 | """ | |
498 | # The ``shared`` or ``relshared`` requirements indicate the |
|
498 | # The ``shared`` or ``relshared`` requirements indicate the | |
499 | # store lives in the path contained in the ``.hg/sharedpath`` file. |
|
499 | # store lives in the path contained in the ``.hg/sharedpath`` file. | |
500 | # This is an absolute path for ``shared`` and relative to |
|
500 | # This is an absolute path for ``shared`` and relative to | |
501 | # ``.hg/`` for ``relshared``. |
|
501 | # ``.hg/`` for ``relshared``. | |
502 | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') |
|
502 | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') | |
503 | if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements: |
|
503 | if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements: | |
504 | sharedpath = util.normpath(hgvfs.join(sharedpath)) |
|
504 | sharedpath = util.normpath(hgvfs.join(sharedpath)) | |
505 |
|
505 | |||
506 | sharedvfs = vfsmod.vfs(sharedpath, realpath=True) |
|
506 | sharedvfs = vfsmod.vfs(sharedpath, realpath=True) | |
507 |
|
507 | |||
508 | if not sharedvfs.exists(): |
|
508 | if not sharedvfs.exists(): | |
509 | raise error.RepoError( |
|
509 | raise error.RepoError( | |
510 | _(b'.hg/sharedpath points to nonexistent directory %s') |
|
510 | _(b'.hg/sharedpath points to nonexistent directory %s') | |
511 | % sharedvfs.base |
|
511 | % sharedvfs.base | |
512 | ) |
|
512 | ) | |
513 | return sharedvfs |
|
513 | return sharedvfs | |
514 |
|
514 | |||
515 |
|
515 | |||
516 | def _readrequires(vfs, allowmissing): |
|
516 | def _readrequires(vfs, allowmissing): | |
517 | """reads the require file present at root of this vfs |
|
517 | """reads the require file present at root of this vfs | |
518 | and return a set of requirements |
|
518 | and return a set of requirements | |
519 |
|
519 | |||
520 | If allowmissing is True, we suppress ENOENT if raised""" |
|
520 | If allowmissing is True, we suppress ENOENT if raised""" | |
521 | # requires file contains a newline-delimited list of |
|
521 | # requires file contains a newline-delimited list of | |
522 | # features/capabilities the opener (us) must have in order to use |
|
522 | # features/capabilities the opener (us) must have in order to use | |
523 | # the repository. This file was introduced in Mercurial 0.9.2, |
|
523 | # the repository. This file was introduced in Mercurial 0.9.2, | |
524 | # which means very old repositories may not have one. We assume |
|
524 | # which means very old repositories may not have one. We assume | |
525 | # a missing file translates to no requirements. |
|
525 | # a missing file translates to no requirements. | |
526 | try: |
|
526 | try: | |
527 | requirements = set(vfs.read(b'requires').splitlines()) |
|
527 | requirements = set(vfs.read(b'requires').splitlines()) | |
528 | except IOError as e: |
|
528 | except IOError as e: | |
529 | if not (allowmissing and e.errno == errno.ENOENT): |
|
529 | if not (allowmissing and e.errno == errno.ENOENT): | |
530 | raise |
|
530 | raise | |
531 | requirements = set() |
|
531 | requirements = set() | |
532 | return requirements |
|
532 | return requirements | |
533 |
|
533 | |||
534 |
|
534 | |||
535 | def makelocalrepository(baseui, path, intents=None): |
|
535 | def makelocalrepository(baseui, path, intents=None): | |
536 | """Create a local repository object. |
|
536 | """Create a local repository object. | |
537 |
|
537 | |||
538 | Given arguments needed to construct a local repository, this function |
|
538 | Given arguments needed to construct a local repository, this function | |
539 | performs various early repository loading functionality (such as |
|
539 | performs various early repository loading functionality (such as | |
540 | reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that |
|
540 | reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that | |
541 | the repository can be opened, derives a type suitable for representing |
|
541 | the repository can be opened, derives a type suitable for representing | |
542 | that repository, and returns an instance of it. |
|
542 | that repository, and returns an instance of it. | |
543 |
|
543 | |||
544 | The returned object conforms to the ``repository.completelocalrepository`` |
|
544 | The returned object conforms to the ``repository.completelocalrepository`` | |
545 | interface. |
|
545 | interface. | |
546 |
|
546 | |||
547 | The repository type is derived by calling a series of factory functions |
|
547 | The repository type is derived by calling a series of factory functions | |
548 | for each aspect/interface of the final repository. These are defined by |
|
548 | for each aspect/interface of the final repository. These are defined by | |
549 | ``REPO_INTERFACES``. |
|
549 | ``REPO_INTERFACES``. | |
550 |
|
550 | |||
551 | Each factory function is called to produce a type implementing a specific |
|
551 | Each factory function is called to produce a type implementing a specific | |
552 | interface. The cumulative list of returned types will be combined into a |
|
552 | interface. The cumulative list of returned types will be combined into a | |
553 | new type and that type will be instantiated to represent the local |
|
553 | new type and that type will be instantiated to represent the local | |
554 | repository. |
|
554 | repository. | |
555 |
|
555 | |||
556 | The factory functions each receive various state that may be consulted |
|
556 | The factory functions each receive various state that may be consulted | |
557 | as part of deriving a type. |
|
557 | as part of deriving a type. | |
558 |
|
558 | |||
559 | Extensions should wrap these factory functions to customize repository type |
|
559 | Extensions should wrap these factory functions to customize repository type | |
560 | creation. Note that an extension's wrapped function may be called even if |
|
560 | creation. Note that an extension's wrapped function may be called even if | |
561 | that extension is not loaded for the repo being constructed. Extensions |
|
561 | that extension is not loaded for the repo being constructed. Extensions | |
562 | should check if their ``__name__`` appears in the |
|
562 | should check if their ``__name__`` appears in the | |
563 | ``extensionmodulenames`` set passed to the factory function and no-op if |
|
563 | ``extensionmodulenames`` set passed to the factory function and no-op if | |
564 | not. |
|
564 | not. | |
565 | """ |
|
565 | """ | |
566 | ui = baseui.copy() |
|
566 | ui = baseui.copy() | |
567 | # Prevent copying repo configuration. |
|
567 | # Prevent copying repo configuration. | |
568 | ui.copy = baseui.copy |
|
568 | ui.copy = baseui.copy | |
569 |
|
569 | |||
570 | # Working directory VFS rooted at repository root. |
|
570 | # Working directory VFS rooted at repository root. | |
571 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
571 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | |
572 |
|
572 | |||
573 | # Main VFS for .hg/ directory. |
|
573 | # Main VFS for .hg/ directory. | |
574 | hgpath = wdirvfs.join(b'.hg') |
|
574 | hgpath = wdirvfs.join(b'.hg') | |
575 | hgvfs = vfsmod.vfs(hgpath, cacheaudited=True) |
|
575 | hgvfs = vfsmod.vfs(hgpath, cacheaudited=True) | |
576 | # Whether this repository is shared one or not |
|
576 | # Whether this repository is shared one or not | |
577 | shared = False |
|
577 | shared = False | |
578 | # If this repository is shared, vfs pointing to shared repo |
|
578 | # If this repository is shared, vfs pointing to shared repo | |
579 | sharedvfs = None |
|
579 | sharedvfs = None | |
580 |
|
580 | |||
581 | # The .hg/ path should exist and should be a directory. All other |
|
581 | # The .hg/ path should exist and should be a directory. All other | |
582 | # cases are errors. |
|
582 | # cases are errors. | |
583 | if not hgvfs.isdir(): |
|
583 | if not hgvfs.isdir(): | |
584 | try: |
|
584 | try: | |
585 | hgvfs.stat() |
|
585 | hgvfs.stat() | |
586 | except OSError as e: |
|
586 | except OSError as e: | |
587 | if e.errno != errno.ENOENT: |
|
587 | if e.errno != errno.ENOENT: | |
588 | raise |
|
588 | raise | |
589 | except ValueError as e: |
|
589 | except ValueError as e: | |
590 | # Can be raised on Python 3.8 when path is invalid. |
|
590 | # Can be raised on Python 3.8 when path is invalid. | |
591 | raise error.Abort( |
|
591 | raise error.Abort( | |
592 | _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e)) |
|
592 | _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e)) | |
593 | ) |
|
593 | ) | |
594 |
|
594 | |||
595 | raise error.RepoError(_(b'repository %s not found') % path) |
|
595 | raise error.RepoError(_(b'repository %s not found') % path) | |
596 |
|
596 | |||
597 | requirements = _readrequires(hgvfs, True) |
|
597 | requirements = _readrequires(hgvfs, True) | |
598 | shared = ( |
|
598 | shared = ( | |
599 | requirementsmod.SHARED_REQUIREMENT in requirements |
|
599 | requirementsmod.SHARED_REQUIREMENT in requirements | |
600 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements |
|
600 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements | |
601 | ) |
|
601 | ) | |
602 | storevfs = None |
|
602 | storevfs = None | |
603 | if shared: |
|
603 | if shared: | |
604 | # This is a shared repo |
|
604 | # This is a shared repo | |
605 | sharedvfs = _getsharedvfs(hgvfs, requirements) |
|
605 | sharedvfs = _getsharedvfs(hgvfs, requirements) | |
606 | storevfs = vfsmod.vfs(sharedvfs.join(b'store')) |
|
606 | storevfs = vfsmod.vfs(sharedvfs.join(b'store')) | |
607 | else: |
|
607 | else: | |
608 | storevfs = vfsmod.vfs(hgvfs.join(b'store')) |
|
608 | storevfs = vfsmod.vfs(hgvfs.join(b'store')) | |
609 |
|
609 | |||
610 | # if .hg/requires contains the sharesafe requirement, it means |
|
610 | # if .hg/requires contains the sharesafe requirement, it means | |
611 | # there exists a `.hg/store/requires` too and we should read it |
|
611 | # there exists a `.hg/store/requires` too and we should read it | |
612 | # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement |
|
612 | # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement | |
613 | # is present. We never write SHARESAFE_REQUIREMENT for a repo if store |
|
613 | # is present. We never write SHARESAFE_REQUIREMENT for a repo if store | |
614 | # is not present, refer checkrequirementscompat() for that |
|
614 | # is not present, refer checkrequirementscompat() for that | |
615 | # |
|
615 | # | |
616 | # However, if SHARESAFE_REQUIREMENT is not present, it means that the |
|
616 | # However, if SHARESAFE_REQUIREMENT is not present, it means that the | |
617 | # repository was shared the old way. We check the share source .hg/requires |
|
617 | # repository was shared the old way. We check the share source .hg/requires | |
618 | # for SHARESAFE_REQUIREMENT to detect whether the current repository needs |
|
618 | # for SHARESAFE_REQUIREMENT to detect whether the current repository needs | |
619 | # to be reshared |
|
619 | # to be reshared | |
620 | hint = _(b"see `hg help config.format.use-share-safe` for more information") |
|
620 | hint = _(b"see `hg help config.format.use-share-safe` for more information") | |
621 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: |
|
621 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: | |
622 |
|
622 | |||
623 | if ( |
|
623 | if ( | |
624 | shared |
|
624 | shared | |
625 | and requirementsmod.SHARESAFE_REQUIREMENT |
|
625 | and requirementsmod.SHARESAFE_REQUIREMENT | |
626 | not in _readrequires(sharedvfs, True) |
|
626 | not in _readrequires(sharedvfs, True) | |
627 | ): |
|
627 | ): | |
628 | mismatch_warn = ui.configbool( |
|
628 | mismatch_warn = ui.configbool( | |
629 | b'share', b'safe-mismatch.source-not-safe.warn' |
|
629 | b'share', b'safe-mismatch.source-not-safe.warn' | |
630 | ) |
|
630 | ) | |
631 | mismatch_config = ui.config( |
|
631 | mismatch_config = ui.config( | |
632 | b'share', b'safe-mismatch.source-not-safe' |
|
632 | b'share', b'safe-mismatch.source-not-safe' | |
633 | ) |
|
633 | ) | |
634 | if mismatch_config in ( |
|
634 | if mismatch_config in ( | |
635 | b'downgrade-allow', |
|
635 | b'downgrade-allow', | |
636 | b'allow', |
|
636 | b'allow', | |
637 | b'downgrade-abort', |
|
637 | b'downgrade-abort', | |
638 | ): |
|
638 | ): | |
639 | # prevent cyclic import localrepo -> upgrade -> localrepo |
|
639 | # prevent cyclic import localrepo -> upgrade -> localrepo | |
640 | from . import upgrade |
|
640 | from . import upgrade | |
641 |
|
641 | |||
642 | upgrade.downgrade_share_to_non_safe( |
|
642 | upgrade.downgrade_share_to_non_safe( | |
643 | ui, |
|
643 | ui, | |
644 | hgvfs, |
|
644 | hgvfs, | |
645 | sharedvfs, |
|
645 | sharedvfs, | |
646 | requirements, |
|
646 | requirements, | |
647 | mismatch_config, |
|
647 | mismatch_config, | |
648 | mismatch_warn, |
|
648 | mismatch_warn, | |
649 | ) |
|
649 | ) | |
650 | elif mismatch_config == b'abort': |
|
650 | elif mismatch_config == b'abort': | |
651 | raise error.Abort( |
|
651 | raise error.Abort( | |
652 | _(b"share source does not support share-safe requirement"), |
|
652 | _(b"share source does not support share-safe requirement"), | |
653 | hint=hint, |
|
653 | hint=hint, | |
654 | ) |
|
654 | ) | |
655 | else: |
|
655 | else: | |
656 | raise error.Abort( |
|
656 | raise error.Abort( | |
657 | _( |
|
657 | _( | |
658 | b"share-safe mismatch with source.\nUnrecognized" |
|
658 | b"share-safe mismatch with source.\nUnrecognized" | |
659 | b" value '%s' of `share.safe-mismatch.source-not-safe`" |
|
659 | b" value '%s' of `share.safe-mismatch.source-not-safe`" | |
660 | b" set." |
|
660 | b" set." | |
661 | ) |
|
661 | ) | |
662 | % mismatch_config, |
|
662 | % mismatch_config, | |
663 | hint=hint, |
|
663 | hint=hint, | |
664 | ) |
|
664 | ) | |
665 | else: |
|
665 | else: | |
666 | requirements |= _readrequires(storevfs, False) |
|
666 | requirements |= _readrequires(storevfs, False) | |
667 | elif shared: |
|
667 | elif shared: | |
668 | sourcerequires = _readrequires(sharedvfs, False) |
|
668 | sourcerequires = _readrequires(sharedvfs, False) | |
669 | if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: |
|
669 | if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: | |
670 | mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe') |
|
670 | mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe') | |
671 | mismatch_warn = ui.configbool( |
|
671 | mismatch_warn = ui.configbool( | |
672 | b'share', b'safe-mismatch.source-safe.warn' |
|
672 | b'share', b'safe-mismatch.source-safe.warn' | |
673 | ) |
|
673 | ) | |
674 | if mismatch_config in ( |
|
674 | if mismatch_config in ( | |
675 | b'upgrade-allow', |
|
675 | b'upgrade-allow', | |
676 | b'allow', |
|
676 | b'allow', | |
677 | b'upgrade-abort', |
|
677 | b'upgrade-abort', | |
678 | ): |
|
678 | ): | |
679 | # prevent cyclic import localrepo -> upgrade -> localrepo |
|
679 | # prevent cyclic import localrepo -> upgrade -> localrepo | |
680 | from . import upgrade |
|
680 | from . import upgrade | |
681 |
|
681 | |||
682 | upgrade.upgrade_share_to_safe( |
|
682 | upgrade.upgrade_share_to_safe( | |
683 | ui, |
|
683 | ui, | |
684 | hgvfs, |
|
684 | hgvfs, | |
685 | storevfs, |
|
685 | storevfs, | |
686 | requirements, |
|
686 | requirements, | |
687 | mismatch_config, |
|
687 | mismatch_config, | |
688 | mismatch_warn, |
|
688 | mismatch_warn, | |
689 | ) |
|
689 | ) | |
690 | elif mismatch_config == b'abort': |
|
690 | elif mismatch_config == b'abort': | |
691 | raise error.Abort( |
|
691 | raise error.Abort( | |
692 | _( |
|
692 | _( | |
693 | b'version mismatch: source uses share-safe' |
|
693 | b'version mismatch: source uses share-safe' | |
694 | b' functionality while the current share does not' |
|
694 | b' functionality while the current share does not' | |
695 | ), |
|
695 | ), | |
696 | hint=hint, |
|
696 | hint=hint, | |
697 | ) |
|
697 | ) | |
698 | else: |
|
698 | else: | |
699 | raise error.Abort( |
|
699 | raise error.Abort( | |
700 | _( |
|
700 | _( | |
701 | b"share-safe mismatch with source.\nUnrecognized" |
|
701 | b"share-safe mismatch with source.\nUnrecognized" | |
702 | b" value '%s' of `share.safe-mismatch.source-safe` set." |
|
702 | b" value '%s' of `share.safe-mismatch.source-safe` set." | |
703 | ) |
|
703 | ) | |
704 | % mismatch_config, |
|
704 | % mismatch_config, | |
705 | hint=hint, |
|
705 | hint=hint, | |
706 | ) |
|
706 | ) | |
707 |
|
707 | |||
708 | # The .hg/hgrc file may load extensions or contain config options |
|
708 | # The .hg/hgrc file may load extensions or contain config options | |
709 | # that influence repository construction. Attempt to load it and |
|
709 | # that influence repository construction. Attempt to load it and | |
710 | # process any new extensions that it may have pulled in. |
|
710 | # process any new extensions that it may have pulled in. | |
711 | if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs): |
|
711 | if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs): | |
712 | afterhgrcload(ui, wdirvfs, hgvfs, requirements) |
|
712 | afterhgrcload(ui, wdirvfs, hgvfs, requirements) | |
713 | extensions.loadall(ui) |
|
713 | extensions.loadall(ui) | |
714 | extensions.populateui(ui) |
|
714 | extensions.populateui(ui) | |
715 |
|
715 | |||
716 | # Set of module names of extensions loaded for this repository. |
|
716 | # Set of module names of extensions loaded for this repository. | |
717 | extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)} |
|
717 | extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)} | |
718 |
|
718 | |||
719 | supportedrequirements = gathersupportedrequirements(ui) |
|
719 | supportedrequirements = gathersupportedrequirements(ui) | |
720 |
|
720 | |||
721 | # We first validate the requirements are known. |
|
721 | # We first validate the requirements are known. | |
722 | ensurerequirementsrecognized(requirements, supportedrequirements) |
|
722 | ensurerequirementsrecognized(requirements, supportedrequirements) | |
723 |
|
723 | |||
724 | # Then we validate that the known set is reasonable to use together. |
|
724 | # Then we validate that the known set is reasonable to use together. | |
725 | ensurerequirementscompatible(ui, requirements) |
|
725 | ensurerequirementscompatible(ui, requirements) | |
726 |
|
726 | |||
727 | # TODO there are unhandled edge cases related to opening repositories with |
|
727 | # TODO there are unhandled edge cases related to opening repositories with | |
728 | # shared storage. If storage is shared, we should also test for requirements |
|
728 | # shared storage. If storage is shared, we should also test for requirements | |
729 | # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in |
|
729 | # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in | |
730 | # that repo, as that repo may load extensions needed to open it. This is a |
|
730 | # that repo, as that repo may load extensions needed to open it. This is a | |
731 | # bit complicated because we don't want the other hgrc to overwrite settings |
|
731 | # bit complicated because we don't want the other hgrc to overwrite settings | |
732 | # in this hgrc. |
|
732 | # in this hgrc. | |
733 | # |
|
733 | # | |
734 | # This bug is somewhat mitigated by the fact that we copy the .hg/requires |
|
734 | # This bug is somewhat mitigated by the fact that we copy the .hg/requires | |
735 | # file when sharing repos. But if a requirement is added after the share is |
|
735 | # file when sharing repos. But if a requirement is added after the share is | |
736 | # performed, thereby introducing a new requirement for the opener, we may |
|
736 | # performed, thereby introducing a new requirement for the opener, we may | |
737 | # will not see that and could encounter a run-time error interacting with |
|
737 | # will not see that and could encounter a run-time error interacting with | |
738 | # that shared store since it has an unknown-to-us requirement. |
|
738 | # that shared store since it has an unknown-to-us requirement. | |
739 |
|
739 | |||
740 | # At this point, we know we should be capable of opening the repository. |
|
740 | # At this point, we know we should be capable of opening the repository. | |
741 | # Now get on with doing that. |
|
741 | # Now get on with doing that. | |
742 |
|
742 | |||
743 | features = set() |
|
743 | features = set() | |
744 |
|
744 | |||
745 | # The "store" part of the repository holds versioned data. How it is |
|
745 | # The "store" part of the repository holds versioned data. How it is | |
746 | # accessed is determined by various requirements. If `shared` or |
|
746 | # accessed is determined by various requirements. If `shared` or | |
747 | # `relshared` requirements are present, this indicates current repository |
|
747 | # `relshared` requirements are present, this indicates current repository | |
748 | # is a share and store exists in path mentioned in `.hg/sharedpath` |
|
748 | # is a share and store exists in path mentioned in `.hg/sharedpath` | |
749 | if shared: |
|
749 | if shared: | |
750 | storebasepath = sharedvfs.base |
|
750 | storebasepath = sharedvfs.base | |
751 | cachepath = sharedvfs.join(b'cache') |
|
751 | cachepath = sharedvfs.join(b'cache') | |
752 | features.add(repository.REPO_FEATURE_SHARED_STORAGE) |
|
752 | features.add(repository.REPO_FEATURE_SHARED_STORAGE) | |
753 | else: |
|
753 | else: | |
754 | storebasepath = hgvfs.base |
|
754 | storebasepath = hgvfs.base | |
755 | cachepath = hgvfs.join(b'cache') |
|
755 | cachepath = hgvfs.join(b'cache') | |
756 | wcachepath = hgvfs.join(b'wcache') |
|
756 | wcachepath = hgvfs.join(b'wcache') | |
757 |
|
757 | |||
758 | # The store has changed over time and the exact layout is dictated by |
|
758 | # The store has changed over time and the exact layout is dictated by | |
759 | # requirements. The store interface abstracts differences across all |
|
759 | # requirements. The store interface abstracts differences across all | |
760 | # of them. |
|
760 | # of them. | |
761 | store = makestore( |
|
761 | store = makestore( | |
762 | requirements, |
|
762 | requirements, | |
763 | storebasepath, |
|
763 | storebasepath, | |
764 | lambda base: vfsmod.vfs(base, cacheaudited=True), |
|
764 | lambda base: vfsmod.vfs(base, cacheaudited=True), | |
765 | ) |
|
765 | ) | |
766 | hgvfs.createmode = store.createmode |
|
766 | hgvfs.createmode = store.createmode | |
767 |
|
767 | |||
768 | storevfs = store.vfs |
|
768 | storevfs = store.vfs | |
769 | storevfs.options = resolvestorevfsoptions(ui, requirements, features) |
|
769 | storevfs.options = resolvestorevfsoptions(ui, requirements, features) | |
770 |
|
770 | |||
771 | if ( |
|
771 | if ( | |
772 | requirementsmod.REVLOGV2_REQUIREMENT in requirements |
|
772 | requirementsmod.REVLOGV2_REQUIREMENT in requirements | |
773 | or requirementsmod.CHANGELOGV2_REQUIREMENT in requirements |
|
773 | or requirementsmod.CHANGELOGV2_REQUIREMENT in requirements | |
774 | ): |
|
774 | ): | |
775 | features.add(repository.REPO_FEATURE_SIDE_DATA) |
|
775 | features.add(repository.REPO_FEATURE_SIDE_DATA) | |
776 | # the revlogv2 docket introduced race condition that we need to fix |
|
776 | # the revlogv2 docket introduced race condition that we need to fix | |
777 | features.discard(repository.REPO_FEATURE_STREAM_CLONE) |
|
777 | features.discard(repository.REPO_FEATURE_STREAM_CLONE) | |
778 |
|
778 | |||
779 | # The cache vfs is used to manage cache files. |
|
779 | # The cache vfs is used to manage cache files. | |
780 | cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) |
|
780 | cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) | |
781 | cachevfs.createmode = store.createmode |
|
781 | cachevfs.createmode = store.createmode | |
782 | # The cache vfs is used to manage cache files related to the working copy |
|
782 | # The cache vfs is used to manage cache files related to the working copy | |
783 | wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) |
|
783 | wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) | |
784 | wcachevfs.createmode = store.createmode |
|
784 | wcachevfs.createmode = store.createmode | |
785 |
|
785 | |||
786 | # Now resolve the type for the repository object. We do this by repeatedly |
|
786 | # Now resolve the type for the repository object. We do this by repeatedly | |
787 | # calling a factory function to produces types for specific aspects of the |
|
787 | # calling a factory function to produces types for specific aspects of the | |
788 | # repo's operation. The aggregate returned types are used as base classes |
|
788 | # repo's operation. The aggregate returned types are used as base classes | |
789 | # for a dynamically-derived type, which will represent our new repository. |
|
789 | # for a dynamically-derived type, which will represent our new repository. | |
790 |
|
790 | |||
791 | bases = [] |
|
791 | bases = [] | |
792 | extrastate = {} |
|
792 | extrastate = {} | |
793 |
|
793 | |||
794 | for iface, fn in REPO_INTERFACES: |
|
794 | for iface, fn in REPO_INTERFACES: | |
795 | # We pass all potentially useful state to give extensions tons of |
|
795 | # We pass all potentially useful state to give extensions tons of | |
796 | # flexibility. |
|
796 | # flexibility. | |
797 | typ = fn()( |
|
797 | typ = fn()( | |
798 | ui=ui, |
|
798 | ui=ui, | |
799 | intents=intents, |
|
799 | intents=intents, | |
800 | requirements=requirements, |
|
800 | requirements=requirements, | |
801 | features=features, |
|
801 | features=features, | |
802 | wdirvfs=wdirvfs, |
|
802 | wdirvfs=wdirvfs, | |
803 | hgvfs=hgvfs, |
|
803 | hgvfs=hgvfs, | |
804 | store=store, |
|
804 | store=store, | |
805 | storevfs=storevfs, |
|
805 | storevfs=storevfs, | |
806 | storeoptions=storevfs.options, |
|
806 | storeoptions=storevfs.options, | |
807 | cachevfs=cachevfs, |
|
807 | cachevfs=cachevfs, | |
808 | wcachevfs=wcachevfs, |
|
808 | wcachevfs=wcachevfs, | |
809 | extensionmodulenames=extensionmodulenames, |
|
809 | extensionmodulenames=extensionmodulenames, | |
810 | extrastate=extrastate, |
|
810 | extrastate=extrastate, | |
811 | baseclasses=bases, |
|
811 | baseclasses=bases, | |
812 | ) |
|
812 | ) | |
813 |
|
813 | |||
814 | if not isinstance(typ, type): |
|
814 | if not isinstance(typ, type): | |
815 | raise error.ProgrammingError( |
|
815 | raise error.ProgrammingError( | |
816 | b'unable to construct type for %s' % iface |
|
816 | b'unable to construct type for %s' % iface | |
817 | ) |
|
817 | ) | |
818 |
|
818 | |||
819 | bases.append(typ) |
|
819 | bases.append(typ) | |
820 |
|
820 | |||
821 | # type() allows you to use characters in type names that wouldn't be |
|
821 | # type() allows you to use characters in type names that wouldn't be | |
822 | # recognized as Python symbols in source code. We abuse that to add |
|
822 | # recognized as Python symbols in source code. We abuse that to add | |
823 | # rich information about our constructed repo. |
|
823 | # rich information about our constructed repo. | |
824 | name = pycompat.sysstr( |
|
824 | name = pycompat.sysstr( | |
825 | b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements))) |
|
825 | b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements))) | |
826 | ) |
|
826 | ) | |
827 |
|
827 | |||
828 | cls = type(name, tuple(bases), {}) |
|
828 | cls = type(name, tuple(bases), {}) | |
829 |
|
829 | |||
830 | return cls( |
|
830 | return cls( | |
831 | baseui=baseui, |
|
831 | baseui=baseui, | |
832 | ui=ui, |
|
832 | ui=ui, | |
833 | origroot=path, |
|
833 | origroot=path, | |
834 | wdirvfs=wdirvfs, |
|
834 | wdirvfs=wdirvfs, | |
835 | hgvfs=hgvfs, |
|
835 | hgvfs=hgvfs, | |
836 | requirements=requirements, |
|
836 | requirements=requirements, | |
837 | supportedrequirements=supportedrequirements, |
|
837 | supportedrequirements=supportedrequirements, | |
838 | sharedpath=storebasepath, |
|
838 | sharedpath=storebasepath, | |
839 | store=store, |
|
839 | store=store, | |
840 | cachevfs=cachevfs, |
|
840 | cachevfs=cachevfs, | |
841 | wcachevfs=wcachevfs, |
|
841 | wcachevfs=wcachevfs, | |
842 | features=features, |
|
842 | features=features, | |
843 | intents=intents, |
|
843 | intents=intents, | |
844 | ) |
|
844 | ) | |
845 |
|
845 | |||
846 |
|
846 | |||
847 | def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None): |
|
847 | def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None): | |
848 | """Load hgrc files/content into a ui instance. |
|
848 | """Load hgrc files/content into a ui instance. | |
849 |
|
849 | |||
850 | This is called during repository opening to load any additional |
|
850 | This is called during repository opening to load any additional | |
851 | config files or settings relevant to the current repository. |
|
851 | config files or settings relevant to the current repository. | |
852 |
|
852 | |||
853 | Returns a bool indicating whether any additional configs were loaded. |
|
853 | Returns a bool indicating whether any additional configs were loaded. | |
854 |
|
854 | |||
855 | Extensions should monkeypatch this function to modify how per-repo |
|
855 | Extensions should monkeypatch this function to modify how per-repo | |
856 | configs are loaded. For example, an extension may wish to pull in |
|
856 | configs are loaded. For example, an extension may wish to pull in | |
857 | configs from alternate files or sources. |
|
857 | configs from alternate files or sources. | |
858 |
|
858 | |||
859 | sharedvfs is vfs object pointing to source repo if the current one is a |
|
859 | sharedvfs is vfs object pointing to source repo if the current one is a | |
860 | shared one |
|
860 | shared one | |
861 | """ |
|
861 | """ | |
862 | if not rcutil.use_repo_hgrc(): |
|
862 | if not rcutil.use_repo_hgrc(): | |
863 | return False |
|
863 | return False | |
864 |
|
864 | |||
865 | ret = False |
|
865 | ret = False | |
866 | # first load config from shared source if we has to |
|
866 | # first load config from shared source if we has to | |
867 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs: |
|
867 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs: | |
868 | try: |
|
868 | try: | |
869 | ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base) |
|
869 | ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base) | |
870 | ret = True |
|
870 | ret = True | |
871 | except IOError: |
|
871 | except IOError: | |
872 | pass |
|
872 | pass | |
873 |
|
873 | |||
874 | try: |
|
874 | try: | |
875 | ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) |
|
875 | ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) | |
876 | ret = True |
|
876 | ret = True | |
877 | except IOError: |
|
877 | except IOError: | |
878 | pass |
|
878 | pass | |
879 |
|
879 | |||
880 | try: |
|
880 | try: | |
881 | ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base) |
|
881 | ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base) | |
882 | ret = True |
|
882 | ret = True | |
883 | except IOError: |
|
883 | except IOError: | |
884 | pass |
|
884 | pass | |
885 |
|
885 | |||
886 | return ret |
|
886 | return ret | |
887 |
|
887 | |||
888 |
|
888 | |||
889 | def afterhgrcload(ui, wdirvfs, hgvfs, requirements): |
|
889 | def afterhgrcload(ui, wdirvfs, hgvfs, requirements): | |
890 | """Perform additional actions after .hg/hgrc is loaded. |
|
890 | """Perform additional actions after .hg/hgrc is loaded. | |
891 |
|
891 | |||
892 | This function is called during repository loading immediately after |
|
892 | This function is called during repository loading immediately after | |
893 | the .hg/hgrc file is loaded and before per-repo extensions are loaded. |
|
893 | the .hg/hgrc file is loaded and before per-repo extensions are loaded. | |
894 |
|
894 | |||
895 | The function can be used to validate configs, automatically add |
|
895 | The function can be used to validate configs, automatically add | |
896 | options (including extensions) based on requirements, etc. |
|
896 | options (including extensions) based on requirements, etc. | |
897 | """ |
|
897 | """ | |
898 |
|
898 | |||
899 | # Map of requirements to list of extensions to load automatically when |
|
899 | # Map of requirements to list of extensions to load automatically when | |
900 | # requirement is present. |
|
900 | # requirement is present. | |
901 | autoextensions = { |
|
901 | autoextensions = { | |
902 | b'git': [b'git'], |
|
902 | b'git': [b'git'], | |
903 | b'largefiles': [b'largefiles'], |
|
903 | b'largefiles': [b'largefiles'], | |
904 | b'lfs': [b'lfs'], |
|
904 | b'lfs': [b'lfs'], | |
905 | } |
|
905 | } | |
906 |
|
906 | |||
907 | for requirement, names in sorted(autoextensions.items()): |
|
907 | for requirement, names in sorted(autoextensions.items()): | |
908 | if requirement not in requirements: |
|
908 | if requirement not in requirements: | |
909 | continue |
|
909 | continue | |
910 |
|
910 | |||
911 | for name in names: |
|
911 | for name in names: | |
912 | if not ui.hasconfig(b'extensions', name): |
|
912 | if not ui.hasconfig(b'extensions', name): | |
913 | ui.setconfig(b'extensions', name, b'', source=b'autoload') |
|
913 | ui.setconfig(b'extensions', name, b'', source=b'autoload') | |
914 |
|
914 | |||
915 |
|
915 | |||
916 | def gathersupportedrequirements(ui): |
|
916 | def gathersupportedrequirements(ui): | |
917 | """Determine the complete set of recognized requirements.""" |
|
917 | """Determine the complete set of recognized requirements.""" | |
918 | # Start with all requirements supported by this file. |
|
918 | # Start with all requirements supported by this file. | |
919 | supported = set(localrepository._basesupported) |
|
919 | supported = set(localrepository._basesupported) | |
920 |
|
920 | |||
921 | # Execute ``featuresetupfuncs`` entries if they belong to an extension |
|
921 | # Execute ``featuresetupfuncs`` entries if they belong to an extension | |
922 | # relevant to this ui instance. |
|
922 | # relevant to this ui instance. | |
923 | modules = {m.__name__ for n, m in extensions.extensions(ui)} |
|
923 | modules = {m.__name__ for n, m in extensions.extensions(ui)} | |
924 |
|
924 | |||
925 | for fn in featuresetupfuncs: |
|
925 | for fn in featuresetupfuncs: | |
926 | if fn.__module__ in modules: |
|
926 | if fn.__module__ in modules: | |
927 | fn(ui, supported) |
|
927 | fn(ui, supported) | |
928 |
|
928 | |||
929 | # Add derived requirements from registered compression engines. |
|
929 | # Add derived requirements from registered compression engines. | |
930 | for name in util.compengines: |
|
930 | for name in util.compengines: | |
931 | engine = util.compengines[name] |
|
931 | engine = util.compengines[name] | |
932 | if engine.available() and engine.revlogheader(): |
|
932 | if engine.available() and engine.revlogheader(): | |
933 | supported.add(b'exp-compression-%s' % name) |
|
933 | supported.add(b'exp-compression-%s' % name) | |
934 | if engine.name() == b'zstd': |
|
934 | if engine.name() == b'zstd': | |
935 | supported.add(b'revlog-compression-zstd') |
|
935 | supported.add(b'revlog-compression-zstd') | |
936 |
|
936 | |||
937 | return supported |
|
937 | return supported | |
938 |
|
938 | |||
939 |
|
939 | |||
940 | def ensurerequirementsrecognized(requirements, supported): |
|
940 | def ensurerequirementsrecognized(requirements, supported): | |
941 | """Validate that a set of local requirements is recognized. |
|
941 | """Validate that a set of local requirements is recognized. | |
942 |
|
942 | |||
943 | Receives a set of requirements. Raises an ``error.RepoError`` if there |
|
943 | Receives a set of requirements. Raises an ``error.RepoError`` if there | |
944 | exists any requirement in that set that currently loaded code doesn't |
|
944 | exists any requirement in that set that currently loaded code doesn't | |
945 | recognize. |
|
945 | recognize. | |
946 |
|
946 | |||
947 | Returns a set of supported requirements. |
|
947 | Returns a set of supported requirements. | |
948 | """ |
|
948 | """ | |
949 | missing = set() |
|
949 | missing = set() | |
950 |
|
950 | |||
951 | for requirement in requirements: |
|
951 | for requirement in requirements: | |
952 | if requirement in supported: |
|
952 | if requirement in supported: | |
953 | continue |
|
953 | continue | |
954 |
|
954 | |||
955 | if not requirement or not requirement[0:1].isalnum(): |
|
955 | if not requirement or not requirement[0:1].isalnum(): | |
956 | raise error.RequirementError(_(b'.hg/requires file is corrupt')) |
|
956 | raise error.RequirementError(_(b'.hg/requires file is corrupt')) | |
957 |
|
957 | |||
958 | missing.add(requirement) |
|
958 | missing.add(requirement) | |
959 |
|
959 | |||
960 | if missing: |
|
960 | if missing: | |
961 | raise error.RequirementError( |
|
961 | raise error.RequirementError( | |
962 | _(b'repository requires features unknown to this Mercurial: %s') |
|
962 | _(b'repository requires features unknown to this Mercurial: %s') | |
963 | % b' '.join(sorted(missing)), |
|
963 | % b' '.join(sorted(missing)), | |
964 | hint=_( |
|
964 | hint=_( | |
965 | b'see https://mercurial-scm.org/wiki/MissingRequirement ' |
|
965 | b'see https://mercurial-scm.org/wiki/MissingRequirement ' | |
966 | b'for more information' |
|
966 | b'for more information' | |
967 | ), |
|
967 | ), | |
968 | ) |
|
968 | ) | |
969 |
|
969 | |||
970 |
|
970 | |||
971 | def ensurerequirementscompatible(ui, requirements): |
|
971 | def ensurerequirementscompatible(ui, requirements): | |
972 | """Validates that a set of recognized requirements is mutually compatible. |
|
972 | """Validates that a set of recognized requirements is mutually compatible. | |
973 |
|
973 | |||
974 | Some requirements may not be compatible with others or require |
|
974 | Some requirements may not be compatible with others or require | |
975 | config options that aren't enabled. This function is called during |
|
975 | config options that aren't enabled. This function is called during | |
976 | repository opening to ensure that the set of requirements needed |
|
976 | repository opening to ensure that the set of requirements needed | |
977 | to open a repository is sane and compatible with config options. |
|
977 | to open a repository is sane and compatible with config options. | |
978 |
|
978 | |||
979 | Extensions can monkeypatch this function to perform additional |
|
979 | Extensions can monkeypatch this function to perform additional | |
980 | checking. |
|
980 | checking. | |
981 |
|
981 | |||
982 | ``error.RepoError`` should be raised on failure. |
|
982 | ``error.RepoError`` should be raised on failure. | |
983 | """ |
|
983 | """ | |
984 | if ( |
|
984 | if ( | |
985 | requirementsmod.SPARSE_REQUIREMENT in requirements |
|
985 | requirementsmod.SPARSE_REQUIREMENT in requirements | |
986 | and not sparse.enabled |
|
986 | and not sparse.enabled | |
987 | ): |
|
987 | ): | |
988 | raise error.RepoError( |
|
988 | raise error.RepoError( | |
989 | _( |
|
989 | _( | |
990 | b'repository is using sparse feature but ' |
|
990 | b'repository is using sparse feature but ' | |
991 | b'sparse is not enabled; enable the ' |
|
991 | b'sparse is not enabled; enable the ' | |
992 | b'"sparse" extensions to access' |
|
992 | b'"sparse" extensions to access' | |
993 | ) |
|
993 | ) | |
994 | ) |
|
994 | ) | |
995 |
|
995 | |||
996 |
|
996 | |||
997 | def makestore(requirements, path, vfstype): |
|
997 | def makestore(requirements, path, vfstype): | |
998 | """Construct a storage object for a repository.""" |
|
998 | """Construct a storage object for a repository.""" | |
999 | if requirementsmod.STORE_REQUIREMENT in requirements: |
|
999 | if requirementsmod.STORE_REQUIREMENT in requirements: | |
1000 | if requirementsmod.FNCACHE_REQUIREMENT in requirements: |
|
1000 | if requirementsmod.FNCACHE_REQUIREMENT in requirements: | |
1001 | dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements |
|
1001 | dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements | |
1002 | return storemod.fncachestore(path, vfstype, dotencode) |
|
1002 | return storemod.fncachestore(path, vfstype, dotencode) | |
1003 |
|
1003 | |||
1004 | return storemod.encodedstore(path, vfstype) |
|
1004 | return storemod.encodedstore(path, vfstype) | |
1005 |
|
1005 | |||
1006 | return storemod.basicstore(path, vfstype) |
|
1006 | return storemod.basicstore(path, vfstype) | |
1007 |
|
1007 | |||
1008 |
|
1008 | |||
1009 | def resolvestorevfsoptions(ui, requirements, features): |
|
1009 | def resolvestorevfsoptions(ui, requirements, features): | |
1010 | """Resolve the options to pass to the store vfs opener. |
|
1010 | """Resolve the options to pass to the store vfs opener. | |
1011 |
|
1011 | |||
1012 | The returned dict is used to influence behavior of the storage layer. |
|
1012 | The returned dict is used to influence behavior of the storage layer. | |
1013 | """ |
|
1013 | """ | |
1014 | options = {} |
|
1014 | options = {} | |
1015 |
|
1015 | |||
1016 | if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements: |
|
1016 | if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements: | |
1017 | options[b'treemanifest'] = True |
|
1017 | options[b'treemanifest'] = True | |
1018 |
|
1018 | |||
1019 | # experimental config: format.manifestcachesize |
|
1019 | # experimental config: format.manifestcachesize | |
1020 | manifestcachesize = ui.configint(b'format', b'manifestcachesize') |
|
1020 | manifestcachesize = ui.configint(b'format', b'manifestcachesize') | |
1021 | if manifestcachesize is not None: |
|
1021 | if manifestcachesize is not None: | |
1022 | options[b'manifestcachesize'] = manifestcachesize |
|
1022 | options[b'manifestcachesize'] = manifestcachesize | |
1023 |
|
1023 | |||
1024 | # In the absence of another requirement superseding a revlog-related |
|
1024 | # In the absence of another requirement superseding a revlog-related | |
1025 | # requirement, we have to assume the repo is using revlog version 0. |
|
1025 | # requirement, we have to assume the repo is using revlog version 0. | |
1026 | # This revlog format is super old and we don't bother trying to parse |
|
1026 | # This revlog format is super old and we don't bother trying to parse | |
1027 | # opener options for it because those options wouldn't do anything |
|
1027 | # opener options for it because those options wouldn't do anything | |
1028 | # meaningful on such old repos. |
|
1028 | # meaningful on such old repos. | |
1029 | if ( |
|
1029 | if ( | |
1030 | requirementsmod.REVLOGV1_REQUIREMENT in requirements |
|
1030 | requirementsmod.REVLOGV1_REQUIREMENT in requirements | |
1031 | or requirementsmod.REVLOGV2_REQUIREMENT in requirements |
|
1031 | or requirementsmod.REVLOGV2_REQUIREMENT in requirements | |
1032 | ): |
|
1032 | ): | |
1033 | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) |
|
1033 | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) | |
1034 | else: # explicitly mark repo as using revlogv0 |
|
1034 | else: # explicitly mark repo as using revlogv0 | |
1035 | options[b'revlogv0'] = True |
|
1035 | options[b'revlogv0'] = True | |
1036 |
|
1036 | |||
1037 | if requirementsmod.COPIESSDC_REQUIREMENT in requirements: |
|
1037 | if requirementsmod.COPIESSDC_REQUIREMENT in requirements: | |
1038 | options[b'copies-storage'] = b'changeset-sidedata' |
|
1038 | options[b'copies-storage'] = b'changeset-sidedata' | |
1039 | else: |
|
1039 | else: | |
1040 | writecopiesto = ui.config(b'experimental', b'copies.write-to') |
|
1040 | writecopiesto = ui.config(b'experimental', b'copies.write-to') | |
1041 | copiesextramode = (b'changeset-only', b'compatibility') |
|
1041 | copiesextramode = (b'changeset-only', b'compatibility') | |
1042 | if writecopiesto in copiesextramode: |
|
1042 | if writecopiesto in copiesextramode: | |
1043 | options[b'copies-storage'] = b'extra' |
|
1043 | options[b'copies-storage'] = b'extra' | |
1044 |
|
1044 | |||
1045 | return options |
|
1045 | return options | |
1046 |
|
1046 | |||
1047 |
|
1047 | |||
1048 | def resolverevlogstorevfsoptions(ui, requirements, features): |
|
1048 | def resolverevlogstorevfsoptions(ui, requirements, features): | |
1049 | """Resolve opener options specific to revlogs.""" |
|
1049 | """Resolve opener options specific to revlogs.""" | |
1050 |
|
1050 | |||
1051 | options = {} |
|
1051 | options = {} | |
1052 | options[b'flagprocessors'] = {} |
|
1052 | options[b'flagprocessors'] = {} | |
1053 |
|
1053 | |||
1054 | if requirementsmod.REVLOGV1_REQUIREMENT in requirements: |
|
1054 | if requirementsmod.REVLOGV1_REQUIREMENT in requirements: | |
1055 | options[b'revlogv1'] = True |
|
1055 | options[b'revlogv1'] = True | |
1056 | if requirementsmod.REVLOGV2_REQUIREMENT in requirements: |
|
1056 | if requirementsmod.REVLOGV2_REQUIREMENT in requirements: | |
1057 | options[b'revlogv2'] = True |
|
1057 | options[b'revlogv2'] = True | |
1058 | if requirementsmod.CHANGELOGV2_REQUIREMENT in requirements: |
|
1058 | if requirementsmod.CHANGELOGV2_REQUIREMENT in requirements: | |
1059 | options[b'changelogv2'] = True |
|
1059 | options[b'changelogv2'] = True | |
1060 |
|
1060 | |||
1061 | if requirementsmod.GENERALDELTA_REQUIREMENT in requirements: |
|
1061 | if requirementsmod.GENERALDELTA_REQUIREMENT in requirements: | |
1062 | options[b'generaldelta'] = True |
|
1062 | options[b'generaldelta'] = True | |
1063 |
|
1063 | |||
1064 | # experimental config: format.chunkcachesize |
|
1064 | # experimental config: format.chunkcachesize | |
1065 | chunkcachesize = ui.configint(b'format', b'chunkcachesize') |
|
1065 | chunkcachesize = ui.configint(b'format', b'chunkcachesize') | |
1066 | if chunkcachesize is not None: |
|
1066 | if chunkcachesize is not None: | |
1067 | options[b'chunkcachesize'] = chunkcachesize |
|
1067 | options[b'chunkcachesize'] = chunkcachesize | |
1068 |
|
1068 | |||
1069 | deltabothparents = ui.configbool( |
|
1069 | deltabothparents = ui.configbool( | |
1070 | b'storage', b'revlog.optimize-delta-parent-choice' |
|
1070 | b'storage', b'revlog.optimize-delta-parent-choice' | |
1071 | ) |
|
1071 | ) | |
1072 | options[b'deltabothparents'] = deltabothparents |
|
1072 | options[b'deltabothparents'] = deltabothparents | |
1073 |
|
1073 | |||
1074 | issue6528 = ui.configbool(b'storage', b'revlog.issue6528.fix-incoming') |
|
1074 | issue6528 = ui.configbool(b'storage', b'revlog.issue6528.fix-incoming') | |
1075 | options[b'issue6528.fix-incoming'] = issue6528 |
|
1075 | options[b'issue6528.fix-incoming'] = issue6528 | |
1076 |
|
1076 | |||
1077 | lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta') |
|
1077 | lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta') | |
1078 | lazydeltabase = False |
|
1078 | lazydeltabase = False | |
1079 | if lazydelta: |
|
1079 | if lazydelta: | |
1080 | lazydeltabase = ui.configbool( |
|
1080 | lazydeltabase = ui.configbool( | |
1081 | b'storage', b'revlog.reuse-external-delta-parent' |
|
1081 | b'storage', b'revlog.reuse-external-delta-parent' | |
1082 | ) |
|
1082 | ) | |
1083 | if lazydeltabase is None: |
|
1083 | if lazydeltabase is None: | |
1084 | lazydeltabase = not scmutil.gddeltaconfig(ui) |
|
1084 | lazydeltabase = not scmutil.gddeltaconfig(ui) | |
1085 | options[b'lazydelta'] = lazydelta |
|
1085 | options[b'lazydelta'] = lazydelta | |
1086 | options[b'lazydeltabase'] = lazydeltabase |
|
1086 | options[b'lazydeltabase'] = lazydeltabase | |
1087 |
|
1087 | |||
1088 | chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan') |
|
1088 | chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan') | |
1089 | if 0 <= chainspan: |
|
1089 | if 0 <= chainspan: | |
1090 | options[b'maxdeltachainspan'] = chainspan |
|
1090 | options[b'maxdeltachainspan'] = chainspan | |
1091 |
|
1091 | |||
1092 | mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold') |
|
1092 | mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold') | |
1093 | if mmapindexthreshold is not None: |
|
1093 | if mmapindexthreshold is not None: | |
1094 | options[b'mmapindexthreshold'] = mmapindexthreshold |
|
1094 | options[b'mmapindexthreshold'] = mmapindexthreshold | |
1095 |
|
1095 | |||
1096 | withsparseread = ui.configbool(b'experimental', b'sparse-read') |
|
1096 | withsparseread = ui.configbool(b'experimental', b'sparse-read') | |
1097 | srdensitythres = float( |
|
1097 | srdensitythres = float( | |
1098 | ui.config(b'experimental', b'sparse-read.density-threshold') |
|
1098 | ui.config(b'experimental', b'sparse-read.density-threshold') | |
1099 | ) |
|
1099 | ) | |
1100 | srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') |
|
1100 | srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') | |
1101 | options[b'with-sparse-read'] = withsparseread |
|
1101 | options[b'with-sparse-read'] = withsparseread | |
1102 | options[b'sparse-read-density-threshold'] = srdensitythres |
|
1102 | options[b'sparse-read-density-threshold'] = srdensitythres | |
1103 | options[b'sparse-read-min-gap-size'] = srmingapsize |
|
1103 | options[b'sparse-read-min-gap-size'] = srmingapsize | |
1104 |
|
1104 | |||
1105 | sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements |
|
1105 | sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements | |
1106 | options[b'sparse-revlog'] = sparserevlog |
|
1106 | options[b'sparse-revlog'] = sparserevlog | |
1107 | if sparserevlog: |
|
1107 | if sparserevlog: | |
1108 | options[b'generaldelta'] = True |
|
1108 | options[b'generaldelta'] = True | |
1109 |
|
1109 | |||
1110 | maxchainlen = None |
|
1110 | maxchainlen = None | |
1111 | if sparserevlog: |
|
1111 | if sparserevlog: | |
1112 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH |
|
1112 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH | |
1113 | # experimental config: format.maxchainlen |
|
1113 | # experimental config: format.maxchainlen | |
1114 | maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) |
|
1114 | maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) | |
1115 | if maxchainlen is not None: |
|
1115 | if maxchainlen is not None: | |
1116 | options[b'maxchainlen'] = maxchainlen |
|
1116 | options[b'maxchainlen'] = maxchainlen | |
1117 |
|
1117 | |||
1118 | for r in requirements: |
|
1118 | for r in requirements: | |
1119 | # we allow multiple compression engine requirement to co-exist because |
|
1119 | # we allow multiple compression engine requirement to co-exist because | |
1120 | # strickly speaking, revlog seems to support mixed compression style. |
|
1120 | # strickly speaking, revlog seems to support mixed compression style. | |
1121 | # |
|
1121 | # | |
1122 | # The compression used for new entries will be "the last one" |
|
1122 | # The compression used for new entries will be "the last one" | |
1123 | prefix = r.startswith |
|
1123 | prefix = r.startswith | |
1124 | if prefix(b'revlog-compression-') or prefix(b'exp-compression-'): |
|
1124 | if prefix(b'revlog-compression-') or prefix(b'exp-compression-'): | |
1125 | options[b'compengine'] = r.split(b'-', 2)[2] |
|
1125 | options[b'compengine'] = r.split(b'-', 2)[2] | |
1126 |
|
1126 | |||
1127 | options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level') |
|
1127 | options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level') | |
1128 | if options[b'zlib.level'] is not None: |
|
1128 | if options[b'zlib.level'] is not None: | |
1129 | if not (0 <= options[b'zlib.level'] <= 9): |
|
1129 | if not (0 <= options[b'zlib.level'] <= 9): | |
1130 | msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d') |
|
1130 | msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d') | |
1131 | raise error.Abort(msg % options[b'zlib.level']) |
|
1131 | raise error.Abort(msg % options[b'zlib.level']) | |
1132 | options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level') |
|
1132 | options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level') | |
1133 | if options[b'zstd.level'] is not None: |
|
1133 | if options[b'zstd.level'] is not None: | |
1134 | if not (0 <= options[b'zstd.level'] <= 22): |
|
1134 | if not (0 <= options[b'zstd.level'] <= 22): | |
1135 | msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') |
|
1135 | msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') | |
1136 | raise error.Abort(msg % options[b'zstd.level']) |
|
1136 | raise error.Abort(msg % options[b'zstd.level']) | |
1137 |
|
1137 | |||
1138 | if requirementsmod.NARROW_REQUIREMENT in requirements: |
|
1138 | if requirementsmod.NARROW_REQUIREMENT in requirements: | |
1139 | options[b'enableellipsis'] = True |
|
1139 | options[b'enableellipsis'] = True | |
1140 |
|
1140 | |||
1141 | if ui.configbool(b'experimental', b'rust.index'): |
|
1141 | if ui.configbool(b'experimental', b'rust.index'): | |
1142 | options[b'rust.index'] = True |
|
1142 | options[b'rust.index'] = True | |
1143 | if requirementsmod.NODEMAP_REQUIREMENT in requirements: |
|
1143 | if requirementsmod.NODEMAP_REQUIREMENT in requirements: | |
1144 | slow_path = ui.config( |
|
1144 | slow_path = ui.config( | |
1145 | b'storage', b'revlog.persistent-nodemap.slow-path' |
|
1145 | b'storage', b'revlog.persistent-nodemap.slow-path' | |
1146 | ) |
|
1146 | ) | |
1147 | if slow_path not in (b'allow', b'warn', b'abort'): |
|
1147 | if slow_path not in (b'allow', b'warn', b'abort'): | |
1148 | default = ui.config_default( |
|
1148 | default = ui.config_default( | |
1149 | b'storage', b'revlog.persistent-nodemap.slow-path' |
|
1149 | b'storage', b'revlog.persistent-nodemap.slow-path' | |
1150 | ) |
|
1150 | ) | |
1151 | msg = _( |
|
1151 | msg = _( | |
1152 | b'unknown value for config ' |
|
1152 | b'unknown value for config ' | |
1153 | b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n' |
|
1153 | b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n' | |
1154 | ) |
|
1154 | ) | |
1155 | ui.warn(msg % slow_path) |
|
1155 | ui.warn(msg % slow_path) | |
1156 | if not ui.quiet: |
|
1156 | if not ui.quiet: | |
1157 | ui.warn(_(b'falling back to default value: %s\n') % default) |
|
1157 | ui.warn(_(b'falling back to default value: %s\n') % default) | |
1158 | slow_path = default |
|
1158 | slow_path = default | |
1159 |
|
1159 | |||
1160 | msg = _( |
|
1160 | msg = _( | |
1161 | b"accessing `persistent-nodemap` repository without associated " |
|
1161 | b"accessing `persistent-nodemap` repository without associated " | |
1162 | b"fast implementation." |
|
1162 | b"fast implementation." | |
1163 | ) |
|
1163 | ) | |
1164 | hint = _( |
|
1164 | hint = _( | |
1165 | b"check `hg help config.format.use-persistent-nodemap` " |
|
1165 | b"check `hg help config.format.use-persistent-nodemap` " | |
1166 | b"for details" |
|
1166 | b"for details" | |
1167 | ) |
|
1167 | ) | |
1168 | if not revlog.HAS_FAST_PERSISTENT_NODEMAP: |
|
1168 | if not revlog.HAS_FAST_PERSISTENT_NODEMAP: | |
1169 | if slow_path == b'warn': |
|
1169 | if slow_path == b'warn': | |
1170 | msg = b"warning: " + msg + b'\n' |
|
1170 | msg = b"warning: " + msg + b'\n' | |
1171 | ui.warn(msg) |
|
1171 | ui.warn(msg) | |
1172 | if not ui.quiet: |
|
1172 | if not ui.quiet: | |
1173 | hint = b'(' + hint + b')\n' |
|
1173 | hint = b'(' + hint + b')\n' | |
1174 | ui.warn(hint) |
|
1174 | ui.warn(hint) | |
1175 | if slow_path == b'abort': |
|
1175 | if slow_path == b'abort': | |
1176 | raise error.Abort(msg, hint=hint) |
|
1176 | raise error.Abort(msg, hint=hint) | |
1177 | options[b'persistent-nodemap'] = True |
|
1177 | options[b'persistent-nodemap'] = True | |
1178 | if requirementsmod.DIRSTATE_V2_REQUIREMENT in requirements: |
|
1178 | if requirementsmod.DIRSTATE_V2_REQUIREMENT in requirements: | |
1179 | slow_path = ui.config(b'storage', b'dirstate-v2.slow-path') |
|
1179 | slow_path = ui.config(b'storage', b'dirstate-v2.slow-path') | |
1180 | if slow_path not in (b'allow', b'warn', b'abort'): |
|
1180 | if slow_path not in (b'allow', b'warn', b'abort'): | |
1181 | default = ui.config_default(b'storage', b'dirstate-v2.slow-path') |
|
1181 | default = ui.config_default(b'storage', b'dirstate-v2.slow-path') | |
1182 | msg = _(b'unknown value for config "dirstate-v2.slow-path": "%s"\n') |
|
1182 | msg = _(b'unknown value for config "dirstate-v2.slow-path": "%s"\n') | |
1183 | ui.warn(msg % slow_path) |
|
1183 | ui.warn(msg % slow_path) | |
1184 | if not ui.quiet: |
|
1184 | if not ui.quiet: | |
1185 | ui.warn(_(b'falling back to default value: %s\n') % default) |
|
1185 | ui.warn(_(b'falling back to default value: %s\n') % default) | |
1186 | slow_path = default |
|
1186 | slow_path = default | |
1187 |
|
1187 | |||
1188 | msg = _( |
|
1188 | msg = _( | |
1189 | b"accessing `dirstate-v2` repository without associated " |
|
1189 | b"accessing `dirstate-v2` repository without associated " | |
1190 | b"fast implementation." |
|
1190 | b"fast implementation." | |
1191 | ) |
|
1191 | ) | |
1192 | hint = _( |
|
1192 | hint = _( | |
1193 | b"check `hg help config.format.exp-rc-dirstate-v2` " b"for details" |
|
1193 | b"check `hg help config.format.exp-rc-dirstate-v2` " b"for details" | |
1194 | ) |
|
1194 | ) | |
1195 | if not dirstate.HAS_FAST_DIRSTATE_V2: |
|
1195 | if not dirstate.HAS_FAST_DIRSTATE_V2: | |
1196 | if slow_path == b'warn': |
|
1196 | if slow_path == b'warn': | |
1197 | msg = b"warning: " + msg + b'\n' |
|
1197 | msg = b"warning: " + msg + b'\n' | |
1198 | ui.warn(msg) |
|
1198 | ui.warn(msg) | |
1199 | if not ui.quiet: |
|
1199 | if not ui.quiet: | |
1200 | hint = b'(' + hint + b')\n' |
|
1200 | hint = b'(' + hint + b')\n' | |
1201 | ui.warn(hint) |
|
1201 | ui.warn(hint) | |
1202 | if slow_path == b'abort': |
|
1202 | if slow_path == b'abort': | |
1203 | raise error.Abort(msg, hint=hint) |
|
1203 | raise error.Abort(msg, hint=hint) | |
1204 | if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): |
|
1204 | if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): | |
1205 | options[b'persistent-nodemap.mmap'] = True |
|
1205 | options[b'persistent-nodemap.mmap'] = True | |
1206 | if ui.configbool(b'devel', b'persistent-nodemap'): |
|
1206 | if ui.configbool(b'devel', b'persistent-nodemap'): | |
1207 | options[b'devel-force-nodemap'] = True |
|
1207 | options[b'devel-force-nodemap'] = True | |
1208 |
|
1208 | |||
1209 | return options |
|
1209 | return options | |
1210 |
|
1210 | |||
1211 |
|
1211 | |||
1212 | def makemain(**kwargs): |
|
1212 | def makemain(**kwargs): | |
1213 | """Produce a type conforming to ``ilocalrepositorymain``.""" |
|
1213 | """Produce a type conforming to ``ilocalrepositorymain``.""" | |
1214 | return localrepository |
|
1214 | return localrepository | |
1215 |
|
1215 | |||
1216 |
|
1216 | |||
1217 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
1217 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) | |
1218 | class revlogfilestorage(object): |
|
1218 | class revlogfilestorage(object): | |
1219 | """File storage when using revlogs.""" |
|
1219 | """File storage when using revlogs.""" | |
1220 |
|
1220 | |||
1221 | def file(self, path): |
|
1221 | def file(self, path): | |
1222 | if path.startswith(b'/'): |
|
1222 | if path.startswith(b'/'): | |
1223 | path = path[1:] |
|
1223 | path = path[1:] | |
1224 |
|
1224 | |||
1225 | return filelog.filelog(self.svfs, path) |
|
1225 | return filelog.filelog(self.svfs, path) | |
1226 |
|
1226 | |||
1227 |
|
1227 | |||
1228 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
1228 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) | |
1229 | class revlognarrowfilestorage(object): |
|
1229 | class revlognarrowfilestorage(object): | |
1230 | """File storage when using revlogs and narrow files.""" |
|
1230 | """File storage when using revlogs and narrow files.""" | |
1231 |
|
1231 | |||
1232 | def file(self, path): |
|
1232 | def file(self, path): | |
1233 | if path.startswith(b'/'): |
|
1233 | if path.startswith(b'/'): | |
1234 | path = path[1:] |
|
1234 | path = path[1:] | |
1235 |
|
1235 | |||
1236 | return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch) |
|
1236 | return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch) | |
1237 |
|
1237 | |||
1238 |
|
1238 | |||
1239 | def makefilestorage(requirements, features, **kwargs): |
|
1239 | def makefilestorage(requirements, features, **kwargs): | |
1240 | """Produce a type conforming to ``ilocalrepositoryfilestorage``.""" |
|
1240 | """Produce a type conforming to ``ilocalrepositoryfilestorage``.""" | |
1241 | features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE) |
|
1241 | features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE) | |
1242 | features.add(repository.REPO_FEATURE_STREAM_CLONE) |
|
1242 | features.add(repository.REPO_FEATURE_STREAM_CLONE) | |
1243 |
|
1243 | |||
1244 | if requirementsmod.NARROW_REQUIREMENT in requirements: |
|
1244 | if requirementsmod.NARROW_REQUIREMENT in requirements: | |
1245 | return revlognarrowfilestorage |
|
1245 | return revlognarrowfilestorage | |
1246 | else: |
|
1246 | else: | |
1247 | return revlogfilestorage |
|
1247 | return revlogfilestorage | |
1248 |
|
1248 | |||
1249 |
|
1249 | |||
1250 | # List of repository interfaces and factory functions for them. Each |
|
1250 | # List of repository interfaces and factory functions for them. Each | |
1251 | # will be called in order during ``makelocalrepository()`` to iteratively |
|
1251 | # will be called in order during ``makelocalrepository()`` to iteratively | |
1252 | # derive the final type for a local repository instance. We capture the |
|
1252 | # derive the final type for a local repository instance. We capture the | |
1253 | # function as a lambda so we don't hold a reference and the module-level |
|
1253 | # function as a lambda so we don't hold a reference and the module-level | |
1254 | # functions can be wrapped. |
|
1254 | # functions can be wrapped. | |
1255 | REPO_INTERFACES = [ |
|
1255 | REPO_INTERFACES = [ | |
1256 | (repository.ilocalrepositorymain, lambda: makemain), |
|
1256 | (repository.ilocalrepositorymain, lambda: makemain), | |
1257 | (repository.ilocalrepositoryfilestorage, lambda: makefilestorage), |
|
1257 | (repository.ilocalrepositoryfilestorage, lambda: makefilestorage), | |
1258 | ] |
|
1258 | ] | |
1259 |
|
1259 | |||
1260 |
|
1260 | |||
1261 | @interfaceutil.implementer(repository.ilocalrepositorymain) |
|
1261 | @interfaceutil.implementer(repository.ilocalrepositorymain) | |
1262 | class localrepository(object): |
|
1262 | class localrepository(object): | |
1263 | """Main class for representing local repositories. |
|
1263 | """Main class for representing local repositories. | |
1264 |
|
1264 | |||
1265 | All local repositories are instances of this class. |
|
1265 | All local repositories are instances of this class. | |
1266 |
|
1266 | |||
1267 | Constructed on its own, instances of this class are not usable as |
|
1267 | Constructed on its own, instances of this class are not usable as | |
1268 | repository objects. To obtain a usable repository object, call |
|
1268 | repository objects. To obtain a usable repository object, call | |
1269 | ``hg.repository()``, ``localrepo.instance()``, or |
|
1269 | ``hg.repository()``, ``localrepo.instance()``, or | |
1270 | ``localrepo.makelocalrepository()``. The latter is the lowest-level. |
|
1270 | ``localrepo.makelocalrepository()``. The latter is the lowest-level. | |
1271 | ``instance()`` adds support for creating new repositories. |
|
1271 | ``instance()`` adds support for creating new repositories. | |
1272 | ``hg.repository()`` adds more extension integration, including calling |
|
1272 | ``hg.repository()`` adds more extension integration, including calling | |
1273 | ``reposetup()``. Generally speaking, ``hg.repository()`` should be |
|
1273 | ``reposetup()``. Generally speaking, ``hg.repository()`` should be | |
1274 | used. |
|
1274 | used. | |
1275 | """ |
|
1275 | """ | |
1276 |
|
1276 | |||
1277 | # obsolete experimental requirements: |
|
1277 | # obsolete experimental requirements: | |
1278 | # - manifestv2: An experimental new manifest format that allowed |
|
1278 | # - manifestv2: An experimental new manifest format that allowed | |
1279 | # for stem compression of long paths. Experiment ended up not |
|
1279 | # for stem compression of long paths. Experiment ended up not | |
1280 | # being successful (repository sizes went up due to worse delta |
|
1280 | # being successful (repository sizes went up due to worse delta | |
1281 | # chains), and the code was deleted in 4.6. |
|
1281 | # chains), and the code was deleted in 4.6. | |
1282 | supportedformats = { |
|
1282 | supportedformats = { | |
1283 | requirementsmod.REVLOGV1_REQUIREMENT, |
|
1283 | requirementsmod.REVLOGV1_REQUIREMENT, | |
1284 | requirementsmod.GENERALDELTA_REQUIREMENT, |
|
1284 | requirementsmod.GENERALDELTA_REQUIREMENT, | |
1285 | requirementsmod.TREEMANIFEST_REQUIREMENT, |
|
1285 | requirementsmod.TREEMANIFEST_REQUIREMENT, | |
1286 | requirementsmod.COPIESSDC_REQUIREMENT, |
|
1286 | requirementsmod.COPIESSDC_REQUIREMENT, | |
1287 | requirementsmod.REVLOGV2_REQUIREMENT, |
|
1287 | requirementsmod.REVLOGV2_REQUIREMENT, | |
1288 | requirementsmod.CHANGELOGV2_REQUIREMENT, |
|
1288 | requirementsmod.CHANGELOGV2_REQUIREMENT, | |
1289 | requirementsmod.SPARSEREVLOG_REQUIREMENT, |
|
1289 | requirementsmod.SPARSEREVLOG_REQUIREMENT, | |
1290 | requirementsmod.NODEMAP_REQUIREMENT, |
|
1290 | requirementsmod.NODEMAP_REQUIREMENT, | |
1291 |
|
|
1291 | requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT, | |
1292 | requirementsmod.SHARESAFE_REQUIREMENT, |
|
1292 | requirementsmod.SHARESAFE_REQUIREMENT, | |
1293 | requirementsmod.DIRSTATE_V2_REQUIREMENT, |
|
1293 | requirementsmod.DIRSTATE_V2_REQUIREMENT, | |
1294 | } |
|
1294 | } | |
1295 | _basesupported = supportedformats | { |
|
1295 | _basesupported = supportedformats | { | |
1296 | requirementsmod.STORE_REQUIREMENT, |
|
1296 | requirementsmod.STORE_REQUIREMENT, | |
1297 | requirementsmod.FNCACHE_REQUIREMENT, |
|
1297 | requirementsmod.FNCACHE_REQUIREMENT, | |
1298 | requirementsmod.SHARED_REQUIREMENT, |
|
1298 | requirementsmod.SHARED_REQUIREMENT, | |
1299 | requirementsmod.RELATIVE_SHARED_REQUIREMENT, |
|
1299 | requirementsmod.RELATIVE_SHARED_REQUIREMENT, | |
1300 | requirementsmod.DOTENCODE_REQUIREMENT, |
|
1300 | requirementsmod.DOTENCODE_REQUIREMENT, | |
1301 | requirementsmod.SPARSE_REQUIREMENT, |
|
1301 | requirementsmod.SPARSE_REQUIREMENT, | |
1302 | requirementsmod.INTERNAL_PHASE_REQUIREMENT, |
|
1302 | requirementsmod.INTERNAL_PHASE_REQUIREMENT, | |
1303 | } |
|
1303 | } | |
1304 |
|
1304 | |||
1305 | # list of prefix for file which can be written without 'wlock' |
|
1305 | # list of prefix for file which can be written without 'wlock' | |
1306 | # Extensions should extend this list when needed |
|
1306 | # Extensions should extend this list when needed | |
1307 | _wlockfreeprefix = { |
|
1307 | _wlockfreeprefix = { | |
1308 | # We migh consider requiring 'wlock' for the next |
|
1308 | # We migh consider requiring 'wlock' for the next | |
1309 | # two, but pretty much all the existing code assume |
|
1309 | # two, but pretty much all the existing code assume | |
1310 | # wlock is not needed so we keep them excluded for |
|
1310 | # wlock is not needed so we keep them excluded for | |
1311 | # now. |
|
1311 | # now. | |
1312 | b'hgrc', |
|
1312 | b'hgrc', | |
1313 | b'requires', |
|
1313 | b'requires', | |
1314 | # XXX cache is a complicatged business someone |
|
1314 | # XXX cache is a complicatged business someone | |
1315 | # should investigate this in depth at some point |
|
1315 | # should investigate this in depth at some point | |
1316 | b'cache/', |
|
1316 | b'cache/', | |
1317 | # XXX shouldn't be dirstate covered by the wlock? |
|
1317 | # XXX shouldn't be dirstate covered by the wlock? | |
1318 | b'dirstate', |
|
1318 | b'dirstate', | |
1319 | # XXX bisect was still a bit too messy at the time |
|
1319 | # XXX bisect was still a bit too messy at the time | |
1320 | # this changeset was introduced. Someone should fix |
|
1320 | # this changeset was introduced. Someone should fix | |
1321 | # the remainig bit and drop this line |
|
1321 | # the remainig bit and drop this line | |
1322 | b'bisect.state', |
|
1322 | b'bisect.state', | |
1323 | } |
|
1323 | } | |
1324 |
|
1324 | |||
1325 | def __init__( |
|
1325 | def __init__( | |
1326 | self, |
|
1326 | self, | |
1327 | baseui, |
|
1327 | baseui, | |
1328 | ui, |
|
1328 | ui, | |
1329 | origroot, |
|
1329 | origroot, | |
1330 | wdirvfs, |
|
1330 | wdirvfs, | |
1331 | hgvfs, |
|
1331 | hgvfs, | |
1332 | requirements, |
|
1332 | requirements, | |
1333 | supportedrequirements, |
|
1333 | supportedrequirements, | |
1334 | sharedpath, |
|
1334 | sharedpath, | |
1335 | store, |
|
1335 | store, | |
1336 | cachevfs, |
|
1336 | cachevfs, | |
1337 | wcachevfs, |
|
1337 | wcachevfs, | |
1338 | features, |
|
1338 | features, | |
1339 | intents=None, |
|
1339 | intents=None, | |
1340 | ): |
|
1340 | ): | |
1341 | """Create a new local repository instance. |
|
1341 | """Create a new local repository instance. | |
1342 |
|
1342 | |||
1343 | Most callers should use ``hg.repository()``, ``localrepo.instance()``, |
|
1343 | Most callers should use ``hg.repository()``, ``localrepo.instance()``, | |
1344 | or ``localrepo.makelocalrepository()`` for obtaining a new repository |
|
1344 | or ``localrepo.makelocalrepository()`` for obtaining a new repository | |
1345 | object. |
|
1345 | object. | |
1346 |
|
1346 | |||
1347 | Arguments: |
|
1347 | Arguments: | |
1348 |
|
1348 | |||
1349 | baseui |
|
1349 | baseui | |
1350 | ``ui.ui`` instance that ``ui`` argument was based off of. |
|
1350 | ``ui.ui`` instance that ``ui`` argument was based off of. | |
1351 |
|
1351 | |||
1352 | ui |
|
1352 | ui | |
1353 | ``ui.ui`` instance for use by the repository. |
|
1353 | ``ui.ui`` instance for use by the repository. | |
1354 |
|
1354 | |||
1355 | origroot |
|
1355 | origroot | |
1356 | ``bytes`` path to working directory root of this repository. |
|
1356 | ``bytes`` path to working directory root of this repository. | |
1357 |
|
1357 | |||
1358 | wdirvfs |
|
1358 | wdirvfs | |
1359 | ``vfs.vfs`` rooted at the working directory. |
|
1359 | ``vfs.vfs`` rooted at the working directory. | |
1360 |
|
1360 | |||
1361 | hgvfs |
|
1361 | hgvfs | |
1362 | ``vfs.vfs`` rooted at .hg/ |
|
1362 | ``vfs.vfs`` rooted at .hg/ | |
1363 |
|
1363 | |||
1364 | requirements |
|
1364 | requirements | |
1365 | ``set`` of bytestrings representing repository opening requirements. |
|
1365 | ``set`` of bytestrings representing repository opening requirements. | |
1366 |
|
1366 | |||
1367 | supportedrequirements |
|
1367 | supportedrequirements | |
1368 | ``set`` of bytestrings representing repository requirements that we |
|
1368 | ``set`` of bytestrings representing repository requirements that we | |
1369 | know how to open. May be a supetset of ``requirements``. |
|
1369 | know how to open. May be a supetset of ``requirements``. | |
1370 |
|
1370 | |||
1371 | sharedpath |
|
1371 | sharedpath | |
1372 | ``bytes`` Defining path to storage base directory. Points to a |
|
1372 | ``bytes`` Defining path to storage base directory. Points to a | |
1373 | ``.hg/`` directory somewhere. |
|
1373 | ``.hg/`` directory somewhere. | |
1374 |
|
1374 | |||
1375 | store |
|
1375 | store | |
1376 | ``store.basicstore`` (or derived) instance providing access to |
|
1376 | ``store.basicstore`` (or derived) instance providing access to | |
1377 | versioned storage. |
|
1377 | versioned storage. | |
1378 |
|
1378 | |||
1379 | cachevfs |
|
1379 | cachevfs | |
1380 | ``vfs.vfs`` used for cache files. |
|
1380 | ``vfs.vfs`` used for cache files. | |
1381 |
|
1381 | |||
1382 | wcachevfs |
|
1382 | wcachevfs | |
1383 | ``vfs.vfs`` used for cache files related to the working copy. |
|
1383 | ``vfs.vfs`` used for cache files related to the working copy. | |
1384 |
|
1384 | |||
1385 | features |
|
1385 | features | |
1386 | ``set`` of bytestrings defining features/capabilities of this |
|
1386 | ``set`` of bytestrings defining features/capabilities of this | |
1387 | instance. |
|
1387 | instance. | |
1388 |
|
1388 | |||
1389 | intents |
|
1389 | intents | |
1390 | ``set`` of system strings indicating what this repo will be used |
|
1390 | ``set`` of system strings indicating what this repo will be used | |
1391 | for. |
|
1391 | for. | |
1392 | """ |
|
1392 | """ | |
1393 | self.baseui = baseui |
|
1393 | self.baseui = baseui | |
1394 | self.ui = ui |
|
1394 | self.ui = ui | |
1395 | self.origroot = origroot |
|
1395 | self.origroot = origroot | |
1396 | # vfs rooted at working directory. |
|
1396 | # vfs rooted at working directory. | |
1397 | self.wvfs = wdirvfs |
|
1397 | self.wvfs = wdirvfs | |
1398 | self.root = wdirvfs.base |
|
1398 | self.root = wdirvfs.base | |
1399 | # vfs rooted at .hg/. Used to access most non-store paths. |
|
1399 | # vfs rooted at .hg/. Used to access most non-store paths. | |
1400 | self.vfs = hgvfs |
|
1400 | self.vfs = hgvfs | |
1401 | self.path = hgvfs.base |
|
1401 | self.path = hgvfs.base | |
1402 | self.requirements = requirements |
|
1402 | self.requirements = requirements | |
1403 | self.nodeconstants = sha1nodeconstants |
|
1403 | self.nodeconstants = sha1nodeconstants | |
1404 | self.nullid = self.nodeconstants.nullid |
|
1404 | self.nullid = self.nodeconstants.nullid | |
1405 | self.supported = supportedrequirements |
|
1405 | self.supported = supportedrequirements | |
1406 | self.sharedpath = sharedpath |
|
1406 | self.sharedpath = sharedpath | |
1407 | self.store = store |
|
1407 | self.store = store | |
1408 | self.cachevfs = cachevfs |
|
1408 | self.cachevfs = cachevfs | |
1409 | self.wcachevfs = wcachevfs |
|
1409 | self.wcachevfs = wcachevfs | |
1410 | self.features = features |
|
1410 | self.features = features | |
1411 |
|
1411 | |||
1412 | self.filtername = None |
|
1412 | self.filtername = None | |
1413 |
|
1413 | |||
1414 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1414 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
1415 | b'devel', b'check-locks' |
|
1415 | b'devel', b'check-locks' | |
1416 | ): |
|
1416 | ): | |
1417 | self.vfs.audit = self._getvfsward(self.vfs.audit) |
|
1417 | self.vfs.audit = self._getvfsward(self.vfs.audit) | |
1418 | # A list of callback to shape the phase if no data were found. |
|
1418 | # A list of callback to shape the phase if no data were found. | |
1419 | # Callback are in the form: func(repo, roots) --> processed root. |
|
1419 | # Callback are in the form: func(repo, roots) --> processed root. | |
1420 | # This list it to be filled by extension during repo setup |
|
1420 | # This list it to be filled by extension during repo setup | |
1421 | self._phasedefaults = [] |
|
1421 | self._phasedefaults = [] | |
1422 |
|
1422 | |||
1423 | color.setup(self.ui) |
|
1423 | color.setup(self.ui) | |
1424 |
|
1424 | |||
1425 | self.spath = self.store.path |
|
1425 | self.spath = self.store.path | |
1426 | self.svfs = self.store.vfs |
|
1426 | self.svfs = self.store.vfs | |
1427 | self.sjoin = self.store.join |
|
1427 | self.sjoin = self.store.join | |
1428 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1428 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
1429 | b'devel', b'check-locks' |
|
1429 | b'devel', b'check-locks' | |
1430 | ): |
|
1430 | ): | |
1431 | if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs |
|
1431 | if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs | |
1432 | self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) |
|
1432 | self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) | |
1433 | else: # standard vfs |
|
1433 | else: # standard vfs | |
1434 | self.svfs.audit = self._getsvfsward(self.svfs.audit) |
|
1434 | self.svfs.audit = self._getsvfsward(self.svfs.audit) | |
1435 |
|
1435 | |||
1436 | self._dirstatevalidatewarned = False |
|
1436 | self._dirstatevalidatewarned = False | |
1437 |
|
1437 | |||
1438 | self._branchcaches = branchmap.BranchMapCache() |
|
1438 | self._branchcaches = branchmap.BranchMapCache() | |
1439 | self._revbranchcache = None |
|
1439 | self._revbranchcache = None | |
1440 | self._filterpats = {} |
|
1440 | self._filterpats = {} | |
1441 | self._datafilters = {} |
|
1441 | self._datafilters = {} | |
1442 | self._transref = self._lockref = self._wlockref = None |
|
1442 | self._transref = self._lockref = self._wlockref = None | |
1443 |
|
1443 | |||
1444 | # A cache for various files under .hg/ that tracks file changes, |
|
1444 | # A cache for various files under .hg/ that tracks file changes, | |
1445 | # (used by the filecache decorator) |
|
1445 | # (used by the filecache decorator) | |
1446 | # |
|
1446 | # | |
1447 | # Maps a property name to its util.filecacheentry |
|
1447 | # Maps a property name to its util.filecacheentry | |
1448 | self._filecache = {} |
|
1448 | self._filecache = {} | |
1449 |
|
1449 | |||
1450 | # hold sets of revision to be filtered |
|
1450 | # hold sets of revision to be filtered | |
1451 | # should be cleared when something might have changed the filter value: |
|
1451 | # should be cleared when something might have changed the filter value: | |
1452 | # - new changesets, |
|
1452 | # - new changesets, | |
1453 | # - phase change, |
|
1453 | # - phase change, | |
1454 | # - new obsolescence marker, |
|
1454 | # - new obsolescence marker, | |
1455 | # - working directory parent change, |
|
1455 | # - working directory parent change, | |
1456 | # - bookmark changes |
|
1456 | # - bookmark changes | |
1457 | self.filteredrevcache = {} |
|
1457 | self.filteredrevcache = {} | |
1458 |
|
1458 | |||
1459 | # post-dirstate-status hooks |
|
1459 | # post-dirstate-status hooks | |
1460 | self._postdsstatus = [] |
|
1460 | self._postdsstatus = [] | |
1461 |
|
1461 | |||
1462 | # generic mapping between names and nodes |
|
1462 | # generic mapping between names and nodes | |
1463 | self.names = namespaces.namespaces() |
|
1463 | self.names = namespaces.namespaces() | |
1464 |
|
1464 | |||
1465 | # Key to signature value. |
|
1465 | # Key to signature value. | |
1466 | self._sparsesignaturecache = {} |
|
1466 | self._sparsesignaturecache = {} | |
1467 | # Signature to cached matcher instance. |
|
1467 | # Signature to cached matcher instance. | |
1468 | self._sparsematchercache = {} |
|
1468 | self._sparsematchercache = {} | |
1469 |
|
1469 | |||
1470 | self._extrafilterid = repoview.extrafilter(ui) |
|
1470 | self._extrafilterid = repoview.extrafilter(ui) | |
1471 |
|
1471 | |||
1472 | self.filecopiesmode = None |
|
1472 | self.filecopiesmode = None | |
1473 | if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements: |
|
1473 | if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements: | |
1474 | self.filecopiesmode = b'changeset-sidedata' |
|
1474 | self.filecopiesmode = b'changeset-sidedata' | |
1475 |
|
1475 | |||
1476 | self._wanted_sidedata = set() |
|
1476 | self._wanted_sidedata = set() | |
1477 | self._sidedata_computers = {} |
|
1477 | self._sidedata_computers = {} | |
1478 | sidedatamod.set_sidedata_spec_for_repo(self) |
|
1478 | sidedatamod.set_sidedata_spec_for_repo(self) | |
1479 |
|
1479 | |||
1480 | def _getvfsward(self, origfunc): |
|
1480 | def _getvfsward(self, origfunc): | |
1481 | """build a ward for self.vfs""" |
|
1481 | """build a ward for self.vfs""" | |
1482 | rref = weakref.ref(self) |
|
1482 | rref = weakref.ref(self) | |
1483 |
|
1483 | |||
1484 | def checkvfs(path, mode=None): |
|
1484 | def checkvfs(path, mode=None): | |
1485 | ret = origfunc(path, mode=mode) |
|
1485 | ret = origfunc(path, mode=mode) | |
1486 | repo = rref() |
|
1486 | repo = rref() | |
1487 | if ( |
|
1487 | if ( | |
1488 | repo is None |
|
1488 | repo is None | |
1489 | or not util.safehasattr(repo, b'_wlockref') |
|
1489 | or not util.safehasattr(repo, b'_wlockref') | |
1490 | or not util.safehasattr(repo, b'_lockref') |
|
1490 | or not util.safehasattr(repo, b'_lockref') | |
1491 | ): |
|
1491 | ): | |
1492 | return |
|
1492 | return | |
1493 | if mode in (None, b'r', b'rb'): |
|
1493 | if mode in (None, b'r', b'rb'): | |
1494 | return |
|
1494 | return | |
1495 | if path.startswith(repo.path): |
|
1495 | if path.startswith(repo.path): | |
1496 | # truncate name relative to the repository (.hg) |
|
1496 | # truncate name relative to the repository (.hg) | |
1497 | path = path[len(repo.path) + 1 :] |
|
1497 | path = path[len(repo.path) + 1 :] | |
1498 | if path.startswith(b'cache/'): |
|
1498 | if path.startswith(b'cache/'): | |
1499 | msg = b'accessing cache with vfs instead of cachevfs: "%s"' |
|
1499 | msg = b'accessing cache with vfs instead of cachevfs: "%s"' | |
1500 | repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs") |
|
1500 | repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs") | |
1501 | # path prefixes covered by 'lock' |
|
1501 | # path prefixes covered by 'lock' | |
1502 | vfs_path_prefixes = ( |
|
1502 | vfs_path_prefixes = ( | |
1503 | b'journal.', |
|
1503 | b'journal.', | |
1504 | b'undo.', |
|
1504 | b'undo.', | |
1505 | b'strip-backup/', |
|
1505 | b'strip-backup/', | |
1506 | b'cache/', |
|
1506 | b'cache/', | |
1507 | ) |
|
1507 | ) | |
1508 | if any(path.startswith(prefix) for prefix in vfs_path_prefixes): |
|
1508 | if any(path.startswith(prefix) for prefix in vfs_path_prefixes): | |
1509 | if repo._currentlock(repo._lockref) is None: |
|
1509 | if repo._currentlock(repo._lockref) is None: | |
1510 | repo.ui.develwarn( |
|
1510 | repo.ui.develwarn( | |
1511 | b'write with no lock: "%s"' % path, |
|
1511 | b'write with no lock: "%s"' % path, | |
1512 | stacklevel=3, |
|
1512 | stacklevel=3, | |
1513 | config=b'check-locks', |
|
1513 | config=b'check-locks', | |
1514 | ) |
|
1514 | ) | |
1515 | elif repo._currentlock(repo._wlockref) is None: |
|
1515 | elif repo._currentlock(repo._wlockref) is None: | |
1516 | # rest of vfs files are covered by 'wlock' |
|
1516 | # rest of vfs files are covered by 'wlock' | |
1517 | # |
|
1517 | # | |
1518 | # exclude special files |
|
1518 | # exclude special files | |
1519 | for prefix in self._wlockfreeprefix: |
|
1519 | for prefix in self._wlockfreeprefix: | |
1520 | if path.startswith(prefix): |
|
1520 | if path.startswith(prefix): | |
1521 | return |
|
1521 | return | |
1522 | repo.ui.develwarn( |
|
1522 | repo.ui.develwarn( | |
1523 | b'write with no wlock: "%s"' % path, |
|
1523 | b'write with no wlock: "%s"' % path, | |
1524 | stacklevel=3, |
|
1524 | stacklevel=3, | |
1525 | config=b'check-locks', |
|
1525 | config=b'check-locks', | |
1526 | ) |
|
1526 | ) | |
1527 | return ret |
|
1527 | return ret | |
1528 |
|
1528 | |||
1529 | return checkvfs |
|
1529 | return checkvfs | |
1530 |
|
1530 | |||
1531 | def _getsvfsward(self, origfunc): |
|
1531 | def _getsvfsward(self, origfunc): | |
1532 | """build a ward for self.svfs""" |
|
1532 | """build a ward for self.svfs""" | |
1533 | rref = weakref.ref(self) |
|
1533 | rref = weakref.ref(self) | |
1534 |
|
1534 | |||
1535 | def checksvfs(path, mode=None): |
|
1535 | def checksvfs(path, mode=None): | |
1536 | ret = origfunc(path, mode=mode) |
|
1536 | ret = origfunc(path, mode=mode) | |
1537 | repo = rref() |
|
1537 | repo = rref() | |
1538 | if repo is None or not util.safehasattr(repo, b'_lockref'): |
|
1538 | if repo is None or not util.safehasattr(repo, b'_lockref'): | |
1539 | return |
|
1539 | return | |
1540 | if mode in (None, b'r', b'rb'): |
|
1540 | if mode in (None, b'r', b'rb'): | |
1541 | return |
|
1541 | return | |
1542 | if path.startswith(repo.sharedpath): |
|
1542 | if path.startswith(repo.sharedpath): | |
1543 | # truncate name relative to the repository (.hg) |
|
1543 | # truncate name relative to the repository (.hg) | |
1544 | path = path[len(repo.sharedpath) + 1 :] |
|
1544 | path = path[len(repo.sharedpath) + 1 :] | |
1545 | if repo._currentlock(repo._lockref) is None: |
|
1545 | if repo._currentlock(repo._lockref) is None: | |
1546 | repo.ui.develwarn( |
|
1546 | repo.ui.develwarn( | |
1547 | b'write with no lock: "%s"' % path, stacklevel=4 |
|
1547 | b'write with no lock: "%s"' % path, stacklevel=4 | |
1548 | ) |
|
1548 | ) | |
1549 | return ret |
|
1549 | return ret | |
1550 |
|
1550 | |||
1551 | return checksvfs |
|
1551 | return checksvfs | |
1552 |
|
1552 | |||
1553 | def close(self): |
|
1553 | def close(self): | |
1554 | self._writecaches() |
|
1554 | self._writecaches() | |
1555 |
|
1555 | |||
1556 | def _writecaches(self): |
|
1556 | def _writecaches(self): | |
1557 | if self._revbranchcache: |
|
1557 | if self._revbranchcache: | |
1558 | self._revbranchcache.write() |
|
1558 | self._revbranchcache.write() | |
1559 |
|
1559 | |||
1560 | def _restrictcapabilities(self, caps): |
|
1560 | def _restrictcapabilities(self, caps): | |
1561 | if self.ui.configbool(b'experimental', b'bundle2-advertise'): |
|
1561 | if self.ui.configbool(b'experimental', b'bundle2-advertise'): | |
1562 | caps = set(caps) |
|
1562 | caps = set(caps) | |
1563 | capsblob = bundle2.encodecaps( |
|
1563 | capsblob = bundle2.encodecaps( | |
1564 | bundle2.getrepocaps(self, role=b'client') |
|
1564 | bundle2.getrepocaps(self, role=b'client') | |
1565 | ) |
|
1565 | ) | |
1566 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) |
|
1566 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) | |
1567 | if self.ui.configbool(b'experimental', b'narrow'): |
|
1567 | if self.ui.configbool(b'experimental', b'narrow'): | |
1568 | caps.add(wireprototypes.NARROWCAP) |
|
1568 | caps.add(wireprototypes.NARROWCAP) | |
1569 | return caps |
|
1569 | return caps | |
1570 |
|
1570 | |||
1571 | # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: |
|
1571 | # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: | |
1572 | # self -> auditor -> self._checknested -> self |
|
1572 | # self -> auditor -> self._checknested -> self | |
1573 |
|
1573 | |||
1574 | @property |
|
1574 | @property | |
1575 | def auditor(self): |
|
1575 | def auditor(self): | |
1576 | # This is only used by context.workingctx.match in order to |
|
1576 | # This is only used by context.workingctx.match in order to | |
1577 | # detect files in subrepos. |
|
1577 | # detect files in subrepos. | |
1578 | return pathutil.pathauditor(self.root, callback=self._checknested) |
|
1578 | return pathutil.pathauditor(self.root, callback=self._checknested) | |
1579 |
|
1579 | |||
1580 | @property |
|
1580 | @property | |
1581 | def nofsauditor(self): |
|
1581 | def nofsauditor(self): | |
1582 | # This is only used by context.basectx.match in order to detect |
|
1582 | # This is only used by context.basectx.match in order to detect | |
1583 | # files in subrepos. |
|
1583 | # files in subrepos. | |
1584 | return pathutil.pathauditor( |
|
1584 | return pathutil.pathauditor( | |
1585 | self.root, callback=self._checknested, realfs=False, cached=True |
|
1585 | self.root, callback=self._checknested, realfs=False, cached=True | |
1586 | ) |
|
1586 | ) | |
1587 |
|
1587 | |||
1588 | def _checknested(self, path): |
|
1588 | def _checknested(self, path): | |
1589 | """Determine if path is a legal nested repository.""" |
|
1589 | """Determine if path is a legal nested repository.""" | |
1590 | if not path.startswith(self.root): |
|
1590 | if not path.startswith(self.root): | |
1591 | return False |
|
1591 | return False | |
1592 | subpath = path[len(self.root) + 1 :] |
|
1592 | subpath = path[len(self.root) + 1 :] | |
1593 | normsubpath = util.pconvert(subpath) |
|
1593 | normsubpath = util.pconvert(subpath) | |
1594 |
|
1594 | |||
1595 | # XXX: Checking against the current working copy is wrong in |
|
1595 | # XXX: Checking against the current working copy is wrong in | |
1596 | # the sense that it can reject things like |
|
1596 | # the sense that it can reject things like | |
1597 | # |
|
1597 | # | |
1598 | # $ hg cat -r 10 sub/x.txt |
|
1598 | # $ hg cat -r 10 sub/x.txt | |
1599 | # |
|
1599 | # | |
1600 | # if sub/ is no longer a subrepository in the working copy |
|
1600 | # if sub/ is no longer a subrepository in the working copy | |
1601 | # parent revision. |
|
1601 | # parent revision. | |
1602 | # |
|
1602 | # | |
1603 | # However, it can of course also allow things that would have |
|
1603 | # However, it can of course also allow things that would have | |
1604 | # been rejected before, such as the above cat command if sub/ |
|
1604 | # been rejected before, such as the above cat command if sub/ | |
1605 | # is a subrepository now, but was a normal directory before. |
|
1605 | # is a subrepository now, but was a normal directory before. | |
1606 | # The old path auditor would have rejected by mistake since it |
|
1606 | # The old path auditor would have rejected by mistake since it | |
1607 | # panics when it sees sub/.hg/. |
|
1607 | # panics when it sees sub/.hg/. | |
1608 | # |
|
1608 | # | |
1609 | # All in all, checking against the working copy seems sensible |
|
1609 | # All in all, checking against the working copy seems sensible | |
1610 | # since we want to prevent access to nested repositories on |
|
1610 | # since we want to prevent access to nested repositories on | |
1611 | # the filesystem *now*. |
|
1611 | # the filesystem *now*. | |
1612 | ctx = self[None] |
|
1612 | ctx = self[None] | |
1613 | parts = util.splitpath(subpath) |
|
1613 | parts = util.splitpath(subpath) | |
1614 | while parts: |
|
1614 | while parts: | |
1615 | prefix = b'/'.join(parts) |
|
1615 | prefix = b'/'.join(parts) | |
1616 | if prefix in ctx.substate: |
|
1616 | if prefix in ctx.substate: | |
1617 | if prefix == normsubpath: |
|
1617 | if prefix == normsubpath: | |
1618 | return True |
|
1618 | return True | |
1619 | else: |
|
1619 | else: | |
1620 | sub = ctx.sub(prefix) |
|
1620 | sub = ctx.sub(prefix) | |
1621 | return sub.checknested(subpath[len(prefix) + 1 :]) |
|
1621 | return sub.checknested(subpath[len(prefix) + 1 :]) | |
1622 | else: |
|
1622 | else: | |
1623 | parts.pop() |
|
1623 | parts.pop() | |
1624 | return False |
|
1624 | return False | |
1625 |
|
1625 | |||
1626 | def peer(self): |
|
1626 | def peer(self): | |
1627 | return localpeer(self) # not cached to avoid reference cycle |
|
1627 | return localpeer(self) # not cached to avoid reference cycle | |
1628 |
|
1628 | |||
1629 | def unfiltered(self): |
|
1629 | def unfiltered(self): | |
1630 | """Return unfiltered version of the repository |
|
1630 | """Return unfiltered version of the repository | |
1631 |
|
1631 | |||
1632 | Intended to be overwritten by filtered repo.""" |
|
1632 | Intended to be overwritten by filtered repo.""" | |
1633 | return self |
|
1633 | return self | |
1634 |
|
1634 | |||
1635 | def filtered(self, name, visibilityexceptions=None): |
|
1635 | def filtered(self, name, visibilityexceptions=None): | |
1636 | """Return a filtered version of a repository |
|
1636 | """Return a filtered version of a repository | |
1637 |
|
1637 | |||
1638 | The `name` parameter is the identifier of the requested view. This |
|
1638 | The `name` parameter is the identifier of the requested view. This | |
1639 | will return a repoview object set "exactly" to the specified view. |
|
1639 | will return a repoview object set "exactly" to the specified view. | |
1640 |
|
1640 | |||
1641 | This function does not apply recursive filtering to a repository. For |
|
1641 | This function does not apply recursive filtering to a repository. For | |
1642 | example calling `repo.filtered("served")` will return a repoview using |
|
1642 | example calling `repo.filtered("served")` will return a repoview using | |
1643 | the "served" view, regardless of the initial view used by `repo`. |
|
1643 | the "served" view, regardless of the initial view used by `repo`. | |
1644 |
|
1644 | |||
1645 | In other word, there is always only one level of `repoview` "filtering". |
|
1645 | In other word, there is always only one level of `repoview` "filtering". | |
1646 | """ |
|
1646 | """ | |
1647 | if self._extrafilterid is not None and b'%' not in name: |
|
1647 | if self._extrafilterid is not None and b'%' not in name: | |
1648 | name = name + b'%' + self._extrafilterid |
|
1648 | name = name + b'%' + self._extrafilterid | |
1649 |
|
1649 | |||
1650 | cls = repoview.newtype(self.unfiltered().__class__) |
|
1650 | cls = repoview.newtype(self.unfiltered().__class__) | |
1651 | return cls(self, name, visibilityexceptions) |
|
1651 | return cls(self, name, visibilityexceptions) | |
1652 |
|
1652 | |||
1653 | @mixedrepostorecache( |
|
1653 | @mixedrepostorecache( | |
1654 | (b'bookmarks', b'plain'), |
|
1654 | (b'bookmarks', b'plain'), | |
1655 | (b'bookmarks.current', b'plain'), |
|
1655 | (b'bookmarks.current', b'plain'), | |
1656 | (b'bookmarks', b''), |
|
1656 | (b'bookmarks', b''), | |
1657 | (b'00changelog.i', b''), |
|
1657 | (b'00changelog.i', b''), | |
1658 | ) |
|
1658 | ) | |
1659 | def _bookmarks(self): |
|
1659 | def _bookmarks(self): | |
1660 | # Since the multiple files involved in the transaction cannot be |
|
1660 | # Since the multiple files involved in the transaction cannot be | |
1661 | # written atomically (with current repository format), there is a race |
|
1661 | # written atomically (with current repository format), there is a race | |
1662 | # condition here. |
|
1662 | # condition here. | |
1663 | # |
|
1663 | # | |
1664 | # 1) changelog content A is read |
|
1664 | # 1) changelog content A is read | |
1665 | # 2) outside transaction update changelog to content B |
|
1665 | # 2) outside transaction update changelog to content B | |
1666 | # 3) outside transaction update bookmark file referring to content B |
|
1666 | # 3) outside transaction update bookmark file referring to content B | |
1667 | # 4) bookmarks file content is read and filtered against changelog-A |
|
1667 | # 4) bookmarks file content is read and filtered against changelog-A | |
1668 | # |
|
1668 | # | |
1669 | # When this happens, bookmarks against nodes missing from A are dropped. |
|
1669 | # When this happens, bookmarks against nodes missing from A are dropped. | |
1670 | # |
|
1670 | # | |
1671 | # Having this happening during read is not great, but it become worse |
|
1671 | # Having this happening during read is not great, but it become worse | |
1672 | # when this happen during write because the bookmarks to the "unknown" |
|
1672 | # when this happen during write because the bookmarks to the "unknown" | |
1673 | # nodes will be dropped for good. However, writes happen within locks. |
|
1673 | # nodes will be dropped for good. However, writes happen within locks. | |
1674 | # This locking makes it possible to have a race free consistent read. |
|
1674 | # This locking makes it possible to have a race free consistent read. | |
1675 | # For this purpose data read from disc before locking are |
|
1675 | # For this purpose data read from disc before locking are | |
1676 | # "invalidated" right after the locks are taken. This invalidations are |
|
1676 | # "invalidated" right after the locks are taken. This invalidations are | |
1677 | # "light", the `filecache` mechanism keep the data in memory and will |
|
1677 | # "light", the `filecache` mechanism keep the data in memory and will | |
1678 | # reuse them if the underlying files did not changed. Not parsing the |
|
1678 | # reuse them if the underlying files did not changed. Not parsing the | |
1679 | # same data multiple times helps performances. |
|
1679 | # same data multiple times helps performances. | |
1680 | # |
|
1680 | # | |
1681 | # Unfortunately in the case describe above, the files tracked by the |
|
1681 | # Unfortunately in the case describe above, the files tracked by the | |
1682 | # bookmarks file cache might not have changed, but the in-memory |
|
1682 | # bookmarks file cache might not have changed, but the in-memory | |
1683 | # content is still "wrong" because we used an older changelog content |
|
1683 | # content is still "wrong" because we used an older changelog content | |
1684 | # to process the on-disk data. So after locking, the changelog would be |
|
1684 | # to process the on-disk data. So after locking, the changelog would be | |
1685 | # refreshed but `_bookmarks` would be preserved. |
|
1685 | # refreshed but `_bookmarks` would be preserved. | |
1686 | # Adding `00changelog.i` to the list of tracked file is not |
|
1686 | # Adding `00changelog.i` to the list of tracked file is not | |
1687 | # enough, because at the time we build the content for `_bookmarks` in |
|
1687 | # enough, because at the time we build the content for `_bookmarks` in | |
1688 | # (4), the changelog file has already diverged from the content used |
|
1688 | # (4), the changelog file has already diverged from the content used | |
1689 | # for loading `changelog` in (1) |
|
1689 | # for loading `changelog` in (1) | |
1690 | # |
|
1690 | # | |
1691 | # To prevent the issue, we force the changelog to be explicitly |
|
1691 | # To prevent the issue, we force the changelog to be explicitly | |
1692 | # reloaded while computing `_bookmarks`. The data race can still happen |
|
1692 | # reloaded while computing `_bookmarks`. The data race can still happen | |
1693 | # without the lock (with a narrower window), but it would no longer go |
|
1693 | # without the lock (with a narrower window), but it would no longer go | |
1694 | # undetected during the lock time refresh. |
|
1694 | # undetected during the lock time refresh. | |
1695 | # |
|
1695 | # | |
1696 | # The new schedule is as follow |
|
1696 | # The new schedule is as follow | |
1697 | # |
|
1697 | # | |
1698 | # 1) filecache logic detect that `_bookmarks` needs to be computed |
|
1698 | # 1) filecache logic detect that `_bookmarks` needs to be computed | |
1699 | # 2) cachestat for `bookmarks` and `changelog` are captured (for book) |
|
1699 | # 2) cachestat for `bookmarks` and `changelog` are captured (for book) | |
1700 | # 3) We force `changelog` filecache to be tested |
|
1700 | # 3) We force `changelog` filecache to be tested | |
1701 | # 4) cachestat for `changelog` are captured (for changelog) |
|
1701 | # 4) cachestat for `changelog` are captured (for changelog) | |
1702 | # 5) `_bookmarks` is computed and cached |
|
1702 | # 5) `_bookmarks` is computed and cached | |
1703 | # |
|
1703 | # | |
1704 | # The step in (3) ensure we have a changelog at least as recent as the |
|
1704 | # The step in (3) ensure we have a changelog at least as recent as the | |
1705 | # cache stat computed in (1). As a result at locking time: |
|
1705 | # cache stat computed in (1). As a result at locking time: | |
1706 | # * if the changelog did not changed since (1) -> we can reuse the data |
|
1706 | # * if the changelog did not changed since (1) -> we can reuse the data | |
1707 | # * otherwise -> the bookmarks get refreshed. |
|
1707 | # * otherwise -> the bookmarks get refreshed. | |
1708 | self._refreshchangelog() |
|
1708 | self._refreshchangelog() | |
1709 | return bookmarks.bmstore(self) |
|
1709 | return bookmarks.bmstore(self) | |
1710 |
|
1710 | |||
1711 | def _refreshchangelog(self): |
|
1711 | def _refreshchangelog(self): | |
1712 | """make sure the in memory changelog match the on-disk one""" |
|
1712 | """make sure the in memory changelog match the on-disk one""" | |
1713 | if 'changelog' in vars(self) and self.currenttransaction() is None: |
|
1713 | if 'changelog' in vars(self) and self.currenttransaction() is None: | |
1714 | del self.changelog |
|
1714 | del self.changelog | |
1715 |
|
1715 | |||
1716 | @property |
|
1716 | @property | |
1717 | def _activebookmark(self): |
|
1717 | def _activebookmark(self): | |
1718 | return self._bookmarks.active |
|
1718 | return self._bookmarks.active | |
1719 |
|
1719 | |||
1720 | # _phasesets depend on changelog. what we need is to call |
|
1720 | # _phasesets depend on changelog. what we need is to call | |
1721 | # _phasecache.invalidate() if '00changelog.i' was changed, but it |
|
1721 | # _phasecache.invalidate() if '00changelog.i' was changed, but it | |
1722 | # can't be easily expressed in filecache mechanism. |
|
1722 | # can't be easily expressed in filecache mechanism. | |
1723 | @storecache(b'phaseroots', b'00changelog.i') |
|
1723 | @storecache(b'phaseroots', b'00changelog.i') | |
1724 | def _phasecache(self): |
|
1724 | def _phasecache(self): | |
1725 | return phases.phasecache(self, self._phasedefaults) |
|
1725 | return phases.phasecache(self, self._phasedefaults) | |
1726 |
|
1726 | |||
1727 | @storecache(b'obsstore') |
|
1727 | @storecache(b'obsstore') | |
1728 | def obsstore(self): |
|
1728 | def obsstore(self): | |
1729 | return obsolete.makestore(self.ui, self) |
|
1729 | return obsolete.makestore(self.ui, self) | |
1730 |
|
1730 | |||
1731 | @changelogcache() |
|
1731 | @changelogcache() | |
1732 | def changelog(repo): |
|
1732 | def changelog(repo): | |
1733 | # load dirstate before changelog to avoid race see issue6303 |
|
1733 | # load dirstate before changelog to avoid race see issue6303 | |
1734 | repo.dirstate.prefetch_parents() |
|
1734 | repo.dirstate.prefetch_parents() | |
1735 | return repo.store.changelog( |
|
1735 | return repo.store.changelog( | |
1736 | txnutil.mayhavepending(repo.root), |
|
1736 | txnutil.mayhavepending(repo.root), | |
1737 | concurrencychecker=revlogchecker.get_checker(repo.ui, b'changelog'), |
|
1737 | concurrencychecker=revlogchecker.get_checker(repo.ui, b'changelog'), | |
1738 | ) |
|
1738 | ) | |
1739 |
|
1739 | |||
1740 | @manifestlogcache() |
|
1740 | @manifestlogcache() | |
1741 | def manifestlog(self): |
|
1741 | def manifestlog(self): | |
1742 | return self.store.manifestlog(self, self._storenarrowmatch) |
|
1742 | return self.store.manifestlog(self, self._storenarrowmatch) | |
1743 |
|
1743 | |||
1744 | @repofilecache(b'dirstate') |
|
1744 | @repofilecache(b'dirstate') | |
1745 | def dirstate(self): |
|
1745 | def dirstate(self): | |
1746 | return self._makedirstate() |
|
1746 | return self._makedirstate() | |
1747 |
|
1747 | |||
1748 | def _makedirstate(self): |
|
1748 | def _makedirstate(self): | |
1749 | """Extension point for wrapping the dirstate per-repo.""" |
|
1749 | """Extension point for wrapping the dirstate per-repo.""" | |
1750 | sparsematchfn = lambda: sparse.matcher(self) |
|
1750 | sparsematchfn = lambda: sparse.matcher(self) | |
1751 | v2_req = requirementsmod.DIRSTATE_V2_REQUIREMENT |
|
1751 | v2_req = requirementsmod.DIRSTATE_V2_REQUIREMENT | |
1752 | use_dirstate_v2 = v2_req in self.requirements |
|
1752 | use_dirstate_v2 = v2_req in self.requirements | |
1753 |
|
1753 | |||
1754 | return dirstate.dirstate( |
|
1754 | return dirstate.dirstate( | |
1755 | self.vfs, |
|
1755 | self.vfs, | |
1756 | self.ui, |
|
1756 | self.ui, | |
1757 | self.root, |
|
1757 | self.root, | |
1758 | self._dirstatevalidate, |
|
1758 | self._dirstatevalidate, | |
1759 | sparsematchfn, |
|
1759 | sparsematchfn, | |
1760 | self.nodeconstants, |
|
1760 | self.nodeconstants, | |
1761 | use_dirstate_v2, |
|
1761 | use_dirstate_v2, | |
1762 | ) |
|
1762 | ) | |
1763 |
|
1763 | |||
1764 | def _dirstatevalidate(self, node): |
|
1764 | def _dirstatevalidate(self, node): | |
1765 | try: |
|
1765 | try: | |
1766 | self.changelog.rev(node) |
|
1766 | self.changelog.rev(node) | |
1767 | return node |
|
1767 | return node | |
1768 | except error.LookupError: |
|
1768 | except error.LookupError: | |
1769 | if not self._dirstatevalidatewarned: |
|
1769 | if not self._dirstatevalidatewarned: | |
1770 | self._dirstatevalidatewarned = True |
|
1770 | self._dirstatevalidatewarned = True | |
1771 | self.ui.warn( |
|
1771 | self.ui.warn( | |
1772 | _(b"warning: ignoring unknown working parent %s!\n") |
|
1772 | _(b"warning: ignoring unknown working parent %s!\n") | |
1773 | % short(node) |
|
1773 | % short(node) | |
1774 | ) |
|
1774 | ) | |
1775 | return self.nullid |
|
1775 | return self.nullid | |
1776 |
|
1776 | |||
1777 | @storecache(narrowspec.FILENAME) |
|
1777 | @storecache(narrowspec.FILENAME) | |
1778 | def narrowpats(self): |
|
1778 | def narrowpats(self): | |
1779 | """matcher patterns for this repository's narrowspec |
|
1779 | """matcher patterns for this repository's narrowspec | |
1780 |
|
1780 | |||
1781 | A tuple of (includes, excludes). |
|
1781 | A tuple of (includes, excludes). | |
1782 | """ |
|
1782 | """ | |
1783 | return narrowspec.load(self) |
|
1783 | return narrowspec.load(self) | |
1784 |
|
1784 | |||
1785 | @storecache(narrowspec.FILENAME) |
|
1785 | @storecache(narrowspec.FILENAME) | |
1786 | def _storenarrowmatch(self): |
|
1786 | def _storenarrowmatch(self): | |
1787 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: |
|
1787 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: | |
1788 | return matchmod.always() |
|
1788 | return matchmod.always() | |
1789 | include, exclude = self.narrowpats |
|
1789 | include, exclude = self.narrowpats | |
1790 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1790 | return narrowspec.match(self.root, include=include, exclude=exclude) | |
1791 |
|
1791 | |||
1792 | @storecache(narrowspec.FILENAME) |
|
1792 | @storecache(narrowspec.FILENAME) | |
1793 | def _narrowmatch(self): |
|
1793 | def _narrowmatch(self): | |
1794 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: |
|
1794 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: | |
1795 | return matchmod.always() |
|
1795 | return matchmod.always() | |
1796 | narrowspec.checkworkingcopynarrowspec(self) |
|
1796 | narrowspec.checkworkingcopynarrowspec(self) | |
1797 | include, exclude = self.narrowpats |
|
1797 | include, exclude = self.narrowpats | |
1798 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1798 | return narrowspec.match(self.root, include=include, exclude=exclude) | |
1799 |
|
1799 | |||
1800 | def narrowmatch(self, match=None, includeexact=False): |
|
1800 | def narrowmatch(self, match=None, includeexact=False): | |
1801 | """matcher corresponding the the repo's narrowspec |
|
1801 | """matcher corresponding the the repo's narrowspec | |
1802 |
|
1802 | |||
1803 | If `match` is given, then that will be intersected with the narrow |
|
1803 | If `match` is given, then that will be intersected with the narrow | |
1804 | matcher. |
|
1804 | matcher. | |
1805 |
|
1805 | |||
1806 | If `includeexact` is True, then any exact matches from `match` will |
|
1806 | If `includeexact` is True, then any exact matches from `match` will | |
1807 | be included even if they're outside the narrowspec. |
|
1807 | be included even if they're outside the narrowspec. | |
1808 | """ |
|
1808 | """ | |
1809 | if match: |
|
1809 | if match: | |
1810 | if includeexact and not self._narrowmatch.always(): |
|
1810 | if includeexact and not self._narrowmatch.always(): | |
1811 | # do not exclude explicitly-specified paths so that they can |
|
1811 | # do not exclude explicitly-specified paths so that they can | |
1812 | # be warned later on |
|
1812 | # be warned later on | |
1813 | em = matchmod.exact(match.files()) |
|
1813 | em = matchmod.exact(match.files()) | |
1814 | nm = matchmod.unionmatcher([self._narrowmatch, em]) |
|
1814 | nm = matchmod.unionmatcher([self._narrowmatch, em]) | |
1815 | return matchmod.intersectmatchers(match, nm) |
|
1815 | return matchmod.intersectmatchers(match, nm) | |
1816 | return matchmod.intersectmatchers(match, self._narrowmatch) |
|
1816 | return matchmod.intersectmatchers(match, self._narrowmatch) | |
1817 | return self._narrowmatch |
|
1817 | return self._narrowmatch | |
1818 |
|
1818 | |||
1819 | def setnarrowpats(self, newincludes, newexcludes): |
|
1819 | def setnarrowpats(self, newincludes, newexcludes): | |
1820 | narrowspec.save(self, newincludes, newexcludes) |
|
1820 | narrowspec.save(self, newincludes, newexcludes) | |
1821 | self.invalidate(clearfilecache=True) |
|
1821 | self.invalidate(clearfilecache=True) | |
1822 |
|
1822 | |||
1823 | @unfilteredpropertycache |
|
1823 | @unfilteredpropertycache | |
1824 | def _quick_access_changeid_null(self): |
|
1824 | def _quick_access_changeid_null(self): | |
1825 | return { |
|
1825 | return { | |
1826 | b'null': (nullrev, self.nodeconstants.nullid), |
|
1826 | b'null': (nullrev, self.nodeconstants.nullid), | |
1827 | nullrev: (nullrev, self.nodeconstants.nullid), |
|
1827 | nullrev: (nullrev, self.nodeconstants.nullid), | |
1828 | self.nullid: (nullrev, self.nullid), |
|
1828 | self.nullid: (nullrev, self.nullid), | |
1829 | } |
|
1829 | } | |
1830 |
|
1830 | |||
1831 | @unfilteredpropertycache |
|
1831 | @unfilteredpropertycache | |
1832 | def _quick_access_changeid_wc(self): |
|
1832 | def _quick_access_changeid_wc(self): | |
1833 | # also fast path access to the working copy parents |
|
1833 | # also fast path access to the working copy parents | |
1834 | # however, only do it for filter that ensure wc is visible. |
|
1834 | # however, only do it for filter that ensure wc is visible. | |
1835 | quick = self._quick_access_changeid_null.copy() |
|
1835 | quick = self._quick_access_changeid_null.copy() | |
1836 | cl = self.unfiltered().changelog |
|
1836 | cl = self.unfiltered().changelog | |
1837 | for node in self.dirstate.parents(): |
|
1837 | for node in self.dirstate.parents(): | |
1838 | if node == self.nullid: |
|
1838 | if node == self.nullid: | |
1839 | continue |
|
1839 | continue | |
1840 | rev = cl.index.get_rev(node) |
|
1840 | rev = cl.index.get_rev(node) | |
1841 | if rev is None: |
|
1841 | if rev is None: | |
1842 | # unknown working copy parent case: |
|
1842 | # unknown working copy parent case: | |
1843 | # |
|
1843 | # | |
1844 | # skip the fast path and let higher code deal with it |
|
1844 | # skip the fast path and let higher code deal with it | |
1845 | continue |
|
1845 | continue | |
1846 | pair = (rev, node) |
|
1846 | pair = (rev, node) | |
1847 | quick[rev] = pair |
|
1847 | quick[rev] = pair | |
1848 | quick[node] = pair |
|
1848 | quick[node] = pair | |
1849 | # also add the parents of the parents |
|
1849 | # also add the parents of the parents | |
1850 | for r in cl.parentrevs(rev): |
|
1850 | for r in cl.parentrevs(rev): | |
1851 | if r == nullrev: |
|
1851 | if r == nullrev: | |
1852 | continue |
|
1852 | continue | |
1853 | n = cl.node(r) |
|
1853 | n = cl.node(r) | |
1854 | pair = (r, n) |
|
1854 | pair = (r, n) | |
1855 | quick[r] = pair |
|
1855 | quick[r] = pair | |
1856 | quick[n] = pair |
|
1856 | quick[n] = pair | |
1857 | p1node = self.dirstate.p1() |
|
1857 | p1node = self.dirstate.p1() | |
1858 | if p1node != self.nullid: |
|
1858 | if p1node != self.nullid: | |
1859 | quick[b'.'] = quick[p1node] |
|
1859 | quick[b'.'] = quick[p1node] | |
1860 | return quick |
|
1860 | return quick | |
1861 |
|
1861 | |||
1862 | @unfilteredmethod |
|
1862 | @unfilteredmethod | |
1863 | def _quick_access_changeid_invalidate(self): |
|
1863 | def _quick_access_changeid_invalidate(self): | |
1864 | if '_quick_access_changeid_wc' in vars(self): |
|
1864 | if '_quick_access_changeid_wc' in vars(self): | |
1865 | del self.__dict__['_quick_access_changeid_wc'] |
|
1865 | del self.__dict__['_quick_access_changeid_wc'] | |
1866 |
|
1866 | |||
1867 | @property |
|
1867 | @property | |
1868 | def _quick_access_changeid(self): |
|
1868 | def _quick_access_changeid(self): | |
1869 | """an helper dictionnary for __getitem__ calls |
|
1869 | """an helper dictionnary for __getitem__ calls | |
1870 |
|
1870 | |||
1871 | This contains a list of symbol we can recognise right away without |
|
1871 | This contains a list of symbol we can recognise right away without | |
1872 | further processing. |
|
1872 | further processing. | |
1873 | """ |
|
1873 | """ | |
1874 | if self.filtername in repoview.filter_has_wc: |
|
1874 | if self.filtername in repoview.filter_has_wc: | |
1875 | return self._quick_access_changeid_wc |
|
1875 | return self._quick_access_changeid_wc | |
1876 | return self._quick_access_changeid_null |
|
1876 | return self._quick_access_changeid_null | |
1877 |
|
1877 | |||
1878 | def __getitem__(self, changeid): |
|
1878 | def __getitem__(self, changeid): | |
1879 | # dealing with special cases |
|
1879 | # dealing with special cases | |
1880 | if changeid is None: |
|
1880 | if changeid is None: | |
1881 | return context.workingctx(self) |
|
1881 | return context.workingctx(self) | |
1882 | if isinstance(changeid, context.basectx): |
|
1882 | if isinstance(changeid, context.basectx): | |
1883 | return changeid |
|
1883 | return changeid | |
1884 |
|
1884 | |||
1885 | # dealing with multiple revisions |
|
1885 | # dealing with multiple revisions | |
1886 | if isinstance(changeid, slice): |
|
1886 | if isinstance(changeid, slice): | |
1887 | # wdirrev isn't contiguous so the slice shouldn't include it |
|
1887 | # wdirrev isn't contiguous so the slice shouldn't include it | |
1888 | return [ |
|
1888 | return [ | |
1889 | self[i] |
|
1889 | self[i] | |
1890 | for i in pycompat.xrange(*changeid.indices(len(self))) |
|
1890 | for i in pycompat.xrange(*changeid.indices(len(self))) | |
1891 | if i not in self.changelog.filteredrevs |
|
1891 | if i not in self.changelog.filteredrevs | |
1892 | ] |
|
1892 | ] | |
1893 |
|
1893 | |||
1894 | # dealing with some special values |
|
1894 | # dealing with some special values | |
1895 | quick_access = self._quick_access_changeid.get(changeid) |
|
1895 | quick_access = self._quick_access_changeid.get(changeid) | |
1896 | if quick_access is not None: |
|
1896 | if quick_access is not None: | |
1897 | rev, node = quick_access |
|
1897 | rev, node = quick_access | |
1898 | return context.changectx(self, rev, node, maybe_filtered=False) |
|
1898 | return context.changectx(self, rev, node, maybe_filtered=False) | |
1899 | if changeid == b'tip': |
|
1899 | if changeid == b'tip': | |
1900 | node = self.changelog.tip() |
|
1900 | node = self.changelog.tip() | |
1901 | rev = self.changelog.rev(node) |
|
1901 | rev = self.changelog.rev(node) | |
1902 | return context.changectx(self, rev, node) |
|
1902 | return context.changectx(self, rev, node) | |
1903 |
|
1903 | |||
1904 | # dealing with arbitrary values |
|
1904 | # dealing with arbitrary values | |
1905 | try: |
|
1905 | try: | |
1906 | if isinstance(changeid, int): |
|
1906 | if isinstance(changeid, int): | |
1907 | node = self.changelog.node(changeid) |
|
1907 | node = self.changelog.node(changeid) | |
1908 | rev = changeid |
|
1908 | rev = changeid | |
1909 | elif changeid == b'.': |
|
1909 | elif changeid == b'.': | |
1910 | # this is a hack to delay/avoid loading obsmarkers |
|
1910 | # this is a hack to delay/avoid loading obsmarkers | |
1911 | # when we know that '.' won't be hidden |
|
1911 | # when we know that '.' won't be hidden | |
1912 | node = self.dirstate.p1() |
|
1912 | node = self.dirstate.p1() | |
1913 | rev = self.unfiltered().changelog.rev(node) |
|
1913 | rev = self.unfiltered().changelog.rev(node) | |
1914 | elif len(changeid) == self.nodeconstants.nodelen: |
|
1914 | elif len(changeid) == self.nodeconstants.nodelen: | |
1915 | try: |
|
1915 | try: | |
1916 | node = changeid |
|
1916 | node = changeid | |
1917 | rev = self.changelog.rev(changeid) |
|
1917 | rev = self.changelog.rev(changeid) | |
1918 | except error.FilteredLookupError: |
|
1918 | except error.FilteredLookupError: | |
1919 | changeid = hex(changeid) # for the error message |
|
1919 | changeid = hex(changeid) # for the error message | |
1920 | raise |
|
1920 | raise | |
1921 | except LookupError: |
|
1921 | except LookupError: | |
1922 | # check if it might have come from damaged dirstate |
|
1922 | # check if it might have come from damaged dirstate | |
1923 | # |
|
1923 | # | |
1924 | # XXX we could avoid the unfiltered if we had a recognizable |
|
1924 | # XXX we could avoid the unfiltered if we had a recognizable | |
1925 | # exception for filtered changeset access |
|
1925 | # exception for filtered changeset access | |
1926 | if ( |
|
1926 | if ( | |
1927 | self.local() |
|
1927 | self.local() | |
1928 | and changeid in self.unfiltered().dirstate.parents() |
|
1928 | and changeid in self.unfiltered().dirstate.parents() | |
1929 | ): |
|
1929 | ): | |
1930 | msg = _(b"working directory has unknown parent '%s'!") |
|
1930 | msg = _(b"working directory has unknown parent '%s'!") | |
1931 | raise error.Abort(msg % short(changeid)) |
|
1931 | raise error.Abort(msg % short(changeid)) | |
1932 | changeid = hex(changeid) # for the error message |
|
1932 | changeid = hex(changeid) # for the error message | |
1933 | raise |
|
1933 | raise | |
1934 |
|
1934 | |||
1935 | elif len(changeid) == 2 * self.nodeconstants.nodelen: |
|
1935 | elif len(changeid) == 2 * self.nodeconstants.nodelen: | |
1936 | node = bin(changeid) |
|
1936 | node = bin(changeid) | |
1937 | rev = self.changelog.rev(node) |
|
1937 | rev = self.changelog.rev(node) | |
1938 | else: |
|
1938 | else: | |
1939 | raise error.ProgrammingError( |
|
1939 | raise error.ProgrammingError( | |
1940 | b"unsupported changeid '%s' of type %s" |
|
1940 | b"unsupported changeid '%s' of type %s" | |
1941 | % (changeid, pycompat.bytestr(type(changeid))) |
|
1941 | % (changeid, pycompat.bytestr(type(changeid))) | |
1942 | ) |
|
1942 | ) | |
1943 |
|
1943 | |||
1944 | return context.changectx(self, rev, node) |
|
1944 | return context.changectx(self, rev, node) | |
1945 |
|
1945 | |||
1946 | except (error.FilteredIndexError, error.FilteredLookupError): |
|
1946 | except (error.FilteredIndexError, error.FilteredLookupError): | |
1947 | raise error.FilteredRepoLookupError( |
|
1947 | raise error.FilteredRepoLookupError( | |
1948 | _(b"filtered revision '%s'") % pycompat.bytestr(changeid) |
|
1948 | _(b"filtered revision '%s'") % pycompat.bytestr(changeid) | |
1949 | ) |
|
1949 | ) | |
1950 | except (IndexError, LookupError): |
|
1950 | except (IndexError, LookupError): | |
1951 | raise error.RepoLookupError( |
|
1951 | raise error.RepoLookupError( | |
1952 | _(b"unknown revision '%s'") % pycompat.bytestr(changeid) |
|
1952 | _(b"unknown revision '%s'") % pycompat.bytestr(changeid) | |
1953 | ) |
|
1953 | ) | |
1954 | except error.WdirUnsupported: |
|
1954 | except error.WdirUnsupported: | |
1955 | return context.workingctx(self) |
|
1955 | return context.workingctx(self) | |
1956 |
|
1956 | |||
1957 | def __contains__(self, changeid): |
|
1957 | def __contains__(self, changeid): | |
1958 | """True if the given changeid exists""" |
|
1958 | """True if the given changeid exists""" | |
1959 | try: |
|
1959 | try: | |
1960 | self[changeid] |
|
1960 | self[changeid] | |
1961 | return True |
|
1961 | return True | |
1962 | except error.RepoLookupError: |
|
1962 | except error.RepoLookupError: | |
1963 | return False |
|
1963 | return False | |
1964 |
|
1964 | |||
1965 | def __nonzero__(self): |
|
1965 | def __nonzero__(self): | |
1966 | return True |
|
1966 | return True | |
1967 |
|
1967 | |||
1968 | __bool__ = __nonzero__ |
|
1968 | __bool__ = __nonzero__ | |
1969 |
|
1969 | |||
1970 | def __len__(self): |
|
1970 | def __len__(self): | |
1971 | # no need to pay the cost of repoview.changelog |
|
1971 | # no need to pay the cost of repoview.changelog | |
1972 | unfi = self.unfiltered() |
|
1972 | unfi = self.unfiltered() | |
1973 | return len(unfi.changelog) |
|
1973 | return len(unfi.changelog) | |
1974 |
|
1974 | |||
1975 | def __iter__(self): |
|
1975 | def __iter__(self): | |
1976 | return iter(self.changelog) |
|
1976 | return iter(self.changelog) | |
1977 |
|
1977 | |||
1978 | def revs(self, expr, *args): |
|
1978 | def revs(self, expr, *args): | |
1979 | """Find revisions matching a revset. |
|
1979 | """Find revisions matching a revset. | |
1980 |
|
1980 | |||
1981 | The revset is specified as a string ``expr`` that may contain |
|
1981 | The revset is specified as a string ``expr`` that may contain | |
1982 | %-formatting to escape certain types. See ``revsetlang.formatspec``. |
|
1982 | %-formatting to escape certain types. See ``revsetlang.formatspec``. | |
1983 |
|
1983 | |||
1984 | Revset aliases from the configuration are not expanded. To expand |
|
1984 | Revset aliases from the configuration are not expanded. To expand | |
1985 | user aliases, consider calling ``scmutil.revrange()`` or |
|
1985 | user aliases, consider calling ``scmutil.revrange()`` or | |
1986 | ``repo.anyrevs([expr], user=True)``. |
|
1986 | ``repo.anyrevs([expr], user=True)``. | |
1987 |
|
1987 | |||
1988 | Returns a smartset.abstractsmartset, which is a list-like interface |
|
1988 | Returns a smartset.abstractsmartset, which is a list-like interface | |
1989 | that contains integer revisions. |
|
1989 | that contains integer revisions. | |
1990 | """ |
|
1990 | """ | |
1991 | tree = revsetlang.spectree(expr, *args) |
|
1991 | tree = revsetlang.spectree(expr, *args) | |
1992 | return revset.makematcher(tree)(self) |
|
1992 | return revset.makematcher(tree)(self) | |
1993 |
|
1993 | |||
1994 | def set(self, expr, *args): |
|
1994 | def set(self, expr, *args): | |
1995 | """Find revisions matching a revset and emit changectx instances. |
|
1995 | """Find revisions matching a revset and emit changectx instances. | |
1996 |
|
1996 | |||
1997 | This is a convenience wrapper around ``revs()`` that iterates the |
|
1997 | This is a convenience wrapper around ``revs()`` that iterates the | |
1998 | result and is a generator of changectx instances. |
|
1998 | result and is a generator of changectx instances. | |
1999 |
|
1999 | |||
2000 | Revset aliases from the configuration are not expanded. To expand |
|
2000 | Revset aliases from the configuration are not expanded. To expand | |
2001 | user aliases, consider calling ``scmutil.revrange()``. |
|
2001 | user aliases, consider calling ``scmutil.revrange()``. | |
2002 | """ |
|
2002 | """ | |
2003 | for r in self.revs(expr, *args): |
|
2003 | for r in self.revs(expr, *args): | |
2004 | yield self[r] |
|
2004 | yield self[r] | |
2005 |
|
2005 | |||
2006 | def anyrevs(self, specs, user=False, localalias=None): |
|
2006 | def anyrevs(self, specs, user=False, localalias=None): | |
2007 | """Find revisions matching one of the given revsets. |
|
2007 | """Find revisions matching one of the given revsets. | |
2008 |
|
2008 | |||
2009 | Revset aliases from the configuration are not expanded by default. To |
|
2009 | Revset aliases from the configuration are not expanded by default. To | |
2010 | expand user aliases, specify ``user=True``. To provide some local |
|
2010 | expand user aliases, specify ``user=True``. To provide some local | |
2011 | definitions overriding user aliases, set ``localalias`` to |
|
2011 | definitions overriding user aliases, set ``localalias`` to | |
2012 | ``{name: definitionstring}``. |
|
2012 | ``{name: definitionstring}``. | |
2013 | """ |
|
2013 | """ | |
2014 | if specs == [b'null']: |
|
2014 | if specs == [b'null']: | |
2015 | return revset.baseset([nullrev]) |
|
2015 | return revset.baseset([nullrev]) | |
2016 | if specs == [b'.']: |
|
2016 | if specs == [b'.']: | |
2017 | quick_data = self._quick_access_changeid.get(b'.') |
|
2017 | quick_data = self._quick_access_changeid.get(b'.') | |
2018 | if quick_data is not None: |
|
2018 | if quick_data is not None: | |
2019 | return revset.baseset([quick_data[0]]) |
|
2019 | return revset.baseset([quick_data[0]]) | |
2020 | if user: |
|
2020 | if user: | |
2021 | m = revset.matchany( |
|
2021 | m = revset.matchany( | |
2022 | self.ui, |
|
2022 | self.ui, | |
2023 | specs, |
|
2023 | specs, | |
2024 | lookup=revset.lookupfn(self), |
|
2024 | lookup=revset.lookupfn(self), | |
2025 | localalias=localalias, |
|
2025 | localalias=localalias, | |
2026 | ) |
|
2026 | ) | |
2027 | else: |
|
2027 | else: | |
2028 | m = revset.matchany(None, specs, localalias=localalias) |
|
2028 | m = revset.matchany(None, specs, localalias=localalias) | |
2029 | return m(self) |
|
2029 | return m(self) | |
2030 |
|
2030 | |||
2031 | def url(self): |
|
2031 | def url(self): | |
2032 | return b'file:' + self.root |
|
2032 | return b'file:' + self.root | |
2033 |
|
2033 | |||
2034 | def hook(self, name, throw=False, **args): |
|
2034 | def hook(self, name, throw=False, **args): | |
2035 | """Call a hook, passing this repo instance. |
|
2035 | """Call a hook, passing this repo instance. | |
2036 |
|
2036 | |||
2037 | This a convenience method to aid invoking hooks. Extensions likely |
|
2037 | This a convenience method to aid invoking hooks. Extensions likely | |
2038 | won't call this unless they have registered a custom hook or are |
|
2038 | won't call this unless they have registered a custom hook or are | |
2039 | replacing code that is expected to call a hook. |
|
2039 | replacing code that is expected to call a hook. | |
2040 | """ |
|
2040 | """ | |
2041 | return hook.hook(self.ui, self, name, throw, **args) |
|
2041 | return hook.hook(self.ui, self, name, throw, **args) | |
2042 |
|
2042 | |||
2043 | @filteredpropertycache |
|
2043 | @filteredpropertycache | |
2044 | def _tagscache(self): |
|
2044 | def _tagscache(self): | |
2045 | """Returns a tagscache object that contains various tags related |
|
2045 | """Returns a tagscache object that contains various tags related | |
2046 | caches.""" |
|
2046 | caches.""" | |
2047 |
|
2047 | |||
2048 | # This simplifies its cache management by having one decorated |
|
2048 | # This simplifies its cache management by having one decorated | |
2049 | # function (this one) and the rest simply fetch things from it. |
|
2049 | # function (this one) and the rest simply fetch things from it. | |
2050 | class tagscache(object): |
|
2050 | class tagscache(object): | |
2051 | def __init__(self): |
|
2051 | def __init__(self): | |
2052 | # These two define the set of tags for this repository. tags |
|
2052 | # These two define the set of tags for this repository. tags | |
2053 | # maps tag name to node; tagtypes maps tag name to 'global' or |
|
2053 | # maps tag name to node; tagtypes maps tag name to 'global' or | |
2054 | # 'local'. (Global tags are defined by .hgtags across all |
|
2054 | # 'local'. (Global tags are defined by .hgtags across all | |
2055 | # heads, and local tags are defined in .hg/localtags.) |
|
2055 | # heads, and local tags are defined in .hg/localtags.) | |
2056 | # They constitute the in-memory cache of tags. |
|
2056 | # They constitute the in-memory cache of tags. | |
2057 | self.tags = self.tagtypes = None |
|
2057 | self.tags = self.tagtypes = None | |
2058 |
|
2058 | |||
2059 | self.nodetagscache = self.tagslist = None |
|
2059 | self.nodetagscache = self.tagslist = None | |
2060 |
|
2060 | |||
2061 | cache = tagscache() |
|
2061 | cache = tagscache() | |
2062 | cache.tags, cache.tagtypes = self._findtags() |
|
2062 | cache.tags, cache.tagtypes = self._findtags() | |
2063 |
|
2063 | |||
2064 | return cache |
|
2064 | return cache | |
2065 |
|
2065 | |||
2066 | def tags(self): |
|
2066 | def tags(self): | |
2067 | '''return a mapping of tag to node''' |
|
2067 | '''return a mapping of tag to node''' | |
2068 | t = {} |
|
2068 | t = {} | |
2069 | if self.changelog.filteredrevs: |
|
2069 | if self.changelog.filteredrevs: | |
2070 | tags, tt = self._findtags() |
|
2070 | tags, tt = self._findtags() | |
2071 | else: |
|
2071 | else: | |
2072 | tags = self._tagscache.tags |
|
2072 | tags = self._tagscache.tags | |
2073 | rev = self.changelog.rev |
|
2073 | rev = self.changelog.rev | |
2074 | for k, v in pycompat.iteritems(tags): |
|
2074 | for k, v in pycompat.iteritems(tags): | |
2075 | try: |
|
2075 | try: | |
2076 | # ignore tags to unknown nodes |
|
2076 | # ignore tags to unknown nodes | |
2077 | rev(v) |
|
2077 | rev(v) | |
2078 | t[k] = v |
|
2078 | t[k] = v | |
2079 | except (error.LookupError, ValueError): |
|
2079 | except (error.LookupError, ValueError): | |
2080 | pass |
|
2080 | pass | |
2081 | return t |
|
2081 | return t | |
2082 |
|
2082 | |||
2083 | def _findtags(self): |
|
2083 | def _findtags(self): | |
2084 | """Do the hard work of finding tags. Return a pair of dicts |
|
2084 | """Do the hard work of finding tags. Return a pair of dicts | |
2085 | (tags, tagtypes) where tags maps tag name to node, and tagtypes |
|
2085 | (tags, tagtypes) where tags maps tag name to node, and tagtypes | |
2086 | maps tag name to a string like \'global\' or \'local\'. |
|
2086 | maps tag name to a string like \'global\' or \'local\'. | |
2087 | Subclasses or extensions are free to add their own tags, but |
|
2087 | Subclasses or extensions are free to add their own tags, but | |
2088 | should be aware that the returned dicts will be retained for the |
|
2088 | should be aware that the returned dicts will be retained for the | |
2089 | duration of the localrepo object.""" |
|
2089 | duration of the localrepo object.""" | |
2090 |
|
2090 | |||
2091 | # XXX what tagtype should subclasses/extensions use? Currently |
|
2091 | # XXX what tagtype should subclasses/extensions use? Currently | |
2092 | # mq and bookmarks add tags, but do not set the tagtype at all. |
|
2092 | # mq and bookmarks add tags, but do not set the tagtype at all. | |
2093 | # Should each extension invent its own tag type? Should there |
|
2093 | # Should each extension invent its own tag type? Should there | |
2094 | # be one tagtype for all such "virtual" tags? Or is the status |
|
2094 | # be one tagtype for all such "virtual" tags? Or is the status | |
2095 | # quo fine? |
|
2095 | # quo fine? | |
2096 |
|
2096 | |||
2097 | # map tag name to (node, hist) |
|
2097 | # map tag name to (node, hist) | |
2098 | alltags = tagsmod.findglobaltags(self.ui, self) |
|
2098 | alltags = tagsmod.findglobaltags(self.ui, self) | |
2099 | # map tag name to tag type |
|
2099 | # map tag name to tag type | |
2100 | tagtypes = {tag: b'global' for tag in alltags} |
|
2100 | tagtypes = {tag: b'global' for tag in alltags} | |
2101 |
|
2101 | |||
2102 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) |
|
2102 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) | |
2103 |
|
2103 | |||
2104 | # Build the return dicts. Have to re-encode tag names because |
|
2104 | # Build the return dicts. Have to re-encode tag names because | |
2105 | # the tags module always uses UTF-8 (in order not to lose info |
|
2105 | # the tags module always uses UTF-8 (in order not to lose info | |
2106 | # writing to the cache), but the rest of Mercurial wants them in |
|
2106 | # writing to the cache), but the rest of Mercurial wants them in | |
2107 | # local encoding. |
|
2107 | # local encoding. | |
2108 | tags = {} |
|
2108 | tags = {} | |
2109 | for (name, (node, hist)) in pycompat.iteritems(alltags): |
|
2109 | for (name, (node, hist)) in pycompat.iteritems(alltags): | |
2110 | if node != self.nullid: |
|
2110 | if node != self.nullid: | |
2111 | tags[encoding.tolocal(name)] = node |
|
2111 | tags[encoding.tolocal(name)] = node | |
2112 | tags[b'tip'] = self.changelog.tip() |
|
2112 | tags[b'tip'] = self.changelog.tip() | |
2113 | tagtypes = { |
|
2113 | tagtypes = { | |
2114 | encoding.tolocal(name): value |
|
2114 | encoding.tolocal(name): value | |
2115 | for (name, value) in pycompat.iteritems(tagtypes) |
|
2115 | for (name, value) in pycompat.iteritems(tagtypes) | |
2116 | } |
|
2116 | } | |
2117 | return (tags, tagtypes) |
|
2117 | return (tags, tagtypes) | |
2118 |
|
2118 | |||
2119 | def tagtype(self, tagname): |
|
2119 | def tagtype(self, tagname): | |
2120 | """ |
|
2120 | """ | |
2121 | return the type of the given tag. result can be: |
|
2121 | return the type of the given tag. result can be: | |
2122 |
|
2122 | |||
2123 | 'local' : a local tag |
|
2123 | 'local' : a local tag | |
2124 | 'global' : a global tag |
|
2124 | 'global' : a global tag | |
2125 | None : tag does not exist |
|
2125 | None : tag does not exist | |
2126 | """ |
|
2126 | """ | |
2127 |
|
2127 | |||
2128 | return self._tagscache.tagtypes.get(tagname) |
|
2128 | return self._tagscache.tagtypes.get(tagname) | |
2129 |
|
2129 | |||
2130 | def tagslist(self): |
|
2130 | def tagslist(self): | |
2131 | '''return a list of tags ordered by revision''' |
|
2131 | '''return a list of tags ordered by revision''' | |
2132 | if not self._tagscache.tagslist: |
|
2132 | if not self._tagscache.tagslist: | |
2133 | l = [] |
|
2133 | l = [] | |
2134 | for t, n in pycompat.iteritems(self.tags()): |
|
2134 | for t, n in pycompat.iteritems(self.tags()): | |
2135 | l.append((self.changelog.rev(n), t, n)) |
|
2135 | l.append((self.changelog.rev(n), t, n)) | |
2136 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] |
|
2136 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] | |
2137 |
|
2137 | |||
2138 | return self._tagscache.tagslist |
|
2138 | return self._tagscache.tagslist | |
2139 |
|
2139 | |||
2140 | def nodetags(self, node): |
|
2140 | def nodetags(self, node): | |
2141 | '''return the tags associated with a node''' |
|
2141 | '''return the tags associated with a node''' | |
2142 | if not self._tagscache.nodetagscache: |
|
2142 | if not self._tagscache.nodetagscache: | |
2143 | nodetagscache = {} |
|
2143 | nodetagscache = {} | |
2144 | for t, n in pycompat.iteritems(self._tagscache.tags): |
|
2144 | for t, n in pycompat.iteritems(self._tagscache.tags): | |
2145 | nodetagscache.setdefault(n, []).append(t) |
|
2145 | nodetagscache.setdefault(n, []).append(t) | |
2146 | for tags in pycompat.itervalues(nodetagscache): |
|
2146 | for tags in pycompat.itervalues(nodetagscache): | |
2147 | tags.sort() |
|
2147 | tags.sort() | |
2148 | self._tagscache.nodetagscache = nodetagscache |
|
2148 | self._tagscache.nodetagscache = nodetagscache | |
2149 | return self._tagscache.nodetagscache.get(node, []) |
|
2149 | return self._tagscache.nodetagscache.get(node, []) | |
2150 |
|
2150 | |||
2151 | def nodebookmarks(self, node): |
|
2151 | def nodebookmarks(self, node): | |
2152 | """return the list of bookmarks pointing to the specified node""" |
|
2152 | """return the list of bookmarks pointing to the specified node""" | |
2153 | return self._bookmarks.names(node) |
|
2153 | return self._bookmarks.names(node) | |
2154 |
|
2154 | |||
2155 | def branchmap(self): |
|
2155 | def branchmap(self): | |
2156 | """returns a dictionary {branch: [branchheads]} with branchheads |
|
2156 | """returns a dictionary {branch: [branchheads]} with branchheads | |
2157 | ordered by increasing revision number""" |
|
2157 | ordered by increasing revision number""" | |
2158 | return self._branchcaches[self] |
|
2158 | return self._branchcaches[self] | |
2159 |
|
2159 | |||
2160 | @unfilteredmethod |
|
2160 | @unfilteredmethod | |
2161 | def revbranchcache(self): |
|
2161 | def revbranchcache(self): | |
2162 | if not self._revbranchcache: |
|
2162 | if not self._revbranchcache: | |
2163 | self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) |
|
2163 | self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) | |
2164 | return self._revbranchcache |
|
2164 | return self._revbranchcache | |
2165 |
|
2165 | |||
2166 | def register_changeset(self, rev, changelogrevision): |
|
2166 | def register_changeset(self, rev, changelogrevision): | |
2167 | self.revbranchcache().setdata(rev, changelogrevision) |
|
2167 | self.revbranchcache().setdata(rev, changelogrevision) | |
2168 |
|
2168 | |||
2169 | def branchtip(self, branch, ignoremissing=False): |
|
2169 | def branchtip(self, branch, ignoremissing=False): | |
2170 | """return the tip node for a given branch |
|
2170 | """return the tip node for a given branch | |
2171 |
|
2171 | |||
2172 | If ignoremissing is True, then this method will not raise an error. |
|
2172 | If ignoremissing is True, then this method will not raise an error. | |
2173 | This is helpful for callers that only expect None for a missing branch |
|
2173 | This is helpful for callers that only expect None for a missing branch | |
2174 | (e.g. namespace). |
|
2174 | (e.g. namespace). | |
2175 |
|
2175 | |||
2176 | """ |
|
2176 | """ | |
2177 | try: |
|
2177 | try: | |
2178 | return self.branchmap().branchtip(branch) |
|
2178 | return self.branchmap().branchtip(branch) | |
2179 | except KeyError: |
|
2179 | except KeyError: | |
2180 | if not ignoremissing: |
|
2180 | if not ignoremissing: | |
2181 | raise error.RepoLookupError(_(b"unknown branch '%s'") % branch) |
|
2181 | raise error.RepoLookupError(_(b"unknown branch '%s'") % branch) | |
2182 | else: |
|
2182 | else: | |
2183 | pass |
|
2183 | pass | |
2184 |
|
2184 | |||
2185 | def lookup(self, key): |
|
2185 | def lookup(self, key): | |
2186 | node = scmutil.revsymbol(self, key).node() |
|
2186 | node = scmutil.revsymbol(self, key).node() | |
2187 | if node is None: |
|
2187 | if node is None: | |
2188 | raise error.RepoLookupError(_(b"unknown revision '%s'") % key) |
|
2188 | raise error.RepoLookupError(_(b"unknown revision '%s'") % key) | |
2189 | return node |
|
2189 | return node | |
2190 |
|
2190 | |||
2191 | def lookupbranch(self, key): |
|
2191 | def lookupbranch(self, key): | |
2192 | if self.branchmap().hasbranch(key): |
|
2192 | if self.branchmap().hasbranch(key): | |
2193 | return key |
|
2193 | return key | |
2194 |
|
2194 | |||
2195 | return scmutil.revsymbol(self, key).branch() |
|
2195 | return scmutil.revsymbol(self, key).branch() | |
2196 |
|
2196 | |||
2197 | def known(self, nodes): |
|
2197 | def known(self, nodes): | |
2198 | cl = self.changelog |
|
2198 | cl = self.changelog | |
2199 | get_rev = cl.index.get_rev |
|
2199 | get_rev = cl.index.get_rev | |
2200 | filtered = cl.filteredrevs |
|
2200 | filtered = cl.filteredrevs | |
2201 | result = [] |
|
2201 | result = [] | |
2202 | for n in nodes: |
|
2202 | for n in nodes: | |
2203 | r = get_rev(n) |
|
2203 | r = get_rev(n) | |
2204 | resp = not (r is None or r in filtered) |
|
2204 | resp = not (r is None or r in filtered) | |
2205 | result.append(resp) |
|
2205 | result.append(resp) | |
2206 | return result |
|
2206 | return result | |
2207 |
|
2207 | |||
2208 | def local(self): |
|
2208 | def local(self): | |
2209 | return self |
|
2209 | return self | |
2210 |
|
2210 | |||
2211 | def publishing(self): |
|
2211 | def publishing(self): | |
2212 | # it's safe (and desirable) to trust the publish flag unconditionally |
|
2212 | # it's safe (and desirable) to trust the publish flag unconditionally | |
2213 | # so that we don't finalize changes shared between users via ssh or nfs |
|
2213 | # so that we don't finalize changes shared between users via ssh or nfs | |
2214 | return self.ui.configbool(b'phases', b'publish', untrusted=True) |
|
2214 | return self.ui.configbool(b'phases', b'publish', untrusted=True) | |
2215 |
|
2215 | |||
2216 | def cancopy(self): |
|
2216 | def cancopy(self): | |
2217 | # so statichttprepo's override of local() works |
|
2217 | # so statichttprepo's override of local() works | |
2218 | if not self.local(): |
|
2218 | if not self.local(): | |
2219 | return False |
|
2219 | return False | |
2220 | if not self.publishing(): |
|
2220 | if not self.publishing(): | |
2221 | return True |
|
2221 | return True | |
2222 | # if publishing we can't copy if there is filtered content |
|
2222 | # if publishing we can't copy if there is filtered content | |
2223 | return not self.filtered(b'visible').changelog.filteredrevs |
|
2223 | return not self.filtered(b'visible').changelog.filteredrevs | |
2224 |
|
2224 | |||
2225 | def shared(self): |
|
2225 | def shared(self): | |
2226 | '''the type of shared repository (None if not shared)''' |
|
2226 | '''the type of shared repository (None if not shared)''' | |
2227 | if self.sharedpath != self.path: |
|
2227 | if self.sharedpath != self.path: | |
2228 | return b'store' |
|
2228 | return b'store' | |
2229 | return None |
|
2229 | return None | |
2230 |
|
2230 | |||
2231 | def wjoin(self, f, *insidef): |
|
2231 | def wjoin(self, f, *insidef): | |
2232 | return self.vfs.reljoin(self.root, f, *insidef) |
|
2232 | return self.vfs.reljoin(self.root, f, *insidef) | |
2233 |
|
2233 | |||
2234 | def setparents(self, p1, p2=None): |
|
2234 | def setparents(self, p1, p2=None): | |
2235 | if p2 is None: |
|
2235 | if p2 is None: | |
2236 | p2 = self.nullid |
|
2236 | p2 = self.nullid | |
2237 | self[None].setparents(p1, p2) |
|
2237 | self[None].setparents(p1, p2) | |
2238 | self._quick_access_changeid_invalidate() |
|
2238 | self._quick_access_changeid_invalidate() | |
2239 |
|
2239 | |||
2240 | def filectx(self, path, changeid=None, fileid=None, changectx=None): |
|
2240 | def filectx(self, path, changeid=None, fileid=None, changectx=None): | |
2241 | """changeid must be a changeset revision, if specified. |
|
2241 | """changeid must be a changeset revision, if specified. | |
2242 | fileid can be a file revision or node.""" |
|
2242 | fileid can be a file revision or node.""" | |
2243 | return context.filectx( |
|
2243 | return context.filectx( | |
2244 | self, path, changeid, fileid, changectx=changectx |
|
2244 | self, path, changeid, fileid, changectx=changectx | |
2245 | ) |
|
2245 | ) | |
2246 |
|
2246 | |||
2247 | def getcwd(self): |
|
2247 | def getcwd(self): | |
2248 | return self.dirstate.getcwd() |
|
2248 | return self.dirstate.getcwd() | |
2249 |
|
2249 | |||
2250 | def pathto(self, f, cwd=None): |
|
2250 | def pathto(self, f, cwd=None): | |
2251 | return self.dirstate.pathto(f, cwd) |
|
2251 | return self.dirstate.pathto(f, cwd) | |
2252 |
|
2252 | |||
2253 | def _loadfilter(self, filter): |
|
2253 | def _loadfilter(self, filter): | |
2254 | if filter not in self._filterpats: |
|
2254 | if filter not in self._filterpats: | |
2255 | l = [] |
|
2255 | l = [] | |
2256 | for pat, cmd in self.ui.configitems(filter): |
|
2256 | for pat, cmd in self.ui.configitems(filter): | |
2257 | if cmd == b'!': |
|
2257 | if cmd == b'!': | |
2258 | continue |
|
2258 | continue | |
2259 | mf = matchmod.match(self.root, b'', [pat]) |
|
2259 | mf = matchmod.match(self.root, b'', [pat]) | |
2260 | fn = None |
|
2260 | fn = None | |
2261 | params = cmd |
|
2261 | params = cmd | |
2262 | for name, filterfn in pycompat.iteritems(self._datafilters): |
|
2262 | for name, filterfn in pycompat.iteritems(self._datafilters): | |
2263 | if cmd.startswith(name): |
|
2263 | if cmd.startswith(name): | |
2264 | fn = filterfn |
|
2264 | fn = filterfn | |
2265 | params = cmd[len(name) :].lstrip() |
|
2265 | params = cmd[len(name) :].lstrip() | |
2266 | break |
|
2266 | break | |
2267 | if not fn: |
|
2267 | if not fn: | |
2268 | fn = lambda s, c, **kwargs: procutil.filter(s, c) |
|
2268 | fn = lambda s, c, **kwargs: procutil.filter(s, c) | |
2269 | fn.__name__ = 'commandfilter' |
|
2269 | fn.__name__ = 'commandfilter' | |
2270 | # Wrap old filters not supporting keyword arguments |
|
2270 | # Wrap old filters not supporting keyword arguments | |
2271 | if not pycompat.getargspec(fn)[2]: |
|
2271 | if not pycompat.getargspec(fn)[2]: | |
2272 | oldfn = fn |
|
2272 | oldfn = fn | |
2273 | fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c) |
|
2273 | fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c) | |
2274 | fn.__name__ = 'compat-' + oldfn.__name__ |
|
2274 | fn.__name__ = 'compat-' + oldfn.__name__ | |
2275 | l.append((mf, fn, params)) |
|
2275 | l.append((mf, fn, params)) | |
2276 | self._filterpats[filter] = l |
|
2276 | self._filterpats[filter] = l | |
2277 | return self._filterpats[filter] |
|
2277 | return self._filterpats[filter] | |
2278 |
|
2278 | |||
2279 | def _filter(self, filterpats, filename, data): |
|
2279 | def _filter(self, filterpats, filename, data): | |
2280 | for mf, fn, cmd in filterpats: |
|
2280 | for mf, fn, cmd in filterpats: | |
2281 | if mf(filename): |
|
2281 | if mf(filename): | |
2282 | self.ui.debug( |
|
2282 | self.ui.debug( | |
2283 | b"filtering %s through %s\n" |
|
2283 | b"filtering %s through %s\n" | |
2284 | % (filename, cmd or pycompat.sysbytes(fn.__name__)) |
|
2284 | % (filename, cmd or pycompat.sysbytes(fn.__name__)) | |
2285 | ) |
|
2285 | ) | |
2286 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) |
|
2286 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) | |
2287 | break |
|
2287 | break | |
2288 |
|
2288 | |||
2289 | return data |
|
2289 | return data | |
2290 |
|
2290 | |||
2291 | @unfilteredpropertycache |
|
2291 | @unfilteredpropertycache | |
2292 | def _encodefilterpats(self): |
|
2292 | def _encodefilterpats(self): | |
2293 | return self._loadfilter(b'encode') |
|
2293 | return self._loadfilter(b'encode') | |
2294 |
|
2294 | |||
2295 | @unfilteredpropertycache |
|
2295 | @unfilteredpropertycache | |
2296 | def _decodefilterpats(self): |
|
2296 | def _decodefilterpats(self): | |
2297 | return self._loadfilter(b'decode') |
|
2297 | return self._loadfilter(b'decode') | |
2298 |
|
2298 | |||
2299 | def adddatafilter(self, name, filter): |
|
2299 | def adddatafilter(self, name, filter): | |
2300 | self._datafilters[name] = filter |
|
2300 | self._datafilters[name] = filter | |
2301 |
|
2301 | |||
2302 | def wread(self, filename): |
|
2302 | def wread(self, filename): | |
2303 | if self.wvfs.islink(filename): |
|
2303 | if self.wvfs.islink(filename): | |
2304 | data = self.wvfs.readlink(filename) |
|
2304 | data = self.wvfs.readlink(filename) | |
2305 | else: |
|
2305 | else: | |
2306 | data = self.wvfs.read(filename) |
|
2306 | data = self.wvfs.read(filename) | |
2307 | return self._filter(self._encodefilterpats, filename, data) |
|
2307 | return self._filter(self._encodefilterpats, filename, data) | |
2308 |
|
2308 | |||
2309 | def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs): |
|
2309 | def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs): | |
2310 | """write ``data`` into ``filename`` in the working directory |
|
2310 | """write ``data`` into ``filename`` in the working directory | |
2311 |
|
2311 | |||
2312 | This returns length of written (maybe decoded) data. |
|
2312 | This returns length of written (maybe decoded) data. | |
2313 | """ |
|
2313 | """ | |
2314 | data = self._filter(self._decodefilterpats, filename, data) |
|
2314 | data = self._filter(self._decodefilterpats, filename, data) | |
2315 | if b'l' in flags: |
|
2315 | if b'l' in flags: | |
2316 | self.wvfs.symlink(data, filename) |
|
2316 | self.wvfs.symlink(data, filename) | |
2317 | else: |
|
2317 | else: | |
2318 | self.wvfs.write( |
|
2318 | self.wvfs.write( | |
2319 | filename, data, backgroundclose=backgroundclose, **kwargs |
|
2319 | filename, data, backgroundclose=backgroundclose, **kwargs | |
2320 | ) |
|
2320 | ) | |
2321 | if b'x' in flags: |
|
2321 | if b'x' in flags: | |
2322 | self.wvfs.setflags(filename, False, True) |
|
2322 | self.wvfs.setflags(filename, False, True) | |
2323 | else: |
|
2323 | else: | |
2324 | self.wvfs.setflags(filename, False, False) |
|
2324 | self.wvfs.setflags(filename, False, False) | |
2325 | return len(data) |
|
2325 | return len(data) | |
2326 |
|
2326 | |||
2327 | def wwritedata(self, filename, data): |
|
2327 | def wwritedata(self, filename, data): | |
2328 | return self._filter(self._decodefilterpats, filename, data) |
|
2328 | return self._filter(self._decodefilterpats, filename, data) | |
2329 |
|
2329 | |||
2330 | def currenttransaction(self): |
|
2330 | def currenttransaction(self): | |
2331 | """return the current transaction or None if non exists""" |
|
2331 | """return the current transaction or None if non exists""" | |
2332 | if self._transref: |
|
2332 | if self._transref: | |
2333 | tr = self._transref() |
|
2333 | tr = self._transref() | |
2334 | else: |
|
2334 | else: | |
2335 | tr = None |
|
2335 | tr = None | |
2336 |
|
2336 | |||
2337 | if tr and tr.running(): |
|
2337 | if tr and tr.running(): | |
2338 | return tr |
|
2338 | return tr | |
2339 | return None |
|
2339 | return None | |
2340 |
|
2340 | |||
2341 | def transaction(self, desc, report=None): |
|
2341 | def transaction(self, desc, report=None): | |
2342 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
2342 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
2343 | b'devel', b'check-locks' |
|
2343 | b'devel', b'check-locks' | |
2344 | ): |
|
2344 | ): | |
2345 | if self._currentlock(self._lockref) is None: |
|
2345 | if self._currentlock(self._lockref) is None: | |
2346 | raise error.ProgrammingError(b'transaction requires locking') |
|
2346 | raise error.ProgrammingError(b'transaction requires locking') | |
2347 | tr = self.currenttransaction() |
|
2347 | tr = self.currenttransaction() | |
2348 | if tr is not None: |
|
2348 | if tr is not None: | |
2349 | return tr.nest(name=desc) |
|
2349 | return tr.nest(name=desc) | |
2350 |
|
2350 | |||
2351 | # abort here if the journal already exists |
|
2351 | # abort here if the journal already exists | |
2352 | if self.svfs.exists(b"journal"): |
|
2352 | if self.svfs.exists(b"journal"): | |
2353 | raise error.RepoError( |
|
2353 | raise error.RepoError( | |
2354 | _(b"abandoned transaction found"), |
|
2354 | _(b"abandoned transaction found"), | |
2355 | hint=_(b"run 'hg recover' to clean up transaction"), |
|
2355 | hint=_(b"run 'hg recover' to clean up transaction"), | |
2356 | ) |
|
2356 | ) | |
2357 |
|
2357 | |||
2358 | idbase = b"%.40f#%f" % (random.random(), time.time()) |
|
2358 | idbase = b"%.40f#%f" % (random.random(), time.time()) | |
2359 | ha = hex(hashutil.sha1(idbase).digest()) |
|
2359 | ha = hex(hashutil.sha1(idbase).digest()) | |
2360 | txnid = b'TXN:' + ha |
|
2360 | txnid = b'TXN:' + ha | |
2361 | self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid) |
|
2361 | self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid) | |
2362 |
|
2362 | |||
2363 | self._writejournal(desc) |
|
2363 | self._writejournal(desc) | |
2364 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
|
2364 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] | |
2365 | if report: |
|
2365 | if report: | |
2366 | rp = report |
|
2366 | rp = report | |
2367 | else: |
|
2367 | else: | |
2368 | rp = self.ui.warn |
|
2368 | rp = self.ui.warn | |
2369 | vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/ |
|
2369 | vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/ | |
2370 | # we must avoid cyclic reference between repo and transaction. |
|
2370 | # we must avoid cyclic reference between repo and transaction. | |
2371 | reporef = weakref.ref(self) |
|
2371 | reporef = weakref.ref(self) | |
2372 | # Code to track tag movement |
|
2372 | # Code to track tag movement | |
2373 | # |
|
2373 | # | |
2374 | # Since tags are all handled as file content, it is actually quite hard |
|
2374 | # Since tags are all handled as file content, it is actually quite hard | |
2375 | # to track these movement from a code perspective. So we fallback to a |
|
2375 | # to track these movement from a code perspective. So we fallback to a | |
2376 | # tracking at the repository level. One could envision to track changes |
|
2376 | # tracking at the repository level. One could envision to track changes | |
2377 | # to the '.hgtags' file through changegroup apply but that fails to |
|
2377 | # to the '.hgtags' file through changegroup apply but that fails to | |
2378 | # cope with case where transaction expose new heads without changegroup |
|
2378 | # cope with case where transaction expose new heads without changegroup | |
2379 | # being involved (eg: phase movement). |
|
2379 | # being involved (eg: phase movement). | |
2380 | # |
|
2380 | # | |
2381 | # For now, We gate the feature behind a flag since this likely comes |
|
2381 | # For now, We gate the feature behind a flag since this likely comes | |
2382 | # with performance impacts. The current code run more often than needed |
|
2382 | # with performance impacts. The current code run more often than needed | |
2383 | # and do not use caches as much as it could. The current focus is on |
|
2383 | # and do not use caches as much as it could. The current focus is on | |
2384 | # the behavior of the feature so we disable it by default. The flag |
|
2384 | # the behavior of the feature so we disable it by default. The flag | |
2385 | # will be removed when we are happy with the performance impact. |
|
2385 | # will be removed when we are happy with the performance impact. | |
2386 | # |
|
2386 | # | |
2387 | # Once this feature is no longer experimental move the following |
|
2387 | # Once this feature is no longer experimental move the following | |
2388 | # documentation to the appropriate help section: |
|
2388 | # documentation to the appropriate help section: | |
2389 | # |
|
2389 | # | |
2390 | # The ``HG_TAG_MOVED`` variable will be set if the transaction touched |
|
2390 | # The ``HG_TAG_MOVED`` variable will be set if the transaction touched | |
2391 | # tags (new or changed or deleted tags). In addition the details of |
|
2391 | # tags (new or changed or deleted tags). In addition the details of | |
2392 | # these changes are made available in a file at: |
|
2392 | # these changes are made available in a file at: | |
2393 | # ``REPOROOT/.hg/changes/tags.changes``. |
|
2393 | # ``REPOROOT/.hg/changes/tags.changes``. | |
2394 | # Make sure you check for HG_TAG_MOVED before reading that file as it |
|
2394 | # Make sure you check for HG_TAG_MOVED before reading that file as it | |
2395 | # might exist from a previous transaction even if no tag were touched |
|
2395 | # might exist from a previous transaction even if no tag were touched | |
2396 | # in this one. Changes are recorded in a line base format:: |
|
2396 | # in this one. Changes are recorded in a line base format:: | |
2397 | # |
|
2397 | # | |
2398 | # <action> <hex-node> <tag-name>\n |
|
2398 | # <action> <hex-node> <tag-name>\n | |
2399 | # |
|
2399 | # | |
2400 | # Actions are defined as follow: |
|
2400 | # Actions are defined as follow: | |
2401 | # "-R": tag is removed, |
|
2401 | # "-R": tag is removed, | |
2402 | # "+A": tag is added, |
|
2402 | # "+A": tag is added, | |
2403 | # "-M": tag is moved (old value), |
|
2403 | # "-M": tag is moved (old value), | |
2404 | # "+M": tag is moved (new value), |
|
2404 | # "+M": tag is moved (new value), | |
2405 | tracktags = lambda x: None |
|
2405 | tracktags = lambda x: None | |
2406 | # experimental config: experimental.hook-track-tags |
|
2406 | # experimental config: experimental.hook-track-tags | |
2407 | shouldtracktags = self.ui.configbool( |
|
2407 | shouldtracktags = self.ui.configbool( | |
2408 | b'experimental', b'hook-track-tags' |
|
2408 | b'experimental', b'hook-track-tags' | |
2409 | ) |
|
2409 | ) | |
2410 | if desc != b'strip' and shouldtracktags: |
|
2410 | if desc != b'strip' and shouldtracktags: | |
2411 | oldheads = self.changelog.headrevs() |
|
2411 | oldheads = self.changelog.headrevs() | |
2412 |
|
2412 | |||
2413 | def tracktags(tr2): |
|
2413 | def tracktags(tr2): | |
2414 | repo = reporef() |
|
2414 | repo = reporef() | |
2415 | assert repo is not None # help pytype |
|
2415 | assert repo is not None # help pytype | |
2416 | oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads) |
|
2416 | oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads) | |
2417 | newheads = repo.changelog.headrevs() |
|
2417 | newheads = repo.changelog.headrevs() | |
2418 | newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads) |
|
2418 | newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads) | |
2419 | # notes: we compare lists here. |
|
2419 | # notes: we compare lists here. | |
2420 | # As we do it only once buiding set would not be cheaper |
|
2420 | # As we do it only once buiding set would not be cheaper | |
2421 | changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes) |
|
2421 | changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes) | |
2422 | if changes: |
|
2422 | if changes: | |
2423 | tr2.hookargs[b'tag_moved'] = b'1' |
|
2423 | tr2.hookargs[b'tag_moved'] = b'1' | |
2424 | with repo.vfs( |
|
2424 | with repo.vfs( | |
2425 | b'changes/tags.changes', b'w', atomictemp=True |
|
2425 | b'changes/tags.changes', b'w', atomictemp=True | |
2426 | ) as changesfile: |
|
2426 | ) as changesfile: | |
2427 | # note: we do not register the file to the transaction |
|
2427 | # note: we do not register the file to the transaction | |
2428 | # because we needs it to still exist on the transaction |
|
2428 | # because we needs it to still exist on the transaction | |
2429 | # is close (for txnclose hooks) |
|
2429 | # is close (for txnclose hooks) | |
2430 | tagsmod.writediff(changesfile, changes) |
|
2430 | tagsmod.writediff(changesfile, changes) | |
2431 |
|
2431 | |||
2432 | def validate(tr2): |
|
2432 | def validate(tr2): | |
2433 | """will run pre-closing hooks""" |
|
2433 | """will run pre-closing hooks""" | |
2434 | # XXX the transaction API is a bit lacking here so we take a hacky |
|
2434 | # XXX the transaction API is a bit lacking here so we take a hacky | |
2435 | # path for now |
|
2435 | # path for now | |
2436 | # |
|
2436 | # | |
2437 | # We cannot add this as a "pending" hooks since the 'tr.hookargs' |
|
2437 | # We cannot add this as a "pending" hooks since the 'tr.hookargs' | |
2438 | # dict is copied before these run. In addition we needs the data |
|
2438 | # dict is copied before these run. In addition we needs the data | |
2439 | # available to in memory hooks too. |
|
2439 | # available to in memory hooks too. | |
2440 | # |
|
2440 | # | |
2441 | # Moreover, we also need to make sure this runs before txnclose |
|
2441 | # Moreover, we also need to make sure this runs before txnclose | |
2442 | # hooks and there is no "pending" mechanism that would execute |
|
2442 | # hooks and there is no "pending" mechanism that would execute | |
2443 | # logic only if hooks are about to run. |
|
2443 | # logic only if hooks are about to run. | |
2444 | # |
|
2444 | # | |
2445 | # Fixing this limitation of the transaction is also needed to track |
|
2445 | # Fixing this limitation of the transaction is also needed to track | |
2446 | # other families of changes (bookmarks, phases, obsolescence). |
|
2446 | # other families of changes (bookmarks, phases, obsolescence). | |
2447 | # |
|
2447 | # | |
2448 | # This will have to be fixed before we remove the experimental |
|
2448 | # This will have to be fixed before we remove the experimental | |
2449 | # gating. |
|
2449 | # gating. | |
2450 | tracktags(tr2) |
|
2450 | tracktags(tr2) | |
2451 | repo = reporef() |
|
2451 | repo = reporef() | |
2452 | assert repo is not None # help pytype |
|
2452 | assert repo is not None # help pytype | |
2453 |
|
2453 | |||
2454 | singleheadopt = (b'experimental', b'single-head-per-branch') |
|
2454 | singleheadopt = (b'experimental', b'single-head-per-branch') | |
2455 | singlehead = repo.ui.configbool(*singleheadopt) |
|
2455 | singlehead = repo.ui.configbool(*singleheadopt) | |
2456 | if singlehead: |
|
2456 | if singlehead: | |
2457 | singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1] |
|
2457 | singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1] | |
2458 | accountclosed = singleheadsub.get( |
|
2458 | accountclosed = singleheadsub.get( | |
2459 | b"account-closed-heads", False |
|
2459 | b"account-closed-heads", False | |
2460 | ) |
|
2460 | ) | |
2461 | if singleheadsub.get(b"public-changes-only", False): |
|
2461 | if singleheadsub.get(b"public-changes-only", False): | |
2462 | filtername = b"immutable" |
|
2462 | filtername = b"immutable" | |
2463 | else: |
|
2463 | else: | |
2464 | filtername = b"visible" |
|
2464 | filtername = b"visible" | |
2465 | scmutil.enforcesinglehead( |
|
2465 | scmutil.enforcesinglehead( | |
2466 | repo, tr2, desc, accountclosed, filtername |
|
2466 | repo, tr2, desc, accountclosed, filtername | |
2467 | ) |
|
2467 | ) | |
2468 | if hook.hashook(repo.ui, b'pretxnclose-bookmark'): |
|
2468 | if hook.hashook(repo.ui, b'pretxnclose-bookmark'): | |
2469 | for name, (old, new) in sorted( |
|
2469 | for name, (old, new) in sorted( | |
2470 | tr.changes[b'bookmarks'].items() |
|
2470 | tr.changes[b'bookmarks'].items() | |
2471 | ): |
|
2471 | ): | |
2472 | args = tr.hookargs.copy() |
|
2472 | args = tr.hookargs.copy() | |
2473 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2473 | args.update(bookmarks.preparehookargs(name, old, new)) | |
2474 | repo.hook( |
|
2474 | repo.hook( | |
2475 | b'pretxnclose-bookmark', |
|
2475 | b'pretxnclose-bookmark', | |
2476 | throw=True, |
|
2476 | throw=True, | |
2477 | **pycompat.strkwargs(args) |
|
2477 | **pycompat.strkwargs(args) | |
2478 | ) |
|
2478 | ) | |
2479 | if hook.hashook(repo.ui, b'pretxnclose-phase'): |
|
2479 | if hook.hashook(repo.ui, b'pretxnclose-phase'): | |
2480 | cl = repo.unfiltered().changelog |
|
2480 | cl = repo.unfiltered().changelog | |
2481 | for revs, (old, new) in tr.changes[b'phases']: |
|
2481 | for revs, (old, new) in tr.changes[b'phases']: | |
2482 | for rev in revs: |
|
2482 | for rev in revs: | |
2483 | args = tr.hookargs.copy() |
|
2483 | args = tr.hookargs.copy() | |
2484 | node = hex(cl.node(rev)) |
|
2484 | node = hex(cl.node(rev)) | |
2485 | args.update(phases.preparehookargs(node, old, new)) |
|
2485 | args.update(phases.preparehookargs(node, old, new)) | |
2486 | repo.hook( |
|
2486 | repo.hook( | |
2487 | b'pretxnclose-phase', |
|
2487 | b'pretxnclose-phase', | |
2488 | throw=True, |
|
2488 | throw=True, | |
2489 | **pycompat.strkwargs(args) |
|
2489 | **pycompat.strkwargs(args) | |
2490 | ) |
|
2490 | ) | |
2491 |
|
2491 | |||
2492 | repo.hook( |
|
2492 | repo.hook( | |
2493 | b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs) |
|
2493 | b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs) | |
2494 | ) |
|
2494 | ) | |
2495 |
|
2495 | |||
2496 | def releasefn(tr, success): |
|
2496 | def releasefn(tr, success): | |
2497 | repo = reporef() |
|
2497 | repo = reporef() | |
2498 | if repo is None: |
|
2498 | if repo is None: | |
2499 | # If the repo has been GC'd (and this release function is being |
|
2499 | # If the repo has been GC'd (and this release function is being | |
2500 | # called from transaction.__del__), there's not much we can do, |
|
2500 | # called from transaction.__del__), there's not much we can do, | |
2501 | # so just leave the unfinished transaction there and let the |
|
2501 | # so just leave the unfinished transaction there and let the | |
2502 | # user run `hg recover`. |
|
2502 | # user run `hg recover`. | |
2503 | return |
|
2503 | return | |
2504 | if success: |
|
2504 | if success: | |
2505 | # this should be explicitly invoked here, because |
|
2505 | # this should be explicitly invoked here, because | |
2506 | # in-memory changes aren't written out at closing |
|
2506 | # in-memory changes aren't written out at closing | |
2507 | # transaction, if tr.addfilegenerator (via |
|
2507 | # transaction, if tr.addfilegenerator (via | |
2508 | # dirstate.write or so) isn't invoked while |
|
2508 | # dirstate.write or so) isn't invoked while | |
2509 | # transaction running |
|
2509 | # transaction running | |
2510 | repo.dirstate.write(None) |
|
2510 | repo.dirstate.write(None) | |
2511 | else: |
|
2511 | else: | |
2512 | # discard all changes (including ones already written |
|
2512 | # discard all changes (including ones already written | |
2513 | # out) in this transaction |
|
2513 | # out) in this transaction | |
2514 | narrowspec.restorebackup(self, b'journal.narrowspec') |
|
2514 | narrowspec.restorebackup(self, b'journal.narrowspec') | |
2515 | narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate') |
|
2515 | narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate') | |
2516 | repo.dirstate.restorebackup(None, b'journal.dirstate') |
|
2516 | repo.dirstate.restorebackup(None, b'journal.dirstate') | |
2517 |
|
2517 | |||
2518 | repo.invalidate(clearfilecache=True) |
|
2518 | repo.invalidate(clearfilecache=True) | |
2519 |
|
2519 | |||
2520 | tr = transaction.transaction( |
|
2520 | tr = transaction.transaction( | |
2521 | rp, |
|
2521 | rp, | |
2522 | self.svfs, |
|
2522 | self.svfs, | |
2523 | vfsmap, |
|
2523 | vfsmap, | |
2524 | b"journal", |
|
2524 | b"journal", | |
2525 | b"undo", |
|
2525 | b"undo", | |
2526 | aftertrans(renames), |
|
2526 | aftertrans(renames), | |
2527 | self.store.createmode, |
|
2527 | self.store.createmode, | |
2528 | validator=validate, |
|
2528 | validator=validate, | |
2529 | releasefn=releasefn, |
|
2529 | releasefn=releasefn, | |
2530 | checkambigfiles=_cachedfiles, |
|
2530 | checkambigfiles=_cachedfiles, | |
2531 | name=desc, |
|
2531 | name=desc, | |
2532 | ) |
|
2532 | ) | |
2533 | tr.changes[b'origrepolen'] = len(self) |
|
2533 | tr.changes[b'origrepolen'] = len(self) | |
2534 | tr.changes[b'obsmarkers'] = set() |
|
2534 | tr.changes[b'obsmarkers'] = set() | |
2535 | tr.changes[b'phases'] = [] |
|
2535 | tr.changes[b'phases'] = [] | |
2536 | tr.changes[b'bookmarks'] = {} |
|
2536 | tr.changes[b'bookmarks'] = {} | |
2537 |
|
2537 | |||
2538 | tr.hookargs[b'txnid'] = txnid |
|
2538 | tr.hookargs[b'txnid'] = txnid | |
2539 | tr.hookargs[b'txnname'] = desc |
|
2539 | tr.hookargs[b'txnname'] = desc | |
2540 | tr.hookargs[b'changes'] = tr.changes |
|
2540 | tr.hookargs[b'changes'] = tr.changes | |
2541 | # note: writing the fncache only during finalize mean that the file is |
|
2541 | # note: writing the fncache only during finalize mean that the file is | |
2542 | # outdated when running hooks. As fncache is used for streaming clone, |
|
2542 | # outdated when running hooks. As fncache is used for streaming clone, | |
2543 | # this is not expected to break anything that happen during the hooks. |
|
2543 | # this is not expected to break anything that happen during the hooks. | |
2544 | tr.addfinalize(b'flush-fncache', self.store.write) |
|
2544 | tr.addfinalize(b'flush-fncache', self.store.write) | |
2545 |
|
2545 | |||
2546 | def txnclosehook(tr2): |
|
2546 | def txnclosehook(tr2): | |
2547 | """To be run if transaction is successful, will schedule a hook run""" |
|
2547 | """To be run if transaction is successful, will schedule a hook run""" | |
2548 | # Don't reference tr2 in hook() so we don't hold a reference. |
|
2548 | # Don't reference tr2 in hook() so we don't hold a reference. | |
2549 | # This reduces memory consumption when there are multiple |
|
2549 | # This reduces memory consumption when there are multiple | |
2550 | # transactions per lock. This can likely go away if issue5045 |
|
2550 | # transactions per lock. This can likely go away if issue5045 | |
2551 | # fixes the function accumulation. |
|
2551 | # fixes the function accumulation. | |
2552 | hookargs = tr2.hookargs |
|
2552 | hookargs = tr2.hookargs | |
2553 |
|
2553 | |||
2554 | def hookfunc(unused_success): |
|
2554 | def hookfunc(unused_success): | |
2555 | repo = reporef() |
|
2555 | repo = reporef() | |
2556 | assert repo is not None # help pytype |
|
2556 | assert repo is not None # help pytype | |
2557 |
|
2557 | |||
2558 | if hook.hashook(repo.ui, b'txnclose-bookmark'): |
|
2558 | if hook.hashook(repo.ui, b'txnclose-bookmark'): | |
2559 | bmchanges = sorted(tr.changes[b'bookmarks'].items()) |
|
2559 | bmchanges = sorted(tr.changes[b'bookmarks'].items()) | |
2560 | for name, (old, new) in bmchanges: |
|
2560 | for name, (old, new) in bmchanges: | |
2561 | args = tr.hookargs.copy() |
|
2561 | args = tr.hookargs.copy() | |
2562 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2562 | args.update(bookmarks.preparehookargs(name, old, new)) | |
2563 | repo.hook( |
|
2563 | repo.hook( | |
2564 | b'txnclose-bookmark', |
|
2564 | b'txnclose-bookmark', | |
2565 | throw=False, |
|
2565 | throw=False, | |
2566 | **pycompat.strkwargs(args) |
|
2566 | **pycompat.strkwargs(args) | |
2567 | ) |
|
2567 | ) | |
2568 |
|
2568 | |||
2569 | if hook.hashook(repo.ui, b'txnclose-phase'): |
|
2569 | if hook.hashook(repo.ui, b'txnclose-phase'): | |
2570 | cl = repo.unfiltered().changelog |
|
2570 | cl = repo.unfiltered().changelog | |
2571 | phasemv = sorted( |
|
2571 | phasemv = sorted( | |
2572 | tr.changes[b'phases'], key=lambda r: r[0][0] |
|
2572 | tr.changes[b'phases'], key=lambda r: r[0][0] | |
2573 | ) |
|
2573 | ) | |
2574 | for revs, (old, new) in phasemv: |
|
2574 | for revs, (old, new) in phasemv: | |
2575 | for rev in revs: |
|
2575 | for rev in revs: | |
2576 | args = tr.hookargs.copy() |
|
2576 | args = tr.hookargs.copy() | |
2577 | node = hex(cl.node(rev)) |
|
2577 | node = hex(cl.node(rev)) | |
2578 | args.update(phases.preparehookargs(node, old, new)) |
|
2578 | args.update(phases.preparehookargs(node, old, new)) | |
2579 | repo.hook( |
|
2579 | repo.hook( | |
2580 | b'txnclose-phase', |
|
2580 | b'txnclose-phase', | |
2581 | throw=False, |
|
2581 | throw=False, | |
2582 | **pycompat.strkwargs(args) |
|
2582 | **pycompat.strkwargs(args) | |
2583 | ) |
|
2583 | ) | |
2584 |
|
2584 | |||
2585 | repo.hook( |
|
2585 | repo.hook( | |
2586 | b'txnclose', throw=False, **pycompat.strkwargs(hookargs) |
|
2586 | b'txnclose', throw=False, **pycompat.strkwargs(hookargs) | |
2587 | ) |
|
2587 | ) | |
2588 |
|
2588 | |||
2589 | repo = reporef() |
|
2589 | repo = reporef() | |
2590 | assert repo is not None # help pytype |
|
2590 | assert repo is not None # help pytype | |
2591 | repo._afterlock(hookfunc) |
|
2591 | repo._afterlock(hookfunc) | |
2592 |
|
2592 | |||
2593 | tr.addfinalize(b'txnclose-hook', txnclosehook) |
|
2593 | tr.addfinalize(b'txnclose-hook', txnclosehook) | |
2594 | # Include a leading "-" to make it happen before the transaction summary |
|
2594 | # Include a leading "-" to make it happen before the transaction summary | |
2595 | # reports registered via scmutil.registersummarycallback() whose names |
|
2595 | # reports registered via scmutil.registersummarycallback() whose names | |
2596 | # are 00-txnreport etc. That way, the caches will be warm when the |
|
2596 | # are 00-txnreport etc. That way, the caches will be warm when the | |
2597 | # callbacks run. |
|
2597 | # callbacks run. | |
2598 | tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr)) |
|
2598 | tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr)) | |
2599 |
|
2599 | |||
2600 | def txnaborthook(tr2): |
|
2600 | def txnaborthook(tr2): | |
2601 | """To be run if transaction is aborted""" |
|
2601 | """To be run if transaction is aborted""" | |
2602 | repo = reporef() |
|
2602 | repo = reporef() | |
2603 | assert repo is not None # help pytype |
|
2603 | assert repo is not None # help pytype | |
2604 | repo.hook( |
|
2604 | repo.hook( | |
2605 | b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs) |
|
2605 | b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs) | |
2606 | ) |
|
2606 | ) | |
2607 |
|
2607 | |||
2608 | tr.addabort(b'txnabort-hook', txnaborthook) |
|
2608 | tr.addabort(b'txnabort-hook', txnaborthook) | |
2609 | # avoid eager cache invalidation. in-memory data should be identical |
|
2609 | # avoid eager cache invalidation. in-memory data should be identical | |
2610 | # to stored data if transaction has no error. |
|
2610 | # to stored data if transaction has no error. | |
2611 | tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats) |
|
2611 | tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats) | |
2612 | self._transref = weakref.ref(tr) |
|
2612 | self._transref = weakref.ref(tr) | |
2613 | scmutil.registersummarycallback(self, tr, desc) |
|
2613 | scmutil.registersummarycallback(self, tr, desc) | |
2614 | return tr |
|
2614 | return tr | |
2615 |
|
2615 | |||
2616 | def _journalfiles(self): |
|
2616 | def _journalfiles(self): | |
2617 | return ( |
|
2617 | return ( | |
2618 | (self.svfs, b'journal'), |
|
2618 | (self.svfs, b'journal'), | |
2619 | (self.svfs, b'journal.narrowspec'), |
|
2619 | (self.svfs, b'journal.narrowspec'), | |
2620 | (self.vfs, b'journal.narrowspec.dirstate'), |
|
2620 | (self.vfs, b'journal.narrowspec.dirstate'), | |
2621 | (self.vfs, b'journal.dirstate'), |
|
2621 | (self.vfs, b'journal.dirstate'), | |
2622 | (self.vfs, b'journal.branch'), |
|
2622 | (self.vfs, b'journal.branch'), | |
2623 | (self.vfs, b'journal.desc'), |
|
2623 | (self.vfs, b'journal.desc'), | |
2624 | (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), |
|
2624 | (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), | |
2625 | (self.svfs, b'journal.phaseroots'), |
|
2625 | (self.svfs, b'journal.phaseroots'), | |
2626 | ) |
|
2626 | ) | |
2627 |
|
2627 | |||
2628 | def undofiles(self): |
|
2628 | def undofiles(self): | |
2629 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] |
|
2629 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] | |
2630 |
|
2630 | |||
2631 | @unfilteredmethod |
|
2631 | @unfilteredmethod | |
2632 | def _writejournal(self, desc): |
|
2632 | def _writejournal(self, desc): | |
2633 | self.dirstate.savebackup(None, b'journal.dirstate') |
|
2633 | self.dirstate.savebackup(None, b'journal.dirstate') | |
2634 | narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate') |
|
2634 | narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate') | |
2635 | narrowspec.savebackup(self, b'journal.narrowspec') |
|
2635 | narrowspec.savebackup(self, b'journal.narrowspec') | |
2636 | self.vfs.write( |
|
2636 | self.vfs.write( | |
2637 | b"journal.branch", encoding.fromlocal(self.dirstate.branch()) |
|
2637 | b"journal.branch", encoding.fromlocal(self.dirstate.branch()) | |
2638 | ) |
|
2638 | ) | |
2639 | self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc)) |
|
2639 | self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc)) | |
2640 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2640 | bookmarksvfs = bookmarks.bookmarksvfs(self) | |
2641 | bookmarksvfs.write( |
|
2641 | bookmarksvfs.write( | |
2642 | b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks") |
|
2642 | b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks") | |
2643 | ) |
|
2643 | ) | |
2644 | self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots")) |
|
2644 | self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots")) | |
2645 |
|
2645 | |||
2646 | def recover(self): |
|
2646 | def recover(self): | |
2647 | with self.lock(): |
|
2647 | with self.lock(): | |
2648 | if self.svfs.exists(b"journal"): |
|
2648 | if self.svfs.exists(b"journal"): | |
2649 | self.ui.status(_(b"rolling back interrupted transaction\n")) |
|
2649 | self.ui.status(_(b"rolling back interrupted transaction\n")) | |
2650 | vfsmap = { |
|
2650 | vfsmap = { | |
2651 | b'': self.svfs, |
|
2651 | b'': self.svfs, | |
2652 | b'plain': self.vfs, |
|
2652 | b'plain': self.vfs, | |
2653 | } |
|
2653 | } | |
2654 | transaction.rollback( |
|
2654 | transaction.rollback( | |
2655 | self.svfs, |
|
2655 | self.svfs, | |
2656 | vfsmap, |
|
2656 | vfsmap, | |
2657 | b"journal", |
|
2657 | b"journal", | |
2658 | self.ui.warn, |
|
2658 | self.ui.warn, | |
2659 | checkambigfiles=_cachedfiles, |
|
2659 | checkambigfiles=_cachedfiles, | |
2660 | ) |
|
2660 | ) | |
2661 | self.invalidate() |
|
2661 | self.invalidate() | |
2662 | return True |
|
2662 | return True | |
2663 | else: |
|
2663 | else: | |
2664 | self.ui.warn(_(b"no interrupted transaction available\n")) |
|
2664 | self.ui.warn(_(b"no interrupted transaction available\n")) | |
2665 | return False |
|
2665 | return False | |
2666 |
|
2666 | |||
2667 | def rollback(self, dryrun=False, force=False): |
|
2667 | def rollback(self, dryrun=False, force=False): | |
2668 | wlock = lock = dsguard = None |
|
2668 | wlock = lock = dsguard = None | |
2669 | try: |
|
2669 | try: | |
2670 | wlock = self.wlock() |
|
2670 | wlock = self.wlock() | |
2671 | lock = self.lock() |
|
2671 | lock = self.lock() | |
2672 | if self.svfs.exists(b"undo"): |
|
2672 | if self.svfs.exists(b"undo"): | |
2673 | dsguard = dirstateguard.dirstateguard(self, b'rollback') |
|
2673 | dsguard = dirstateguard.dirstateguard(self, b'rollback') | |
2674 |
|
2674 | |||
2675 | return self._rollback(dryrun, force, dsguard) |
|
2675 | return self._rollback(dryrun, force, dsguard) | |
2676 | else: |
|
2676 | else: | |
2677 | self.ui.warn(_(b"no rollback information available\n")) |
|
2677 | self.ui.warn(_(b"no rollback information available\n")) | |
2678 | return 1 |
|
2678 | return 1 | |
2679 | finally: |
|
2679 | finally: | |
2680 | release(dsguard, lock, wlock) |
|
2680 | release(dsguard, lock, wlock) | |
2681 |
|
2681 | |||
2682 | @unfilteredmethod # Until we get smarter cache management |
|
2682 | @unfilteredmethod # Until we get smarter cache management | |
2683 | def _rollback(self, dryrun, force, dsguard): |
|
2683 | def _rollback(self, dryrun, force, dsguard): | |
2684 | ui = self.ui |
|
2684 | ui = self.ui | |
2685 | try: |
|
2685 | try: | |
2686 | args = self.vfs.read(b'undo.desc').splitlines() |
|
2686 | args = self.vfs.read(b'undo.desc').splitlines() | |
2687 | (oldlen, desc, detail) = (int(args[0]), args[1], None) |
|
2687 | (oldlen, desc, detail) = (int(args[0]), args[1], None) | |
2688 | if len(args) >= 3: |
|
2688 | if len(args) >= 3: | |
2689 | detail = args[2] |
|
2689 | detail = args[2] | |
2690 | oldtip = oldlen - 1 |
|
2690 | oldtip = oldlen - 1 | |
2691 |
|
2691 | |||
2692 | if detail and ui.verbose: |
|
2692 | if detail and ui.verbose: | |
2693 | msg = _( |
|
2693 | msg = _( | |
2694 | b'repository tip rolled back to revision %d' |
|
2694 | b'repository tip rolled back to revision %d' | |
2695 | b' (undo %s: %s)\n' |
|
2695 | b' (undo %s: %s)\n' | |
2696 | ) % (oldtip, desc, detail) |
|
2696 | ) % (oldtip, desc, detail) | |
2697 | else: |
|
2697 | else: | |
2698 | msg = _( |
|
2698 | msg = _( | |
2699 | b'repository tip rolled back to revision %d (undo %s)\n' |
|
2699 | b'repository tip rolled back to revision %d (undo %s)\n' | |
2700 | ) % (oldtip, desc) |
|
2700 | ) % (oldtip, desc) | |
2701 | except IOError: |
|
2701 | except IOError: | |
2702 | msg = _(b'rolling back unknown transaction\n') |
|
2702 | msg = _(b'rolling back unknown transaction\n') | |
2703 | desc = None |
|
2703 | desc = None | |
2704 |
|
2704 | |||
2705 | if not force and self[b'.'] != self[b'tip'] and desc == b'commit': |
|
2705 | if not force and self[b'.'] != self[b'tip'] and desc == b'commit': | |
2706 | raise error.Abort( |
|
2706 | raise error.Abort( | |
2707 | _( |
|
2707 | _( | |
2708 | b'rollback of last commit while not checked out ' |
|
2708 | b'rollback of last commit while not checked out ' | |
2709 | b'may lose data' |
|
2709 | b'may lose data' | |
2710 | ), |
|
2710 | ), | |
2711 | hint=_(b'use -f to force'), |
|
2711 | hint=_(b'use -f to force'), | |
2712 | ) |
|
2712 | ) | |
2713 |
|
2713 | |||
2714 | ui.status(msg) |
|
2714 | ui.status(msg) | |
2715 | if dryrun: |
|
2715 | if dryrun: | |
2716 | return 0 |
|
2716 | return 0 | |
2717 |
|
2717 | |||
2718 | parents = self.dirstate.parents() |
|
2718 | parents = self.dirstate.parents() | |
2719 | self.destroying() |
|
2719 | self.destroying() | |
2720 | vfsmap = {b'plain': self.vfs, b'': self.svfs} |
|
2720 | vfsmap = {b'plain': self.vfs, b'': self.svfs} | |
2721 | transaction.rollback( |
|
2721 | transaction.rollback( | |
2722 | self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles |
|
2722 | self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles | |
2723 | ) |
|
2723 | ) | |
2724 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2724 | bookmarksvfs = bookmarks.bookmarksvfs(self) | |
2725 | if bookmarksvfs.exists(b'undo.bookmarks'): |
|
2725 | if bookmarksvfs.exists(b'undo.bookmarks'): | |
2726 | bookmarksvfs.rename( |
|
2726 | bookmarksvfs.rename( | |
2727 | b'undo.bookmarks', b'bookmarks', checkambig=True |
|
2727 | b'undo.bookmarks', b'bookmarks', checkambig=True | |
2728 | ) |
|
2728 | ) | |
2729 | if self.svfs.exists(b'undo.phaseroots'): |
|
2729 | if self.svfs.exists(b'undo.phaseroots'): | |
2730 | self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) |
|
2730 | self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) | |
2731 | self.invalidate() |
|
2731 | self.invalidate() | |
2732 |
|
2732 | |||
2733 | has_node = self.changelog.index.has_node |
|
2733 | has_node = self.changelog.index.has_node | |
2734 | parentgone = any(not has_node(p) for p in parents) |
|
2734 | parentgone = any(not has_node(p) for p in parents) | |
2735 | if parentgone: |
|
2735 | if parentgone: | |
2736 | # prevent dirstateguard from overwriting already restored one |
|
2736 | # prevent dirstateguard from overwriting already restored one | |
2737 | dsguard.close() |
|
2737 | dsguard.close() | |
2738 |
|
2738 | |||
2739 | narrowspec.restorebackup(self, b'undo.narrowspec') |
|
2739 | narrowspec.restorebackup(self, b'undo.narrowspec') | |
2740 | narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate') |
|
2740 | narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate') | |
2741 | self.dirstate.restorebackup(None, b'undo.dirstate') |
|
2741 | self.dirstate.restorebackup(None, b'undo.dirstate') | |
2742 | try: |
|
2742 | try: | |
2743 | branch = self.vfs.read(b'undo.branch') |
|
2743 | branch = self.vfs.read(b'undo.branch') | |
2744 | self.dirstate.setbranch(encoding.tolocal(branch)) |
|
2744 | self.dirstate.setbranch(encoding.tolocal(branch)) | |
2745 | except IOError: |
|
2745 | except IOError: | |
2746 | ui.warn( |
|
2746 | ui.warn( | |
2747 | _( |
|
2747 | _( | |
2748 | b'named branch could not be reset: ' |
|
2748 | b'named branch could not be reset: ' | |
2749 | b'current branch is still \'%s\'\n' |
|
2749 | b'current branch is still \'%s\'\n' | |
2750 | ) |
|
2750 | ) | |
2751 | % self.dirstate.branch() |
|
2751 | % self.dirstate.branch() | |
2752 | ) |
|
2752 | ) | |
2753 |
|
2753 | |||
2754 | parents = tuple([p.rev() for p in self[None].parents()]) |
|
2754 | parents = tuple([p.rev() for p in self[None].parents()]) | |
2755 | if len(parents) > 1: |
|
2755 | if len(parents) > 1: | |
2756 | ui.status( |
|
2756 | ui.status( | |
2757 | _( |
|
2757 | _( | |
2758 | b'working directory now based on ' |
|
2758 | b'working directory now based on ' | |
2759 | b'revisions %d and %d\n' |
|
2759 | b'revisions %d and %d\n' | |
2760 | ) |
|
2760 | ) | |
2761 | % parents |
|
2761 | % parents | |
2762 | ) |
|
2762 | ) | |
2763 | else: |
|
2763 | else: | |
2764 | ui.status( |
|
2764 | ui.status( | |
2765 | _(b'working directory now based on revision %d\n') % parents |
|
2765 | _(b'working directory now based on revision %d\n') % parents | |
2766 | ) |
|
2766 | ) | |
2767 | mergestatemod.mergestate.clean(self) |
|
2767 | mergestatemod.mergestate.clean(self) | |
2768 |
|
2768 | |||
2769 | # TODO: if we know which new heads may result from this rollback, pass |
|
2769 | # TODO: if we know which new heads may result from this rollback, pass | |
2770 | # them to destroy(), which will prevent the branchhead cache from being |
|
2770 | # them to destroy(), which will prevent the branchhead cache from being | |
2771 | # invalidated. |
|
2771 | # invalidated. | |
2772 | self.destroyed() |
|
2772 | self.destroyed() | |
2773 | return 0 |
|
2773 | return 0 | |
2774 |
|
2774 | |||
2775 | def _buildcacheupdater(self, newtransaction): |
|
2775 | def _buildcacheupdater(self, newtransaction): | |
2776 | """called during transaction to build the callback updating cache |
|
2776 | """called during transaction to build the callback updating cache | |
2777 |
|
2777 | |||
2778 | Lives on the repository to help extension who might want to augment |
|
2778 | Lives on the repository to help extension who might want to augment | |
2779 | this logic. For this purpose, the created transaction is passed to the |
|
2779 | this logic. For this purpose, the created transaction is passed to the | |
2780 | method. |
|
2780 | method. | |
2781 | """ |
|
2781 | """ | |
2782 | # we must avoid cyclic reference between repo and transaction. |
|
2782 | # we must avoid cyclic reference between repo and transaction. | |
2783 | reporef = weakref.ref(self) |
|
2783 | reporef = weakref.ref(self) | |
2784 |
|
2784 | |||
2785 | def updater(tr): |
|
2785 | def updater(tr): | |
2786 | repo = reporef() |
|
2786 | repo = reporef() | |
2787 | assert repo is not None # help pytype |
|
2787 | assert repo is not None # help pytype | |
2788 | repo.updatecaches(tr) |
|
2788 | repo.updatecaches(tr) | |
2789 |
|
2789 | |||
2790 | return updater |
|
2790 | return updater | |
2791 |
|
2791 | |||
2792 | @unfilteredmethod |
|
2792 | @unfilteredmethod | |
2793 | def updatecaches(self, tr=None, full=False, caches=None): |
|
2793 | def updatecaches(self, tr=None, full=False, caches=None): | |
2794 | """warm appropriate caches |
|
2794 | """warm appropriate caches | |
2795 |
|
2795 | |||
2796 | If this function is called after a transaction closed. The transaction |
|
2796 | If this function is called after a transaction closed. The transaction | |
2797 | will be available in the 'tr' argument. This can be used to selectively |
|
2797 | will be available in the 'tr' argument. This can be used to selectively | |
2798 | update caches relevant to the changes in that transaction. |
|
2798 | update caches relevant to the changes in that transaction. | |
2799 |
|
2799 | |||
2800 | If 'full' is set, make sure all caches the function knows about have |
|
2800 | If 'full' is set, make sure all caches the function knows about have | |
2801 | up-to-date data. Even the ones usually loaded more lazily. |
|
2801 | up-to-date data. Even the ones usually loaded more lazily. | |
2802 |
|
2802 | |||
2803 | The `full` argument can take a special "post-clone" value. In this case |
|
2803 | The `full` argument can take a special "post-clone" value. In this case | |
2804 | the cache warming is made after a clone and of the slower cache might |
|
2804 | the cache warming is made after a clone and of the slower cache might | |
2805 | be skipped, namely the `.fnodetags` one. This argument is 5.8 specific |
|
2805 | be skipped, namely the `.fnodetags` one. This argument is 5.8 specific | |
2806 | as we plan for a cleaner way to deal with this for 5.9. |
|
2806 | as we plan for a cleaner way to deal with this for 5.9. | |
2807 | """ |
|
2807 | """ | |
2808 | if tr is not None and tr.hookargs.get(b'source') == b'strip': |
|
2808 | if tr is not None and tr.hookargs.get(b'source') == b'strip': | |
2809 | # During strip, many caches are invalid but |
|
2809 | # During strip, many caches are invalid but | |
2810 | # later call to `destroyed` will refresh them. |
|
2810 | # later call to `destroyed` will refresh them. | |
2811 | return |
|
2811 | return | |
2812 |
|
2812 | |||
2813 | unfi = self.unfiltered() |
|
2813 | unfi = self.unfiltered() | |
2814 |
|
2814 | |||
2815 | if full: |
|
2815 | if full: | |
2816 | msg = ( |
|
2816 | msg = ( | |
2817 | "`full` argument for `repo.updatecaches` is deprecated\n" |
|
2817 | "`full` argument for `repo.updatecaches` is deprecated\n" | |
2818 | "(use `caches=repository.CACHE_ALL` instead)" |
|
2818 | "(use `caches=repository.CACHE_ALL` instead)" | |
2819 | ) |
|
2819 | ) | |
2820 | self.ui.deprecwarn(msg, b"5.9") |
|
2820 | self.ui.deprecwarn(msg, b"5.9") | |
2821 | caches = repository.CACHES_ALL |
|
2821 | caches = repository.CACHES_ALL | |
2822 | if full == b"post-clone": |
|
2822 | if full == b"post-clone": | |
2823 | caches = repository.CACHES_POST_CLONE |
|
2823 | caches = repository.CACHES_POST_CLONE | |
2824 | caches = repository.CACHES_ALL |
|
2824 | caches = repository.CACHES_ALL | |
2825 | elif caches is None: |
|
2825 | elif caches is None: | |
2826 | caches = repository.CACHES_DEFAULT |
|
2826 | caches = repository.CACHES_DEFAULT | |
2827 |
|
2827 | |||
2828 | if repository.CACHE_BRANCHMAP_SERVED in caches: |
|
2828 | if repository.CACHE_BRANCHMAP_SERVED in caches: | |
2829 | if tr is None or tr.changes[b'origrepolen'] < len(self): |
|
2829 | if tr is None or tr.changes[b'origrepolen'] < len(self): | |
2830 | # accessing the 'served' branchmap should refresh all the others, |
|
2830 | # accessing the 'served' branchmap should refresh all the others, | |
2831 | self.ui.debug(b'updating the branch cache\n') |
|
2831 | self.ui.debug(b'updating the branch cache\n') | |
2832 | self.filtered(b'served').branchmap() |
|
2832 | self.filtered(b'served').branchmap() | |
2833 | self.filtered(b'served.hidden').branchmap() |
|
2833 | self.filtered(b'served.hidden').branchmap() | |
2834 |
|
2834 | |||
2835 | if repository.CACHE_CHANGELOG_CACHE in caches: |
|
2835 | if repository.CACHE_CHANGELOG_CACHE in caches: | |
2836 | self.changelog.update_caches(transaction=tr) |
|
2836 | self.changelog.update_caches(transaction=tr) | |
2837 |
|
2837 | |||
2838 | if repository.CACHE_MANIFESTLOG_CACHE in caches: |
|
2838 | if repository.CACHE_MANIFESTLOG_CACHE in caches: | |
2839 | self.manifestlog.update_caches(transaction=tr) |
|
2839 | self.manifestlog.update_caches(transaction=tr) | |
2840 |
|
2840 | |||
2841 | if repository.CACHE_REV_BRANCH in caches: |
|
2841 | if repository.CACHE_REV_BRANCH in caches: | |
2842 | rbc = unfi.revbranchcache() |
|
2842 | rbc = unfi.revbranchcache() | |
2843 | for r in unfi.changelog: |
|
2843 | for r in unfi.changelog: | |
2844 | rbc.branchinfo(r) |
|
2844 | rbc.branchinfo(r) | |
2845 | rbc.write() |
|
2845 | rbc.write() | |
2846 |
|
2846 | |||
2847 | if repository.CACHE_FULL_MANIFEST in caches: |
|
2847 | if repository.CACHE_FULL_MANIFEST in caches: | |
2848 | # ensure the working copy parents are in the manifestfulltextcache |
|
2848 | # ensure the working copy parents are in the manifestfulltextcache | |
2849 | for ctx in self[b'.'].parents(): |
|
2849 | for ctx in self[b'.'].parents(): | |
2850 | ctx.manifest() # accessing the manifest is enough |
|
2850 | ctx.manifest() # accessing the manifest is enough | |
2851 |
|
2851 | |||
2852 | if repository.CACHE_FILE_NODE_TAGS in caches: |
|
2852 | if repository.CACHE_FILE_NODE_TAGS in caches: | |
2853 | # accessing fnode cache warms the cache |
|
2853 | # accessing fnode cache warms the cache | |
2854 | tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs()) |
|
2854 | tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs()) | |
2855 |
|
2855 | |||
2856 | if repository.CACHE_TAGS_DEFAULT in caches: |
|
2856 | if repository.CACHE_TAGS_DEFAULT in caches: | |
2857 | # accessing tags warm the cache |
|
2857 | # accessing tags warm the cache | |
2858 | self.tags() |
|
2858 | self.tags() | |
2859 | if repository.CACHE_TAGS_SERVED in caches: |
|
2859 | if repository.CACHE_TAGS_SERVED in caches: | |
2860 | self.filtered(b'served').tags() |
|
2860 | self.filtered(b'served').tags() | |
2861 |
|
2861 | |||
2862 | if repository.CACHE_BRANCHMAP_ALL in caches: |
|
2862 | if repository.CACHE_BRANCHMAP_ALL in caches: | |
2863 | # The CACHE_BRANCHMAP_ALL updates lazily-loaded caches immediately, |
|
2863 | # The CACHE_BRANCHMAP_ALL updates lazily-loaded caches immediately, | |
2864 | # so we're forcing a write to cause these caches to be warmed up |
|
2864 | # so we're forcing a write to cause these caches to be warmed up | |
2865 | # even if they haven't explicitly been requested yet (if they've |
|
2865 | # even if they haven't explicitly been requested yet (if they've | |
2866 | # never been used by hg, they won't ever have been written, even if |
|
2866 | # never been used by hg, they won't ever have been written, even if | |
2867 | # they're a subset of another kind of cache that *has* been used). |
|
2867 | # they're a subset of another kind of cache that *has* been used). | |
2868 | for filt in repoview.filtertable.keys(): |
|
2868 | for filt in repoview.filtertable.keys(): | |
2869 | filtered = self.filtered(filt) |
|
2869 | filtered = self.filtered(filt) | |
2870 | filtered.branchmap().write(filtered) |
|
2870 | filtered.branchmap().write(filtered) | |
2871 |
|
2871 | |||
2872 | def invalidatecaches(self): |
|
2872 | def invalidatecaches(self): | |
2873 |
|
2873 | |||
2874 | if '_tagscache' in vars(self): |
|
2874 | if '_tagscache' in vars(self): | |
2875 | # can't use delattr on proxy |
|
2875 | # can't use delattr on proxy | |
2876 | del self.__dict__['_tagscache'] |
|
2876 | del self.__dict__['_tagscache'] | |
2877 |
|
2877 | |||
2878 | self._branchcaches.clear() |
|
2878 | self._branchcaches.clear() | |
2879 | self.invalidatevolatilesets() |
|
2879 | self.invalidatevolatilesets() | |
2880 | self._sparsesignaturecache.clear() |
|
2880 | self._sparsesignaturecache.clear() | |
2881 |
|
2881 | |||
2882 | def invalidatevolatilesets(self): |
|
2882 | def invalidatevolatilesets(self): | |
2883 | self.filteredrevcache.clear() |
|
2883 | self.filteredrevcache.clear() | |
2884 | obsolete.clearobscaches(self) |
|
2884 | obsolete.clearobscaches(self) | |
2885 | self._quick_access_changeid_invalidate() |
|
2885 | self._quick_access_changeid_invalidate() | |
2886 |
|
2886 | |||
2887 | def invalidatedirstate(self): |
|
2887 | def invalidatedirstate(self): | |
2888 | """Invalidates the dirstate, causing the next call to dirstate |
|
2888 | """Invalidates the dirstate, causing the next call to dirstate | |
2889 | to check if it was modified since the last time it was read, |
|
2889 | to check if it was modified since the last time it was read, | |
2890 | rereading it if it has. |
|
2890 | rereading it if it has. | |
2891 |
|
2891 | |||
2892 | This is different to dirstate.invalidate() that it doesn't always |
|
2892 | This is different to dirstate.invalidate() that it doesn't always | |
2893 | rereads the dirstate. Use dirstate.invalidate() if you want to |
|
2893 | rereads the dirstate. Use dirstate.invalidate() if you want to | |
2894 | explicitly read the dirstate again (i.e. restoring it to a previous |
|
2894 | explicitly read the dirstate again (i.e. restoring it to a previous | |
2895 | known good state).""" |
|
2895 | known good state).""" | |
2896 | if hasunfilteredcache(self, 'dirstate'): |
|
2896 | if hasunfilteredcache(self, 'dirstate'): | |
2897 | for k in self.dirstate._filecache: |
|
2897 | for k in self.dirstate._filecache: | |
2898 | try: |
|
2898 | try: | |
2899 | delattr(self.dirstate, k) |
|
2899 | delattr(self.dirstate, k) | |
2900 | except AttributeError: |
|
2900 | except AttributeError: | |
2901 | pass |
|
2901 | pass | |
2902 | delattr(self.unfiltered(), 'dirstate') |
|
2902 | delattr(self.unfiltered(), 'dirstate') | |
2903 |
|
2903 | |||
2904 | def invalidate(self, clearfilecache=False): |
|
2904 | def invalidate(self, clearfilecache=False): | |
2905 | """Invalidates both store and non-store parts other than dirstate |
|
2905 | """Invalidates both store and non-store parts other than dirstate | |
2906 |
|
2906 | |||
2907 | If a transaction is running, invalidation of store is omitted, |
|
2907 | If a transaction is running, invalidation of store is omitted, | |
2908 | because discarding in-memory changes might cause inconsistency |
|
2908 | because discarding in-memory changes might cause inconsistency | |
2909 | (e.g. incomplete fncache causes unintentional failure, but |
|
2909 | (e.g. incomplete fncache causes unintentional failure, but | |
2910 | redundant one doesn't). |
|
2910 | redundant one doesn't). | |
2911 | """ |
|
2911 | """ | |
2912 | unfiltered = self.unfiltered() # all file caches are stored unfiltered |
|
2912 | unfiltered = self.unfiltered() # all file caches are stored unfiltered | |
2913 | for k in list(self._filecache.keys()): |
|
2913 | for k in list(self._filecache.keys()): | |
2914 | # dirstate is invalidated separately in invalidatedirstate() |
|
2914 | # dirstate is invalidated separately in invalidatedirstate() | |
2915 | if k == b'dirstate': |
|
2915 | if k == b'dirstate': | |
2916 | continue |
|
2916 | continue | |
2917 | if ( |
|
2917 | if ( | |
2918 | k == b'changelog' |
|
2918 | k == b'changelog' | |
2919 | and self.currenttransaction() |
|
2919 | and self.currenttransaction() | |
2920 | and self.changelog._delayed |
|
2920 | and self.changelog._delayed | |
2921 | ): |
|
2921 | ): | |
2922 | # The changelog object may store unwritten revisions. We don't |
|
2922 | # The changelog object may store unwritten revisions. We don't | |
2923 | # want to lose them. |
|
2923 | # want to lose them. | |
2924 | # TODO: Solve the problem instead of working around it. |
|
2924 | # TODO: Solve the problem instead of working around it. | |
2925 | continue |
|
2925 | continue | |
2926 |
|
2926 | |||
2927 | if clearfilecache: |
|
2927 | if clearfilecache: | |
2928 | del self._filecache[k] |
|
2928 | del self._filecache[k] | |
2929 | try: |
|
2929 | try: | |
2930 | delattr(unfiltered, k) |
|
2930 | delattr(unfiltered, k) | |
2931 | except AttributeError: |
|
2931 | except AttributeError: | |
2932 | pass |
|
2932 | pass | |
2933 | self.invalidatecaches() |
|
2933 | self.invalidatecaches() | |
2934 | if not self.currenttransaction(): |
|
2934 | if not self.currenttransaction(): | |
2935 | # TODO: Changing contents of store outside transaction |
|
2935 | # TODO: Changing contents of store outside transaction | |
2936 | # causes inconsistency. We should make in-memory store |
|
2936 | # causes inconsistency. We should make in-memory store | |
2937 | # changes detectable, and abort if changed. |
|
2937 | # changes detectable, and abort if changed. | |
2938 | self.store.invalidatecaches() |
|
2938 | self.store.invalidatecaches() | |
2939 |
|
2939 | |||
2940 | def invalidateall(self): |
|
2940 | def invalidateall(self): | |
2941 | """Fully invalidates both store and non-store parts, causing the |
|
2941 | """Fully invalidates both store and non-store parts, causing the | |
2942 | subsequent operation to reread any outside changes.""" |
|
2942 | subsequent operation to reread any outside changes.""" | |
2943 | # extension should hook this to invalidate its caches |
|
2943 | # extension should hook this to invalidate its caches | |
2944 | self.invalidate() |
|
2944 | self.invalidate() | |
2945 | self.invalidatedirstate() |
|
2945 | self.invalidatedirstate() | |
2946 |
|
2946 | |||
2947 | @unfilteredmethod |
|
2947 | @unfilteredmethod | |
2948 | def _refreshfilecachestats(self, tr): |
|
2948 | def _refreshfilecachestats(self, tr): | |
2949 | """Reload stats of cached files so that they are flagged as valid""" |
|
2949 | """Reload stats of cached files so that they are flagged as valid""" | |
2950 | for k, ce in self._filecache.items(): |
|
2950 | for k, ce in self._filecache.items(): | |
2951 | k = pycompat.sysstr(k) |
|
2951 | k = pycompat.sysstr(k) | |
2952 | if k == 'dirstate' or k not in self.__dict__: |
|
2952 | if k == 'dirstate' or k not in self.__dict__: | |
2953 | continue |
|
2953 | continue | |
2954 | ce.refresh() |
|
2954 | ce.refresh() | |
2955 |
|
2955 | |||
2956 | def _lock( |
|
2956 | def _lock( | |
2957 | self, |
|
2957 | self, | |
2958 | vfs, |
|
2958 | vfs, | |
2959 | lockname, |
|
2959 | lockname, | |
2960 | wait, |
|
2960 | wait, | |
2961 | releasefn, |
|
2961 | releasefn, | |
2962 | acquirefn, |
|
2962 | acquirefn, | |
2963 | desc, |
|
2963 | desc, | |
2964 | ): |
|
2964 | ): | |
2965 | timeout = 0 |
|
2965 | timeout = 0 | |
2966 | warntimeout = 0 |
|
2966 | warntimeout = 0 | |
2967 | if wait: |
|
2967 | if wait: | |
2968 | timeout = self.ui.configint(b"ui", b"timeout") |
|
2968 | timeout = self.ui.configint(b"ui", b"timeout") | |
2969 | warntimeout = self.ui.configint(b"ui", b"timeout.warn") |
|
2969 | warntimeout = self.ui.configint(b"ui", b"timeout.warn") | |
2970 | # internal config: ui.signal-safe-lock |
|
2970 | # internal config: ui.signal-safe-lock | |
2971 | signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock') |
|
2971 | signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock') | |
2972 |
|
2972 | |||
2973 | l = lockmod.trylock( |
|
2973 | l = lockmod.trylock( | |
2974 | self.ui, |
|
2974 | self.ui, | |
2975 | vfs, |
|
2975 | vfs, | |
2976 | lockname, |
|
2976 | lockname, | |
2977 | timeout, |
|
2977 | timeout, | |
2978 | warntimeout, |
|
2978 | warntimeout, | |
2979 | releasefn=releasefn, |
|
2979 | releasefn=releasefn, | |
2980 | acquirefn=acquirefn, |
|
2980 | acquirefn=acquirefn, | |
2981 | desc=desc, |
|
2981 | desc=desc, | |
2982 | signalsafe=signalsafe, |
|
2982 | signalsafe=signalsafe, | |
2983 | ) |
|
2983 | ) | |
2984 | return l |
|
2984 | return l | |
2985 |
|
2985 | |||
2986 | def _afterlock(self, callback): |
|
2986 | def _afterlock(self, callback): | |
2987 | """add a callback to be run when the repository is fully unlocked |
|
2987 | """add a callback to be run when the repository is fully unlocked | |
2988 |
|
2988 | |||
2989 | The callback will be executed when the outermost lock is released |
|
2989 | The callback will be executed when the outermost lock is released | |
2990 | (with wlock being higher level than 'lock').""" |
|
2990 | (with wlock being higher level than 'lock').""" | |
2991 | for ref in (self._wlockref, self._lockref): |
|
2991 | for ref in (self._wlockref, self._lockref): | |
2992 | l = ref and ref() |
|
2992 | l = ref and ref() | |
2993 | if l and l.held: |
|
2993 | if l and l.held: | |
2994 | l.postrelease.append(callback) |
|
2994 | l.postrelease.append(callback) | |
2995 | break |
|
2995 | break | |
2996 | else: # no lock have been found. |
|
2996 | else: # no lock have been found. | |
2997 | callback(True) |
|
2997 | callback(True) | |
2998 |
|
2998 | |||
2999 | def lock(self, wait=True): |
|
2999 | def lock(self, wait=True): | |
3000 | """Lock the repository store (.hg/store) and return a weak reference |
|
3000 | """Lock the repository store (.hg/store) and return a weak reference | |
3001 | to the lock. Use this before modifying the store (e.g. committing or |
|
3001 | to the lock. Use this before modifying the store (e.g. committing or | |
3002 | stripping). If you are opening a transaction, get a lock as well.) |
|
3002 | stripping). If you are opening a transaction, get a lock as well.) | |
3003 |
|
3003 | |||
3004 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
3004 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires | |
3005 | 'wlock' first to avoid a dead-lock hazard.""" |
|
3005 | 'wlock' first to avoid a dead-lock hazard.""" | |
3006 | l = self._currentlock(self._lockref) |
|
3006 | l = self._currentlock(self._lockref) | |
3007 | if l is not None: |
|
3007 | if l is not None: | |
3008 | l.lock() |
|
3008 | l.lock() | |
3009 | return l |
|
3009 | return l | |
3010 |
|
3010 | |||
3011 | l = self._lock( |
|
3011 | l = self._lock( | |
3012 | vfs=self.svfs, |
|
3012 | vfs=self.svfs, | |
3013 | lockname=b"lock", |
|
3013 | lockname=b"lock", | |
3014 | wait=wait, |
|
3014 | wait=wait, | |
3015 | releasefn=None, |
|
3015 | releasefn=None, | |
3016 | acquirefn=self.invalidate, |
|
3016 | acquirefn=self.invalidate, | |
3017 | desc=_(b'repository %s') % self.origroot, |
|
3017 | desc=_(b'repository %s') % self.origroot, | |
3018 | ) |
|
3018 | ) | |
3019 | self._lockref = weakref.ref(l) |
|
3019 | self._lockref = weakref.ref(l) | |
3020 | return l |
|
3020 | return l | |
3021 |
|
3021 | |||
3022 | def wlock(self, wait=True): |
|
3022 | def wlock(self, wait=True): | |
3023 | """Lock the non-store parts of the repository (everything under |
|
3023 | """Lock the non-store parts of the repository (everything under | |
3024 | .hg except .hg/store) and return a weak reference to the lock. |
|
3024 | .hg except .hg/store) and return a weak reference to the lock. | |
3025 |
|
3025 | |||
3026 | Use this before modifying files in .hg. |
|
3026 | Use this before modifying files in .hg. | |
3027 |
|
3027 | |||
3028 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
3028 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires | |
3029 | 'wlock' first to avoid a dead-lock hazard.""" |
|
3029 | 'wlock' first to avoid a dead-lock hazard.""" | |
3030 | l = self._wlockref() if self._wlockref else None |
|
3030 | l = self._wlockref() if self._wlockref else None | |
3031 | if l is not None and l.held: |
|
3031 | if l is not None and l.held: | |
3032 | l.lock() |
|
3032 | l.lock() | |
3033 | return l |
|
3033 | return l | |
3034 |
|
3034 | |||
3035 | # We do not need to check for non-waiting lock acquisition. Such |
|
3035 | # We do not need to check for non-waiting lock acquisition. Such | |
3036 | # acquisition would not cause dead-lock as they would just fail. |
|
3036 | # acquisition would not cause dead-lock as they would just fail. | |
3037 | if wait and ( |
|
3037 | if wait and ( | |
3038 | self.ui.configbool(b'devel', b'all-warnings') |
|
3038 | self.ui.configbool(b'devel', b'all-warnings') | |
3039 | or self.ui.configbool(b'devel', b'check-locks') |
|
3039 | or self.ui.configbool(b'devel', b'check-locks') | |
3040 | ): |
|
3040 | ): | |
3041 | if self._currentlock(self._lockref) is not None: |
|
3041 | if self._currentlock(self._lockref) is not None: | |
3042 | self.ui.develwarn(b'"wlock" acquired after "lock"') |
|
3042 | self.ui.develwarn(b'"wlock" acquired after "lock"') | |
3043 |
|
3043 | |||
3044 | def unlock(): |
|
3044 | def unlock(): | |
3045 | if self.dirstate.pendingparentchange(): |
|
3045 | if self.dirstate.pendingparentchange(): | |
3046 | self.dirstate.invalidate() |
|
3046 | self.dirstate.invalidate() | |
3047 | else: |
|
3047 | else: | |
3048 | self.dirstate.write(None) |
|
3048 | self.dirstate.write(None) | |
3049 |
|
3049 | |||
3050 | self._filecache[b'dirstate'].refresh() |
|
3050 | self._filecache[b'dirstate'].refresh() | |
3051 |
|
3051 | |||
3052 | l = self._lock( |
|
3052 | l = self._lock( | |
3053 | self.vfs, |
|
3053 | self.vfs, | |
3054 | b"wlock", |
|
3054 | b"wlock", | |
3055 | wait, |
|
3055 | wait, | |
3056 | unlock, |
|
3056 | unlock, | |
3057 | self.invalidatedirstate, |
|
3057 | self.invalidatedirstate, | |
3058 | _(b'working directory of %s') % self.origroot, |
|
3058 | _(b'working directory of %s') % self.origroot, | |
3059 | ) |
|
3059 | ) | |
3060 | self._wlockref = weakref.ref(l) |
|
3060 | self._wlockref = weakref.ref(l) | |
3061 | return l |
|
3061 | return l | |
3062 |
|
3062 | |||
3063 | def _currentlock(self, lockref): |
|
3063 | def _currentlock(self, lockref): | |
3064 | """Returns the lock if it's held, or None if it's not.""" |
|
3064 | """Returns the lock if it's held, or None if it's not.""" | |
3065 | if lockref is None: |
|
3065 | if lockref is None: | |
3066 | return None |
|
3066 | return None | |
3067 | l = lockref() |
|
3067 | l = lockref() | |
3068 | if l is None or not l.held: |
|
3068 | if l is None or not l.held: | |
3069 | return None |
|
3069 | return None | |
3070 | return l |
|
3070 | return l | |
3071 |
|
3071 | |||
3072 | def currentwlock(self): |
|
3072 | def currentwlock(self): | |
3073 | """Returns the wlock if it's held, or None if it's not.""" |
|
3073 | """Returns the wlock if it's held, or None if it's not.""" | |
3074 | return self._currentlock(self._wlockref) |
|
3074 | return self._currentlock(self._wlockref) | |
3075 |
|
3075 | |||
3076 | def checkcommitpatterns(self, wctx, match, status, fail): |
|
3076 | def checkcommitpatterns(self, wctx, match, status, fail): | |
3077 | """check for commit arguments that aren't committable""" |
|
3077 | """check for commit arguments that aren't committable""" | |
3078 | if match.isexact() or match.prefix(): |
|
3078 | if match.isexact() or match.prefix(): | |
3079 | matched = set(status.modified + status.added + status.removed) |
|
3079 | matched = set(status.modified + status.added + status.removed) | |
3080 |
|
3080 | |||
3081 | for f in match.files(): |
|
3081 | for f in match.files(): | |
3082 | f = self.dirstate.normalize(f) |
|
3082 | f = self.dirstate.normalize(f) | |
3083 | if f == b'.' or f in matched or f in wctx.substate: |
|
3083 | if f == b'.' or f in matched or f in wctx.substate: | |
3084 | continue |
|
3084 | continue | |
3085 | if f in status.deleted: |
|
3085 | if f in status.deleted: | |
3086 | fail(f, _(b'file not found!')) |
|
3086 | fail(f, _(b'file not found!')) | |
3087 | # Is it a directory that exists or used to exist? |
|
3087 | # Is it a directory that exists or used to exist? | |
3088 | if self.wvfs.isdir(f) or wctx.p1().hasdir(f): |
|
3088 | if self.wvfs.isdir(f) or wctx.p1().hasdir(f): | |
3089 | d = f + b'/' |
|
3089 | d = f + b'/' | |
3090 | for mf in matched: |
|
3090 | for mf in matched: | |
3091 | if mf.startswith(d): |
|
3091 | if mf.startswith(d): | |
3092 | break |
|
3092 | break | |
3093 | else: |
|
3093 | else: | |
3094 | fail(f, _(b"no match under directory!")) |
|
3094 | fail(f, _(b"no match under directory!")) | |
3095 | elif f not in self.dirstate: |
|
3095 | elif f not in self.dirstate: | |
3096 | fail(f, _(b"file not tracked!")) |
|
3096 | fail(f, _(b"file not tracked!")) | |
3097 |
|
3097 | |||
3098 | @unfilteredmethod |
|
3098 | @unfilteredmethod | |
3099 | def commit( |
|
3099 | def commit( | |
3100 | self, |
|
3100 | self, | |
3101 | text=b"", |
|
3101 | text=b"", | |
3102 | user=None, |
|
3102 | user=None, | |
3103 | date=None, |
|
3103 | date=None, | |
3104 | match=None, |
|
3104 | match=None, | |
3105 | force=False, |
|
3105 | force=False, | |
3106 | editor=None, |
|
3106 | editor=None, | |
3107 | extra=None, |
|
3107 | extra=None, | |
3108 | ): |
|
3108 | ): | |
3109 | """Add a new revision to current repository. |
|
3109 | """Add a new revision to current repository. | |
3110 |
|
3110 | |||
3111 | Revision information is gathered from the working directory, |
|
3111 | Revision information is gathered from the working directory, | |
3112 | match can be used to filter the committed files. If editor is |
|
3112 | match can be used to filter the committed files. If editor is | |
3113 | supplied, it is called to get a commit message. |
|
3113 | supplied, it is called to get a commit message. | |
3114 | """ |
|
3114 | """ | |
3115 | if extra is None: |
|
3115 | if extra is None: | |
3116 | extra = {} |
|
3116 | extra = {} | |
3117 |
|
3117 | |||
3118 | def fail(f, msg): |
|
3118 | def fail(f, msg): | |
3119 | raise error.InputError(b'%s: %s' % (f, msg)) |
|
3119 | raise error.InputError(b'%s: %s' % (f, msg)) | |
3120 |
|
3120 | |||
3121 | if not match: |
|
3121 | if not match: | |
3122 | match = matchmod.always() |
|
3122 | match = matchmod.always() | |
3123 |
|
3123 | |||
3124 | if not force: |
|
3124 | if not force: | |
3125 | match.bad = fail |
|
3125 | match.bad = fail | |
3126 |
|
3126 | |||
3127 | # lock() for recent changelog (see issue4368) |
|
3127 | # lock() for recent changelog (see issue4368) | |
3128 | with self.wlock(), self.lock(): |
|
3128 | with self.wlock(), self.lock(): | |
3129 | wctx = self[None] |
|
3129 | wctx = self[None] | |
3130 | merge = len(wctx.parents()) > 1 |
|
3130 | merge = len(wctx.parents()) > 1 | |
3131 |
|
3131 | |||
3132 | if not force and merge and not match.always(): |
|
3132 | if not force and merge and not match.always(): | |
3133 | raise error.Abort( |
|
3133 | raise error.Abort( | |
3134 | _( |
|
3134 | _( | |
3135 | b'cannot partially commit a merge ' |
|
3135 | b'cannot partially commit a merge ' | |
3136 | b'(do not specify files or patterns)' |
|
3136 | b'(do not specify files or patterns)' | |
3137 | ) |
|
3137 | ) | |
3138 | ) |
|
3138 | ) | |
3139 |
|
3139 | |||
3140 | status = self.status(match=match, clean=force) |
|
3140 | status = self.status(match=match, clean=force) | |
3141 | if force: |
|
3141 | if force: | |
3142 | status.modified.extend( |
|
3142 | status.modified.extend( | |
3143 | status.clean |
|
3143 | status.clean | |
3144 | ) # mq may commit clean files |
|
3144 | ) # mq may commit clean files | |
3145 |
|
3145 | |||
3146 | # check subrepos |
|
3146 | # check subrepos | |
3147 | subs, commitsubs, newstate = subrepoutil.precommit( |
|
3147 | subs, commitsubs, newstate = subrepoutil.precommit( | |
3148 | self.ui, wctx, status, match, force=force |
|
3148 | self.ui, wctx, status, match, force=force | |
3149 | ) |
|
3149 | ) | |
3150 |
|
3150 | |||
3151 | # make sure all explicit patterns are matched |
|
3151 | # make sure all explicit patterns are matched | |
3152 | if not force: |
|
3152 | if not force: | |
3153 | self.checkcommitpatterns(wctx, match, status, fail) |
|
3153 | self.checkcommitpatterns(wctx, match, status, fail) | |
3154 |
|
3154 | |||
3155 | cctx = context.workingcommitctx( |
|
3155 | cctx = context.workingcommitctx( | |
3156 | self, status, text, user, date, extra |
|
3156 | self, status, text, user, date, extra | |
3157 | ) |
|
3157 | ) | |
3158 |
|
3158 | |||
3159 | ms = mergestatemod.mergestate.read(self) |
|
3159 | ms = mergestatemod.mergestate.read(self) | |
3160 | mergeutil.checkunresolved(ms) |
|
3160 | mergeutil.checkunresolved(ms) | |
3161 |
|
3161 | |||
3162 | # internal config: ui.allowemptycommit |
|
3162 | # internal config: ui.allowemptycommit | |
3163 | if cctx.isempty() and not self.ui.configbool( |
|
3163 | if cctx.isempty() and not self.ui.configbool( | |
3164 | b'ui', b'allowemptycommit' |
|
3164 | b'ui', b'allowemptycommit' | |
3165 | ): |
|
3165 | ): | |
3166 | self.ui.debug(b'nothing to commit, clearing merge state\n') |
|
3166 | self.ui.debug(b'nothing to commit, clearing merge state\n') | |
3167 | ms.reset() |
|
3167 | ms.reset() | |
3168 | return None |
|
3168 | return None | |
3169 |
|
3169 | |||
3170 | if merge and cctx.deleted(): |
|
3170 | if merge and cctx.deleted(): | |
3171 | raise error.Abort(_(b"cannot commit merge with missing files")) |
|
3171 | raise error.Abort(_(b"cannot commit merge with missing files")) | |
3172 |
|
3172 | |||
3173 | if editor: |
|
3173 | if editor: | |
3174 | cctx._text = editor(self, cctx, subs) |
|
3174 | cctx._text = editor(self, cctx, subs) | |
3175 | edited = text != cctx._text |
|
3175 | edited = text != cctx._text | |
3176 |
|
3176 | |||
3177 | # Save commit message in case this transaction gets rolled back |
|
3177 | # Save commit message in case this transaction gets rolled back | |
3178 | # (e.g. by a pretxncommit hook). Leave the content alone on |
|
3178 | # (e.g. by a pretxncommit hook). Leave the content alone on | |
3179 | # the assumption that the user will use the same editor again. |
|
3179 | # the assumption that the user will use the same editor again. | |
3180 | msgfn = self.savecommitmessage(cctx._text) |
|
3180 | msgfn = self.savecommitmessage(cctx._text) | |
3181 |
|
3181 | |||
3182 | # commit subs and write new state |
|
3182 | # commit subs and write new state | |
3183 | if subs: |
|
3183 | if subs: | |
3184 | uipathfn = scmutil.getuipathfn(self) |
|
3184 | uipathfn = scmutil.getuipathfn(self) | |
3185 | for s in sorted(commitsubs): |
|
3185 | for s in sorted(commitsubs): | |
3186 | sub = wctx.sub(s) |
|
3186 | sub = wctx.sub(s) | |
3187 | self.ui.status( |
|
3187 | self.ui.status( | |
3188 | _(b'committing subrepository %s\n') |
|
3188 | _(b'committing subrepository %s\n') | |
3189 | % uipathfn(subrepoutil.subrelpath(sub)) |
|
3189 | % uipathfn(subrepoutil.subrelpath(sub)) | |
3190 | ) |
|
3190 | ) | |
3191 | sr = sub.commit(cctx._text, user, date) |
|
3191 | sr = sub.commit(cctx._text, user, date) | |
3192 | newstate[s] = (newstate[s][0], sr) |
|
3192 | newstate[s] = (newstate[s][0], sr) | |
3193 | subrepoutil.writestate(self, newstate) |
|
3193 | subrepoutil.writestate(self, newstate) | |
3194 |
|
3194 | |||
3195 | p1, p2 = self.dirstate.parents() |
|
3195 | p1, p2 = self.dirstate.parents() | |
3196 | hookp1, hookp2 = hex(p1), (p2 != self.nullid and hex(p2) or b'') |
|
3196 | hookp1, hookp2 = hex(p1), (p2 != self.nullid and hex(p2) or b'') | |
3197 | try: |
|
3197 | try: | |
3198 | self.hook( |
|
3198 | self.hook( | |
3199 | b"precommit", throw=True, parent1=hookp1, parent2=hookp2 |
|
3199 | b"precommit", throw=True, parent1=hookp1, parent2=hookp2 | |
3200 | ) |
|
3200 | ) | |
3201 | with self.transaction(b'commit'): |
|
3201 | with self.transaction(b'commit'): | |
3202 | ret = self.commitctx(cctx, True) |
|
3202 | ret = self.commitctx(cctx, True) | |
3203 | # update bookmarks, dirstate and mergestate |
|
3203 | # update bookmarks, dirstate and mergestate | |
3204 | bookmarks.update(self, [p1, p2], ret) |
|
3204 | bookmarks.update(self, [p1, p2], ret) | |
3205 | cctx.markcommitted(ret) |
|
3205 | cctx.markcommitted(ret) | |
3206 | ms.reset() |
|
3206 | ms.reset() | |
3207 | except: # re-raises |
|
3207 | except: # re-raises | |
3208 | if edited: |
|
3208 | if edited: | |
3209 | self.ui.write( |
|
3209 | self.ui.write( | |
3210 | _(b'note: commit message saved in %s\n') % msgfn |
|
3210 | _(b'note: commit message saved in %s\n') % msgfn | |
3211 | ) |
|
3211 | ) | |
3212 | self.ui.write( |
|
3212 | self.ui.write( | |
3213 | _( |
|
3213 | _( | |
3214 | b"note: use 'hg commit --logfile " |
|
3214 | b"note: use 'hg commit --logfile " | |
3215 | b".hg/last-message.txt --edit' to reuse it\n" |
|
3215 | b".hg/last-message.txt --edit' to reuse it\n" | |
3216 | ) |
|
3216 | ) | |
3217 | ) |
|
3217 | ) | |
3218 | raise |
|
3218 | raise | |
3219 |
|
3219 | |||
3220 | def commithook(unused_success): |
|
3220 | def commithook(unused_success): | |
3221 | # hack for command that use a temporary commit (eg: histedit) |
|
3221 | # hack for command that use a temporary commit (eg: histedit) | |
3222 | # temporary commit got stripped before hook release |
|
3222 | # temporary commit got stripped before hook release | |
3223 | if self.changelog.hasnode(ret): |
|
3223 | if self.changelog.hasnode(ret): | |
3224 | self.hook( |
|
3224 | self.hook( | |
3225 | b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2 |
|
3225 | b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2 | |
3226 | ) |
|
3226 | ) | |
3227 |
|
3227 | |||
3228 | self._afterlock(commithook) |
|
3228 | self._afterlock(commithook) | |
3229 | return ret |
|
3229 | return ret | |
3230 |
|
3230 | |||
3231 | @unfilteredmethod |
|
3231 | @unfilteredmethod | |
3232 | def commitctx(self, ctx, error=False, origctx=None): |
|
3232 | def commitctx(self, ctx, error=False, origctx=None): | |
3233 | return commit.commitctx(self, ctx, error=error, origctx=origctx) |
|
3233 | return commit.commitctx(self, ctx, error=error, origctx=origctx) | |
3234 |
|
3234 | |||
3235 | @unfilteredmethod |
|
3235 | @unfilteredmethod | |
3236 | def destroying(self): |
|
3236 | def destroying(self): | |
3237 | """Inform the repository that nodes are about to be destroyed. |
|
3237 | """Inform the repository that nodes are about to be destroyed. | |
3238 | Intended for use by strip and rollback, so there's a common |
|
3238 | Intended for use by strip and rollback, so there's a common | |
3239 | place for anything that has to be done before destroying history. |
|
3239 | place for anything that has to be done before destroying history. | |
3240 |
|
3240 | |||
3241 | This is mostly useful for saving state that is in memory and waiting |
|
3241 | This is mostly useful for saving state that is in memory and waiting | |
3242 | to be flushed when the current lock is released. Because a call to |
|
3242 | to be flushed when the current lock is released. Because a call to | |
3243 | destroyed is imminent, the repo will be invalidated causing those |
|
3243 | destroyed is imminent, the repo will be invalidated causing those | |
3244 | changes to stay in memory (waiting for the next unlock), or vanish |
|
3244 | changes to stay in memory (waiting for the next unlock), or vanish | |
3245 | completely. |
|
3245 | completely. | |
3246 | """ |
|
3246 | """ | |
3247 | # When using the same lock to commit and strip, the phasecache is left |
|
3247 | # When using the same lock to commit and strip, the phasecache is left | |
3248 | # dirty after committing. Then when we strip, the repo is invalidated, |
|
3248 | # dirty after committing. Then when we strip, the repo is invalidated, | |
3249 | # causing those changes to disappear. |
|
3249 | # causing those changes to disappear. | |
3250 | if '_phasecache' in vars(self): |
|
3250 | if '_phasecache' in vars(self): | |
3251 | self._phasecache.write() |
|
3251 | self._phasecache.write() | |
3252 |
|
3252 | |||
3253 | @unfilteredmethod |
|
3253 | @unfilteredmethod | |
3254 | def destroyed(self): |
|
3254 | def destroyed(self): | |
3255 | """Inform the repository that nodes have been destroyed. |
|
3255 | """Inform the repository that nodes have been destroyed. | |
3256 | Intended for use by strip and rollback, so there's a common |
|
3256 | Intended for use by strip and rollback, so there's a common | |
3257 | place for anything that has to be done after destroying history. |
|
3257 | place for anything that has to be done after destroying history. | |
3258 | """ |
|
3258 | """ | |
3259 | # When one tries to: |
|
3259 | # When one tries to: | |
3260 | # 1) destroy nodes thus calling this method (e.g. strip) |
|
3260 | # 1) destroy nodes thus calling this method (e.g. strip) | |
3261 | # 2) use phasecache somewhere (e.g. commit) |
|
3261 | # 2) use phasecache somewhere (e.g. commit) | |
3262 | # |
|
3262 | # | |
3263 | # then 2) will fail because the phasecache contains nodes that were |
|
3263 | # then 2) will fail because the phasecache contains nodes that were | |
3264 | # removed. We can either remove phasecache from the filecache, |
|
3264 | # removed. We can either remove phasecache from the filecache, | |
3265 | # causing it to reload next time it is accessed, or simply filter |
|
3265 | # causing it to reload next time it is accessed, or simply filter | |
3266 | # the removed nodes now and write the updated cache. |
|
3266 | # the removed nodes now and write the updated cache. | |
3267 | self._phasecache.filterunknown(self) |
|
3267 | self._phasecache.filterunknown(self) | |
3268 | self._phasecache.write() |
|
3268 | self._phasecache.write() | |
3269 |
|
3269 | |||
3270 | # refresh all repository caches |
|
3270 | # refresh all repository caches | |
3271 | self.updatecaches() |
|
3271 | self.updatecaches() | |
3272 |
|
3272 | |||
3273 | # Ensure the persistent tag cache is updated. Doing it now |
|
3273 | # Ensure the persistent tag cache is updated. Doing it now | |
3274 | # means that the tag cache only has to worry about destroyed |
|
3274 | # means that the tag cache only has to worry about destroyed | |
3275 | # heads immediately after a strip/rollback. That in turn |
|
3275 | # heads immediately after a strip/rollback. That in turn | |
3276 | # guarantees that "cachetip == currenttip" (comparing both rev |
|
3276 | # guarantees that "cachetip == currenttip" (comparing both rev | |
3277 | # and node) always means no nodes have been added or destroyed. |
|
3277 | # and node) always means no nodes have been added or destroyed. | |
3278 |
|
3278 | |||
3279 | # XXX this is suboptimal when qrefresh'ing: we strip the current |
|
3279 | # XXX this is suboptimal when qrefresh'ing: we strip the current | |
3280 | # head, refresh the tag cache, then immediately add a new head. |
|
3280 | # head, refresh the tag cache, then immediately add a new head. | |
3281 | # But I think doing it this way is necessary for the "instant |
|
3281 | # But I think doing it this way is necessary for the "instant | |
3282 | # tag cache retrieval" case to work. |
|
3282 | # tag cache retrieval" case to work. | |
3283 | self.invalidate() |
|
3283 | self.invalidate() | |
3284 |
|
3284 | |||
3285 | def status( |
|
3285 | def status( | |
3286 | self, |
|
3286 | self, | |
3287 | node1=b'.', |
|
3287 | node1=b'.', | |
3288 | node2=None, |
|
3288 | node2=None, | |
3289 | match=None, |
|
3289 | match=None, | |
3290 | ignored=False, |
|
3290 | ignored=False, | |
3291 | clean=False, |
|
3291 | clean=False, | |
3292 | unknown=False, |
|
3292 | unknown=False, | |
3293 | listsubrepos=False, |
|
3293 | listsubrepos=False, | |
3294 | ): |
|
3294 | ): | |
3295 | '''a convenience method that calls node1.status(node2)''' |
|
3295 | '''a convenience method that calls node1.status(node2)''' | |
3296 | return self[node1].status( |
|
3296 | return self[node1].status( | |
3297 | node2, match, ignored, clean, unknown, listsubrepos |
|
3297 | node2, match, ignored, clean, unknown, listsubrepos | |
3298 | ) |
|
3298 | ) | |
3299 |
|
3299 | |||
3300 | def addpostdsstatus(self, ps): |
|
3300 | def addpostdsstatus(self, ps): | |
3301 | """Add a callback to run within the wlock, at the point at which status |
|
3301 | """Add a callback to run within the wlock, at the point at which status | |
3302 | fixups happen. |
|
3302 | fixups happen. | |
3303 |
|
3303 | |||
3304 | On status completion, callback(wctx, status) will be called with the |
|
3304 | On status completion, callback(wctx, status) will be called with the | |
3305 | wlock held, unless the dirstate has changed from underneath or the wlock |
|
3305 | wlock held, unless the dirstate has changed from underneath or the wlock | |
3306 | couldn't be grabbed. |
|
3306 | couldn't be grabbed. | |
3307 |
|
3307 | |||
3308 | Callbacks should not capture and use a cached copy of the dirstate -- |
|
3308 | Callbacks should not capture and use a cached copy of the dirstate -- | |
3309 | it might change in the meanwhile. Instead, they should access the |
|
3309 | it might change in the meanwhile. Instead, they should access the | |
3310 | dirstate via wctx.repo().dirstate. |
|
3310 | dirstate via wctx.repo().dirstate. | |
3311 |
|
3311 | |||
3312 | This list is emptied out after each status run -- extensions should |
|
3312 | This list is emptied out after each status run -- extensions should | |
3313 | make sure it adds to this list each time dirstate.status is called. |
|
3313 | make sure it adds to this list each time dirstate.status is called. | |
3314 | Extensions should also make sure they don't call this for statuses |
|
3314 | Extensions should also make sure they don't call this for statuses | |
3315 | that don't involve the dirstate. |
|
3315 | that don't involve the dirstate. | |
3316 | """ |
|
3316 | """ | |
3317 |
|
3317 | |||
3318 | # The list is located here for uniqueness reasons -- it is actually |
|
3318 | # The list is located here for uniqueness reasons -- it is actually | |
3319 | # managed by the workingctx, but that isn't unique per-repo. |
|
3319 | # managed by the workingctx, but that isn't unique per-repo. | |
3320 | self._postdsstatus.append(ps) |
|
3320 | self._postdsstatus.append(ps) | |
3321 |
|
3321 | |||
3322 | def postdsstatus(self): |
|
3322 | def postdsstatus(self): | |
3323 | """Used by workingctx to get the list of post-dirstate-status hooks.""" |
|
3323 | """Used by workingctx to get the list of post-dirstate-status hooks.""" | |
3324 | return self._postdsstatus |
|
3324 | return self._postdsstatus | |
3325 |
|
3325 | |||
3326 | def clearpostdsstatus(self): |
|
3326 | def clearpostdsstatus(self): | |
3327 | """Used by workingctx to clear post-dirstate-status hooks.""" |
|
3327 | """Used by workingctx to clear post-dirstate-status hooks.""" | |
3328 | del self._postdsstatus[:] |
|
3328 | del self._postdsstatus[:] | |
3329 |
|
3329 | |||
3330 | def heads(self, start=None): |
|
3330 | def heads(self, start=None): | |
3331 | if start is None: |
|
3331 | if start is None: | |
3332 | cl = self.changelog |
|
3332 | cl = self.changelog | |
3333 | headrevs = reversed(cl.headrevs()) |
|
3333 | headrevs = reversed(cl.headrevs()) | |
3334 | return [cl.node(rev) for rev in headrevs] |
|
3334 | return [cl.node(rev) for rev in headrevs] | |
3335 |
|
3335 | |||
3336 | heads = self.changelog.heads(start) |
|
3336 | heads = self.changelog.heads(start) | |
3337 | # sort the output in rev descending order |
|
3337 | # sort the output in rev descending order | |
3338 | return sorted(heads, key=self.changelog.rev, reverse=True) |
|
3338 | return sorted(heads, key=self.changelog.rev, reverse=True) | |
3339 |
|
3339 | |||
3340 | def branchheads(self, branch=None, start=None, closed=False): |
|
3340 | def branchheads(self, branch=None, start=None, closed=False): | |
3341 | """return a (possibly filtered) list of heads for the given branch |
|
3341 | """return a (possibly filtered) list of heads for the given branch | |
3342 |
|
3342 | |||
3343 | Heads are returned in topological order, from newest to oldest. |
|
3343 | Heads are returned in topological order, from newest to oldest. | |
3344 | If branch is None, use the dirstate branch. |
|
3344 | If branch is None, use the dirstate branch. | |
3345 | If start is not None, return only heads reachable from start. |
|
3345 | If start is not None, return only heads reachable from start. | |
3346 | If closed is True, return heads that are marked as closed as well. |
|
3346 | If closed is True, return heads that are marked as closed as well. | |
3347 | """ |
|
3347 | """ | |
3348 | if branch is None: |
|
3348 | if branch is None: | |
3349 | branch = self[None].branch() |
|
3349 | branch = self[None].branch() | |
3350 | branches = self.branchmap() |
|
3350 | branches = self.branchmap() | |
3351 | if not branches.hasbranch(branch): |
|
3351 | if not branches.hasbranch(branch): | |
3352 | return [] |
|
3352 | return [] | |
3353 | # the cache returns heads ordered lowest to highest |
|
3353 | # the cache returns heads ordered lowest to highest | |
3354 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) |
|
3354 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) | |
3355 | if start is not None: |
|
3355 | if start is not None: | |
3356 | # filter out the heads that cannot be reached from startrev |
|
3356 | # filter out the heads that cannot be reached from startrev | |
3357 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) |
|
3357 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) | |
3358 | bheads = [h for h in bheads if h in fbheads] |
|
3358 | bheads = [h for h in bheads if h in fbheads] | |
3359 | return bheads |
|
3359 | return bheads | |
3360 |
|
3360 | |||
3361 | def branches(self, nodes): |
|
3361 | def branches(self, nodes): | |
3362 | if not nodes: |
|
3362 | if not nodes: | |
3363 | nodes = [self.changelog.tip()] |
|
3363 | nodes = [self.changelog.tip()] | |
3364 | b = [] |
|
3364 | b = [] | |
3365 | for n in nodes: |
|
3365 | for n in nodes: | |
3366 | t = n |
|
3366 | t = n | |
3367 | while True: |
|
3367 | while True: | |
3368 | p = self.changelog.parents(n) |
|
3368 | p = self.changelog.parents(n) | |
3369 | if p[1] != self.nullid or p[0] == self.nullid: |
|
3369 | if p[1] != self.nullid or p[0] == self.nullid: | |
3370 | b.append((t, n, p[0], p[1])) |
|
3370 | b.append((t, n, p[0], p[1])) | |
3371 | break |
|
3371 | break | |
3372 | n = p[0] |
|
3372 | n = p[0] | |
3373 | return b |
|
3373 | return b | |
3374 |
|
3374 | |||
3375 | def between(self, pairs): |
|
3375 | def between(self, pairs): | |
3376 | r = [] |
|
3376 | r = [] | |
3377 |
|
3377 | |||
3378 | for top, bottom in pairs: |
|
3378 | for top, bottom in pairs: | |
3379 | n, l, i = top, [], 0 |
|
3379 | n, l, i = top, [], 0 | |
3380 | f = 1 |
|
3380 | f = 1 | |
3381 |
|
3381 | |||
3382 | while n != bottom and n != self.nullid: |
|
3382 | while n != bottom and n != self.nullid: | |
3383 | p = self.changelog.parents(n)[0] |
|
3383 | p = self.changelog.parents(n)[0] | |
3384 | if i == f: |
|
3384 | if i == f: | |
3385 | l.append(n) |
|
3385 | l.append(n) | |
3386 | f = f * 2 |
|
3386 | f = f * 2 | |
3387 | n = p |
|
3387 | n = p | |
3388 | i += 1 |
|
3388 | i += 1 | |
3389 |
|
3389 | |||
3390 | r.append(l) |
|
3390 | r.append(l) | |
3391 |
|
3391 | |||
3392 | return r |
|
3392 | return r | |
3393 |
|
3393 | |||
3394 | def checkpush(self, pushop): |
|
3394 | def checkpush(self, pushop): | |
3395 | """Extensions can override this function if additional checks have |
|
3395 | """Extensions can override this function if additional checks have | |
3396 | to be performed before pushing, or call it if they override push |
|
3396 | to be performed before pushing, or call it if they override push | |
3397 | command. |
|
3397 | command. | |
3398 | """ |
|
3398 | """ | |
3399 |
|
3399 | |||
3400 | @unfilteredpropertycache |
|
3400 | @unfilteredpropertycache | |
3401 | def prepushoutgoinghooks(self): |
|
3401 | def prepushoutgoinghooks(self): | |
3402 | """Return util.hooks consists of a pushop with repo, remote, outgoing |
|
3402 | """Return util.hooks consists of a pushop with repo, remote, outgoing | |
3403 | methods, which are called before pushing changesets. |
|
3403 | methods, which are called before pushing changesets. | |
3404 | """ |
|
3404 | """ | |
3405 | return util.hooks() |
|
3405 | return util.hooks() | |
3406 |
|
3406 | |||
3407 | def pushkey(self, namespace, key, old, new): |
|
3407 | def pushkey(self, namespace, key, old, new): | |
3408 | try: |
|
3408 | try: | |
3409 | tr = self.currenttransaction() |
|
3409 | tr = self.currenttransaction() | |
3410 | hookargs = {} |
|
3410 | hookargs = {} | |
3411 | if tr is not None: |
|
3411 | if tr is not None: | |
3412 | hookargs.update(tr.hookargs) |
|
3412 | hookargs.update(tr.hookargs) | |
3413 | hookargs = pycompat.strkwargs(hookargs) |
|
3413 | hookargs = pycompat.strkwargs(hookargs) | |
3414 | hookargs['namespace'] = namespace |
|
3414 | hookargs['namespace'] = namespace | |
3415 | hookargs['key'] = key |
|
3415 | hookargs['key'] = key | |
3416 | hookargs['old'] = old |
|
3416 | hookargs['old'] = old | |
3417 | hookargs['new'] = new |
|
3417 | hookargs['new'] = new | |
3418 | self.hook(b'prepushkey', throw=True, **hookargs) |
|
3418 | self.hook(b'prepushkey', throw=True, **hookargs) | |
3419 | except error.HookAbort as exc: |
|
3419 | except error.HookAbort as exc: | |
3420 | self.ui.write_err(_(b"pushkey-abort: %s\n") % exc) |
|
3420 | self.ui.write_err(_(b"pushkey-abort: %s\n") % exc) | |
3421 | if exc.hint: |
|
3421 | if exc.hint: | |
3422 | self.ui.write_err(_(b"(%s)\n") % exc.hint) |
|
3422 | self.ui.write_err(_(b"(%s)\n") % exc.hint) | |
3423 | return False |
|
3423 | return False | |
3424 | self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key)) |
|
3424 | self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key)) | |
3425 | ret = pushkey.push(self, namespace, key, old, new) |
|
3425 | ret = pushkey.push(self, namespace, key, old, new) | |
3426 |
|
3426 | |||
3427 | def runhook(unused_success): |
|
3427 | def runhook(unused_success): | |
3428 | self.hook( |
|
3428 | self.hook( | |
3429 | b'pushkey', |
|
3429 | b'pushkey', | |
3430 | namespace=namespace, |
|
3430 | namespace=namespace, | |
3431 | key=key, |
|
3431 | key=key, | |
3432 | old=old, |
|
3432 | old=old, | |
3433 | new=new, |
|
3433 | new=new, | |
3434 | ret=ret, |
|
3434 | ret=ret, | |
3435 | ) |
|
3435 | ) | |
3436 |
|
3436 | |||
3437 | self._afterlock(runhook) |
|
3437 | self._afterlock(runhook) | |
3438 | return ret |
|
3438 | return ret | |
3439 |
|
3439 | |||
3440 | def listkeys(self, namespace): |
|
3440 | def listkeys(self, namespace): | |
3441 | self.hook(b'prelistkeys', throw=True, namespace=namespace) |
|
3441 | self.hook(b'prelistkeys', throw=True, namespace=namespace) | |
3442 | self.ui.debug(b'listing keys for "%s"\n' % namespace) |
|
3442 | self.ui.debug(b'listing keys for "%s"\n' % namespace) | |
3443 | values = pushkey.list(self, namespace) |
|
3443 | values = pushkey.list(self, namespace) | |
3444 | self.hook(b'listkeys', namespace=namespace, values=values) |
|
3444 | self.hook(b'listkeys', namespace=namespace, values=values) | |
3445 | return values |
|
3445 | return values | |
3446 |
|
3446 | |||
3447 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
3447 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
3448 | '''used to test argument passing over the wire''' |
|
3448 | '''used to test argument passing over the wire''' | |
3449 | return b"%s %s %s %s %s" % ( |
|
3449 | return b"%s %s %s %s %s" % ( | |
3450 | one, |
|
3450 | one, | |
3451 | two, |
|
3451 | two, | |
3452 | pycompat.bytestr(three), |
|
3452 | pycompat.bytestr(three), | |
3453 | pycompat.bytestr(four), |
|
3453 | pycompat.bytestr(four), | |
3454 | pycompat.bytestr(five), |
|
3454 | pycompat.bytestr(five), | |
3455 | ) |
|
3455 | ) | |
3456 |
|
3456 | |||
3457 | def savecommitmessage(self, text): |
|
3457 | def savecommitmessage(self, text): | |
3458 | fp = self.vfs(b'last-message.txt', b'wb') |
|
3458 | fp = self.vfs(b'last-message.txt', b'wb') | |
3459 | try: |
|
3459 | try: | |
3460 | fp.write(text) |
|
3460 | fp.write(text) | |
3461 | finally: |
|
3461 | finally: | |
3462 | fp.close() |
|
3462 | fp.close() | |
3463 | return self.pathto(fp.name[len(self.root) + 1 :]) |
|
3463 | return self.pathto(fp.name[len(self.root) + 1 :]) | |
3464 |
|
3464 | |||
3465 | def register_wanted_sidedata(self, category): |
|
3465 | def register_wanted_sidedata(self, category): | |
3466 | if repository.REPO_FEATURE_SIDE_DATA not in self.features: |
|
3466 | if repository.REPO_FEATURE_SIDE_DATA not in self.features: | |
3467 | # Only revlogv2 repos can want sidedata. |
|
3467 | # Only revlogv2 repos can want sidedata. | |
3468 | return |
|
3468 | return | |
3469 | self._wanted_sidedata.add(pycompat.bytestr(category)) |
|
3469 | self._wanted_sidedata.add(pycompat.bytestr(category)) | |
3470 |
|
3470 | |||
3471 | def register_sidedata_computer( |
|
3471 | def register_sidedata_computer( | |
3472 | self, kind, category, keys, computer, flags, replace=False |
|
3472 | self, kind, category, keys, computer, flags, replace=False | |
3473 | ): |
|
3473 | ): | |
3474 | if kind not in revlogconst.ALL_KINDS: |
|
3474 | if kind not in revlogconst.ALL_KINDS: | |
3475 | msg = _(b"unexpected revlog kind '%s'.") |
|
3475 | msg = _(b"unexpected revlog kind '%s'.") | |
3476 | raise error.ProgrammingError(msg % kind) |
|
3476 | raise error.ProgrammingError(msg % kind) | |
3477 | category = pycompat.bytestr(category) |
|
3477 | category = pycompat.bytestr(category) | |
3478 | already_registered = category in self._sidedata_computers.get(kind, []) |
|
3478 | already_registered = category in self._sidedata_computers.get(kind, []) | |
3479 | if already_registered and not replace: |
|
3479 | if already_registered and not replace: | |
3480 | msg = _( |
|
3480 | msg = _( | |
3481 | b"cannot register a sidedata computer twice for category '%s'." |
|
3481 | b"cannot register a sidedata computer twice for category '%s'." | |
3482 | ) |
|
3482 | ) | |
3483 | raise error.ProgrammingError(msg % category) |
|
3483 | raise error.ProgrammingError(msg % category) | |
3484 | if replace and not already_registered: |
|
3484 | if replace and not already_registered: | |
3485 | msg = _( |
|
3485 | msg = _( | |
3486 | b"cannot replace a sidedata computer that isn't registered " |
|
3486 | b"cannot replace a sidedata computer that isn't registered " | |
3487 | b"for category '%s'." |
|
3487 | b"for category '%s'." | |
3488 | ) |
|
3488 | ) | |
3489 | raise error.ProgrammingError(msg % category) |
|
3489 | raise error.ProgrammingError(msg % category) | |
3490 | self._sidedata_computers.setdefault(kind, {}) |
|
3490 | self._sidedata_computers.setdefault(kind, {}) | |
3491 | self._sidedata_computers[kind][category] = (keys, computer, flags) |
|
3491 | self._sidedata_computers[kind][category] = (keys, computer, flags) | |
3492 |
|
3492 | |||
3493 |
|
3493 | |||
3494 | # used to avoid circular references so destructors work |
|
3494 | # used to avoid circular references so destructors work | |
3495 | def aftertrans(files): |
|
3495 | def aftertrans(files): | |
3496 | renamefiles = [tuple(t) for t in files] |
|
3496 | renamefiles = [tuple(t) for t in files] | |
3497 |
|
3497 | |||
3498 | def a(): |
|
3498 | def a(): | |
3499 | for vfs, src, dest in renamefiles: |
|
3499 | for vfs, src, dest in renamefiles: | |
3500 | # if src and dest refer to a same file, vfs.rename is a no-op, |
|
3500 | # if src and dest refer to a same file, vfs.rename is a no-op, | |
3501 | # leaving both src and dest on disk. delete dest to make sure |
|
3501 | # leaving both src and dest on disk. delete dest to make sure | |
3502 | # the rename couldn't be such a no-op. |
|
3502 | # the rename couldn't be such a no-op. | |
3503 | vfs.tryunlink(dest) |
|
3503 | vfs.tryunlink(dest) | |
3504 | try: |
|
3504 | try: | |
3505 | vfs.rename(src, dest) |
|
3505 | vfs.rename(src, dest) | |
3506 | except OSError as exc: # journal file does not yet exist |
|
3506 | except OSError as exc: # journal file does not yet exist | |
3507 | if exc.errno != errno.ENOENT: |
|
3507 | if exc.errno != errno.ENOENT: | |
3508 | raise |
|
3508 | raise | |
3509 |
|
3509 | |||
3510 | return a |
|
3510 | return a | |
3511 |
|
3511 | |||
3512 |
|
3512 | |||
3513 | def undoname(fn): |
|
3513 | def undoname(fn): | |
3514 | base, name = os.path.split(fn) |
|
3514 | base, name = os.path.split(fn) | |
3515 | assert name.startswith(b'journal') |
|
3515 | assert name.startswith(b'journal') | |
3516 | return os.path.join(base, name.replace(b'journal', b'undo', 1)) |
|
3516 | return os.path.join(base, name.replace(b'journal', b'undo', 1)) | |
3517 |
|
3517 | |||
3518 |
|
3518 | |||
3519 | def instance(ui, path, create, intents=None, createopts=None): |
|
3519 | def instance(ui, path, create, intents=None, createopts=None): | |
3520 | localpath = urlutil.urllocalpath(path) |
|
3520 | localpath = urlutil.urllocalpath(path) | |
3521 | if create: |
|
3521 | if create: | |
3522 | createrepository(ui, localpath, createopts=createopts) |
|
3522 | createrepository(ui, localpath, createopts=createopts) | |
3523 |
|
3523 | |||
3524 | return makelocalrepository(ui, localpath, intents=intents) |
|
3524 | return makelocalrepository(ui, localpath, intents=intents) | |
3525 |
|
3525 | |||
3526 |
|
3526 | |||
3527 | def islocal(path): |
|
3527 | def islocal(path): | |
3528 | return True |
|
3528 | return True | |
3529 |
|
3529 | |||
3530 |
|
3530 | |||
3531 | def defaultcreateopts(ui, createopts=None): |
|
3531 | def defaultcreateopts(ui, createopts=None): | |
3532 | """Populate the default creation options for a repository. |
|
3532 | """Populate the default creation options for a repository. | |
3533 |
|
3533 | |||
3534 | A dictionary of explicitly requested creation options can be passed |
|
3534 | A dictionary of explicitly requested creation options can be passed | |
3535 | in. Missing keys will be populated. |
|
3535 | in. Missing keys will be populated. | |
3536 | """ |
|
3536 | """ | |
3537 | createopts = dict(createopts or {}) |
|
3537 | createopts = dict(createopts or {}) | |
3538 |
|
3538 | |||
3539 | if b'backend' not in createopts: |
|
3539 | if b'backend' not in createopts: | |
3540 | # experimental config: storage.new-repo-backend |
|
3540 | # experimental config: storage.new-repo-backend | |
3541 | createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend') |
|
3541 | createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend') | |
3542 |
|
3542 | |||
3543 | return createopts |
|
3543 | return createopts | |
3544 |
|
3544 | |||
3545 |
|
3545 | |||
3546 | def clone_requirements(ui, createopts, srcrepo): |
|
3546 | def clone_requirements(ui, createopts, srcrepo): | |
3547 | """clone the requirements of a local repo for a local clone |
|
3547 | """clone the requirements of a local repo for a local clone | |
3548 |
|
3548 | |||
3549 | The store requirements are unchanged while the working copy requirements |
|
3549 | The store requirements are unchanged while the working copy requirements | |
3550 | depends on the configuration |
|
3550 | depends on the configuration | |
3551 | """ |
|
3551 | """ | |
3552 | target_requirements = set() |
|
3552 | target_requirements = set() | |
3553 | createopts = defaultcreateopts(ui, createopts=createopts) |
|
3553 | createopts = defaultcreateopts(ui, createopts=createopts) | |
3554 | for r in newreporequirements(ui, createopts): |
|
3554 | for r in newreporequirements(ui, createopts): | |
3555 | if r in requirementsmod.WORKING_DIR_REQUIREMENTS: |
|
3555 | if r in requirementsmod.WORKING_DIR_REQUIREMENTS: | |
3556 | target_requirements.add(r) |
|
3556 | target_requirements.add(r) | |
3557 |
|
3557 | |||
3558 | for r in srcrepo.requirements: |
|
3558 | for r in srcrepo.requirements: | |
3559 | if r not in requirementsmod.WORKING_DIR_REQUIREMENTS: |
|
3559 | if r not in requirementsmod.WORKING_DIR_REQUIREMENTS: | |
3560 | target_requirements.add(r) |
|
3560 | target_requirements.add(r) | |
3561 | return target_requirements |
|
3561 | return target_requirements | |
3562 |
|
3562 | |||
3563 |
|
3563 | |||
3564 | def newreporequirements(ui, createopts): |
|
3564 | def newreporequirements(ui, createopts): | |
3565 | """Determine the set of requirements for a new local repository. |
|
3565 | """Determine the set of requirements for a new local repository. | |
3566 |
|
3566 | |||
3567 | Extensions can wrap this function to specify custom requirements for |
|
3567 | Extensions can wrap this function to specify custom requirements for | |
3568 | new repositories. |
|
3568 | new repositories. | |
3569 | """ |
|
3569 | """ | |
3570 |
|
3570 | |||
3571 | if b'backend' not in createopts: |
|
3571 | if b'backend' not in createopts: | |
3572 | raise error.ProgrammingError( |
|
3572 | raise error.ProgrammingError( | |
3573 | b'backend key not present in createopts; ' |
|
3573 | b'backend key not present in createopts; ' | |
3574 | b'was defaultcreateopts() called?' |
|
3574 | b'was defaultcreateopts() called?' | |
3575 | ) |
|
3575 | ) | |
3576 |
|
3576 | |||
3577 | if createopts[b'backend'] != b'revlogv1': |
|
3577 | if createopts[b'backend'] != b'revlogv1': | |
3578 | raise error.Abort( |
|
3578 | raise error.Abort( | |
3579 | _( |
|
3579 | _( | |
3580 | b'unable to determine repository requirements for ' |
|
3580 | b'unable to determine repository requirements for ' | |
3581 | b'storage backend: %s' |
|
3581 | b'storage backend: %s' | |
3582 | ) |
|
3582 | ) | |
3583 | % createopts[b'backend'] |
|
3583 | % createopts[b'backend'] | |
3584 | ) |
|
3584 | ) | |
3585 |
|
3585 | |||
3586 | requirements = {requirementsmod.REVLOGV1_REQUIREMENT} |
|
3586 | requirements = {requirementsmod.REVLOGV1_REQUIREMENT} | |
3587 | if ui.configbool(b'format', b'usestore'): |
|
3587 | if ui.configbool(b'format', b'usestore'): | |
3588 | requirements.add(requirementsmod.STORE_REQUIREMENT) |
|
3588 | requirements.add(requirementsmod.STORE_REQUIREMENT) | |
3589 | if ui.configbool(b'format', b'usefncache'): |
|
3589 | if ui.configbool(b'format', b'usefncache'): | |
3590 | requirements.add(requirementsmod.FNCACHE_REQUIREMENT) |
|
3590 | requirements.add(requirementsmod.FNCACHE_REQUIREMENT) | |
3591 | if ui.configbool(b'format', b'dotencode'): |
|
3591 | if ui.configbool(b'format', b'dotencode'): | |
3592 | requirements.add(requirementsmod.DOTENCODE_REQUIREMENT) |
|
3592 | requirements.add(requirementsmod.DOTENCODE_REQUIREMENT) | |
3593 |
|
3593 | |||
3594 | compengines = ui.configlist(b'format', b'revlog-compression') |
|
3594 | compengines = ui.configlist(b'format', b'revlog-compression') | |
3595 | for compengine in compengines: |
|
3595 | for compengine in compengines: | |
3596 | if compengine in util.compengines: |
|
3596 | if compengine in util.compengines: | |
3597 | engine = util.compengines[compengine] |
|
3597 | engine = util.compengines[compengine] | |
3598 | if engine.available() and engine.revlogheader(): |
|
3598 | if engine.available() and engine.revlogheader(): | |
3599 | break |
|
3599 | break | |
3600 | else: |
|
3600 | else: | |
3601 | raise error.Abort( |
|
3601 | raise error.Abort( | |
3602 | _( |
|
3602 | _( | |
3603 | b'compression engines %s defined by ' |
|
3603 | b'compression engines %s defined by ' | |
3604 | b'format.revlog-compression not available' |
|
3604 | b'format.revlog-compression not available' | |
3605 | ) |
|
3605 | ) | |
3606 | % b', '.join(b'"%s"' % e for e in compengines), |
|
3606 | % b', '.join(b'"%s"' % e for e in compengines), | |
3607 | hint=_( |
|
3607 | hint=_( | |
3608 | b'run "hg debuginstall" to list available ' |
|
3608 | b'run "hg debuginstall" to list available ' | |
3609 | b'compression engines' |
|
3609 | b'compression engines' | |
3610 | ), |
|
3610 | ), | |
3611 | ) |
|
3611 | ) | |
3612 |
|
3612 | |||
3613 | # zlib is the historical default and doesn't need an explicit requirement. |
|
3613 | # zlib is the historical default and doesn't need an explicit requirement. | |
3614 | if compengine == b'zstd': |
|
3614 | if compengine == b'zstd': | |
3615 | requirements.add(b'revlog-compression-zstd') |
|
3615 | requirements.add(b'revlog-compression-zstd') | |
3616 | elif compengine != b'zlib': |
|
3616 | elif compengine != b'zlib': | |
3617 | requirements.add(b'exp-compression-%s' % compengine) |
|
3617 | requirements.add(b'exp-compression-%s' % compengine) | |
3618 |
|
3618 | |||
3619 | if scmutil.gdinitconfig(ui): |
|
3619 | if scmutil.gdinitconfig(ui): | |
3620 | requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT) |
|
3620 | requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT) | |
3621 | if ui.configbool(b'format', b'sparse-revlog'): |
|
3621 | if ui.configbool(b'format', b'sparse-revlog'): | |
3622 | requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) |
|
3622 | requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) | |
3623 |
|
3623 | |||
3624 | # experimental config: format.exp-rc-dirstate-v2 |
|
3624 | # experimental config: format.exp-rc-dirstate-v2 | |
3625 | # Keep this logic in sync with `has_dirstate_v2()` in `tests/hghave.py` |
|
3625 | # Keep this logic in sync with `has_dirstate_v2()` in `tests/hghave.py` | |
3626 | if ui.configbool(b'format', b'exp-rc-dirstate-v2'): |
|
3626 | if ui.configbool(b'format', b'exp-rc-dirstate-v2'): | |
3627 | requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT) |
|
3627 | requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT) | |
3628 |
|
3628 | |||
3629 | # experimental config: format.exp-use-copies-side-data-changeset |
|
3629 | # experimental config: format.exp-use-copies-side-data-changeset | |
3630 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): |
|
3630 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): | |
3631 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) |
|
3631 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) | |
3632 | requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) |
|
3632 | requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) | |
3633 | if ui.configbool(b'experimental', b'treemanifest'): |
|
3633 | if ui.configbool(b'experimental', b'treemanifest'): | |
3634 | requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) |
|
3634 | requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) | |
3635 |
|
3635 | |||
3636 | changelogv2 = ui.config(b'format', b'exp-use-changelog-v2') |
|
3636 | changelogv2 = ui.config(b'format', b'exp-use-changelog-v2') | |
3637 | if changelogv2 == b'enable-unstable-format-and-corrupt-my-data': |
|
3637 | if changelogv2 == b'enable-unstable-format-and-corrupt-my-data': | |
3638 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) |
|
3638 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) | |
3639 |
|
3639 | |||
3640 | revlogv2 = ui.config(b'experimental', b'revlogv2') |
|
3640 | revlogv2 = ui.config(b'experimental', b'revlogv2') | |
3641 | if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': |
|
3641 | if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': | |
3642 | requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) |
|
3642 | requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) | |
3643 | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) |
|
3643 | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) | |
3644 | # experimental config: format.internal-phase |
|
3644 | # experimental config: format.internal-phase | |
3645 | if ui.configbool(b'format', b'internal-phase'): |
|
3645 | if ui.configbool(b'format', b'internal-phase'): | |
3646 | requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) |
|
3646 | requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) | |
3647 |
|
3647 | |||
3648 | if createopts.get(b'narrowfiles'): |
|
3648 | if createopts.get(b'narrowfiles'): | |
3649 | requirements.add(requirementsmod.NARROW_REQUIREMENT) |
|
3649 | requirements.add(requirementsmod.NARROW_REQUIREMENT) | |
3650 |
|
3650 | |||
3651 | if createopts.get(b'lfs'): |
|
3651 | if createopts.get(b'lfs'): | |
3652 | requirements.add(b'lfs') |
|
3652 | requirements.add(b'lfs') | |
3653 |
|
3653 | |||
3654 | if ui.configbool(b'format', b'bookmarks-in-store'): |
|
3654 | if ui.configbool(b'format', b'bookmarks-in-store'): | |
3655 |
requirements.add( |
|
3655 | requirements.add(requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT) | |
3656 |
|
3656 | |||
3657 | if ui.configbool(b'format', b'use-persistent-nodemap'): |
|
3657 | if ui.configbool(b'format', b'use-persistent-nodemap'): | |
3658 | requirements.add(requirementsmod.NODEMAP_REQUIREMENT) |
|
3658 | requirements.add(requirementsmod.NODEMAP_REQUIREMENT) | |
3659 |
|
3659 | |||
3660 | # if share-safe is enabled, let's create the new repository with the new |
|
3660 | # if share-safe is enabled, let's create the new repository with the new | |
3661 | # requirement |
|
3661 | # requirement | |
3662 | if ui.configbool(b'format', b'use-share-safe'): |
|
3662 | if ui.configbool(b'format', b'use-share-safe'): | |
3663 | requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) |
|
3663 | requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) | |
3664 |
|
3664 | |||
3665 | # if we are creating a share-repoΒΉ we have to handle requirement |
|
3665 | # if we are creating a share-repoΒΉ we have to handle requirement | |
3666 | # differently. |
|
3666 | # differently. | |
3667 | # |
|
3667 | # | |
3668 | # [1] (i.e. reusing the store from another repository, just having a |
|
3668 | # [1] (i.e. reusing the store from another repository, just having a | |
3669 | # working copy) |
|
3669 | # working copy) | |
3670 | if b'sharedrepo' in createopts: |
|
3670 | if b'sharedrepo' in createopts: | |
3671 | source_requirements = set(createopts[b'sharedrepo'].requirements) |
|
3671 | source_requirements = set(createopts[b'sharedrepo'].requirements) | |
3672 |
|
3672 | |||
3673 | if requirementsmod.SHARESAFE_REQUIREMENT not in source_requirements: |
|
3673 | if requirementsmod.SHARESAFE_REQUIREMENT not in source_requirements: | |
3674 | # share to an old school repository, we have to copy the |
|
3674 | # share to an old school repository, we have to copy the | |
3675 | # requirements and hope for the best. |
|
3675 | # requirements and hope for the best. | |
3676 | requirements = source_requirements |
|
3676 | requirements = source_requirements | |
3677 | else: |
|
3677 | else: | |
3678 | # We have control on the working copy only, so "copy" the non |
|
3678 | # We have control on the working copy only, so "copy" the non | |
3679 | # working copy part over, ignoring previous logic. |
|
3679 | # working copy part over, ignoring previous logic. | |
3680 | to_drop = set() |
|
3680 | to_drop = set() | |
3681 | for req in requirements: |
|
3681 | for req in requirements: | |
3682 | if req in requirementsmod.WORKING_DIR_REQUIREMENTS: |
|
3682 | if req in requirementsmod.WORKING_DIR_REQUIREMENTS: | |
3683 | continue |
|
3683 | continue | |
3684 | if req in source_requirements: |
|
3684 | if req in source_requirements: | |
3685 | continue |
|
3685 | continue | |
3686 | to_drop.add(req) |
|
3686 | to_drop.add(req) | |
3687 | requirements -= to_drop |
|
3687 | requirements -= to_drop | |
3688 | requirements |= source_requirements |
|
3688 | requirements |= source_requirements | |
3689 |
|
3689 | |||
3690 | if createopts.get(b'sharedrelative'): |
|
3690 | if createopts.get(b'sharedrelative'): | |
3691 | requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT) |
|
3691 | requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT) | |
3692 | else: |
|
3692 | else: | |
3693 | requirements.add(requirementsmod.SHARED_REQUIREMENT) |
|
3693 | requirements.add(requirementsmod.SHARED_REQUIREMENT) | |
3694 |
|
3694 | |||
3695 | return requirements |
|
3695 | return requirements | |
3696 |
|
3696 | |||
3697 |
|
3697 | |||
3698 | def checkrequirementscompat(ui, requirements): |
|
3698 | def checkrequirementscompat(ui, requirements): | |
3699 | """Checks compatibility of repository requirements enabled and disabled. |
|
3699 | """Checks compatibility of repository requirements enabled and disabled. | |
3700 |
|
3700 | |||
3701 | Returns a set of requirements which needs to be dropped because dependend |
|
3701 | Returns a set of requirements which needs to be dropped because dependend | |
3702 | requirements are not enabled. Also warns users about it""" |
|
3702 | requirements are not enabled. Also warns users about it""" | |
3703 |
|
3703 | |||
3704 | dropped = set() |
|
3704 | dropped = set() | |
3705 |
|
3705 | |||
3706 | if requirementsmod.STORE_REQUIREMENT not in requirements: |
|
3706 | if requirementsmod.STORE_REQUIREMENT not in requirements: | |
3707 |
if |
|
3707 | if requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT in requirements: | |
3708 | ui.warn( |
|
3708 | ui.warn( | |
3709 | _( |
|
3709 | _( | |
3710 | b'ignoring enabled \'format.bookmarks-in-store\' config ' |
|
3710 | b'ignoring enabled \'format.bookmarks-in-store\' config ' | |
3711 | b'beacuse it is incompatible with disabled ' |
|
3711 | b'beacuse it is incompatible with disabled ' | |
3712 | b'\'format.usestore\' config\n' |
|
3712 | b'\'format.usestore\' config\n' | |
3713 | ) |
|
3713 | ) | |
3714 | ) |
|
3714 | ) | |
3715 |
dropped.add( |
|
3715 | dropped.add(requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT) | |
3716 |
|
3716 | |||
3717 | if ( |
|
3717 | if ( | |
3718 | requirementsmod.SHARED_REQUIREMENT in requirements |
|
3718 | requirementsmod.SHARED_REQUIREMENT in requirements | |
3719 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements |
|
3719 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements | |
3720 | ): |
|
3720 | ): | |
3721 | raise error.Abort( |
|
3721 | raise error.Abort( | |
3722 | _( |
|
3722 | _( | |
3723 | b"cannot create shared repository as source was created" |
|
3723 | b"cannot create shared repository as source was created" | |
3724 | b" with 'format.usestore' config disabled" |
|
3724 | b" with 'format.usestore' config disabled" | |
3725 | ) |
|
3725 | ) | |
3726 | ) |
|
3726 | ) | |
3727 |
|
3727 | |||
3728 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: |
|
3728 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: | |
3729 | ui.warn( |
|
3729 | ui.warn( | |
3730 | _( |
|
3730 | _( | |
3731 | b"ignoring enabled 'format.use-share-safe' config because " |
|
3731 | b"ignoring enabled 'format.use-share-safe' config because " | |
3732 | b"it is incompatible with disabled 'format.usestore'" |
|
3732 | b"it is incompatible with disabled 'format.usestore'" | |
3733 | b" config\n" |
|
3733 | b" config\n" | |
3734 | ) |
|
3734 | ) | |
3735 | ) |
|
3735 | ) | |
3736 | dropped.add(requirementsmod.SHARESAFE_REQUIREMENT) |
|
3736 | dropped.add(requirementsmod.SHARESAFE_REQUIREMENT) | |
3737 |
|
3737 | |||
3738 | return dropped |
|
3738 | return dropped | |
3739 |
|
3739 | |||
3740 |
|
3740 | |||
3741 | def filterknowncreateopts(ui, createopts): |
|
3741 | def filterknowncreateopts(ui, createopts): | |
3742 | """Filters a dict of repo creation options against options that are known. |
|
3742 | """Filters a dict of repo creation options against options that are known. | |
3743 |
|
3743 | |||
3744 | Receives a dict of repo creation options and returns a dict of those |
|
3744 | Receives a dict of repo creation options and returns a dict of those | |
3745 | options that we don't know how to handle. |
|
3745 | options that we don't know how to handle. | |
3746 |
|
3746 | |||
3747 | This function is called as part of repository creation. If the |
|
3747 | This function is called as part of repository creation. If the | |
3748 | returned dict contains any items, repository creation will not |
|
3748 | returned dict contains any items, repository creation will not | |
3749 | be allowed, as it means there was a request to create a repository |
|
3749 | be allowed, as it means there was a request to create a repository | |
3750 | with options not recognized by loaded code. |
|
3750 | with options not recognized by loaded code. | |
3751 |
|
3751 | |||
3752 | Extensions can wrap this function to filter out creation options |
|
3752 | Extensions can wrap this function to filter out creation options | |
3753 | they know how to handle. |
|
3753 | they know how to handle. | |
3754 | """ |
|
3754 | """ | |
3755 | known = { |
|
3755 | known = { | |
3756 | b'backend', |
|
3756 | b'backend', | |
3757 | b'lfs', |
|
3757 | b'lfs', | |
3758 | b'narrowfiles', |
|
3758 | b'narrowfiles', | |
3759 | b'sharedrepo', |
|
3759 | b'sharedrepo', | |
3760 | b'sharedrelative', |
|
3760 | b'sharedrelative', | |
3761 | b'shareditems', |
|
3761 | b'shareditems', | |
3762 | b'shallowfilestore', |
|
3762 | b'shallowfilestore', | |
3763 | } |
|
3763 | } | |
3764 |
|
3764 | |||
3765 | return {k: v for k, v in createopts.items() if k not in known} |
|
3765 | return {k: v for k, v in createopts.items() if k not in known} | |
3766 |
|
3766 | |||
3767 |
|
3767 | |||
3768 | def createrepository(ui, path, createopts=None, requirements=None): |
|
3768 | def createrepository(ui, path, createopts=None, requirements=None): | |
3769 | """Create a new repository in a vfs. |
|
3769 | """Create a new repository in a vfs. | |
3770 |
|
3770 | |||
3771 | ``path`` path to the new repo's working directory. |
|
3771 | ``path`` path to the new repo's working directory. | |
3772 | ``createopts`` options for the new repository. |
|
3772 | ``createopts`` options for the new repository. | |
3773 | ``requirement`` predefined set of requirements. |
|
3773 | ``requirement`` predefined set of requirements. | |
3774 | (incompatible with ``createopts``) |
|
3774 | (incompatible with ``createopts``) | |
3775 |
|
3775 | |||
3776 | The following keys for ``createopts`` are recognized: |
|
3776 | The following keys for ``createopts`` are recognized: | |
3777 |
|
3777 | |||
3778 | backend |
|
3778 | backend | |
3779 | The storage backend to use. |
|
3779 | The storage backend to use. | |
3780 | lfs |
|
3780 | lfs | |
3781 | Repository will be created with ``lfs`` requirement. The lfs extension |
|
3781 | Repository will be created with ``lfs`` requirement. The lfs extension | |
3782 | will automatically be loaded when the repository is accessed. |
|
3782 | will automatically be loaded when the repository is accessed. | |
3783 | narrowfiles |
|
3783 | narrowfiles | |
3784 | Set up repository to support narrow file storage. |
|
3784 | Set up repository to support narrow file storage. | |
3785 | sharedrepo |
|
3785 | sharedrepo | |
3786 | Repository object from which storage should be shared. |
|
3786 | Repository object from which storage should be shared. | |
3787 | sharedrelative |
|
3787 | sharedrelative | |
3788 | Boolean indicating if the path to the shared repo should be |
|
3788 | Boolean indicating if the path to the shared repo should be | |
3789 | stored as relative. By default, the pointer to the "parent" repo |
|
3789 | stored as relative. By default, the pointer to the "parent" repo | |
3790 | is stored as an absolute path. |
|
3790 | is stored as an absolute path. | |
3791 | shareditems |
|
3791 | shareditems | |
3792 | Set of items to share to the new repository (in addition to storage). |
|
3792 | Set of items to share to the new repository (in addition to storage). | |
3793 | shallowfilestore |
|
3793 | shallowfilestore | |
3794 | Indicates that storage for files should be shallow (not all ancestor |
|
3794 | Indicates that storage for files should be shallow (not all ancestor | |
3795 | revisions are known). |
|
3795 | revisions are known). | |
3796 | """ |
|
3796 | """ | |
3797 |
|
3797 | |||
3798 | if requirements is not None: |
|
3798 | if requirements is not None: | |
3799 | if createopts is not None: |
|
3799 | if createopts is not None: | |
3800 | msg = b'cannot specify both createopts and requirements' |
|
3800 | msg = b'cannot specify both createopts and requirements' | |
3801 | raise error.ProgrammingError(msg) |
|
3801 | raise error.ProgrammingError(msg) | |
3802 | createopts = {} |
|
3802 | createopts = {} | |
3803 | else: |
|
3803 | else: | |
3804 | createopts = defaultcreateopts(ui, createopts=createopts) |
|
3804 | createopts = defaultcreateopts(ui, createopts=createopts) | |
3805 |
|
3805 | |||
3806 | unknownopts = filterknowncreateopts(ui, createopts) |
|
3806 | unknownopts = filterknowncreateopts(ui, createopts) | |
3807 |
|
3807 | |||
3808 | if not isinstance(unknownopts, dict): |
|
3808 | if not isinstance(unknownopts, dict): | |
3809 | raise error.ProgrammingError( |
|
3809 | raise error.ProgrammingError( | |
3810 | b'filterknowncreateopts() did not return a dict' |
|
3810 | b'filterknowncreateopts() did not return a dict' | |
3811 | ) |
|
3811 | ) | |
3812 |
|
3812 | |||
3813 | if unknownopts: |
|
3813 | if unknownopts: | |
3814 | raise error.Abort( |
|
3814 | raise error.Abort( | |
3815 | _( |
|
3815 | _( | |
3816 | b'unable to create repository because of unknown ' |
|
3816 | b'unable to create repository because of unknown ' | |
3817 | b'creation option: %s' |
|
3817 | b'creation option: %s' | |
3818 | ) |
|
3818 | ) | |
3819 | % b', '.join(sorted(unknownopts)), |
|
3819 | % b', '.join(sorted(unknownopts)), | |
3820 | hint=_(b'is a required extension not loaded?'), |
|
3820 | hint=_(b'is a required extension not loaded?'), | |
3821 | ) |
|
3821 | ) | |
3822 |
|
3822 | |||
3823 | requirements = newreporequirements(ui, createopts=createopts) |
|
3823 | requirements = newreporequirements(ui, createopts=createopts) | |
3824 | requirements -= checkrequirementscompat(ui, requirements) |
|
3824 | requirements -= checkrequirementscompat(ui, requirements) | |
3825 |
|
3825 | |||
3826 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
3826 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | |
3827 |
|
3827 | |||
3828 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) |
|
3828 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) | |
3829 | if hgvfs.exists(): |
|
3829 | if hgvfs.exists(): | |
3830 | raise error.RepoError(_(b'repository %s already exists') % path) |
|
3830 | raise error.RepoError(_(b'repository %s already exists') % path) | |
3831 |
|
3831 | |||
3832 | if b'sharedrepo' in createopts: |
|
3832 | if b'sharedrepo' in createopts: | |
3833 | sharedpath = createopts[b'sharedrepo'].sharedpath |
|
3833 | sharedpath = createopts[b'sharedrepo'].sharedpath | |
3834 |
|
3834 | |||
3835 | if createopts.get(b'sharedrelative'): |
|
3835 | if createopts.get(b'sharedrelative'): | |
3836 | try: |
|
3836 | try: | |
3837 | sharedpath = os.path.relpath(sharedpath, hgvfs.base) |
|
3837 | sharedpath = os.path.relpath(sharedpath, hgvfs.base) | |
3838 | sharedpath = util.pconvert(sharedpath) |
|
3838 | sharedpath = util.pconvert(sharedpath) | |
3839 | except (IOError, ValueError) as e: |
|
3839 | except (IOError, ValueError) as e: | |
3840 | # ValueError is raised on Windows if the drive letters differ |
|
3840 | # ValueError is raised on Windows if the drive letters differ | |
3841 | # on each path. |
|
3841 | # on each path. | |
3842 | raise error.Abort( |
|
3842 | raise error.Abort( | |
3843 | _(b'cannot calculate relative path'), |
|
3843 | _(b'cannot calculate relative path'), | |
3844 | hint=stringutil.forcebytestr(e), |
|
3844 | hint=stringutil.forcebytestr(e), | |
3845 | ) |
|
3845 | ) | |
3846 |
|
3846 | |||
3847 | if not wdirvfs.exists(): |
|
3847 | if not wdirvfs.exists(): | |
3848 | wdirvfs.makedirs() |
|
3848 | wdirvfs.makedirs() | |
3849 |
|
3849 | |||
3850 | hgvfs.makedir(notindexed=True) |
|
3850 | hgvfs.makedir(notindexed=True) | |
3851 | if b'sharedrepo' not in createopts: |
|
3851 | if b'sharedrepo' not in createopts: | |
3852 | hgvfs.mkdir(b'cache') |
|
3852 | hgvfs.mkdir(b'cache') | |
3853 | hgvfs.mkdir(b'wcache') |
|
3853 | hgvfs.mkdir(b'wcache') | |
3854 |
|
3854 | |||
3855 | has_store = requirementsmod.STORE_REQUIREMENT in requirements |
|
3855 | has_store = requirementsmod.STORE_REQUIREMENT in requirements | |
3856 | if has_store and b'sharedrepo' not in createopts: |
|
3856 | if has_store and b'sharedrepo' not in createopts: | |
3857 | hgvfs.mkdir(b'store') |
|
3857 | hgvfs.mkdir(b'store') | |
3858 |
|
3858 | |||
3859 | # We create an invalid changelog outside the store so very old |
|
3859 | # We create an invalid changelog outside the store so very old | |
3860 | # Mercurial versions (which didn't know about the requirements |
|
3860 | # Mercurial versions (which didn't know about the requirements | |
3861 | # file) encounter an error on reading the changelog. This |
|
3861 | # file) encounter an error on reading the changelog. This | |
3862 | # effectively locks out old clients and prevents them from |
|
3862 | # effectively locks out old clients and prevents them from | |
3863 | # mucking with a repo in an unknown format. |
|
3863 | # mucking with a repo in an unknown format. | |
3864 | # |
|
3864 | # | |
3865 | # The revlog header has version 65535, which won't be recognized by |
|
3865 | # The revlog header has version 65535, which won't be recognized by | |
3866 | # such old clients. |
|
3866 | # such old clients. | |
3867 | hgvfs.append( |
|
3867 | hgvfs.append( | |
3868 | b'00changelog.i', |
|
3868 | b'00changelog.i', | |
3869 | b'\0\0\xFF\xFF dummy changelog to prevent using the old repo ' |
|
3869 | b'\0\0\xFF\xFF dummy changelog to prevent using the old repo ' | |
3870 | b'layout', |
|
3870 | b'layout', | |
3871 | ) |
|
3871 | ) | |
3872 |
|
3872 | |||
3873 | # Filter the requirements into working copy and store ones |
|
3873 | # Filter the requirements into working copy and store ones | |
3874 | wcreq, storereq = scmutil.filterrequirements(requirements) |
|
3874 | wcreq, storereq = scmutil.filterrequirements(requirements) | |
3875 | # write working copy ones |
|
3875 | # write working copy ones | |
3876 | scmutil.writerequires(hgvfs, wcreq) |
|
3876 | scmutil.writerequires(hgvfs, wcreq) | |
3877 | # If there are store requirements and the current repository |
|
3877 | # If there are store requirements and the current repository | |
3878 | # is not a shared one, write stored requirements |
|
3878 | # is not a shared one, write stored requirements | |
3879 | # For new shared repository, we don't need to write the store |
|
3879 | # For new shared repository, we don't need to write the store | |
3880 | # requirements as they are already present in store requires |
|
3880 | # requirements as they are already present in store requires | |
3881 | if storereq and b'sharedrepo' not in createopts: |
|
3881 | if storereq and b'sharedrepo' not in createopts: | |
3882 | storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True) |
|
3882 | storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True) | |
3883 | scmutil.writerequires(storevfs, storereq) |
|
3883 | scmutil.writerequires(storevfs, storereq) | |
3884 |
|
3884 | |||
3885 | # Write out file telling readers where to find the shared store. |
|
3885 | # Write out file telling readers where to find the shared store. | |
3886 | if b'sharedrepo' in createopts: |
|
3886 | if b'sharedrepo' in createopts: | |
3887 | hgvfs.write(b'sharedpath', sharedpath) |
|
3887 | hgvfs.write(b'sharedpath', sharedpath) | |
3888 |
|
3888 | |||
3889 | if createopts.get(b'shareditems'): |
|
3889 | if createopts.get(b'shareditems'): | |
3890 | shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n' |
|
3890 | shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n' | |
3891 | hgvfs.write(b'shared', shared) |
|
3891 | hgvfs.write(b'shared', shared) | |
3892 |
|
3892 | |||
3893 |
|
3893 | |||
3894 | def poisonrepository(repo): |
|
3894 | def poisonrepository(repo): | |
3895 | """Poison a repository instance so it can no longer be used.""" |
|
3895 | """Poison a repository instance so it can no longer be used.""" | |
3896 | # Perform any cleanup on the instance. |
|
3896 | # Perform any cleanup on the instance. | |
3897 | repo.close() |
|
3897 | repo.close() | |
3898 |
|
3898 | |||
3899 | # Our strategy is to replace the type of the object with one that |
|
3899 | # Our strategy is to replace the type of the object with one that | |
3900 | # has all attribute lookups result in error. |
|
3900 | # has all attribute lookups result in error. | |
3901 | # |
|
3901 | # | |
3902 | # But we have to allow the close() method because some constructors |
|
3902 | # But we have to allow the close() method because some constructors | |
3903 | # of repos call close() on repo references. |
|
3903 | # of repos call close() on repo references. | |
3904 | class poisonedrepository(object): |
|
3904 | class poisonedrepository(object): | |
3905 | def __getattribute__(self, item): |
|
3905 | def __getattribute__(self, item): | |
3906 | if item == 'close': |
|
3906 | if item == 'close': | |
3907 | return object.__getattribute__(self, item) |
|
3907 | return object.__getattribute__(self, item) | |
3908 |
|
3908 | |||
3909 | raise error.ProgrammingError( |
|
3909 | raise error.ProgrammingError( | |
3910 | b'repo instances should not be used after unshare' |
|
3910 | b'repo instances should not be used after unshare' | |
3911 | ) |
|
3911 | ) | |
3912 |
|
3912 | |||
3913 | def close(self): |
|
3913 | def close(self): | |
3914 | pass |
|
3914 | pass | |
3915 |
|
3915 | |||
3916 | # We may have a repoview, which intercepts __setattr__. So be sure |
|
3916 | # We may have a repoview, which intercepts __setattr__. So be sure | |
3917 | # we operate at the lowest level possible. |
|
3917 | # we operate at the lowest level possible. | |
3918 | object.__setattr__(repo, '__class__', poisonedrepository) |
|
3918 | object.__setattr__(repo, '__class__', poisonedrepository) |
@@ -1,87 +1,91 b'' | |||||
1 | # requirements.py - objects and functions related to repository requirements |
|
1 | # requirements.py - objects and functions related to repository requirements | |
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 | GENERALDELTA_REQUIREMENT = b'generaldelta' |
|
10 | GENERALDELTA_REQUIREMENT = b'generaldelta' | |
11 | DOTENCODE_REQUIREMENT = b'dotencode' |
|
11 | DOTENCODE_REQUIREMENT = b'dotencode' | |
12 | STORE_REQUIREMENT = b'store' |
|
12 | STORE_REQUIREMENT = b'store' | |
13 | FNCACHE_REQUIREMENT = b'fncache' |
|
13 | FNCACHE_REQUIREMENT = b'fncache' | |
14 |
|
14 | |||
15 | DIRSTATE_V2_REQUIREMENT = b'dirstate-v2' |
|
15 | DIRSTATE_V2_REQUIREMENT = b'dirstate-v2' | |
16 |
|
16 | |||
17 | # When narrowing is finalized and no longer subject to format changes, |
|
17 | # When narrowing is finalized and no longer subject to format changes, | |
18 | # we should move this to just "narrow" or similar. |
|
18 | # we should move this to just "narrow" or similar. | |
19 | NARROW_REQUIREMENT = b'narrowhg-experimental' |
|
19 | NARROW_REQUIREMENT = b'narrowhg-experimental' | |
20 |
|
20 | |||
21 | # Enables sparse working directory usage |
|
21 | # Enables sparse working directory usage | |
22 | SPARSE_REQUIREMENT = b'exp-sparse' |
|
22 | SPARSE_REQUIREMENT = b'exp-sparse' | |
23 |
|
23 | |||
24 | # Enables the internal phase which is used to hide changesets instead |
|
24 | # Enables the internal phase which is used to hide changesets instead | |
25 | # of stripping them |
|
25 | # of stripping them | |
26 | INTERNAL_PHASE_REQUIREMENT = b'internal-phase' |
|
26 | INTERNAL_PHASE_REQUIREMENT = b'internal-phase' | |
27 |
|
27 | |||
28 | # Stores manifest in Tree structure |
|
28 | # Stores manifest in Tree structure | |
29 | TREEMANIFEST_REQUIREMENT = b'treemanifest' |
|
29 | TREEMANIFEST_REQUIREMENT = b'treemanifest' | |
30 |
|
30 | |||
31 | REVLOGV1_REQUIREMENT = b'revlogv1' |
|
31 | REVLOGV1_REQUIREMENT = b'revlogv1' | |
32 |
|
32 | |||
33 | # Increment the sub-version when the revlog v2 format changes to lock out old |
|
33 | # Increment the sub-version when the revlog v2 format changes to lock out old | |
34 | # clients. |
|
34 | # clients. | |
35 | CHANGELOGV2_REQUIREMENT = b'exp-changelog-v2' |
|
35 | CHANGELOGV2_REQUIREMENT = b'exp-changelog-v2' | |
36 |
|
36 | |||
37 | # Increment the sub-version when the revlog v2 format changes to lock out old |
|
37 | # Increment the sub-version when the revlog v2 format changes to lock out old | |
38 | # clients. |
|
38 | # clients. | |
39 | REVLOGV2_REQUIREMENT = b'exp-revlogv2.2' |
|
39 | REVLOGV2_REQUIREMENT = b'exp-revlogv2.2' | |
40 |
|
40 | |||
41 | # A repository with the sparserevlog feature will have delta chains that |
|
41 | # A repository with the sparserevlog feature will have delta chains that | |
42 | # can spread over a larger span. Sparse reading cuts these large spans into |
|
42 | # can spread over a larger span. Sparse reading cuts these large spans into | |
43 | # pieces, so that each piece isn't too big. |
|
43 | # pieces, so that each piece isn't too big. | |
44 | # Without the sparserevlog capability, reading from the repository could use |
|
44 | # Without the sparserevlog capability, reading from the repository could use | |
45 | # huge amounts of memory, because the whole span would be read at once, |
|
45 | # huge amounts of memory, because the whole span would be read at once, | |
46 | # including all the intermediate revisions that aren't pertinent for the chain. |
|
46 | # including all the intermediate revisions that aren't pertinent for the chain. | |
47 | # This is why once a repository has enabled sparse-read, it becomes required. |
|
47 | # This is why once a repository has enabled sparse-read, it becomes required. | |
48 | SPARSEREVLOG_REQUIREMENT = b'sparserevlog' |
|
48 | SPARSEREVLOG_REQUIREMENT = b'sparserevlog' | |
49 |
|
49 | |||
50 | # A repository with the the copies-sidedata-changeset requirement will store |
|
50 | # A repository with the the copies-sidedata-changeset requirement will store | |
51 | # copies related information in changeset's sidedata. |
|
51 | # copies related information in changeset's sidedata. | |
52 | COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' |
|
52 | COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' | |
53 |
|
53 | |||
54 | # The repository use persistent nodemap for the changelog and the manifest. |
|
54 | # The repository use persistent nodemap for the changelog and the manifest. | |
55 | NODEMAP_REQUIREMENT = b'persistent-nodemap' |
|
55 | NODEMAP_REQUIREMENT = b'persistent-nodemap' | |
56 |
|
56 | |||
57 | # Denotes that the current repository is a share |
|
57 | # Denotes that the current repository is a share | |
58 | SHARED_REQUIREMENT = b'shared' |
|
58 | SHARED_REQUIREMENT = b'shared' | |
59 |
|
59 | |||
60 | # Denotes that current repository is a share and the shared source path is |
|
60 | # Denotes that current repository is a share and the shared source path is | |
61 | # relative to the current repository root path |
|
61 | # relative to the current repository root path | |
62 | RELATIVE_SHARED_REQUIREMENT = b'relshared' |
|
62 | RELATIVE_SHARED_REQUIREMENT = b'relshared' | |
63 |
|
63 | |||
64 | # A repository with share implemented safely. The repository has different |
|
64 | # A repository with share implemented safely. The repository has different | |
65 | # store and working copy requirements i.e. both `.hg/requires` and |
|
65 | # store and working copy requirements i.e. both `.hg/requires` and | |
66 | # `.hg/store/requires` are present. |
|
66 | # `.hg/store/requires` are present. | |
67 | SHARESAFE_REQUIREMENT = b'share-safe' |
|
67 | SHARESAFE_REQUIREMENT = b'share-safe' | |
68 |
|
68 | |||
|
69 | # Bookmarks must be stored in the `store` part of the repository and will be | |||
|
70 | # share accross shares | |||
|
71 | BOOKMARKS_IN_STORE_REQUIREMENT = b'bookmarksinstore' | |||
|
72 | ||||
69 | # List of requirements which are working directory specific |
|
73 | # List of requirements which are working directory specific | |
70 | # These requirements cannot be shared between repositories if they |
|
74 | # These requirements cannot be shared between repositories if they | |
71 | # share the same store |
|
75 | # share the same store | |
72 | # * sparse is a working directory specific functionality and hence working |
|
76 | # * sparse is a working directory specific functionality and hence working | |
73 | # directory specific requirement |
|
77 | # directory specific requirement | |
74 | # * SHARED_REQUIREMENT and RELATIVE_SHARED_REQUIREMENT are requirements which |
|
78 | # * SHARED_REQUIREMENT and RELATIVE_SHARED_REQUIREMENT are requirements which | |
75 | # represents that the current working copy/repository shares store of another |
|
79 | # represents that the current working copy/repository shares store of another | |
76 | # repo. Hence both of them should be stored in working copy |
|
80 | # repo. Hence both of them should be stored in working copy | |
77 | # * SHARESAFE_REQUIREMENT needs to be stored in working dir to mark that rest of |
|
81 | # * SHARESAFE_REQUIREMENT needs to be stored in working dir to mark that rest of | |
78 | # the requirements are stored in store's requires |
|
82 | # the requirements are stored in store's requires | |
79 | # * DIRSTATE_V2_REQUIREMENT affects .hg/dirstate, of which there is one per |
|
83 | # * DIRSTATE_V2_REQUIREMENT affects .hg/dirstate, of which there is one per | |
80 | # working directory. |
|
84 | # working directory. | |
81 | WORKING_DIR_REQUIREMENTS = { |
|
85 | WORKING_DIR_REQUIREMENTS = { | |
82 | SPARSE_REQUIREMENT, |
|
86 | SPARSE_REQUIREMENT, | |
83 | SHARED_REQUIREMENT, |
|
87 | SHARED_REQUIREMENT, | |
84 | RELATIVE_SHARED_REQUIREMENT, |
|
88 | RELATIVE_SHARED_REQUIREMENT, | |
85 | SHARESAFE_REQUIREMENT, |
|
89 | SHARESAFE_REQUIREMENT, | |
86 | DIRSTATE_V2_REQUIREMENT, |
|
90 | DIRSTATE_V2_REQUIREMENT, | |
87 | } |
|
91 | } |
General Comments 0
You need to be logged in to leave comments.
Login now