Show More
@@ -1,828 +1,844 b'' | |||||
1 | # branchmap.py - logic to computes, maintain and stores branchmap for local repo |
|
1 | # branchmap.py - logic to computes, maintain and stores branchmap for local repo | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> |
|
3 | # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import struct |
|
10 | import struct | |
11 |
|
11 | |||
12 | from .node import ( |
|
12 | from .node import ( | |
13 | bin, |
|
13 | bin, | |
14 | hex, |
|
14 | hex, | |
15 | nullrev, |
|
15 | nullrev, | |
16 | ) |
|
16 | ) | |
17 | from . import ( |
|
17 | from . import ( | |
18 | encoding, |
|
18 | encoding, | |
19 | error, |
|
19 | error, | |
20 | pycompat, |
|
20 | pycompat, | |
21 | scmutil, |
|
21 | scmutil, | |
22 | util, |
|
22 | util, | |
23 | ) |
|
23 | ) | |
24 | from .utils import ( |
|
24 | from .utils import ( | |
25 | repoviewutil, |
|
25 | repoviewutil, | |
26 | stringutil, |
|
26 | stringutil, | |
27 | ) |
|
27 | ) | |
28 |
|
28 | |||
29 | if pycompat.TYPE_CHECKING: |
|
29 | if pycompat.TYPE_CHECKING: | |
30 | from typing import ( |
|
30 | from typing import ( | |
31 | Any, |
|
31 | Any, | |
32 | Callable, |
|
32 | Callable, | |
33 | Dict, |
|
33 | Dict, | |
34 | Iterable, |
|
34 | Iterable, | |
35 | List, |
|
35 | List, | |
36 | Optional, |
|
36 | Optional, | |
37 | Set, |
|
37 | Set, | |
38 | Tuple, |
|
38 | Tuple, | |
39 | Union, |
|
39 | Union, | |
40 | ) |
|
40 | ) | |
41 | from . import localrepo |
|
41 | from . import localrepo | |
42 |
|
42 | |||
43 | assert any( |
|
43 | assert any( | |
44 | ( |
|
44 | ( | |
45 | Any, |
|
45 | Any, | |
46 | Callable, |
|
46 | Callable, | |
47 | Dict, |
|
47 | Dict, | |
48 | Iterable, |
|
48 | Iterable, | |
49 | List, |
|
49 | List, | |
50 | Optional, |
|
50 | Optional, | |
51 | Set, |
|
51 | Set, | |
52 | Tuple, |
|
52 | Tuple, | |
53 | Union, |
|
53 | Union, | |
54 | localrepo, |
|
54 | localrepo, | |
55 | ) |
|
55 | ) | |
56 | ) |
|
56 | ) | |
57 |
|
57 | |||
58 | subsettable = repoviewutil.subsettable |
|
58 | subsettable = repoviewutil.subsettable | |
59 |
|
59 | |||
60 | calcsize = struct.calcsize |
|
60 | calcsize = struct.calcsize | |
61 | pack_into = struct.pack_into |
|
61 | pack_into = struct.pack_into | |
62 | unpack_from = struct.unpack_from |
|
62 | unpack_from = struct.unpack_from | |
63 |
|
63 | |||
64 |
|
64 | |||
65 | class BranchMapCache(object): |
|
65 | class BranchMapCache(object): | |
66 | """mapping of filtered views of repo with their branchcache""" |
|
66 | """mapping of filtered views of repo with their branchcache""" | |
67 |
|
67 | |||
68 | def __init__(self): |
|
68 | def __init__(self): | |
69 | self._per_filter = {} |
|
69 | self._per_filter = {} | |
70 |
|
70 | |||
71 | def __getitem__(self, repo): |
|
71 | def __getitem__(self, repo): | |
72 | self.updatecache(repo) |
|
72 | self.updatecache(repo) | |
73 | return self._per_filter[repo.filtername] |
|
73 | return self._per_filter[repo.filtername] | |
74 |
|
74 | |||
75 | def updatecache(self, repo): |
|
75 | def updatecache(self, repo): | |
76 | """Update the cache for the given filtered view on a repository""" |
|
76 | """Update the cache for the given filtered view on a repository""" | |
77 | # This can trigger updates for the caches for subsets of the filtered |
|
77 | # This can trigger updates for the caches for subsets of the filtered | |
78 | # view, e.g. when there is no cache for this filtered view or the cache |
|
78 | # view, e.g. when there is no cache for this filtered view or the cache | |
79 | # is stale. |
|
79 | # is stale. | |
80 |
|
80 | |||
81 | cl = repo.changelog |
|
81 | cl = repo.changelog | |
82 | filtername = repo.filtername |
|
82 | filtername = repo.filtername | |
83 | bcache = self._per_filter.get(filtername) |
|
83 | bcache = self._per_filter.get(filtername) | |
84 | if bcache is None or not bcache.validfor(repo): |
|
84 | if bcache is None or not bcache.validfor(repo): | |
85 | # cache object missing or cache object stale? Read from disk |
|
85 | # cache object missing or cache object stale? Read from disk | |
86 | bcache = branchcache.fromfile(repo) |
|
86 | bcache = branchcache.fromfile(repo) | |
87 |
|
87 | |||
88 | revs = [] |
|
88 | revs = [] | |
89 | if bcache is None: |
|
89 | if bcache is None: | |
90 | # no (fresh) cache available anymore, perhaps we can re-use |
|
90 | # no (fresh) cache available anymore, perhaps we can re-use | |
91 | # the cache for a subset, then extend that to add info on missing |
|
91 | # the cache for a subset, then extend that to add info on missing | |
92 | # revisions. |
|
92 | # revisions. | |
93 | subsetname = subsettable.get(filtername) |
|
93 | subsetname = subsettable.get(filtername) | |
94 | if subsetname is not None: |
|
94 | if subsetname is not None: | |
95 | subset = repo.filtered(subsetname) |
|
95 | subset = repo.filtered(subsetname) | |
96 | bcache = self[subset].copy() |
|
96 | bcache = self[subset].copy() | |
97 | extrarevs = subset.changelog.filteredrevs - cl.filteredrevs |
|
97 | extrarevs = subset.changelog.filteredrevs - cl.filteredrevs | |
98 | revs.extend(r for r in extrarevs if r <= bcache.tiprev) |
|
98 | revs.extend(r for r in extrarevs if r <= bcache.tiprev) | |
99 | else: |
|
99 | else: | |
100 | # nothing to fall back on, start empty. |
|
100 | # nothing to fall back on, start empty. | |
101 | bcache = branchcache(repo) |
|
101 | bcache = branchcache(repo) | |
102 |
|
102 | |||
103 | revs.extend(cl.revs(start=bcache.tiprev + 1)) |
|
103 | revs.extend(cl.revs(start=bcache.tiprev + 1)) | |
104 | if revs: |
|
104 | if revs: | |
105 | bcache.update(repo, revs) |
|
105 | bcache.update(repo, revs) | |
106 |
|
106 | |||
107 | assert bcache.validfor(repo), filtername |
|
107 | assert bcache.validfor(repo), filtername | |
108 | self._per_filter[repo.filtername] = bcache |
|
108 | self._per_filter[repo.filtername] = bcache | |
109 |
|
109 | |||
110 | def replace(self, repo, remotebranchmap): |
|
110 | def replace(self, repo, remotebranchmap): | |
111 | """Replace the branchmap cache for a repo with a branch mapping. |
|
111 | """Replace the branchmap cache for a repo with a branch mapping. | |
112 |
|
112 | |||
113 | This is likely only called during clone with a branch map from a |
|
113 | This is likely only called during clone with a branch map from a | |
114 | remote. |
|
114 | remote. | |
115 |
|
115 | |||
116 | """ |
|
116 | """ | |
117 | cl = repo.changelog |
|
117 | cl = repo.changelog | |
118 | clrev = cl.rev |
|
118 | clrev = cl.rev | |
119 | clbranchinfo = cl.branchinfo |
|
119 | clbranchinfo = cl.branchinfo | |
120 | rbheads = [] |
|
120 | rbheads = [] | |
121 | closed = set() |
|
121 | closed = set() | |
122 | for bheads in pycompat.itervalues(remotebranchmap): |
|
122 | for bheads in pycompat.itervalues(remotebranchmap): | |
123 | rbheads += bheads |
|
123 | rbheads += bheads | |
124 | for h in bheads: |
|
124 | for h in bheads: | |
125 | r = clrev(h) |
|
125 | r = clrev(h) | |
126 | b, c = clbranchinfo(r) |
|
126 | b, c = clbranchinfo(r) | |
127 | if c: |
|
127 | if c: | |
128 | closed.add(h) |
|
128 | closed.add(h) | |
129 |
|
129 | |||
130 | if rbheads: |
|
130 | if rbheads: | |
131 | rtiprev = max((int(clrev(node)) for node in rbheads)) |
|
131 | rtiprev = max((int(clrev(node)) for node in rbheads)) | |
132 | cache = branchcache( |
|
132 | cache = branchcache( | |
133 | repo, |
|
133 | repo, | |
134 | remotebranchmap, |
|
134 | remotebranchmap, | |
135 | repo[rtiprev].node(), |
|
135 | repo[rtiprev].node(), | |
136 | rtiprev, |
|
136 | rtiprev, | |
137 | closednodes=closed, |
|
137 | closednodes=closed, | |
138 | ) |
|
138 | ) | |
139 |
|
139 | |||
140 | # Try to stick it as low as possible |
|
140 | # Try to stick it as low as possible | |
141 | # filter above served are unlikely to be fetch from a clone |
|
141 | # filter above served are unlikely to be fetch from a clone | |
142 | for candidate in (b'base', b'immutable', b'served'): |
|
142 | for candidate in (b'base', b'immutable', b'served'): | |
143 | rview = repo.filtered(candidate) |
|
143 | rview = repo.filtered(candidate) | |
144 | if cache.validfor(rview): |
|
144 | if cache.validfor(rview): | |
145 | self._per_filter[candidate] = cache |
|
145 | self._per_filter[candidate] = cache | |
146 | cache.write(rview) |
|
146 | cache.write(rview) | |
147 | return |
|
147 | return | |
148 |
|
148 | |||
149 | def clear(self): |
|
149 | def clear(self): | |
150 | self._per_filter.clear() |
|
150 | self._per_filter.clear() | |
151 |
|
151 | |||
|
152 | def write_delayed(self, repo): | |||
|
153 | unfi = repo.unfiltered() | |||
|
154 | for filtername, cache in self._per_filter.items(): | |||
|
155 | if cache._delayed: | |||
|
156 | repo = unfi.filtered(filtername) | |||
|
157 | cache.write(repo) | |||
|
158 | ||||
152 |
|
159 | |||
153 | def _unknownnode(node): |
|
160 | def _unknownnode(node): | |
154 | """raises ValueError when branchcache found a node which does not exists""" |
|
161 | """raises ValueError when branchcache found a node which does not exists""" | |
155 | raise ValueError('node %s does not exist' % pycompat.sysstr(hex(node))) |
|
162 | raise ValueError('node %s does not exist' % pycompat.sysstr(hex(node))) | |
156 |
|
163 | |||
157 |
|
164 | |||
158 | def _branchcachedesc(repo): |
|
165 | def _branchcachedesc(repo): | |
159 | if repo.filtername is not None: |
|
166 | if repo.filtername is not None: | |
160 | return b'branch cache (%s)' % repo.filtername |
|
167 | return b'branch cache (%s)' % repo.filtername | |
161 | else: |
|
168 | else: | |
162 | return b'branch cache' |
|
169 | return b'branch cache' | |
163 |
|
170 | |||
164 |
|
171 | |||
165 | class branchcache(object): |
|
172 | class branchcache(object): | |
166 | """A dict like object that hold branches heads cache. |
|
173 | """A dict like object that hold branches heads cache. | |
167 |
|
174 | |||
168 | This cache is used to avoid costly computations to determine all the |
|
175 | This cache is used to avoid costly computations to determine all the | |
169 | branch heads of a repo. |
|
176 | branch heads of a repo. | |
170 |
|
177 | |||
171 | The cache is serialized on disk in the following format: |
|
178 | The cache is serialized on disk in the following format: | |
172 |
|
179 | |||
173 | <tip hex node> <tip rev number> [optional filtered repo hex hash] |
|
180 | <tip hex node> <tip rev number> [optional filtered repo hex hash] | |
174 | <branch head hex node> <open/closed state> <branch name> |
|
181 | <branch head hex node> <open/closed state> <branch name> | |
175 | <branch head hex node> <open/closed state> <branch name> |
|
182 | <branch head hex node> <open/closed state> <branch name> | |
176 | ... |
|
183 | ... | |
177 |
|
184 | |||
178 | The first line is used to check if the cache is still valid. If the |
|
185 | The first line is used to check if the cache is still valid. If the | |
179 | branch cache is for a filtered repo view, an optional third hash is |
|
186 | branch cache is for a filtered repo view, an optional third hash is | |
180 | included that hashes the hashes of all filtered revisions. |
|
187 | included that hashes the hashes of all filtered revisions. | |
181 |
|
188 | |||
182 | The open/closed state is represented by a single letter 'o' or 'c'. |
|
189 | The open/closed state is represented by a single letter 'o' or 'c'. | |
183 | This field can be used to avoid changelog reads when determining if a |
|
190 | This field can be used to avoid changelog reads when determining if a | |
184 | branch head closes a branch or not. |
|
191 | branch head closes a branch or not. | |
185 | """ |
|
192 | """ | |
186 |
|
193 | |||
187 | def __init__( |
|
194 | def __init__( | |
188 | self, |
|
195 | self, | |
189 | repo, |
|
196 | repo, | |
190 | entries=(), |
|
197 | entries=(), | |
191 | tipnode=None, |
|
198 | tipnode=None, | |
192 | tiprev=nullrev, |
|
199 | tiprev=nullrev, | |
193 | filteredhash=None, |
|
200 | filteredhash=None, | |
194 | closednodes=None, |
|
201 | closednodes=None, | |
195 | hasnode=None, |
|
202 | hasnode=None, | |
196 | ): |
|
203 | ): | |
197 | # type: (localrepo.localrepository, Union[Dict[bytes, List[bytes]], Iterable[Tuple[bytes, List[bytes]]]], bytes, int, Optional[bytes], Optional[Set[bytes]], Optional[Callable[[bytes], bool]]) -> None |
|
204 | # type: (localrepo.localrepository, Union[Dict[bytes, List[bytes]], Iterable[Tuple[bytes, List[bytes]]]], bytes, int, Optional[bytes], Optional[Set[bytes]], Optional[Callable[[bytes], bool]]) -> None | |
198 | """hasnode is a function which can be used to verify whether changelog |
|
205 | """hasnode is a function which can be used to verify whether changelog | |
199 | has a given node or not. If it's not provided, we assume that every node |
|
206 | has a given node or not. If it's not provided, we assume that every node | |
200 | we have exists in changelog""" |
|
207 | we have exists in changelog""" | |
201 | self._repo = repo |
|
208 | self._repo = repo | |
|
209 | self._delayed = False | |||
202 | if tipnode is None: |
|
210 | if tipnode is None: | |
203 | self.tipnode = repo.nullid |
|
211 | self.tipnode = repo.nullid | |
204 | else: |
|
212 | else: | |
205 | self.tipnode = tipnode |
|
213 | self.tipnode = tipnode | |
206 | self.tiprev = tiprev |
|
214 | self.tiprev = tiprev | |
207 | self.filteredhash = filteredhash |
|
215 | self.filteredhash = filteredhash | |
208 | # closednodes is a set of nodes that close their branch. If the branch |
|
216 | # closednodes is a set of nodes that close their branch. If the branch | |
209 | # cache has been updated, it may contain nodes that are no longer |
|
217 | # cache has been updated, it may contain nodes that are no longer | |
210 | # heads. |
|
218 | # heads. | |
211 | if closednodes is None: |
|
219 | if closednodes is None: | |
212 | self._closednodes = set() |
|
220 | self._closednodes = set() | |
213 | else: |
|
221 | else: | |
214 | self._closednodes = closednodes |
|
222 | self._closednodes = closednodes | |
215 | self._entries = dict(entries) |
|
223 | self._entries = dict(entries) | |
216 | # whether closed nodes are verified or not |
|
224 | # whether closed nodes are verified or not | |
217 | self._closedverified = False |
|
225 | self._closedverified = False | |
218 | # branches for which nodes are verified |
|
226 | # branches for which nodes are verified | |
219 | self._verifiedbranches = set() |
|
227 | self._verifiedbranches = set() | |
220 | self._hasnode = hasnode |
|
228 | self._hasnode = hasnode | |
221 | if self._hasnode is None: |
|
229 | if self._hasnode is None: | |
222 | self._hasnode = lambda x: True |
|
230 | self._hasnode = lambda x: True | |
223 |
|
231 | |||
224 | def _verifyclosed(self): |
|
232 | def _verifyclosed(self): | |
225 | """verify the closed nodes we have""" |
|
233 | """verify the closed nodes we have""" | |
226 | if self._closedverified: |
|
234 | if self._closedverified: | |
227 | return |
|
235 | return | |
228 | for node in self._closednodes: |
|
236 | for node in self._closednodes: | |
229 | if not self._hasnode(node): |
|
237 | if not self._hasnode(node): | |
230 | _unknownnode(node) |
|
238 | _unknownnode(node) | |
231 |
|
239 | |||
232 | self._closedverified = True |
|
240 | self._closedverified = True | |
233 |
|
241 | |||
234 | def _verifybranch(self, branch): |
|
242 | def _verifybranch(self, branch): | |
235 | """verify head nodes for the given branch.""" |
|
243 | """verify head nodes for the given branch.""" | |
236 | if branch not in self._entries or branch in self._verifiedbranches: |
|
244 | if branch not in self._entries or branch in self._verifiedbranches: | |
237 | return |
|
245 | return | |
238 | for n in self._entries[branch]: |
|
246 | for n in self._entries[branch]: | |
239 | if not self._hasnode(n): |
|
247 | if not self._hasnode(n): | |
240 | _unknownnode(n) |
|
248 | _unknownnode(n) | |
241 |
|
249 | |||
242 | self._verifiedbranches.add(branch) |
|
250 | self._verifiedbranches.add(branch) | |
243 |
|
251 | |||
244 | def _verifyall(self): |
|
252 | def _verifyall(self): | |
245 | """verifies nodes of all the branches""" |
|
253 | """verifies nodes of all the branches""" | |
246 | needverification = set(self._entries.keys()) - self._verifiedbranches |
|
254 | needverification = set(self._entries.keys()) - self._verifiedbranches | |
247 | for b in needverification: |
|
255 | for b in needverification: | |
248 | self._verifybranch(b) |
|
256 | self._verifybranch(b) | |
249 |
|
257 | |||
250 | def __iter__(self): |
|
258 | def __iter__(self): | |
251 | return iter(self._entries) |
|
259 | return iter(self._entries) | |
252 |
|
260 | |||
253 | def __setitem__(self, key, value): |
|
261 | def __setitem__(self, key, value): | |
254 | self._entries[key] = value |
|
262 | self._entries[key] = value | |
255 |
|
263 | |||
256 | def __getitem__(self, key): |
|
264 | def __getitem__(self, key): | |
257 | self._verifybranch(key) |
|
265 | self._verifybranch(key) | |
258 | return self._entries[key] |
|
266 | return self._entries[key] | |
259 |
|
267 | |||
260 | def __contains__(self, key): |
|
268 | def __contains__(self, key): | |
261 | self._verifybranch(key) |
|
269 | self._verifybranch(key) | |
262 | return key in self._entries |
|
270 | return key in self._entries | |
263 |
|
271 | |||
264 | def iteritems(self): |
|
272 | def iteritems(self): | |
265 | for k, v in pycompat.iteritems(self._entries): |
|
273 | for k, v in pycompat.iteritems(self._entries): | |
266 | self._verifybranch(k) |
|
274 | self._verifybranch(k) | |
267 | yield k, v |
|
275 | yield k, v | |
268 |
|
276 | |||
269 | items = iteritems |
|
277 | items = iteritems | |
270 |
|
278 | |||
271 | def hasbranch(self, label): |
|
279 | def hasbranch(self, label): | |
272 | """checks whether a branch of this name exists or not""" |
|
280 | """checks whether a branch of this name exists or not""" | |
273 | self._verifybranch(label) |
|
281 | self._verifybranch(label) | |
274 | return label in self._entries |
|
282 | return label in self._entries | |
275 |
|
283 | |||
276 | @classmethod |
|
284 | @classmethod | |
277 | def fromfile(cls, repo): |
|
285 | def fromfile(cls, repo): | |
278 | f = None |
|
286 | f = None | |
279 | try: |
|
287 | try: | |
280 | f = repo.cachevfs(cls._filename(repo)) |
|
288 | f = repo.cachevfs(cls._filename(repo)) | |
281 | lineiter = iter(f) |
|
289 | lineiter = iter(f) | |
282 | cachekey = next(lineiter).rstrip(b'\n').split(b" ", 2) |
|
290 | cachekey = next(lineiter).rstrip(b'\n').split(b" ", 2) | |
283 | last, lrev = cachekey[:2] |
|
291 | last, lrev = cachekey[:2] | |
284 | last, lrev = bin(last), int(lrev) |
|
292 | last, lrev = bin(last), int(lrev) | |
285 | filteredhash = None |
|
293 | filteredhash = None | |
286 | hasnode = repo.changelog.hasnode |
|
294 | hasnode = repo.changelog.hasnode | |
287 | if len(cachekey) > 2: |
|
295 | if len(cachekey) > 2: | |
288 | filteredhash = bin(cachekey[2]) |
|
296 | filteredhash = bin(cachekey[2]) | |
289 | bcache = cls( |
|
297 | bcache = cls( | |
290 | repo, |
|
298 | repo, | |
291 | tipnode=last, |
|
299 | tipnode=last, | |
292 | tiprev=lrev, |
|
300 | tiprev=lrev, | |
293 | filteredhash=filteredhash, |
|
301 | filteredhash=filteredhash, | |
294 | hasnode=hasnode, |
|
302 | hasnode=hasnode, | |
295 | ) |
|
303 | ) | |
296 | if not bcache.validfor(repo): |
|
304 | if not bcache.validfor(repo): | |
297 | # invalidate the cache |
|
305 | # invalidate the cache | |
298 | raise ValueError('tip differs') |
|
306 | raise ValueError('tip differs') | |
299 | bcache.load(repo, lineiter) |
|
307 | bcache.load(repo, lineiter) | |
300 | except (IOError, OSError): |
|
308 | except (IOError, OSError): | |
301 | return None |
|
309 | return None | |
302 |
|
310 | |||
303 | except Exception as inst: |
|
311 | except Exception as inst: | |
304 | if repo.ui.debugflag: |
|
312 | if repo.ui.debugflag: | |
305 | msg = b'invalid %s: %s\n' |
|
313 | msg = b'invalid %s: %s\n' | |
306 | repo.ui.debug( |
|
314 | repo.ui.debug( | |
307 | msg |
|
315 | msg | |
308 | % ( |
|
316 | % ( | |
309 | _branchcachedesc(repo), |
|
317 | _branchcachedesc(repo), | |
310 | stringutil.forcebytestr(inst), |
|
318 | stringutil.forcebytestr(inst), | |
311 | ) |
|
319 | ) | |
312 | ) |
|
320 | ) | |
313 | bcache = None |
|
321 | bcache = None | |
314 |
|
322 | |||
315 | finally: |
|
323 | finally: | |
316 | if f: |
|
324 | if f: | |
317 | f.close() |
|
325 | f.close() | |
318 |
|
326 | |||
319 | return bcache |
|
327 | return bcache | |
320 |
|
328 | |||
321 | def load(self, repo, lineiter): |
|
329 | def load(self, repo, lineiter): | |
322 | """fully loads the branchcache by reading from the file using the line |
|
330 | """fully loads the branchcache by reading from the file using the line | |
323 | iterator passed""" |
|
331 | iterator passed""" | |
324 | for line in lineiter: |
|
332 | for line in lineiter: | |
325 | line = line.rstrip(b'\n') |
|
333 | line = line.rstrip(b'\n') | |
326 | if not line: |
|
334 | if not line: | |
327 | continue |
|
335 | continue | |
328 | node, state, label = line.split(b" ", 2) |
|
336 | node, state, label = line.split(b" ", 2) | |
329 | if state not in b'oc': |
|
337 | if state not in b'oc': | |
330 | raise ValueError('invalid branch state') |
|
338 | raise ValueError('invalid branch state') | |
331 | label = encoding.tolocal(label.strip()) |
|
339 | label = encoding.tolocal(label.strip()) | |
332 | node = bin(node) |
|
340 | node = bin(node) | |
333 | self._entries.setdefault(label, []).append(node) |
|
341 | self._entries.setdefault(label, []).append(node) | |
334 | if state == b'c': |
|
342 | if state == b'c': | |
335 | self._closednodes.add(node) |
|
343 | self._closednodes.add(node) | |
336 |
|
344 | |||
337 | @staticmethod |
|
345 | @staticmethod | |
338 | def _filename(repo): |
|
346 | def _filename(repo): | |
339 | """name of a branchcache file for a given repo or repoview""" |
|
347 | """name of a branchcache file for a given repo or repoview""" | |
340 | filename = b"branch2" |
|
348 | filename = b"branch2" | |
341 | if repo.filtername: |
|
349 | if repo.filtername: | |
342 | filename = b'%s-%s' % (filename, repo.filtername) |
|
350 | filename = b'%s-%s' % (filename, repo.filtername) | |
343 | return filename |
|
351 | return filename | |
344 |
|
352 | |||
345 | def validfor(self, repo): |
|
353 | def validfor(self, repo): | |
346 | """Is the cache content valid regarding a repo |
|
354 | """Is the cache content valid regarding a repo | |
347 |
|
355 | |||
348 | - False when cached tipnode is unknown or if we detect a strip. |
|
356 | - False when cached tipnode is unknown or if we detect a strip. | |
349 | - True when cache is up to date or a subset of current repo.""" |
|
357 | - True when cache is up to date or a subset of current repo.""" | |
350 | try: |
|
358 | try: | |
351 | return (self.tipnode == repo.changelog.node(self.tiprev)) and ( |
|
359 | return (self.tipnode == repo.changelog.node(self.tiprev)) and ( | |
352 | self.filteredhash == scmutil.filteredhash(repo, self.tiprev) |
|
360 | self.filteredhash == scmutil.filteredhash(repo, self.tiprev) | |
353 | ) |
|
361 | ) | |
354 | except IndexError: |
|
362 | except IndexError: | |
355 | return False |
|
363 | return False | |
356 |
|
364 | |||
357 | def _branchtip(self, heads): |
|
365 | def _branchtip(self, heads): | |
358 | """Return tuple with last open head in heads and false, |
|
366 | """Return tuple with last open head in heads and false, | |
359 | otherwise return last closed head and true.""" |
|
367 | otherwise return last closed head and true.""" | |
360 | tip = heads[-1] |
|
368 | tip = heads[-1] | |
361 | closed = True |
|
369 | closed = True | |
362 | for h in reversed(heads): |
|
370 | for h in reversed(heads): | |
363 | if h not in self._closednodes: |
|
371 | if h not in self._closednodes: | |
364 | tip = h |
|
372 | tip = h | |
365 | closed = False |
|
373 | closed = False | |
366 | break |
|
374 | break | |
367 | return tip, closed |
|
375 | return tip, closed | |
368 |
|
376 | |||
369 | def branchtip(self, branch): |
|
377 | def branchtip(self, branch): | |
370 | """Return the tipmost open head on branch head, otherwise return the |
|
378 | """Return the tipmost open head on branch head, otherwise return the | |
371 | tipmost closed head on branch. |
|
379 | tipmost closed head on branch. | |
372 | Raise KeyError for unknown branch.""" |
|
380 | Raise KeyError for unknown branch.""" | |
373 | return self._branchtip(self[branch])[0] |
|
381 | return self._branchtip(self[branch])[0] | |
374 |
|
382 | |||
375 | def iteropen(self, nodes): |
|
383 | def iteropen(self, nodes): | |
376 | return (n for n in nodes if n not in self._closednodes) |
|
384 | return (n for n in nodes if n not in self._closednodes) | |
377 |
|
385 | |||
378 | def branchheads(self, branch, closed=False): |
|
386 | def branchheads(self, branch, closed=False): | |
379 | self._verifybranch(branch) |
|
387 | self._verifybranch(branch) | |
380 | heads = self._entries[branch] |
|
388 | heads = self._entries[branch] | |
381 | if not closed: |
|
389 | if not closed: | |
382 | heads = list(self.iteropen(heads)) |
|
390 | heads = list(self.iteropen(heads)) | |
383 | return heads |
|
391 | return heads | |
384 |
|
392 | |||
385 | def iterbranches(self): |
|
393 | def iterbranches(self): | |
386 | for bn, heads in pycompat.iteritems(self): |
|
394 | for bn, heads in pycompat.iteritems(self): | |
387 | yield (bn, heads) + self._branchtip(heads) |
|
395 | yield (bn, heads) + self._branchtip(heads) | |
388 |
|
396 | |||
389 | def iterheads(self): |
|
397 | def iterheads(self): | |
390 | """returns all the heads""" |
|
398 | """returns all the heads""" | |
391 | self._verifyall() |
|
399 | self._verifyall() | |
392 | return pycompat.itervalues(self._entries) |
|
400 | return pycompat.itervalues(self._entries) | |
393 |
|
401 | |||
394 | def copy(self): |
|
402 | def copy(self): | |
395 | """return an deep copy of the branchcache object""" |
|
403 | """return an deep copy of the branchcache object""" | |
396 | return type(self)( |
|
404 | return type(self)( | |
397 | self._repo, |
|
405 | self._repo, | |
398 | self._entries, |
|
406 | self._entries, | |
399 | self.tipnode, |
|
407 | self.tipnode, | |
400 | self.tiprev, |
|
408 | self.tiprev, | |
401 | self.filteredhash, |
|
409 | self.filteredhash, | |
402 | self._closednodes, |
|
410 | self._closednodes, | |
403 | ) |
|
411 | ) | |
404 |
|
412 | |||
405 | def write(self, repo): |
|
413 | def write(self, repo): | |
|
414 | tr = repo.currenttransaction() | |||
|
415 | if not getattr(tr, 'finalized', True): | |||
|
416 | # Avoid premature writing. | |||
|
417 | # | |||
|
418 | # (The cache warming setup by localrepo will update the file later.) | |||
|
419 | self._delayed = True | |||
|
420 | return | |||
406 | try: |
|
421 | try: | |
407 | f = repo.cachevfs(self._filename(repo), b"w", atomictemp=True) |
|
422 | f = repo.cachevfs(self._filename(repo), b"w", atomictemp=True) | |
408 | cachekey = [hex(self.tipnode), b'%d' % self.tiprev] |
|
423 | cachekey = [hex(self.tipnode), b'%d' % self.tiprev] | |
409 | if self.filteredhash is not None: |
|
424 | if self.filteredhash is not None: | |
410 | cachekey.append(hex(self.filteredhash)) |
|
425 | cachekey.append(hex(self.filteredhash)) | |
411 | f.write(b" ".join(cachekey) + b'\n') |
|
426 | f.write(b" ".join(cachekey) + b'\n') | |
412 | nodecount = 0 |
|
427 | nodecount = 0 | |
413 | for label, nodes in sorted(pycompat.iteritems(self._entries)): |
|
428 | for label, nodes in sorted(pycompat.iteritems(self._entries)): | |
414 | label = encoding.fromlocal(label) |
|
429 | label = encoding.fromlocal(label) | |
415 | for node in nodes: |
|
430 | for node in nodes: | |
416 | nodecount += 1 |
|
431 | nodecount += 1 | |
417 | if node in self._closednodes: |
|
432 | if node in self._closednodes: | |
418 | state = b'c' |
|
433 | state = b'c' | |
419 | else: |
|
434 | else: | |
420 | state = b'o' |
|
435 | state = b'o' | |
421 | f.write(b"%s %s %s\n" % (hex(node), state, label)) |
|
436 | f.write(b"%s %s %s\n" % (hex(node), state, label)) | |
422 | f.close() |
|
437 | f.close() | |
423 | repo.ui.log( |
|
438 | repo.ui.log( | |
424 | b'branchcache', |
|
439 | b'branchcache', | |
425 | b'wrote %s with %d labels and %d nodes\n', |
|
440 | b'wrote %s with %d labels and %d nodes\n', | |
426 | _branchcachedesc(repo), |
|
441 | _branchcachedesc(repo), | |
427 | len(self._entries), |
|
442 | len(self._entries), | |
428 | nodecount, |
|
443 | nodecount, | |
429 | ) |
|
444 | ) | |
|
445 | self._delayed = False | |||
430 | except (IOError, OSError, error.Abort) as inst: |
|
446 | except (IOError, OSError, error.Abort) as inst: | |
431 | # Abort may be raised by read only opener, so log and continue |
|
447 | # Abort may be raised by read only opener, so log and continue | |
432 | repo.ui.debug( |
|
448 | repo.ui.debug( | |
433 | b"couldn't write branch cache: %s\n" |
|
449 | b"couldn't write branch cache: %s\n" | |
434 | % stringutil.forcebytestr(inst) |
|
450 | % stringutil.forcebytestr(inst) | |
435 | ) |
|
451 | ) | |
436 |
|
452 | |||
437 | def update(self, repo, revgen): |
|
453 | def update(self, repo, revgen): | |
438 | """Given a branchhead cache, self, that may have extra nodes or be |
|
454 | """Given a branchhead cache, self, that may have extra nodes or be | |
439 | missing heads, and a generator of nodes that are strictly a superset of |
|
455 | missing heads, and a generator of nodes that are strictly a superset of | |
440 | heads missing, this function updates self to be correct. |
|
456 | heads missing, this function updates self to be correct. | |
441 | """ |
|
457 | """ | |
442 | starttime = util.timer() |
|
458 | starttime = util.timer() | |
443 | cl = repo.changelog |
|
459 | cl = repo.changelog | |
444 | # collect new branch entries |
|
460 | # collect new branch entries | |
445 | newbranches = {} |
|
461 | newbranches = {} | |
446 | getbranchinfo = repo.revbranchcache().branchinfo |
|
462 | getbranchinfo = repo.revbranchcache().branchinfo | |
447 | for r in revgen: |
|
463 | for r in revgen: | |
448 | branch, closesbranch = getbranchinfo(r) |
|
464 | branch, closesbranch = getbranchinfo(r) | |
449 | newbranches.setdefault(branch, []).append(r) |
|
465 | newbranches.setdefault(branch, []).append(r) | |
450 | if closesbranch: |
|
466 | if closesbranch: | |
451 | self._closednodes.add(cl.node(r)) |
|
467 | self._closednodes.add(cl.node(r)) | |
452 |
|
468 | |||
453 | # new tip revision which we found after iterating items from new |
|
469 | # new tip revision which we found after iterating items from new | |
454 | # branches |
|
470 | # branches | |
455 | ntiprev = self.tiprev |
|
471 | ntiprev = self.tiprev | |
456 |
|
472 | |||
457 | # Delay fetching the topological heads until they are needed. |
|
473 | # Delay fetching the topological heads until they are needed. | |
458 | # A repository without non-continous branches can skip this part. |
|
474 | # A repository without non-continous branches can skip this part. | |
459 | topoheads = None |
|
475 | topoheads = None | |
460 |
|
476 | |||
461 | # If a changeset is visible, its parents must be visible too, so |
|
477 | # If a changeset is visible, its parents must be visible too, so | |
462 | # use the faster unfiltered parent accessor. |
|
478 | # use the faster unfiltered parent accessor. | |
463 | parentrevs = repo.unfiltered().changelog.parentrevs |
|
479 | parentrevs = repo.unfiltered().changelog.parentrevs | |
464 |
|
480 | |||
465 | for branch, newheadrevs in pycompat.iteritems(newbranches): |
|
481 | for branch, newheadrevs in pycompat.iteritems(newbranches): | |
466 | # For every branch, compute the new branchheads. |
|
482 | # For every branch, compute the new branchheads. | |
467 | # A branchhead is a revision such that no descendant is on |
|
483 | # A branchhead is a revision such that no descendant is on | |
468 | # the same branch. |
|
484 | # the same branch. | |
469 | # |
|
485 | # | |
470 | # The branchheads are computed iteratively in revision order. |
|
486 | # The branchheads are computed iteratively in revision order. | |
471 | # This ensures topological order, i.e. parents are processed |
|
487 | # This ensures topological order, i.e. parents are processed | |
472 | # before their children. Ancestors are inclusive here, i.e. |
|
488 | # before their children. Ancestors are inclusive here, i.e. | |
473 | # any revision is an ancestor of itself. |
|
489 | # any revision is an ancestor of itself. | |
474 | # |
|
490 | # | |
475 | # Core observations: |
|
491 | # Core observations: | |
476 | # - The current revision is always a branchhead for the |
|
492 | # - The current revision is always a branchhead for the | |
477 | # repository up to that point. |
|
493 | # repository up to that point. | |
478 | # - It is the first revision of the branch if and only if |
|
494 | # - It is the first revision of the branch if and only if | |
479 | # there was no branchhead before. In that case, it is the |
|
495 | # there was no branchhead before. In that case, it is the | |
480 | # only branchhead as there are no possible ancestors on |
|
496 | # only branchhead as there are no possible ancestors on | |
481 | # the same branch. |
|
497 | # the same branch. | |
482 | # - If a parent is on the same branch, a branchhead can |
|
498 | # - If a parent is on the same branch, a branchhead can | |
483 | # only be an ancestor of that parent, if it is parent |
|
499 | # only be an ancestor of that parent, if it is parent | |
484 | # itself. Otherwise it would have been removed as ancestor |
|
500 | # itself. Otherwise it would have been removed as ancestor | |
485 | # of that parent before. |
|
501 | # of that parent before. | |
486 | # - Therefore, if all parents are on the same branch, they |
|
502 | # - Therefore, if all parents are on the same branch, they | |
487 | # can just be removed from the branchhead set. |
|
503 | # can just be removed from the branchhead set. | |
488 | # - If one parent is on the same branch and the other is not |
|
504 | # - If one parent is on the same branch and the other is not | |
489 | # and there was exactly one branchhead known, the existing |
|
505 | # and there was exactly one branchhead known, the existing | |
490 | # branchhead can only be an ancestor if it is the parent. |
|
506 | # branchhead can only be an ancestor if it is the parent. | |
491 | # Otherwise it would have been removed as ancestor of |
|
507 | # Otherwise it would have been removed as ancestor of | |
492 | # the parent before. The other parent therefore can't have |
|
508 | # the parent before. The other parent therefore can't have | |
493 | # a branchhead as ancestor. |
|
509 | # a branchhead as ancestor. | |
494 | # - In all other cases, the parents on different branches |
|
510 | # - In all other cases, the parents on different branches | |
495 | # could have a branchhead as ancestor. Those parents are |
|
511 | # could have a branchhead as ancestor. Those parents are | |
496 | # kept in the "uncertain" set. If all branchheads are also |
|
512 | # kept in the "uncertain" set. If all branchheads are also | |
497 | # topological heads, they can't have descendants and further |
|
513 | # topological heads, they can't have descendants and further | |
498 | # checks can be skipped. Otherwise, the ancestors of the |
|
514 | # checks can be skipped. Otherwise, the ancestors of the | |
499 | # "uncertain" set are removed from branchheads. |
|
515 | # "uncertain" set are removed from branchheads. | |
500 | # This computation is heavy and avoided if at all possible. |
|
516 | # This computation is heavy and avoided if at all possible. | |
501 | bheads = self._entries.setdefault(branch, []) |
|
517 | bheads = self._entries.setdefault(branch, []) | |
502 | bheadset = {cl.rev(node) for node in bheads} |
|
518 | bheadset = {cl.rev(node) for node in bheads} | |
503 | uncertain = set() |
|
519 | uncertain = set() | |
504 | for newrev in sorted(newheadrevs): |
|
520 | for newrev in sorted(newheadrevs): | |
505 | if not bheadset: |
|
521 | if not bheadset: | |
506 | bheadset.add(newrev) |
|
522 | bheadset.add(newrev) | |
507 | continue |
|
523 | continue | |
508 |
|
524 | |||
509 | parents = [p for p in parentrevs(newrev) if p != nullrev] |
|
525 | parents = [p for p in parentrevs(newrev) if p != nullrev] | |
510 | samebranch = set() |
|
526 | samebranch = set() | |
511 | otherbranch = set() |
|
527 | otherbranch = set() | |
512 | for p in parents: |
|
528 | for p in parents: | |
513 | if p in bheadset or getbranchinfo(p)[0] == branch: |
|
529 | if p in bheadset or getbranchinfo(p)[0] == branch: | |
514 | samebranch.add(p) |
|
530 | samebranch.add(p) | |
515 | else: |
|
531 | else: | |
516 | otherbranch.add(p) |
|
532 | otherbranch.add(p) | |
517 | if otherbranch and not (len(bheadset) == len(samebranch) == 1): |
|
533 | if otherbranch and not (len(bheadset) == len(samebranch) == 1): | |
518 | uncertain.update(otherbranch) |
|
534 | uncertain.update(otherbranch) | |
519 | bheadset.difference_update(samebranch) |
|
535 | bheadset.difference_update(samebranch) | |
520 | bheadset.add(newrev) |
|
536 | bheadset.add(newrev) | |
521 |
|
537 | |||
522 | if uncertain: |
|
538 | if uncertain: | |
523 | if topoheads is None: |
|
539 | if topoheads is None: | |
524 | topoheads = set(cl.headrevs()) |
|
540 | topoheads = set(cl.headrevs()) | |
525 | if bheadset - topoheads: |
|
541 | if bheadset - topoheads: | |
526 | floorrev = min(bheadset) |
|
542 | floorrev = min(bheadset) | |
527 | ancestors = set(cl.ancestors(newheadrevs, floorrev)) |
|
543 | ancestors = set(cl.ancestors(newheadrevs, floorrev)) | |
528 | bheadset -= ancestors |
|
544 | bheadset -= ancestors | |
529 | bheadrevs = sorted(bheadset) |
|
545 | bheadrevs = sorted(bheadset) | |
530 | self[branch] = [cl.node(rev) for rev in bheadrevs] |
|
546 | self[branch] = [cl.node(rev) for rev in bheadrevs] | |
531 | tiprev = bheadrevs[-1] |
|
547 | tiprev = bheadrevs[-1] | |
532 | if tiprev > ntiprev: |
|
548 | if tiprev > ntiprev: | |
533 | ntiprev = tiprev |
|
549 | ntiprev = tiprev | |
534 |
|
550 | |||
535 | if ntiprev > self.tiprev: |
|
551 | if ntiprev > self.tiprev: | |
536 | self.tiprev = ntiprev |
|
552 | self.tiprev = ntiprev | |
537 | self.tipnode = cl.node(ntiprev) |
|
553 | self.tipnode = cl.node(ntiprev) | |
538 |
|
554 | |||
539 | if not self.validfor(repo): |
|
555 | if not self.validfor(repo): | |
540 | # cache key are not valid anymore |
|
556 | # cache key are not valid anymore | |
541 | self.tipnode = repo.nullid |
|
557 | self.tipnode = repo.nullid | |
542 | self.tiprev = nullrev |
|
558 | self.tiprev = nullrev | |
543 | for heads in self.iterheads(): |
|
559 | for heads in self.iterheads(): | |
544 | tiprev = max(cl.rev(node) for node in heads) |
|
560 | tiprev = max(cl.rev(node) for node in heads) | |
545 | if tiprev > self.tiprev: |
|
561 | if tiprev > self.tiprev: | |
546 | self.tipnode = cl.node(tiprev) |
|
562 | self.tipnode = cl.node(tiprev) | |
547 | self.tiprev = tiprev |
|
563 | self.tiprev = tiprev | |
548 | self.filteredhash = scmutil.filteredhash(repo, self.tiprev) |
|
564 | self.filteredhash = scmutil.filteredhash(repo, self.tiprev) | |
549 |
|
565 | |||
550 | duration = util.timer() - starttime |
|
566 | duration = util.timer() - starttime | |
551 | repo.ui.log( |
|
567 | repo.ui.log( | |
552 | b'branchcache', |
|
568 | b'branchcache', | |
553 | b'updated %s in %.4f seconds\n', |
|
569 | b'updated %s in %.4f seconds\n', | |
554 | _branchcachedesc(repo), |
|
570 | _branchcachedesc(repo), | |
555 | duration, |
|
571 | duration, | |
556 | ) |
|
572 | ) | |
557 |
|
573 | |||
558 | self.write(repo) |
|
574 | self.write(repo) | |
559 |
|
575 | |||
560 |
|
576 | |||
561 | class remotebranchcache(branchcache): |
|
577 | class remotebranchcache(branchcache): | |
562 | """Branchmap info for a remote connection, should not write locally""" |
|
578 | """Branchmap info for a remote connection, should not write locally""" | |
563 |
|
579 | |||
564 | def write(self, repo): |
|
580 | def write(self, repo): | |
565 | pass |
|
581 | pass | |
566 |
|
582 | |||
567 |
|
583 | |||
568 | # Revision branch info cache |
|
584 | # Revision branch info cache | |
569 |
|
585 | |||
570 | _rbcversion = b'-v1' |
|
586 | _rbcversion = b'-v1' | |
571 | _rbcnames = b'rbc-names' + _rbcversion |
|
587 | _rbcnames = b'rbc-names' + _rbcversion | |
572 | _rbcrevs = b'rbc-revs' + _rbcversion |
|
588 | _rbcrevs = b'rbc-revs' + _rbcversion | |
573 | # [4 byte hash prefix][4 byte branch name number with sign bit indicating open] |
|
589 | # [4 byte hash prefix][4 byte branch name number with sign bit indicating open] | |
574 | _rbcrecfmt = b'>4sI' |
|
590 | _rbcrecfmt = b'>4sI' | |
575 | _rbcrecsize = calcsize(_rbcrecfmt) |
|
591 | _rbcrecsize = calcsize(_rbcrecfmt) | |
576 | _rbcmininc = 64 * _rbcrecsize |
|
592 | _rbcmininc = 64 * _rbcrecsize | |
577 | _rbcnodelen = 4 |
|
593 | _rbcnodelen = 4 | |
578 | _rbcbranchidxmask = 0x7FFFFFFF |
|
594 | _rbcbranchidxmask = 0x7FFFFFFF | |
579 | _rbccloseflag = 0x80000000 |
|
595 | _rbccloseflag = 0x80000000 | |
580 |
|
596 | |||
581 |
|
597 | |||
582 | class revbranchcache(object): |
|
598 | class revbranchcache(object): | |
583 | """Persistent cache, mapping from revision number to branch name and close. |
|
599 | """Persistent cache, mapping from revision number to branch name and close. | |
584 | This is a low level cache, independent of filtering. |
|
600 | This is a low level cache, independent of filtering. | |
585 |
|
601 | |||
586 | Branch names are stored in rbc-names in internal encoding separated by 0. |
|
602 | Branch names are stored in rbc-names in internal encoding separated by 0. | |
587 | rbc-names is append-only, and each branch name is only stored once and will |
|
603 | rbc-names is append-only, and each branch name is only stored once and will | |
588 | thus have a unique index. |
|
604 | thus have a unique index. | |
589 |
|
605 | |||
590 | The branch info for each revision is stored in rbc-revs as constant size |
|
606 | The branch info for each revision is stored in rbc-revs as constant size | |
591 | records. The whole file is read into memory, but it is only 'parsed' on |
|
607 | records. The whole file is read into memory, but it is only 'parsed' on | |
592 | demand. The file is usually append-only but will be truncated if repo |
|
608 | demand. The file is usually append-only but will be truncated if repo | |
593 | modification is detected. |
|
609 | modification is detected. | |
594 | The record for each revision contains the first 4 bytes of the |
|
610 | The record for each revision contains the first 4 bytes of the | |
595 | corresponding node hash, and the record is only used if it still matches. |
|
611 | corresponding node hash, and the record is only used if it still matches. | |
596 | Even a completely trashed rbc-revs fill thus still give the right result |
|
612 | Even a completely trashed rbc-revs fill thus still give the right result | |
597 | while converging towards full recovery ... assuming no incorrectly matching |
|
613 | while converging towards full recovery ... assuming no incorrectly matching | |
598 | node hashes. |
|
614 | node hashes. | |
599 | The record also contains 4 bytes where 31 bits contains the index of the |
|
615 | The record also contains 4 bytes where 31 bits contains the index of the | |
600 | branch and the last bit indicate that it is a branch close commit. |
|
616 | branch and the last bit indicate that it is a branch close commit. | |
601 | The usage pattern for rbc-revs is thus somewhat similar to 00changelog.i |
|
617 | The usage pattern for rbc-revs is thus somewhat similar to 00changelog.i | |
602 | and will grow with it but be 1/8th of its size. |
|
618 | and will grow with it but be 1/8th of its size. | |
603 | """ |
|
619 | """ | |
604 |
|
620 | |||
605 | def __init__(self, repo, readonly=True): |
|
621 | def __init__(self, repo, readonly=True): | |
606 | assert repo.filtername is None |
|
622 | assert repo.filtername is None | |
607 | self._repo = repo |
|
623 | self._repo = repo | |
608 | self._names = [] # branch names in local encoding with static index |
|
624 | self._names = [] # branch names in local encoding with static index | |
609 | self._rbcrevs = bytearray() |
|
625 | self._rbcrevs = bytearray() | |
610 | self._rbcsnameslen = 0 # length of names read at _rbcsnameslen |
|
626 | self._rbcsnameslen = 0 # length of names read at _rbcsnameslen | |
611 | try: |
|
627 | try: | |
612 | bndata = repo.cachevfs.read(_rbcnames) |
|
628 | bndata = repo.cachevfs.read(_rbcnames) | |
613 | self._rbcsnameslen = len(bndata) # for verification before writing |
|
629 | self._rbcsnameslen = len(bndata) # for verification before writing | |
614 | if bndata: |
|
630 | if bndata: | |
615 | self._names = [ |
|
631 | self._names = [ | |
616 | encoding.tolocal(bn) for bn in bndata.split(b'\0') |
|
632 | encoding.tolocal(bn) for bn in bndata.split(b'\0') | |
617 | ] |
|
633 | ] | |
618 | except (IOError, OSError): |
|
634 | except (IOError, OSError): | |
619 | if readonly: |
|
635 | if readonly: | |
620 | # don't try to use cache - fall back to the slow path |
|
636 | # don't try to use cache - fall back to the slow path | |
621 | self.branchinfo = self._branchinfo |
|
637 | self.branchinfo = self._branchinfo | |
622 |
|
638 | |||
623 | if self._names: |
|
639 | if self._names: | |
624 | try: |
|
640 | try: | |
625 | data = repo.cachevfs.read(_rbcrevs) |
|
641 | data = repo.cachevfs.read(_rbcrevs) | |
626 | self._rbcrevs[:] = data |
|
642 | self._rbcrevs[:] = data | |
627 | except (IOError, OSError) as inst: |
|
643 | except (IOError, OSError) as inst: | |
628 | repo.ui.debug( |
|
644 | repo.ui.debug( | |
629 | b"couldn't read revision branch cache: %s\n" |
|
645 | b"couldn't read revision branch cache: %s\n" | |
630 | % stringutil.forcebytestr(inst) |
|
646 | % stringutil.forcebytestr(inst) | |
631 | ) |
|
647 | ) | |
632 | # remember number of good records on disk |
|
648 | # remember number of good records on disk | |
633 | self._rbcrevslen = min( |
|
649 | self._rbcrevslen = min( | |
634 | len(self._rbcrevs) // _rbcrecsize, len(repo.changelog) |
|
650 | len(self._rbcrevs) // _rbcrecsize, len(repo.changelog) | |
635 | ) |
|
651 | ) | |
636 | if self._rbcrevslen == 0: |
|
652 | if self._rbcrevslen == 0: | |
637 | self._names = [] |
|
653 | self._names = [] | |
638 | self._rbcnamescount = len(self._names) # number of names read at |
|
654 | self._rbcnamescount = len(self._names) # number of names read at | |
639 | # _rbcsnameslen |
|
655 | # _rbcsnameslen | |
640 |
|
656 | |||
641 | def _clear(self): |
|
657 | def _clear(self): | |
642 | self._rbcsnameslen = 0 |
|
658 | self._rbcsnameslen = 0 | |
643 | del self._names[:] |
|
659 | del self._names[:] | |
644 | self._rbcnamescount = 0 |
|
660 | self._rbcnamescount = 0 | |
645 | self._rbcrevslen = len(self._repo.changelog) |
|
661 | self._rbcrevslen = len(self._repo.changelog) | |
646 | self._rbcrevs = bytearray(self._rbcrevslen * _rbcrecsize) |
|
662 | self._rbcrevs = bytearray(self._rbcrevslen * _rbcrecsize) | |
647 | util.clearcachedproperty(self, b'_namesreverse') |
|
663 | util.clearcachedproperty(self, b'_namesreverse') | |
648 |
|
664 | |||
649 | @util.propertycache |
|
665 | @util.propertycache | |
650 | def _namesreverse(self): |
|
666 | def _namesreverse(self): | |
651 | return {b: r for r, b in enumerate(self._names)} |
|
667 | return {b: r for r, b in enumerate(self._names)} | |
652 |
|
668 | |||
653 | def branchinfo(self, rev): |
|
669 | def branchinfo(self, rev): | |
654 | """Return branch name and close flag for rev, using and updating |
|
670 | """Return branch name and close flag for rev, using and updating | |
655 | persistent cache.""" |
|
671 | persistent cache.""" | |
656 | changelog = self._repo.changelog |
|
672 | changelog = self._repo.changelog | |
657 | rbcrevidx = rev * _rbcrecsize |
|
673 | rbcrevidx = rev * _rbcrecsize | |
658 |
|
674 | |||
659 | # avoid negative index, changelog.read(nullrev) is fast without cache |
|
675 | # avoid negative index, changelog.read(nullrev) is fast without cache | |
660 | if rev == nullrev: |
|
676 | if rev == nullrev: | |
661 | return changelog.branchinfo(rev) |
|
677 | return changelog.branchinfo(rev) | |
662 |
|
678 | |||
663 | # if requested rev isn't allocated, grow and cache the rev info |
|
679 | # if requested rev isn't allocated, grow and cache the rev info | |
664 | if len(self._rbcrevs) < rbcrevidx + _rbcrecsize: |
|
680 | if len(self._rbcrevs) < rbcrevidx + _rbcrecsize: | |
665 | return self._branchinfo(rev) |
|
681 | return self._branchinfo(rev) | |
666 |
|
682 | |||
667 | # fast path: extract data from cache, use it if node is matching |
|
683 | # fast path: extract data from cache, use it if node is matching | |
668 | reponode = changelog.node(rev)[:_rbcnodelen] |
|
684 | reponode = changelog.node(rev)[:_rbcnodelen] | |
669 | cachenode, branchidx = unpack_from( |
|
685 | cachenode, branchidx = unpack_from( | |
670 | _rbcrecfmt, util.buffer(self._rbcrevs), rbcrevidx |
|
686 | _rbcrecfmt, util.buffer(self._rbcrevs), rbcrevidx | |
671 | ) |
|
687 | ) | |
672 | close = bool(branchidx & _rbccloseflag) |
|
688 | close = bool(branchidx & _rbccloseflag) | |
673 | if close: |
|
689 | if close: | |
674 | branchidx &= _rbcbranchidxmask |
|
690 | branchidx &= _rbcbranchidxmask | |
675 | if cachenode == b'\0\0\0\0': |
|
691 | if cachenode == b'\0\0\0\0': | |
676 | pass |
|
692 | pass | |
677 | elif cachenode == reponode: |
|
693 | elif cachenode == reponode: | |
678 | try: |
|
694 | try: | |
679 | return self._names[branchidx], close |
|
695 | return self._names[branchidx], close | |
680 | except IndexError: |
|
696 | except IndexError: | |
681 | # recover from invalid reference to unknown branch |
|
697 | # recover from invalid reference to unknown branch | |
682 | self._repo.ui.debug( |
|
698 | self._repo.ui.debug( | |
683 | b"referenced branch names not found" |
|
699 | b"referenced branch names not found" | |
684 | b" - rebuilding revision branch cache from scratch\n" |
|
700 | b" - rebuilding revision branch cache from scratch\n" | |
685 | ) |
|
701 | ) | |
686 | self._clear() |
|
702 | self._clear() | |
687 | else: |
|
703 | else: | |
688 | # rev/node map has changed, invalidate the cache from here up |
|
704 | # rev/node map has changed, invalidate the cache from here up | |
689 | self._repo.ui.debug( |
|
705 | self._repo.ui.debug( | |
690 | b"history modification detected - truncating " |
|
706 | b"history modification detected - truncating " | |
691 | b"revision branch cache to revision %d\n" % rev |
|
707 | b"revision branch cache to revision %d\n" % rev | |
692 | ) |
|
708 | ) | |
693 | truncate = rbcrevidx + _rbcrecsize |
|
709 | truncate = rbcrevidx + _rbcrecsize | |
694 | del self._rbcrevs[truncate:] |
|
710 | del self._rbcrevs[truncate:] | |
695 | self._rbcrevslen = min(self._rbcrevslen, truncate) |
|
711 | self._rbcrevslen = min(self._rbcrevslen, truncate) | |
696 |
|
712 | |||
697 | # fall back to slow path and make sure it will be written to disk |
|
713 | # fall back to slow path and make sure it will be written to disk | |
698 | return self._branchinfo(rev) |
|
714 | return self._branchinfo(rev) | |
699 |
|
715 | |||
700 | def _branchinfo(self, rev): |
|
716 | def _branchinfo(self, rev): | |
701 | """Retrieve branch info from changelog and update _rbcrevs""" |
|
717 | """Retrieve branch info from changelog and update _rbcrevs""" | |
702 | changelog = self._repo.changelog |
|
718 | changelog = self._repo.changelog | |
703 | b, close = changelog.branchinfo(rev) |
|
719 | b, close = changelog.branchinfo(rev) | |
704 | if b in self._namesreverse: |
|
720 | if b in self._namesreverse: | |
705 | branchidx = self._namesreverse[b] |
|
721 | branchidx = self._namesreverse[b] | |
706 | else: |
|
722 | else: | |
707 | branchidx = len(self._names) |
|
723 | branchidx = len(self._names) | |
708 | self._names.append(b) |
|
724 | self._names.append(b) | |
709 | self._namesreverse[b] = branchidx |
|
725 | self._namesreverse[b] = branchidx | |
710 | reponode = changelog.node(rev) |
|
726 | reponode = changelog.node(rev) | |
711 | if close: |
|
727 | if close: | |
712 | branchidx |= _rbccloseflag |
|
728 | branchidx |= _rbccloseflag | |
713 | self._setcachedata(rev, reponode, branchidx) |
|
729 | self._setcachedata(rev, reponode, branchidx) | |
714 | return b, close |
|
730 | return b, close | |
715 |
|
731 | |||
716 | def setdata(self, rev, changelogrevision): |
|
732 | def setdata(self, rev, changelogrevision): | |
717 | """add new data information to the cache""" |
|
733 | """add new data information to the cache""" | |
718 | branch, close = changelogrevision.branchinfo |
|
734 | branch, close = changelogrevision.branchinfo | |
719 |
|
735 | |||
720 | if branch in self._namesreverse: |
|
736 | if branch in self._namesreverse: | |
721 | branchidx = self._namesreverse[branch] |
|
737 | branchidx = self._namesreverse[branch] | |
722 | else: |
|
738 | else: | |
723 | branchidx = len(self._names) |
|
739 | branchidx = len(self._names) | |
724 | self._names.append(branch) |
|
740 | self._names.append(branch) | |
725 | self._namesreverse[branch] = branchidx |
|
741 | self._namesreverse[branch] = branchidx | |
726 | if close: |
|
742 | if close: | |
727 | branchidx |= _rbccloseflag |
|
743 | branchidx |= _rbccloseflag | |
728 | self._setcachedata(rev, self._repo.changelog.node(rev), branchidx) |
|
744 | self._setcachedata(rev, self._repo.changelog.node(rev), branchidx) | |
729 | # If no cache data were readable (non exists, bad permission, etc) |
|
745 | # If no cache data were readable (non exists, bad permission, etc) | |
730 | # the cache was bypassing itself by setting: |
|
746 | # the cache was bypassing itself by setting: | |
731 | # |
|
747 | # | |
732 | # self.branchinfo = self._branchinfo |
|
748 | # self.branchinfo = self._branchinfo | |
733 | # |
|
749 | # | |
734 | # Since we now have data in the cache, we need to drop this bypassing. |
|
750 | # Since we now have data in the cache, we need to drop this bypassing. | |
735 | if 'branchinfo' in vars(self): |
|
751 | if 'branchinfo' in vars(self): | |
736 | del self.branchinfo |
|
752 | del self.branchinfo | |
737 |
|
753 | |||
738 | def _setcachedata(self, rev, node, branchidx): |
|
754 | def _setcachedata(self, rev, node, branchidx): | |
739 | """Writes the node's branch data to the in-memory cache data.""" |
|
755 | """Writes the node's branch data to the in-memory cache data.""" | |
740 | if rev == nullrev: |
|
756 | if rev == nullrev: | |
741 | return |
|
757 | return | |
742 | rbcrevidx = rev * _rbcrecsize |
|
758 | rbcrevidx = rev * _rbcrecsize | |
743 | requiredsize = rbcrevidx + _rbcrecsize |
|
759 | requiredsize = rbcrevidx + _rbcrecsize | |
744 | rbccur = len(self._rbcrevs) |
|
760 | rbccur = len(self._rbcrevs) | |
745 | if rbccur < requiredsize: |
|
761 | if rbccur < requiredsize: | |
746 | # bytearray doesn't allocate extra space at least in Python 3.7. |
|
762 | # bytearray doesn't allocate extra space at least in Python 3.7. | |
747 | # When multiple changesets are added in a row, precise resize would |
|
763 | # When multiple changesets are added in a row, precise resize would | |
748 | # result in quadratic complexity. Overallocate to compensate by |
|
764 | # result in quadratic complexity. Overallocate to compensate by | |
749 | # use the classic doubling technique for dynamic arrays instead. |
|
765 | # use the classic doubling technique for dynamic arrays instead. | |
750 | # If there was a gap in the map before, less space will be reserved. |
|
766 | # If there was a gap in the map before, less space will be reserved. | |
751 | self._rbcrevs.extend(b'\0' * max(_rbcmininc, requiredsize)) |
|
767 | self._rbcrevs.extend(b'\0' * max(_rbcmininc, requiredsize)) | |
752 | pack_into(_rbcrecfmt, self._rbcrevs, rbcrevidx, node, branchidx) |
|
768 | pack_into(_rbcrecfmt, self._rbcrevs, rbcrevidx, node, branchidx) | |
753 | self._rbcrevslen = min(self._rbcrevslen, rev) |
|
769 | self._rbcrevslen = min(self._rbcrevslen, rev) | |
754 |
|
770 | |||
755 | tr = self._repo.currenttransaction() |
|
771 | tr = self._repo.currenttransaction() | |
756 | if tr: |
|
772 | if tr: | |
757 | tr.addfinalize(b'write-revbranchcache', self.write) |
|
773 | tr.addfinalize(b'write-revbranchcache', self.write) | |
758 |
|
774 | |||
759 | def write(self, tr=None): |
|
775 | def write(self, tr=None): | |
760 | """Save branch cache if it is dirty.""" |
|
776 | """Save branch cache if it is dirty.""" | |
761 | repo = self._repo |
|
777 | repo = self._repo | |
762 | wlock = None |
|
778 | wlock = None | |
763 | step = b'' |
|
779 | step = b'' | |
764 | try: |
|
780 | try: | |
765 | # write the new names |
|
781 | # write the new names | |
766 | if self._rbcnamescount < len(self._names): |
|
782 | if self._rbcnamescount < len(self._names): | |
767 | wlock = repo.wlock(wait=False) |
|
783 | wlock = repo.wlock(wait=False) | |
768 | step = b' names' |
|
784 | step = b' names' | |
769 | self._writenames(repo) |
|
785 | self._writenames(repo) | |
770 |
|
786 | |||
771 | # write the new revs |
|
787 | # write the new revs | |
772 | start = self._rbcrevslen * _rbcrecsize |
|
788 | start = self._rbcrevslen * _rbcrecsize | |
773 | if start != len(self._rbcrevs): |
|
789 | if start != len(self._rbcrevs): | |
774 | step = b'' |
|
790 | step = b'' | |
775 | if wlock is None: |
|
791 | if wlock is None: | |
776 | wlock = repo.wlock(wait=False) |
|
792 | wlock = repo.wlock(wait=False) | |
777 | self._writerevs(repo, start) |
|
793 | self._writerevs(repo, start) | |
778 |
|
794 | |||
779 | except (IOError, OSError, error.Abort, error.LockError) as inst: |
|
795 | except (IOError, OSError, error.Abort, error.LockError) as inst: | |
780 | repo.ui.debug( |
|
796 | repo.ui.debug( | |
781 | b"couldn't write revision branch cache%s: %s\n" |
|
797 | b"couldn't write revision branch cache%s: %s\n" | |
782 | % (step, stringutil.forcebytestr(inst)) |
|
798 | % (step, stringutil.forcebytestr(inst)) | |
783 | ) |
|
799 | ) | |
784 | finally: |
|
800 | finally: | |
785 | if wlock is not None: |
|
801 | if wlock is not None: | |
786 | wlock.release() |
|
802 | wlock.release() | |
787 |
|
803 | |||
788 | def _writenames(self, repo): |
|
804 | def _writenames(self, repo): | |
789 | """write the new branch names to revbranchcache""" |
|
805 | """write the new branch names to revbranchcache""" | |
790 | if self._rbcnamescount != 0: |
|
806 | if self._rbcnamescount != 0: | |
791 | f = repo.cachevfs.open(_rbcnames, b'ab') |
|
807 | f = repo.cachevfs.open(_rbcnames, b'ab') | |
792 | if f.tell() == self._rbcsnameslen: |
|
808 | if f.tell() == self._rbcsnameslen: | |
793 | f.write(b'\0') |
|
809 | f.write(b'\0') | |
794 | else: |
|
810 | else: | |
795 | f.close() |
|
811 | f.close() | |
796 | repo.ui.debug(b"%s changed - rewriting it\n" % _rbcnames) |
|
812 | repo.ui.debug(b"%s changed - rewriting it\n" % _rbcnames) | |
797 | self._rbcnamescount = 0 |
|
813 | self._rbcnamescount = 0 | |
798 | self._rbcrevslen = 0 |
|
814 | self._rbcrevslen = 0 | |
799 | if self._rbcnamescount == 0: |
|
815 | if self._rbcnamescount == 0: | |
800 | # before rewriting names, make sure references are removed |
|
816 | # before rewriting names, make sure references are removed | |
801 | repo.cachevfs.unlinkpath(_rbcrevs, ignoremissing=True) |
|
817 | repo.cachevfs.unlinkpath(_rbcrevs, ignoremissing=True) | |
802 | f = repo.cachevfs.open(_rbcnames, b'wb') |
|
818 | f = repo.cachevfs.open(_rbcnames, b'wb') | |
803 | f.write( |
|
819 | f.write( | |
804 | b'\0'.join( |
|
820 | b'\0'.join( | |
805 | encoding.fromlocal(b) |
|
821 | encoding.fromlocal(b) | |
806 | for b in self._names[self._rbcnamescount :] |
|
822 | for b in self._names[self._rbcnamescount :] | |
807 | ) |
|
823 | ) | |
808 | ) |
|
824 | ) | |
809 | self._rbcsnameslen = f.tell() |
|
825 | self._rbcsnameslen = f.tell() | |
810 | f.close() |
|
826 | f.close() | |
811 | self._rbcnamescount = len(self._names) |
|
827 | self._rbcnamescount = len(self._names) | |
812 |
|
828 | |||
813 | def _writerevs(self, repo, start): |
|
829 | def _writerevs(self, repo, start): | |
814 | """write the new revs to revbranchcache""" |
|
830 | """write the new revs to revbranchcache""" | |
815 | revs = min(len(repo.changelog), len(self._rbcrevs) // _rbcrecsize) |
|
831 | revs = min(len(repo.changelog), len(self._rbcrevs) // _rbcrecsize) | |
816 | with repo.cachevfs.open(_rbcrevs, b'ab') as f: |
|
832 | with repo.cachevfs.open(_rbcrevs, b'ab') as f: | |
817 | if f.tell() != start: |
|
833 | if f.tell() != start: | |
818 | repo.ui.debug( |
|
834 | repo.ui.debug( | |
819 | b"truncating cache/%s to %d\n" % (_rbcrevs, start) |
|
835 | b"truncating cache/%s to %d\n" % (_rbcrevs, start) | |
820 | ) |
|
836 | ) | |
821 | f.seek(start) |
|
837 | f.seek(start) | |
822 | if f.tell() != start: |
|
838 | if f.tell() != start: | |
823 | start = 0 |
|
839 | start = 0 | |
824 | f.seek(start) |
|
840 | f.seek(start) | |
825 | f.truncate() |
|
841 | f.truncate() | |
826 | end = revs * _rbcrecsize |
|
842 | end = revs * _rbcrecsize | |
827 | f.write(self._rbcrevs[start:end]) |
|
843 | f.write(self._rbcrevs[start:end]) | |
828 | self._rbcrevslen = revs |
|
844 | self._rbcrevslen = revs |
@@ -1,3897 +1,3899 b'' | |||||
1 | # localrepo.py - read/write repository class for mercurial |
|
1 | # localrepo.py - read/write repository class for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> |
|
3 | # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import errno |
|
10 | import errno | |
11 | import functools |
|
11 | import functools | |
12 | import os |
|
12 | import os | |
13 | import random |
|
13 | import random | |
14 | import sys |
|
14 | import sys | |
15 | import time |
|
15 | import time | |
16 | import weakref |
|
16 | import weakref | |
17 |
|
17 | |||
18 | from .i18n import _ |
|
18 | from .i18n import _ | |
19 | from .node import ( |
|
19 | from .node import ( | |
20 | bin, |
|
20 | bin, | |
21 | hex, |
|
21 | hex, | |
22 | nullrev, |
|
22 | nullrev, | |
23 | sha1nodeconstants, |
|
23 | sha1nodeconstants, | |
24 | short, |
|
24 | short, | |
25 | ) |
|
25 | ) | |
26 | from .pycompat import ( |
|
26 | from .pycompat import ( | |
27 | delattr, |
|
27 | delattr, | |
28 | getattr, |
|
28 | getattr, | |
29 | ) |
|
29 | ) | |
30 | from . import ( |
|
30 | from . import ( | |
31 | bookmarks, |
|
31 | bookmarks, | |
32 | branchmap, |
|
32 | branchmap, | |
33 | bundle2, |
|
33 | bundle2, | |
34 | bundlecaches, |
|
34 | bundlecaches, | |
35 | changegroup, |
|
35 | changegroup, | |
36 | color, |
|
36 | color, | |
37 | commit, |
|
37 | commit, | |
38 | context, |
|
38 | context, | |
39 | dirstate, |
|
39 | dirstate, | |
40 | dirstateguard, |
|
40 | dirstateguard, | |
41 | discovery, |
|
41 | discovery, | |
42 | encoding, |
|
42 | encoding, | |
43 | error, |
|
43 | error, | |
44 | exchange, |
|
44 | exchange, | |
45 | extensions, |
|
45 | extensions, | |
46 | filelog, |
|
46 | filelog, | |
47 | hook, |
|
47 | hook, | |
48 | lock as lockmod, |
|
48 | lock as lockmod, | |
49 | match as matchmod, |
|
49 | match as matchmod, | |
50 | mergestate as mergestatemod, |
|
50 | mergestate as mergestatemod, | |
51 | mergeutil, |
|
51 | mergeutil, | |
52 | namespaces, |
|
52 | namespaces, | |
53 | narrowspec, |
|
53 | narrowspec, | |
54 | obsolete, |
|
54 | obsolete, | |
55 | pathutil, |
|
55 | pathutil, | |
56 | phases, |
|
56 | phases, | |
57 | pushkey, |
|
57 | pushkey, | |
58 | pycompat, |
|
58 | pycompat, | |
59 | rcutil, |
|
59 | rcutil, | |
60 | repoview, |
|
60 | repoview, | |
61 | requirements as requirementsmod, |
|
61 | requirements as requirementsmod, | |
62 | revlog, |
|
62 | revlog, | |
63 | revset, |
|
63 | revset, | |
64 | revsetlang, |
|
64 | revsetlang, | |
65 | scmutil, |
|
65 | scmutil, | |
66 | sparse, |
|
66 | sparse, | |
67 | store as storemod, |
|
67 | store as storemod, | |
68 | subrepoutil, |
|
68 | subrepoutil, | |
69 | tags as tagsmod, |
|
69 | tags as tagsmod, | |
70 | transaction, |
|
70 | transaction, | |
71 | txnutil, |
|
71 | txnutil, | |
72 | util, |
|
72 | util, | |
73 | vfs as vfsmod, |
|
73 | vfs as vfsmod, | |
74 | wireprototypes, |
|
74 | wireprototypes, | |
75 | ) |
|
75 | ) | |
76 |
|
76 | |||
77 | from .interfaces import ( |
|
77 | from .interfaces import ( | |
78 | repository, |
|
78 | repository, | |
79 | util as interfaceutil, |
|
79 | util as interfaceutil, | |
80 | ) |
|
80 | ) | |
81 |
|
81 | |||
82 | from .utils import ( |
|
82 | from .utils import ( | |
83 | hashutil, |
|
83 | hashutil, | |
84 | procutil, |
|
84 | procutil, | |
85 | stringutil, |
|
85 | stringutil, | |
86 | urlutil, |
|
86 | urlutil, | |
87 | ) |
|
87 | ) | |
88 |
|
88 | |||
89 | from .revlogutils import ( |
|
89 | from .revlogutils import ( | |
90 | concurrency_checker as revlogchecker, |
|
90 | concurrency_checker as revlogchecker, | |
91 | constants as revlogconst, |
|
91 | constants as revlogconst, | |
92 | sidedata as sidedatamod, |
|
92 | sidedata as sidedatamod, | |
93 | ) |
|
93 | ) | |
94 |
|
94 | |||
95 | release = lockmod.release |
|
95 | release = lockmod.release | |
96 | urlerr = util.urlerr |
|
96 | urlerr = util.urlerr | |
97 | urlreq = util.urlreq |
|
97 | urlreq = util.urlreq | |
98 |
|
98 | |||
99 | # set of (path, vfs-location) tuples. vfs-location is: |
|
99 | # set of (path, vfs-location) tuples. vfs-location is: | |
100 | # - 'plain for vfs relative paths |
|
100 | # - 'plain for vfs relative paths | |
101 | # - '' for svfs relative paths |
|
101 | # - '' for svfs relative paths | |
102 | _cachedfiles = set() |
|
102 | _cachedfiles = set() | |
103 |
|
103 | |||
104 |
|
104 | |||
105 | class _basefilecache(scmutil.filecache): |
|
105 | class _basefilecache(scmutil.filecache): | |
106 | """All filecache usage on repo are done for logic that should be unfiltered""" |
|
106 | """All filecache usage on repo are done for logic that should be unfiltered""" | |
107 |
|
107 | |||
108 | def __get__(self, repo, type=None): |
|
108 | def __get__(self, repo, type=None): | |
109 | if repo is None: |
|
109 | if repo is None: | |
110 | return self |
|
110 | return self | |
111 | # proxy to unfiltered __dict__ since filtered repo has no entry |
|
111 | # proxy to unfiltered __dict__ since filtered repo has no entry | |
112 | unfi = repo.unfiltered() |
|
112 | unfi = repo.unfiltered() | |
113 | try: |
|
113 | try: | |
114 | return unfi.__dict__[self.sname] |
|
114 | return unfi.__dict__[self.sname] | |
115 | except KeyError: |
|
115 | except KeyError: | |
116 | pass |
|
116 | pass | |
117 | return super(_basefilecache, self).__get__(unfi, type) |
|
117 | return super(_basefilecache, self).__get__(unfi, type) | |
118 |
|
118 | |||
119 | def set(self, repo, value): |
|
119 | def set(self, repo, value): | |
120 | return super(_basefilecache, self).set(repo.unfiltered(), value) |
|
120 | return super(_basefilecache, self).set(repo.unfiltered(), value) | |
121 |
|
121 | |||
122 |
|
122 | |||
123 | class repofilecache(_basefilecache): |
|
123 | class repofilecache(_basefilecache): | |
124 | """filecache for files in .hg but outside of .hg/store""" |
|
124 | """filecache for files in .hg but outside of .hg/store""" | |
125 |
|
125 | |||
126 | def __init__(self, *paths): |
|
126 | def __init__(self, *paths): | |
127 | super(repofilecache, self).__init__(*paths) |
|
127 | super(repofilecache, self).__init__(*paths) | |
128 | for path in paths: |
|
128 | for path in paths: | |
129 | _cachedfiles.add((path, b'plain')) |
|
129 | _cachedfiles.add((path, b'plain')) | |
130 |
|
130 | |||
131 | def join(self, obj, fname): |
|
131 | def join(self, obj, fname): | |
132 | return obj.vfs.join(fname) |
|
132 | return obj.vfs.join(fname) | |
133 |
|
133 | |||
134 |
|
134 | |||
135 | class storecache(_basefilecache): |
|
135 | class storecache(_basefilecache): | |
136 | """filecache for files in the store""" |
|
136 | """filecache for files in the store""" | |
137 |
|
137 | |||
138 | def __init__(self, *paths): |
|
138 | def __init__(self, *paths): | |
139 | super(storecache, self).__init__(*paths) |
|
139 | super(storecache, self).__init__(*paths) | |
140 | for path in paths: |
|
140 | for path in paths: | |
141 | _cachedfiles.add((path, b'')) |
|
141 | _cachedfiles.add((path, b'')) | |
142 |
|
142 | |||
143 | def join(self, obj, fname): |
|
143 | def join(self, obj, fname): | |
144 | return obj.sjoin(fname) |
|
144 | return obj.sjoin(fname) | |
145 |
|
145 | |||
146 |
|
146 | |||
147 | class changelogcache(storecache): |
|
147 | class changelogcache(storecache): | |
148 | """filecache for the changelog""" |
|
148 | """filecache for the changelog""" | |
149 |
|
149 | |||
150 | def __init__(self): |
|
150 | def __init__(self): | |
151 | super(changelogcache, self).__init__() |
|
151 | super(changelogcache, self).__init__() | |
152 | _cachedfiles.add((b'00changelog.i', b'')) |
|
152 | _cachedfiles.add((b'00changelog.i', b'')) | |
153 | _cachedfiles.add((b'00changelog.n', b'')) |
|
153 | _cachedfiles.add((b'00changelog.n', b'')) | |
154 |
|
154 | |||
155 | def tracked_paths(self, obj): |
|
155 | def tracked_paths(self, obj): | |
156 | paths = [self.join(obj, b'00changelog.i')] |
|
156 | paths = [self.join(obj, b'00changelog.i')] | |
157 | if obj.store.opener.options.get(b'persistent-nodemap', False): |
|
157 | if obj.store.opener.options.get(b'persistent-nodemap', False): | |
158 | paths.append(self.join(obj, b'00changelog.n')) |
|
158 | paths.append(self.join(obj, b'00changelog.n')) | |
159 | return paths |
|
159 | return paths | |
160 |
|
160 | |||
161 |
|
161 | |||
162 | class manifestlogcache(storecache): |
|
162 | class manifestlogcache(storecache): | |
163 | """filecache for the manifestlog""" |
|
163 | """filecache for the manifestlog""" | |
164 |
|
164 | |||
165 | def __init__(self): |
|
165 | def __init__(self): | |
166 | super(manifestlogcache, self).__init__() |
|
166 | super(manifestlogcache, self).__init__() | |
167 | _cachedfiles.add((b'00manifest.i', b'')) |
|
167 | _cachedfiles.add((b'00manifest.i', b'')) | |
168 | _cachedfiles.add((b'00manifest.n', b'')) |
|
168 | _cachedfiles.add((b'00manifest.n', b'')) | |
169 |
|
169 | |||
170 | def tracked_paths(self, obj): |
|
170 | def tracked_paths(self, obj): | |
171 | paths = [self.join(obj, b'00manifest.i')] |
|
171 | paths = [self.join(obj, b'00manifest.i')] | |
172 | if obj.store.opener.options.get(b'persistent-nodemap', False): |
|
172 | if obj.store.opener.options.get(b'persistent-nodemap', False): | |
173 | paths.append(self.join(obj, b'00manifest.n')) |
|
173 | paths.append(self.join(obj, b'00manifest.n')) | |
174 | return paths |
|
174 | return paths | |
175 |
|
175 | |||
176 |
|
176 | |||
177 | class mixedrepostorecache(_basefilecache): |
|
177 | class mixedrepostorecache(_basefilecache): | |
178 | """filecache for a mix files in .hg/store and outside""" |
|
178 | """filecache for a mix files in .hg/store and outside""" | |
179 |
|
179 | |||
180 | def __init__(self, *pathsandlocations): |
|
180 | def __init__(self, *pathsandlocations): | |
181 | # scmutil.filecache only uses the path for passing back into our |
|
181 | # scmutil.filecache only uses the path for passing back into our | |
182 | # join(), so we can safely pass a list of paths and locations |
|
182 | # join(), so we can safely pass a list of paths and locations | |
183 | super(mixedrepostorecache, self).__init__(*pathsandlocations) |
|
183 | super(mixedrepostorecache, self).__init__(*pathsandlocations) | |
184 | _cachedfiles.update(pathsandlocations) |
|
184 | _cachedfiles.update(pathsandlocations) | |
185 |
|
185 | |||
186 | def join(self, obj, fnameandlocation): |
|
186 | def join(self, obj, fnameandlocation): | |
187 | fname, location = fnameandlocation |
|
187 | fname, location = fnameandlocation | |
188 | if location == b'plain': |
|
188 | if location == b'plain': | |
189 | return obj.vfs.join(fname) |
|
189 | return obj.vfs.join(fname) | |
190 | else: |
|
190 | else: | |
191 | if location != b'': |
|
191 | if location != b'': | |
192 | raise error.ProgrammingError( |
|
192 | raise error.ProgrammingError( | |
193 | b'unexpected location: %s' % location |
|
193 | b'unexpected location: %s' % location | |
194 | ) |
|
194 | ) | |
195 | return obj.sjoin(fname) |
|
195 | return obj.sjoin(fname) | |
196 |
|
196 | |||
197 |
|
197 | |||
198 | def isfilecached(repo, name): |
|
198 | def isfilecached(repo, name): | |
199 | """check if a repo has already cached "name" filecache-ed property |
|
199 | """check if a repo has already cached "name" filecache-ed property | |
200 |
|
200 | |||
201 | This returns (cachedobj-or-None, iscached) tuple. |
|
201 | This returns (cachedobj-or-None, iscached) tuple. | |
202 | """ |
|
202 | """ | |
203 | cacheentry = repo.unfiltered()._filecache.get(name, None) |
|
203 | cacheentry = repo.unfiltered()._filecache.get(name, None) | |
204 | if not cacheentry: |
|
204 | if not cacheentry: | |
205 | return None, False |
|
205 | return None, False | |
206 | return cacheentry.obj, True |
|
206 | return cacheentry.obj, True | |
207 |
|
207 | |||
208 |
|
208 | |||
209 | class unfilteredpropertycache(util.propertycache): |
|
209 | class unfilteredpropertycache(util.propertycache): | |
210 | """propertycache that apply to unfiltered repo only""" |
|
210 | """propertycache that apply to unfiltered repo only""" | |
211 |
|
211 | |||
212 | def __get__(self, repo, type=None): |
|
212 | def __get__(self, repo, type=None): | |
213 | unfi = repo.unfiltered() |
|
213 | unfi = repo.unfiltered() | |
214 | if unfi is repo: |
|
214 | if unfi is repo: | |
215 | return super(unfilteredpropertycache, self).__get__(unfi) |
|
215 | return super(unfilteredpropertycache, self).__get__(unfi) | |
216 | return getattr(unfi, self.name) |
|
216 | return getattr(unfi, self.name) | |
217 |
|
217 | |||
218 |
|
218 | |||
219 | class filteredpropertycache(util.propertycache): |
|
219 | class filteredpropertycache(util.propertycache): | |
220 | """propertycache that must take filtering in account""" |
|
220 | """propertycache that must take filtering in account""" | |
221 |
|
221 | |||
222 | def cachevalue(self, obj, value): |
|
222 | def cachevalue(self, obj, value): | |
223 | object.__setattr__(obj, self.name, value) |
|
223 | object.__setattr__(obj, self.name, value) | |
224 |
|
224 | |||
225 |
|
225 | |||
226 | def hasunfilteredcache(repo, name): |
|
226 | def hasunfilteredcache(repo, name): | |
227 | """check if a repo has an unfilteredpropertycache value for <name>""" |
|
227 | """check if a repo has an unfilteredpropertycache value for <name>""" | |
228 | return name in vars(repo.unfiltered()) |
|
228 | return name in vars(repo.unfiltered()) | |
229 |
|
229 | |||
230 |
|
230 | |||
231 | def unfilteredmethod(orig): |
|
231 | def unfilteredmethod(orig): | |
232 | """decorate method that always need to be run on unfiltered version""" |
|
232 | """decorate method that always need to be run on unfiltered version""" | |
233 |
|
233 | |||
234 | @functools.wraps(orig) |
|
234 | @functools.wraps(orig) | |
235 | def wrapper(repo, *args, **kwargs): |
|
235 | def wrapper(repo, *args, **kwargs): | |
236 | return orig(repo.unfiltered(), *args, **kwargs) |
|
236 | return orig(repo.unfiltered(), *args, **kwargs) | |
237 |
|
237 | |||
238 | return wrapper |
|
238 | return wrapper | |
239 |
|
239 | |||
240 |
|
240 | |||
241 | moderncaps = { |
|
241 | moderncaps = { | |
242 | b'lookup', |
|
242 | b'lookup', | |
243 | b'branchmap', |
|
243 | b'branchmap', | |
244 | b'pushkey', |
|
244 | b'pushkey', | |
245 | b'known', |
|
245 | b'known', | |
246 | b'getbundle', |
|
246 | b'getbundle', | |
247 | b'unbundle', |
|
247 | b'unbundle', | |
248 | } |
|
248 | } | |
249 | legacycaps = moderncaps.union({b'changegroupsubset'}) |
|
249 | legacycaps = moderncaps.union({b'changegroupsubset'}) | |
250 |
|
250 | |||
251 |
|
251 | |||
252 | @interfaceutil.implementer(repository.ipeercommandexecutor) |
|
252 | @interfaceutil.implementer(repository.ipeercommandexecutor) | |
253 | class localcommandexecutor(object): |
|
253 | class localcommandexecutor(object): | |
254 | def __init__(self, peer): |
|
254 | def __init__(self, peer): | |
255 | self._peer = peer |
|
255 | self._peer = peer | |
256 | self._sent = False |
|
256 | self._sent = False | |
257 | self._closed = False |
|
257 | self._closed = False | |
258 |
|
258 | |||
259 | def __enter__(self): |
|
259 | def __enter__(self): | |
260 | return self |
|
260 | return self | |
261 |
|
261 | |||
262 | def __exit__(self, exctype, excvalue, exctb): |
|
262 | def __exit__(self, exctype, excvalue, exctb): | |
263 | self.close() |
|
263 | self.close() | |
264 |
|
264 | |||
265 | def callcommand(self, command, args): |
|
265 | def callcommand(self, command, args): | |
266 | if self._sent: |
|
266 | if self._sent: | |
267 | raise error.ProgrammingError( |
|
267 | raise error.ProgrammingError( | |
268 | b'callcommand() cannot be used after sendcommands()' |
|
268 | b'callcommand() cannot be used after sendcommands()' | |
269 | ) |
|
269 | ) | |
270 |
|
270 | |||
271 | if self._closed: |
|
271 | if self._closed: | |
272 | raise error.ProgrammingError( |
|
272 | raise error.ProgrammingError( | |
273 | b'callcommand() cannot be used after close()' |
|
273 | b'callcommand() cannot be used after close()' | |
274 | ) |
|
274 | ) | |
275 |
|
275 | |||
276 | # We don't need to support anything fancy. Just call the named |
|
276 | # We don't need to support anything fancy. Just call the named | |
277 | # method on the peer and return a resolved future. |
|
277 | # method on the peer and return a resolved future. | |
278 | fn = getattr(self._peer, pycompat.sysstr(command)) |
|
278 | fn = getattr(self._peer, pycompat.sysstr(command)) | |
279 |
|
279 | |||
280 | f = pycompat.futures.Future() |
|
280 | f = pycompat.futures.Future() | |
281 |
|
281 | |||
282 | try: |
|
282 | try: | |
283 | result = fn(**pycompat.strkwargs(args)) |
|
283 | result = fn(**pycompat.strkwargs(args)) | |
284 | except Exception: |
|
284 | except Exception: | |
285 | pycompat.future_set_exception_info(f, sys.exc_info()[1:]) |
|
285 | pycompat.future_set_exception_info(f, sys.exc_info()[1:]) | |
286 | else: |
|
286 | else: | |
287 | f.set_result(result) |
|
287 | f.set_result(result) | |
288 |
|
288 | |||
289 | return f |
|
289 | return f | |
290 |
|
290 | |||
291 | def sendcommands(self): |
|
291 | def sendcommands(self): | |
292 | self._sent = True |
|
292 | self._sent = True | |
293 |
|
293 | |||
294 | def close(self): |
|
294 | def close(self): | |
295 | self._closed = True |
|
295 | self._closed = True | |
296 |
|
296 | |||
297 |
|
297 | |||
298 | @interfaceutil.implementer(repository.ipeercommands) |
|
298 | @interfaceutil.implementer(repository.ipeercommands) | |
299 | class localpeer(repository.peer): |
|
299 | class localpeer(repository.peer): | |
300 | '''peer for a local repo; reflects only the most recent API''' |
|
300 | '''peer for a local repo; reflects only the most recent API''' | |
301 |
|
301 | |||
302 | def __init__(self, repo, caps=None): |
|
302 | def __init__(self, repo, caps=None): | |
303 | super(localpeer, self).__init__() |
|
303 | super(localpeer, self).__init__() | |
304 |
|
304 | |||
305 | if caps is None: |
|
305 | if caps is None: | |
306 | caps = moderncaps.copy() |
|
306 | caps = moderncaps.copy() | |
307 | self._repo = repo.filtered(b'served') |
|
307 | self._repo = repo.filtered(b'served') | |
308 | self.ui = repo.ui |
|
308 | self.ui = repo.ui | |
309 |
|
309 | |||
310 | if repo._wanted_sidedata: |
|
310 | if repo._wanted_sidedata: | |
311 | formatted = bundle2.format_remote_wanted_sidedata(repo) |
|
311 | formatted = bundle2.format_remote_wanted_sidedata(repo) | |
312 | caps.add(b'exp-wanted-sidedata=' + formatted) |
|
312 | caps.add(b'exp-wanted-sidedata=' + formatted) | |
313 |
|
313 | |||
314 | self._caps = repo._restrictcapabilities(caps) |
|
314 | self._caps = repo._restrictcapabilities(caps) | |
315 |
|
315 | |||
316 | # Begin of _basepeer interface. |
|
316 | # Begin of _basepeer interface. | |
317 |
|
317 | |||
318 | def url(self): |
|
318 | def url(self): | |
319 | return self._repo.url() |
|
319 | return self._repo.url() | |
320 |
|
320 | |||
321 | def local(self): |
|
321 | def local(self): | |
322 | return self._repo |
|
322 | return self._repo | |
323 |
|
323 | |||
324 | def peer(self): |
|
324 | def peer(self): | |
325 | return self |
|
325 | return self | |
326 |
|
326 | |||
327 | def canpush(self): |
|
327 | def canpush(self): | |
328 | return True |
|
328 | return True | |
329 |
|
329 | |||
330 | def close(self): |
|
330 | def close(self): | |
331 | self._repo.close() |
|
331 | self._repo.close() | |
332 |
|
332 | |||
333 | # End of _basepeer interface. |
|
333 | # End of _basepeer interface. | |
334 |
|
334 | |||
335 | # Begin of _basewirecommands interface. |
|
335 | # Begin of _basewirecommands interface. | |
336 |
|
336 | |||
337 | def branchmap(self): |
|
337 | def branchmap(self): | |
338 | return self._repo.branchmap() |
|
338 | return self._repo.branchmap() | |
339 |
|
339 | |||
340 | def capabilities(self): |
|
340 | def capabilities(self): | |
341 | return self._caps |
|
341 | return self._caps | |
342 |
|
342 | |||
343 | def clonebundles(self): |
|
343 | def clonebundles(self): | |
344 | return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE) |
|
344 | return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE) | |
345 |
|
345 | |||
346 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
346 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
347 | """Used to test argument passing over the wire""" |
|
347 | """Used to test argument passing over the wire""" | |
348 | return b"%s %s %s %s %s" % ( |
|
348 | return b"%s %s %s %s %s" % ( | |
349 | one, |
|
349 | one, | |
350 | two, |
|
350 | two, | |
351 | pycompat.bytestr(three), |
|
351 | pycompat.bytestr(three), | |
352 | pycompat.bytestr(four), |
|
352 | pycompat.bytestr(four), | |
353 | pycompat.bytestr(five), |
|
353 | pycompat.bytestr(five), | |
354 | ) |
|
354 | ) | |
355 |
|
355 | |||
356 | def getbundle( |
|
356 | def getbundle( | |
357 | self, |
|
357 | self, | |
358 | source, |
|
358 | source, | |
359 | heads=None, |
|
359 | heads=None, | |
360 | common=None, |
|
360 | common=None, | |
361 | bundlecaps=None, |
|
361 | bundlecaps=None, | |
362 | remote_sidedata=None, |
|
362 | remote_sidedata=None, | |
363 | **kwargs |
|
363 | **kwargs | |
364 | ): |
|
364 | ): | |
365 | chunks = exchange.getbundlechunks( |
|
365 | chunks = exchange.getbundlechunks( | |
366 | self._repo, |
|
366 | self._repo, | |
367 | source, |
|
367 | source, | |
368 | heads=heads, |
|
368 | heads=heads, | |
369 | common=common, |
|
369 | common=common, | |
370 | bundlecaps=bundlecaps, |
|
370 | bundlecaps=bundlecaps, | |
371 | remote_sidedata=remote_sidedata, |
|
371 | remote_sidedata=remote_sidedata, | |
372 | **kwargs |
|
372 | **kwargs | |
373 | )[1] |
|
373 | )[1] | |
374 | cb = util.chunkbuffer(chunks) |
|
374 | cb = util.chunkbuffer(chunks) | |
375 |
|
375 | |||
376 | if exchange.bundle2requested(bundlecaps): |
|
376 | if exchange.bundle2requested(bundlecaps): | |
377 | # When requesting a bundle2, getbundle returns a stream to make the |
|
377 | # When requesting a bundle2, getbundle returns a stream to make the | |
378 | # wire level function happier. We need to build a proper object |
|
378 | # wire level function happier. We need to build a proper object | |
379 | # from it in local peer. |
|
379 | # from it in local peer. | |
380 | return bundle2.getunbundler(self.ui, cb) |
|
380 | return bundle2.getunbundler(self.ui, cb) | |
381 | else: |
|
381 | else: | |
382 | return changegroup.getunbundler(b'01', cb, None) |
|
382 | return changegroup.getunbundler(b'01', cb, None) | |
383 |
|
383 | |||
384 | def heads(self): |
|
384 | def heads(self): | |
385 | return self._repo.heads() |
|
385 | return self._repo.heads() | |
386 |
|
386 | |||
387 | def known(self, nodes): |
|
387 | def known(self, nodes): | |
388 | return self._repo.known(nodes) |
|
388 | return self._repo.known(nodes) | |
389 |
|
389 | |||
390 | def listkeys(self, namespace): |
|
390 | def listkeys(self, namespace): | |
391 | return self._repo.listkeys(namespace) |
|
391 | return self._repo.listkeys(namespace) | |
392 |
|
392 | |||
393 | def lookup(self, key): |
|
393 | def lookup(self, key): | |
394 | return self._repo.lookup(key) |
|
394 | return self._repo.lookup(key) | |
395 |
|
395 | |||
396 | def pushkey(self, namespace, key, old, new): |
|
396 | def pushkey(self, namespace, key, old, new): | |
397 | return self._repo.pushkey(namespace, key, old, new) |
|
397 | return self._repo.pushkey(namespace, key, old, new) | |
398 |
|
398 | |||
399 | def stream_out(self): |
|
399 | def stream_out(self): | |
400 | raise error.Abort(_(b'cannot perform stream clone against local peer')) |
|
400 | raise error.Abort(_(b'cannot perform stream clone against local peer')) | |
401 |
|
401 | |||
402 | def unbundle(self, bundle, heads, url): |
|
402 | def unbundle(self, bundle, heads, url): | |
403 | """apply a bundle on a repo |
|
403 | """apply a bundle on a repo | |
404 |
|
404 | |||
405 | This function handles the repo locking itself.""" |
|
405 | This function handles the repo locking itself.""" | |
406 | try: |
|
406 | try: | |
407 | try: |
|
407 | try: | |
408 | bundle = exchange.readbundle(self.ui, bundle, None) |
|
408 | bundle = exchange.readbundle(self.ui, bundle, None) | |
409 | ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) |
|
409 | ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) | |
410 | if util.safehasattr(ret, b'getchunks'): |
|
410 | if util.safehasattr(ret, b'getchunks'): | |
411 | # This is a bundle20 object, turn it into an unbundler. |
|
411 | # This is a bundle20 object, turn it into an unbundler. | |
412 | # This little dance should be dropped eventually when the |
|
412 | # This little dance should be dropped eventually when the | |
413 | # API is finally improved. |
|
413 | # API is finally improved. | |
414 | stream = util.chunkbuffer(ret.getchunks()) |
|
414 | stream = util.chunkbuffer(ret.getchunks()) | |
415 | ret = bundle2.getunbundler(self.ui, stream) |
|
415 | ret = bundle2.getunbundler(self.ui, stream) | |
416 | return ret |
|
416 | return ret | |
417 | except Exception as exc: |
|
417 | except Exception as exc: | |
418 | # If the exception contains output salvaged from a bundle2 |
|
418 | # If the exception contains output salvaged from a bundle2 | |
419 | # reply, we need to make sure it is printed before continuing |
|
419 | # reply, we need to make sure it is printed before continuing | |
420 | # to fail. So we build a bundle2 with such output and consume |
|
420 | # to fail. So we build a bundle2 with such output and consume | |
421 | # it directly. |
|
421 | # it directly. | |
422 | # |
|
422 | # | |
423 | # This is not very elegant but allows a "simple" solution for |
|
423 | # This is not very elegant but allows a "simple" solution for | |
424 | # issue4594 |
|
424 | # issue4594 | |
425 | output = getattr(exc, '_bundle2salvagedoutput', ()) |
|
425 | output = getattr(exc, '_bundle2salvagedoutput', ()) | |
426 | if output: |
|
426 | if output: | |
427 | bundler = bundle2.bundle20(self._repo.ui) |
|
427 | bundler = bundle2.bundle20(self._repo.ui) | |
428 | for out in output: |
|
428 | for out in output: | |
429 | bundler.addpart(out) |
|
429 | bundler.addpart(out) | |
430 | stream = util.chunkbuffer(bundler.getchunks()) |
|
430 | stream = util.chunkbuffer(bundler.getchunks()) | |
431 | b = bundle2.getunbundler(self.ui, stream) |
|
431 | b = bundle2.getunbundler(self.ui, stream) | |
432 | bundle2.processbundle(self._repo, b) |
|
432 | bundle2.processbundle(self._repo, b) | |
433 | raise |
|
433 | raise | |
434 | except error.PushRaced as exc: |
|
434 | except error.PushRaced as exc: | |
435 | raise error.ResponseError( |
|
435 | raise error.ResponseError( | |
436 | _(b'push failed:'), stringutil.forcebytestr(exc) |
|
436 | _(b'push failed:'), stringutil.forcebytestr(exc) | |
437 | ) |
|
437 | ) | |
438 |
|
438 | |||
439 | # End of _basewirecommands interface. |
|
439 | # End of _basewirecommands interface. | |
440 |
|
440 | |||
441 | # Begin of peer interface. |
|
441 | # Begin of peer interface. | |
442 |
|
442 | |||
443 | def commandexecutor(self): |
|
443 | def commandexecutor(self): | |
444 | return localcommandexecutor(self) |
|
444 | return localcommandexecutor(self) | |
445 |
|
445 | |||
446 | # End of peer interface. |
|
446 | # End of peer interface. | |
447 |
|
447 | |||
448 |
|
448 | |||
449 | @interfaceutil.implementer(repository.ipeerlegacycommands) |
|
449 | @interfaceutil.implementer(repository.ipeerlegacycommands) | |
450 | class locallegacypeer(localpeer): |
|
450 | class locallegacypeer(localpeer): | |
451 | """peer extension which implements legacy methods too; used for tests with |
|
451 | """peer extension which implements legacy methods too; used for tests with | |
452 | restricted capabilities""" |
|
452 | restricted capabilities""" | |
453 |
|
453 | |||
454 | def __init__(self, repo): |
|
454 | def __init__(self, repo): | |
455 | super(locallegacypeer, self).__init__(repo, caps=legacycaps) |
|
455 | super(locallegacypeer, self).__init__(repo, caps=legacycaps) | |
456 |
|
456 | |||
457 | # Begin of baselegacywirecommands interface. |
|
457 | # Begin of baselegacywirecommands interface. | |
458 |
|
458 | |||
459 | def between(self, pairs): |
|
459 | def between(self, pairs): | |
460 | return self._repo.between(pairs) |
|
460 | return self._repo.between(pairs) | |
461 |
|
461 | |||
462 | def branches(self, nodes): |
|
462 | def branches(self, nodes): | |
463 | return self._repo.branches(nodes) |
|
463 | return self._repo.branches(nodes) | |
464 |
|
464 | |||
465 | def changegroup(self, nodes, source): |
|
465 | def changegroup(self, nodes, source): | |
466 | outgoing = discovery.outgoing( |
|
466 | outgoing = discovery.outgoing( | |
467 | self._repo, missingroots=nodes, ancestorsof=self._repo.heads() |
|
467 | self._repo, missingroots=nodes, ancestorsof=self._repo.heads() | |
468 | ) |
|
468 | ) | |
469 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
469 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) | |
470 |
|
470 | |||
471 | def changegroupsubset(self, bases, heads, source): |
|
471 | def changegroupsubset(self, bases, heads, source): | |
472 | outgoing = discovery.outgoing( |
|
472 | outgoing = discovery.outgoing( | |
473 | self._repo, missingroots=bases, ancestorsof=heads |
|
473 | self._repo, missingroots=bases, ancestorsof=heads | |
474 | ) |
|
474 | ) | |
475 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
475 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) | |
476 |
|
476 | |||
477 | # End of baselegacywirecommands interface. |
|
477 | # End of baselegacywirecommands interface. | |
478 |
|
478 | |||
479 |
|
479 | |||
480 | # Functions receiving (ui, features) that extensions can register to impact |
|
480 | # Functions receiving (ui, features) that extensions can register to impact | |
481 | # the ability to load repositories with custom requirements. Only |
|
481 | # the ability to load repositories with custom requirements. Only | |
482 | # functions defined in loaded extensions are called. |
|
482 | # functions defined in loaded extensions are called. | |
483 | # |
|
483 | # | |
484 | # The function receives a set of requirement strings that the repository |
|
484 | # The function receives a set of requirement strings that the repository | |
485 | # is capable of opening. Functions will typically add elements to the |
|
485 | # is capable of opening. Functions will typically add elements to the | |
486 | # set to reflect that the extension knows how to handle that requirements. |
|
486 | # set to reflect that the extension knows how to handle that requirements. | |
487 | featuresetupfuncs = set() |
|
487 | featuresetupfuncs = set() | |
488 |
|
488 | |||
489 |
|
489 | |||
490 | def _getsharedvfs(hgvfs, requirements): |
|
490 | def _getsharedvfs(hgvfs, requirements): | |
491 | """returns the vfs object pointing to root of shared source |
|
491 | """returns the vfs object pointing to root of shared source | |
492 | repo for a shared repository |
|
492 | repo for a shared repository | |
493 |
|
493 | |||
494 | hgvfs is vfs pointing at .hg/ of current repo (shared one) |
|
494 | hgvfs is vfs pointing at .hg/ of current repo (shared one) | |
495 | requirements is a set of requirements of current repo (shared one) |
|
495 | requirements is a set of requirements of current repo (shared one) | |
496 | """ |
|
496 | """ | |
497 | # The ``shared`` or ``relshared`` requirements indicate the |
|
497 | # The ``shared`` or ``relshared`` requirements indicate the | |
498 | # store lives in the path contained in the ``.hg/sharedpath`` file. |
|
498 | # store lives in the path contained in the ``.hg/sharedpath`` file. | |
499 | # This is an absolute path for ``shared`` and relative to |
|
499 | # This is an absolute path for ``shared`` and relative to | |
500 | # ``.hg/`` for ``relshared``. |
|
500 | # ``.hg/`` for ``relshared``. | |
501 | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') |
|
501 | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') | |
502 | if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements: |
|
502 | if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements: | |
503 | sharedpath = util.normpath(hgvfs.join(sharedpath)) |
|
503 | sharedpath = util.normpath(hgvfs.join(sharedpath)) | |
504 |
|
504 | |||
505 | sharedvfs = vfsmod.vfs(sharedpath, realpath=True) |
|
505 | sharedvfs = vfsmod.vfs(sharedpath, realpath=True) | |
506 |
|
506 | |||
507 | if not sharedvfs.exists(): |
|
507 | if not sharedvfs.exists(): | |
508 | raise error.RepoError( |
|
508 | raise error.RepoError( | |
509 | _(b'.hg/sharedpath points to nonexistent directory %s') |
|
509 | _(b'.hg/sharedpath points to nonexistent directory %s') | |
510 | % sharedvfs.base |
|
510 | % sharedvfs.base | |
511 | ) |
|
511 | ) | |
512 | return sharedvfs |
|
512 | return sharedvfs | |
513 |
|
513 | |||
514 |
|
514 | |||
515 | def _readrequires(vfs, allowmissing): |
|
515 | def _readrequires(vfs, allowmissing): | |
516 | """reads the require file present at root of this vfs |
|
516 | """reads the require file present at root of this vfs | |
517 | and return a set of requirements |
|
517 | and return a set of requirements | |
518 |
|
518 | |||
519 | If allowmissing is True, we suppress ENOENT if raised""" |
|
519 | If allowmissing is True, we suppress ENOENT if raised""" | |
520 | # requires file contains a newline-delimited list of |
|
520 | # requires file contains a newline-delimited list of | |
521 | # features/capabilities the opener (us) must have in order to use |
|
521 | # features/capabilities the opener (us) must have in order to use | |
522 | # the repository. This file was introduced in Mercurial 0.9.2, |
|
522 | # the repository. This file was introduced in Mercurial 0.9.2, | |
523 | # which means very old repositories may not have one. We assume |
|
523 | # which means very old repositories may not have one. We assume | |
524 | # a missing file translates to no requirements. |
|
524 | # a missing file translates to no requirements. | |
525 | try: |
|
525 | try: | |
526 | requirements = set(vfs.read(b'requires').splitlines()) |
|
526 | requirements = set(vfs.read(b'requires').splitlines()) | |
527 | except IOError as e: |
|
527 | except IOError as e: | |
528 | if not (allowmissing and e.errno == errno.ENOENT): |
|
528 | if not (allowmissing and e.errno == errno.ENOENT): | |
529 | raise |
|
529 | raise | |
530 | requirements = set() |
|
530 | requirements = set() | |
531 | return requirements |
|
531 | return requirements | |
532 |
|
532 | |||
533 |
|
533 | |||
534 | def makelocalrepository(baseui, path, intents=None): |
|
534 | def makelocalrepository(baseui, path, intents=None): | |
535 | """Create a local repository object. |
|
535 | """Create a local repository object. | |
536 |
|
536 | |||
537 | Given arguments needed to construct a local repository, this function |
|
537 | Given arguments needed to construct a local repository, this function | |
538 | performs various early repository loading functionality (such as |
|
538 | performs various early repository loading functionality (such as | |
539 | reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that |
|
539 | reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that | |
540 | the repository can be opened, derives a type suitable for representing |
|
540 | the repository can be opened, derives a type suitable for representing | |
541 | that repository, and returns an instance of it. |
|
541 | that repository, and returns an instance of it. | |
542 |
|
542 | |||
543 | The returned object conforms to the ``repository.completelocalrepository`` |
|
543 | The returned object conforms to the ``repository.completelocalrepository`` | |
544 | interface. |
|
544 | interface. | |
545 |
|
545 | |||
546 | The repository type is derived by calling a series of factory functions |
|
546 | The repository type is derived by calling a series of factory functions | |
547 | for each aspect/interface of the final repository. These are defined by |
|
547 | for each aspect/interface of the final repository. These are defined by | |
548 | ``REPO_INTERFACES``. |
|
548 | ``REPO_INTERFACES``. | |
549 |
|
549 | |||
550 | Each factory function is called to produce a type implementing a specific |
|
550 | Each factory function is called to produce a type implementing a specific | |
551 | interface. The cumulative list of returned types will be combined into a |
|
551 | interface. The cumulative list of returned types will be combined into a | |
552 | new type and that type will be instantiated to represent the local |
|
552 | new type and that type will be instantiated to represent the local | |
553 | repository. |
|
553 | repository. | |
554 |
|
554 | |||
555 | The factory functions each receive various state that may be consulted |
|
555 | The factory functions each receive various state that may be consulted | |
556 | as part of deriving a type. |
|
556 | as part of deriving a type. | |
557 |
|
557 | |||
558 | Extensions should wrap these factory functions to customize repository type |
|
558 | Extensions should wrap these factory functions to customize repository type | |
559 | creation. Note that an extension's wrapped function may be called even if |
|
559 | creation. Note that an extension's wrapped function may be called even if | |
560 | that extension is not loaded for the repo being constructed. Extensions |
|
560 | that extension is not loaded for the repo being constructed. Extensions | |
561 | should check if their ``__name__`` appears in the |
|
561 | should check if their ``__name__`` appears in the | |
562 | ``extensionmodulenames`` set passed to the factory function and no-op if |
|
562 | ``extensionmodulenames`` set passed to the factory function and no-op if | |
563 | not. |
|
563 | not. | |
564 | """ |
|
564 | """ | |
565 | ui = baseui.copy() |
|
565 | ui = baseui.copy() | |
566 | # Prevent copying repo configuration. |
|
566 | # Prevent copying repo configuration. | |
567 | ui.copy = baseui.copy |
|
567 | ui.copy = baseui.copy | |
568 |
|
568 | |||
569 | # Working directory VFS rooted at repository root. |
|
569 | # Working directory VFS rooted at repository root. | |
570 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
570 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | |
571 |
|
571 | |||
572 | # Main VFS for .hg/ directory. |
|
572 | # Main VFS for .hg/ directory. | |
573 | hgpath = wdirvfs.join(b'.hg') |
|
573 | hgpath = wdirvfs.join(b'.hg') | |
574 | hgvfs = vfsmod.vfs(hgpath, cacheaudited=True) |
|
574 | hgvfs = vfsmod.vfs(hgpath, cacheaudited=True) | |
575 | # Whether this repository is shared one or not |
|
575 | # Whether this repository is shared one or not | |
576 | shared = False |
|
576 | shared = False | |
577 | # If this repository is shared, vfs pointing to shared repo |
|
577 | # If this repository is shared, vfs pointing to shared repo | |
578 | sharedvfs = None |
|
578 | sharedvfs = None | |
579 |
|
579 | |||
580 | # The .hg/ path should exist and should be a directory. All other |
|
580 | # The .hg/ path should exist and should be a directory. All other | |
581 | # cases are errors. |
|
581 | # cases are errors. | |
582 | if not hgvfs.isdir(): |
|
582 | if not hgvfs.isdir(): | |
583 | try: |
|
583 | try: | |
584 | hgvfs.stat() |
|
584 | hgvfs.stat() | |
585 | except OSError as e: |
|
585 | except OSError as e: | |
586 | if e.errno != errno.ENOENT: |
|
586 | if e.errno != errno.ENOENT: | |
587 | raise |
|
587 | raise | |
588 | except ValueError as e: |
|
588 | except ValueError as e: | |
589 | # Can be raised on Python 3.8 when path is invalid. |
|
589 | # Can be raised on Python 3.8 when path is invalid. | |
590 | raise error.Abort( |
|
590 | raise error.Abort( | |
591 | _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e)) |
|
591 | _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e)) | |
592 | ) |
|
592 | ) | |
593 |
|
593 | |||
594 | raise error.RepoError(_(b'repository %s not found') % path) |
|
594 | raise error.RepoError(_(b'repository %s not found') % path) | |
595 |
|
595 | |||
596 | requirements = _readrequires(hgvfs, True) |
|
596 | requirements = _readrequires(hgvfs, True) | |
597 | shared = ( |
|
597 | shared = ( | |
598 | requirementsmod.SHARED_REQUIREMENT in requirements |
|
598 | requirementsmod.SHARED_REQUIREMENT in requirements | |
599 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements |
|
599 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements | |
600 | ) |
|
600 | ) | |
601 | storevfs = None |
|
601 | storevfs = None | |
602 | if shared: |
|
602 | if shared: | |
603 | # This is a shared repo |
|
603 | # This is a shared repo | |
604 | sharedvfs = _getsharedvfs(hgvfs, requirements) |
|
604 | sharedvfs = _getsharedvfs(hgvfs, requirements) | |
605 | storevfs = vfsmod.vfs(sharedvfs.join(b'store')) |
|
605 | storevfs = vfsmod.vfs(sharedvfs.join(b'store')) | |
606 | else: |
|
606 | else: | |
607 | storevfs = vfsmod.vfs(hgvfs.join(b'store')) |
|
607 | storevfs = vfsmod.vfs(hgvfs.join(b'store')) | |
608 |
|
608 | |||
609 | # if .hg/requires contains the sharesafe requirement, it means |
|
609 | # if .hg/requires contains the sharesafe requirement, it means | |
610 | # there exists a `.hg/store/requires` too and we should read it |
|
610 | # there exists a `.hg/store/requires` too and we should read it | |
611 | # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement |
|
611 | # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement | |
612 | # is present. We never write SHARESAFE_REQUIREMENT for a repo if store |
|
612 | # is present. We never write SHARESAFE_REQUIREMENT for a repo if store | |
613 | # is not present, refer checkrequirementscompat() for that |
|
613 | # is not present, refer checkrequirementscompat() for that | |
614 | # |
|
614 | # | |
615 | # However, if SHARESAFE_REQUIREMENT is not present, it means that the |
|
615 | # However, if SHARESAFE_REQUIREMENT is not present, it means that the | |
616 | # repository was shared the old way. We check the share source .hg/requires |
|
616 | # repository was shared the old way. We check the share source .hg/requires | |
617 | # for SHARESAFE_REQUIREMENT to detect whether the current repository needs |
|
617 | # for SHARESAFE_REQUIREMENT to detect whether the current repository needs | |
618 | # to be reshared |
|
618 | # to be reshared | |
619 | hint = _(b"see `hg help config.format.use-share-safe` for more information") |
|
619 | hint = _(b"see `hg help config.format.use-share-safe` for more information") | |
620 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: |
|
620 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: | |
621 |
|
621 | |||
622 | if ( |
|
622 | if ( | |
623 | shared |
|
623 | shared | |
624 | and requirementsmod.SHARESAFE_REQUIREMENT |
|
624 | and requirementsmod.SHARESAFE_REQUIREMENT | |
625 | not in _readrequires(sharedvfs, True) |
|
625 | not in _readrequires(sharedvfs, True) | |
626 | ): |
|
626 | ): | |
627 | mismatch_warn = ui.configbool( |
|
627 | mismatch_warn = ui.configbool( | |
628 | b'share', b'safe-mismatch.source-not-safe.warn' |
|
628 | b'share', b'safe-mismatch.source-not-safe.warn' | |
629 | ) |
|
629 | ) | |
630 | mismatch_config = ui.config( |
|
630 | mismatch_config = ui.config( | |
631 | b'share', b'safe-mismatch.source-not-safe' |
|
631 | b'share', b'safe-mismatch.source-not-safe' | |
632 | ) |
|
632 | ) | |
633 | if mismatch_config in ( |
|
633 | if mismatch_config in ( | |
634 | b'downgrade-allow', |
|
634 | b'downgrade-allow', | |
635 | b'allow', |
|
635 | b'allow', | |
636 | b'downgrade-abort', |
|
636 | b'downgrade-abort', | |
637 | ): |
|
637 | ): | |
638 | # prevent cyclic import localrepo -> upgrade -> localrepo |
|
638 | # prevent cyclic import localrepo -> upgrade -> localrepo | |
639 | from . import upgrade |
|
639 | from . import upgrade | |
640 |
|
640 | |||
641 | upgrade.downgrade_share_to_non_safe( |
|
641 | upgrade.downgrade_share_to_non_safe( | |
642 | ui, |
|
642 | ui, | |
643 | hgvfs, |
|
643 | hgvfs, | |
644 | sharedvfs, |
|
644 | sharedvfs, | |
645 | requirements, |
|
645 | requirements, | |
646 | mismatch_config, |
|
646 | mismatch_config, | |
647 | mismatch_warn, |
|
647 | mismatch_warn, | |
648 | ) |
|
648 | ) | |
649 | elif mismatch_config == b'abort': |
|
649 | elif mismatch_config == b'abort': | |
650 | raise error.Abort( |
|
650 | raise error.Abort( | |
651 | _(b"share source does not support share-safe requirement"), |
|
651 | _(b"share source does not support share-safe requirement"), | |
652 | hint=hint, |
|
652 | hint=hint, | |
653 | ) |
|
653 | ) | |
654 | else: |
|
654 | else: | |
655 | raise error.Abort( |
|
655 | raise error.Abort( | |
656 | _( |
|
656 | _( | |
657 | b"share-safe mismatch with source.\nUnrecognized" |
|
657 | b"share-safe mismatch with source.\nUnrecognized" | |
658 | b" value '%s' of `share.safe-mismatch.source-not-safe`" |
|
658 | b" value '%s' of `share.safe-mismatch.source-not-safe`" | |
659 | b" set." |
|
659 | b" set." | |
660 | ) |
|
660 | ) | |
661 | % mismatch_config, |
|
661 | % mismatch_config, | |
662 | hint=hint, |
|
662 | hint=hint, | |
663 | ) |
|
663 | ) | |
664 | else: |
|
664 | else: | |
665 | requirements |= _readrequires(storevfs, False) |
|
665 | requirements |= _readrequires(storevfs, False) | |
666 | elif shared: |
|
666 | elif shared: | |
667 | sourcerequires = _readrequires(sharedvfs, False) |
|
667 | sourcerequires = _readrequires(sharedvfs, False) | |
668 | if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: |
|
668 | if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: | |
669 | mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe') |
|
669 | mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe') | |
670 | mismatch_warn = ui.configbool( |
|
670 | mismatch_warn = ui.configbool( | |
671 | b'share', b'safe-mismatch.source-safe.warn' |
|
671 | b'share', b'safe-mismatch.source-safe.warn' | |
672 | ) |
|
672 | ) | |
673 | if mismatch_config in ( |
|
673 | if mismatch_config in ( | |
674 | b'upgrade-allow', |
|
674 | b'upgrade-allow', | |
675 | b'allow', |
|
675 | b'allow', | |
676 | b'upgrade-abort', |
|
676 | b'upgrade-abort', | |
677 | ): |
|
677 | ): | |
678 | # prevent cyclic import localrepo -> upgrade -> localrepo |
|
678 | # prevent cyclic import localrepo -> upgrade -> localrepo | |
679 | from . import upgrade |
|
679 | from . import upgrade | |
680 |
|
680 | |||
681 | upgrade.upgrade_share_to_safe( |
|
681 | upgrade.upgrade_share_to_safe( | |
682 | ui, |
|
682 | ui, | |
683 | hgvfs, |
|
683 | hgvfs, | |
684 | storevfs, |
|
684 | storevfs, | |
685 | requirements, |
|
685 | requirements, | |
686 | mismatch_config, |
|
686 | mismatch_config, | |
687 | mismatch_warn, |
|
687 | mismatch_warn, | |
688 | ) |
|
688 | ) | |
689 | elif mismatch_config == b'abort': |
|
689 | elif mismatch_config == b'abort': | |
690 | raise error.Abort( |
|
690 | raise error.Abort( | |
691 | _( |
|
691 | _( | |
692 | b'version mismatch: source uses share-safe' |
|
692 | b'version mismatch: source uses share-safe' | |
693 | b' functionality while the current share does not' |
|
693 | b' functionality while the current share does not' | |
694 | ), |
|
694 | ), | |
695 | hint=hint, |
|
695 | hint=hint, | |
696 | ) |
|
696 | ) | |
697 | else: |
|
697 | else: | |
698 | raise error.Abort( |
|
698 | raise error.Abort( | |
699 | _( |
|
699 | _( | |
700 | b"share-safe mismatch with source.\nUnrecognized" |
|
700 | b"share-safe mismatch with source.\nUnrecognized" | |
701 | b" value '%s' of `share.safe-mismatch.source-safe` set." |
|
701 | b" value '%s' of `share.safe-mismatch.source-safe` set." | |
702 | ) |
|
702 | ) | |
703 | % mismatch_config, |
|
703 | % mismatch_config, | |
704 | hint=hint, |
|
704 | hint=hint, | |
705 | ) |
|
705 | ) | |
706 |
|
706 | |||
707 | # The .hg/hgrc file may load extensions or contain config options |
|
707 | # The .hg/hgrc file may load extensions or contain config options | |
708 | # that influence repository construction. Attempt to load it and |
|
708 | # that influence repository construction. Attempt to load it and | |
709 | # process any new extensions that it may have pulled in. |
|
709 | # process any new extensions that it may have pulled in. | |
710 | if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs): |
|
710 | if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs): | |
711 | afterhgrcload(ui, wdirvfs, hgvfs, requirements) |
|
711 | afterhgrcload(ui, wdirvfs, hgvfs, requirements) | |
712 | extensions.loadall(ui) |
|
712 | extensions.loadall(ui) | |
713 | extensions.populateui(ui) |
|
713 | extensions.populateui(ui) | |
714 |
|
714 | |||
715 | # Set of module names of extensions loaded for this repository. |
|
715 | # Set of module names of extensions loaded for this repository. | |
716 | extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)} |
|
716 | extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)} | |
717 |
|
717 | |||
718 | supportedrequirements = gathersupportedrequirements(ui) |
|
718 | supportedrequirements = gathersupportedrequirements(ui) | |
719 |
|
719 | |||
720 | # We first validate the requirements are known. |
|
720 | # We first validate the requirements are known. | |
721 | ensurerequirementsrecognized(requirements, supportedrequirements) |
|
721 | ensurerequirementsrecognized(requirements, supportedrequirements) | |
722 |
|
722 | |||
723 | # Then we validate that the known set is reasonable to use together. |
|
723 | # Then we validate that the known set is reasonable to use together. | |
724 | ensurerequirementscompatible(ui, requirements) |
|
724 | ensurerequirementscompatible(ui, requirements) | |
725 |
|
725 | |||
726 | # TODO there are unhandled edge cases related to opening repositories with |
|
726 | # TODO there are unhandled edge cases related to opening repositories with | |
727 | # shared storage. If storage is shared, we should also test for requirements |
|
727 | # shared storage. If storage is shared, we should also test for requirements | |
728 | # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in |
|
728 | # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in | |
729 | # that repo, as that repo may load extensions needed to open it. This is a |
|
729 | # that repo, as that repo may load extensions needed to open it. This is a | |
730 | # bit complicated because we don't want the other hgrc to overwrite settings |
|
730 | # bit complicated because we don't want the other hgrc to overwrite settings | |
731 | # in this hgrc. |
|
731 | # in this hgrc. | |
732 | # |
|
732 | # | |
733 | # This bug is somewhat mitigated by the fact that we copy the .hg/requires |
|
733 | # This bug is somewhat mitigated by the fact that we copy the .hg/requires | |
734 | # file when sharing repos. But if a requirement is added after the share is |
|
734 | # file when sharing repos. But if a requirement is added after the share is | |
735 | # performed, thereby introducing a new requirement for the opener, we may |
|
735 | # performed, thereby introducing a new requirement for the opener, we may | |
736 | # will not see that and could encounter a run-time error interacting with |
|
736 | # will not see that and could encounter a run-time error interacting with | |
737 | # that shared store since it has an unknown-to-us requirement. |
|
737 | # that shared store since it has an unknown-to-us requirement. | |
738 |
|
738 | |||
739 | # At this point, we know we should be capable of opening the repository. |
|
739 | # At this point, we know we should be capable of opening the repository. | |
740 | # Now get on with doing that. |
|
740 | # Now get on with doing that. | |
741 |
|
741 | |||
742 | features = set() |
|
742 | features = set() | |
743 |
|
743 | |||
744 | # The "store" part of the repository holds versioned data. How it is |
|
744 | # The "store" part of the repository holds versioned data. How it is | |
745 | # accessed is determined by various requirements. If `shared` or |
|
745 | # accessed is determined by various requirements. If `shared` or | |
746 | # `relshared` requirements are present, this indicates current repository |
|
746 | # `relshared` requirements are present, this indicates current repository | |
747 | # is a share and store exists in path mentioned in `.hg/sharedpath` |
|
747 | # is a share and store exists in path mentioned in `.hg/sharedpath` | |
748 | if shared: |
|
748 | if shared: | |
749 | storebasepath = sharedvfs.base |
|
749 | storebasepath = sharedvfs.base | |
750 | cachepath = sharedvfs.join(b'cache') |
|
750 | cachepath = sharedvfs.join(b'cache') | |
751 | features.add(repository.REPO_FEATURE_SHARED_STORAGE) |
|
751 | features.add(repository.REPO_FEATURE_SHARED_STORAGE) | |
752 | else: |
|
752 | else: | |
753 | storebasepath = hgvfs.base |
|
753 | storebasepath = hgvfs.base | |
754 | cachepath = hgvfs.join(b'cache') |
|
754 | cachepath = hgvfs.join(b'cache') | |
755 | wcachepath = hgvfs.join(b'wcache') |
|
755 | wcachepath = hgvfs.join(b'wcache') | |
756 |
|
756 | |||
757 | # The store has changed over time and the exact layout is dictated by |
|
757 | # The store has changed over time and the exact layout is dictated by | |
758 | # requirements. The store interface abstracts differences across all |
|
758 | # requirements. The store interface abstracts differences across all | |
759 | # of them. |
|
759 | # of them. | |
760 | store = makestore( |
|
760 | store = makestore( | |
761 | requirements, |
|
761 | requirements, | |
762 | storebasepath, |
|
762 | storebasepath, | |
763 | lambda base: vfsmod.vfs(base, cacheaudited=True), |
|
763 | lambda base: vfsmod.vfs(base, cacheaudited=True), | |
764 | ) |
|
764 | ) | |
765 | hgvfs.createmode = store.createmode |
|
765 | hgvfs.createmode = store.createmode | |
766 |
|
766 | |||
767 | storevfs = store.vfs |
|
767 | storevfs = store.vfs | |
768 | storevfs.options = resolvestorevfsoptions(ui, requirements, features) |
|
768 | storevfs.options = resolvestorevfsoptions(ui, requirements, features) | |
769 |
|
769 | |||
770 | if ( |
|
770 | if ( | |
771 | requirementsmod.REVLOGV2_REQUIREMENT in requirements |
|
771 | requirementsmod.REVLOGV2_REQUIREMENT in requirements | |
772 | or requirementsmod.CHANGELOGV2_REQUIREMENT in requirements |
|
772 | or requirementsmod.CHANGELOGV2_REQUIREMENT in requirements | |
773 | ): |
|
773 | ): | |
774 | features.add(repository.REPO_FEATURE_SIDE_DATA) |
|
774 | features.add(repository.REPO_FEATURE_SIDE_DATA) | |
775 | # the revlogv2 docket introduced race condition that we need to fix |
|
775 | # the revlogv2 docket introduced race condition that we need to fix | |
776 | features.discard(repository.REPO_FEATURE_STREAM_CLONE) |
|
776 | features.discard(repository.REPO_FEATURE_STREAM_CLONE) | |
777 |
|
777 | |||
778 | # The cache vfs is used to manage cache files. |
|
778 | # The cache vfs is used to manage cache files. | |
779 | cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) |
|
779 | cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) | |
780 | cachevfs.createmode = store.createmode |
|
780 | cachevfs.createmode = store.createmode | |
781 | # The cache vfs is used to manage cache files related to the working copy |
|
781 | # The cache vfs is used to manage cache files related to the working copy | |
782 | wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) |
|
782 | wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) | |
783 | wcachevfs.createmode = store.createmode |
|
783 | wcachevfs.createmode = store.createmode | |
784 |
|
784 | |||
785 | # Now resolve the type for the repository object. We do this by repeatedly |
|
785 | # Now resolve the type for the repository object. We do this by repeatedly | |
786 | # calling a factory function to produces types for specific aspects of the |
|
786 | # calling a factory function to produces types for specific aspects of the | |
787 | # repo's operation. The aggregate returned types are used as base classes |
|
787 | # repo's operation. The aggregate returned types are used as base classes | |
788 | # for a dynamically-derived type, which will represent our new repository. |
|
788 | # for a dynamically-derived type, which will represent our new repository. | |
789 |
|
789 | |||
790 | bases = [] |
|
790 | bases = [] | |
791 | extrastate = {} |
|
791 | extrastate = {} | |
792 |
|
792 | |||
793 | for iface, fn in REPO_INTERFACES: |
|
793 | for iface, fn in REPO_INTERFACES: | |
794 | # We pass all potentially useful state to give extensions tons of |
|
794 | # We pass all potentially useful state to give extensions tons of | |
795 | # flexibility. |
|
795 | # flexibility. | |
796 | typ = fn()( |
|
796 | typ = fn()( | |
797 | ui=ui, |
|
797 | ui=ui, | |
798 | intents=intents, |
|
798 | intents=intents, | |
799 | requirements=requirements, |
|
799 | requirements=requirements, | |
800 | features=features, |
|
800 | features=features, | |
801 | wdirvfs=wdirvfs, |
|
801 | wdirvfs=wdirvfs, | |
802 | hgvfs=hgvfs, |
|
802 | hgvfs=hgvfs, | |
803 | store=store, |
|
803 | store=store, | |
804 | storevfs=storevfs, |
|
804 | storevfs=storevfs, | |
805 | storeoptions=storevfs.options, |
|
805 | storeoptions=storevfs.options, | |
806 | cachevfs=cachevfs, |
|
806 | cachevfs=cachevfs, | |
807 | wcachevfs=wcachevfs, |
|
807 | wcachevfs=wcachevfs, | |
808 | extensionmodulenames=extensionmodulenames, |
|
808 | extensionmodulenames=extensionmodulenames, | |
809 | extrastate=extrastate, |
|
809 | extrastate=extrastate, | |
810 | baseclasses=bases, |
|
810 | baseclasses=bases, | |
811 | ) |
|
811 | ) | |
812 |
|
812 | |||
813 | if not isinstance(typ, type): |
|
813 | if not isinstance(typ, type): | |
814 | raise error.ProgrammingError( |
|
814 | raise error.ProgrammingError( | |
815 | b'unable to construct type for %s' % iface |
|
815 | b'unable to construct type for %s' % iface | |
816 | ) |
|
816 | ) | |
817 |
|
817 | |||
818 | bases.append(typ) |
|
818 | bases.append(typ) | |
819 |
|
819 | |||
820 | # type() allows you to use characters in type names that wouldn't be |
|
820 | # type() allows you to use characters in type names that wouldn't be | |
821 | # recognized as Python symbols in source code. We abuse that to add |
|
821 | # recognized as Python symbols in source code. We abuse that to add | |
822 | # rich information about our constructed repo. |
|
822 | # rich information about our constructed repo. | |
823 | name = pycompat.sysstr( |
|
823 | name = pycompat.sysstr( | |
824 | b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements))) |
|
824 | b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements))) | |
825 | ) |
|
825 | ) | |
826 |
|
826 | |||
827 | cls = type(name, tuple(bases), {}) |
|
827 | cls = type(name, tuple(bases), {}) | |
828 |
|
828 | |||
829 | return cls( |
|
829 | return cls( | |
830 | baseui=baseui, |
|
830 | baseui=baseui, | |
831 | ui=ui, |
|
831 | ui=ui, | |
832 | origroot=path, |
|
832 | origroot=path, | |
833 | wdirvfs=wdirvfs, |
|
833 | wdirvfs=wdirvfs, | |
834 | hgvfs=hgvfs, |
|
834 | hgvfs=hgvfs, | |
835 | requirements=requirements, |
|
835 | requirements=requirements, | |
836 | supportedrequirements=supportedrequirements, |
|
836 | supportedrequirements=supportedrequirements, | |
837 | sharedpath=storebasepath, |
|
837 | sharedpath=storebasepath, | |
838 | store=store, |
|
838 | store=store, | |
839 | cachevfs=cachevfs, |
|
839 | cachevfs=cachevfs, | |
840 | wcachevfs=wcachevfs, |
|
840 | wcachevfs=wcachevfs, | |
841 | features=features, |
|
841 | features=features, | |
842 | intents=intents, |
|
842 | intents=intents, | |
843 | ) |
|
843 | ) | |
844 |
|
844 | |||
845 |
|
845 | |||
846 | def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None): |
|
846 | def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None): | |
847 | """Load hgrc files/content into a ui instance. |
|
847 | """Load hgrc files/content into a ui instance. | |
848 |
|
848 | |||
849 | This is called during repository opening to load any additional |
|
849 | This is called during repository opening to load any additional | |
850 | config files or settings relevant to the current repository. |
|
850 | config files or settings relevant to the current repository. | |
851 |
|
851 | |||
852 | Returns a bool indicating whether any additional configs were loaded. |
|
852 | Returns a bool indicating whether any additional configs were loaded. | |
853 |
|
853 | |||
854 | Extensions should monkeypatch this function to modify how per-repo |
|
854 | Extensions should monkeypatch this function to modify how per-repo | |
855 | configs are loaded. For example, an extension may wish to pull in |
|
855 | configs are loaded. For example, an extension may wish to pull in | |
856 | configs from alternate files or sources. |
|
856 | configs from alternate files or sources. | |
857 |
|
857 | |||
858 | sharedvfs is vfs object pointing to source repo if the current one is a |
|
858 | sharedvfs is vfs object pointing to source repo if the current one is a | |
859 | shared one |
|
859 | shared one | |
860 | """ |
|
860 | """ | |
861 | if not rcutil.use_repo_hgrc(): |
|
861 | if not rcutil.use_repo_hgrc(): | |
862 | return False |
|
862 | return False | |
863 |
|
863 | |||
864 | ret = False |
|
864 | ret = False | |
865 | # first load config from shared source if we has to |
|
865 | # first load config from shared source if we has to | |
866 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs: |
|
866 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs: | |
867 | try: |
|
867 | try: | |
868 | ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base) |
|
868 | ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base) | |
869 | ret = True |
|
869 | ret = True | |
870 | except IOError: |
|
870 | except IOError: | |
871 | pass |
|
871 | pass | |
872 |
|
872 | |||
873 | try: |
|
873 | try: | |
874 | ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) |
|
874 | ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) | |
875 | ret = True |
|
875 | ret = True | |
876 | except IOError: |
|
876 | except IOError: | |
877 | pass |
|
877 | pass | |
878 |
|
878 | |||
879 | try: |
|
879 | try: | |
880 | ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base) |
|
880 | ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base) | |
881 | ret = True |
|
881 | ret = True | |
882 | except IOError: |
|
882 | except IOError: | |
883 | pass |
|
883 | pass | |
884 |
|
884 | |||
885 | return ret |
|
885 | return ret | |
886 |
|
886 | |||
887 |
|
887 | |||
888 | def afterhgrcload(ui, wdirvfs, hgvfs, requirements): |
|
888 | def afterhgrcload(ui, wdirvfs, hgvfs, requirements): | |
889 | """Perform additional actions after .hg/hgrc is loaded. |
|
889 | """Perform additional actions after .hg/hgrc is loaded. | |
890 |
|
890 | |||
891 | This function is called during repository loading immediately after |
|
891 | This function is called during repository loading immediately after | |
892 | the .hg/hgrc file is loaded and before per-repo extensions are loaded. |
|
892 | the .hg/hgrc file is loaded and before per-repo extensions are loaded. | |
893 |
|
893 | |||
894 | The function can be used to validate configs, automatically add |
|
894 | The function can be used to validate configs, automatically add | |
895 | options (including extensions) based on requirements, etc. |
|
895 | options (including extensions) based on requirements, etc. | |
896 | """ |
|
896 | """ | |
897 |
|
897 | |||
898 | # Map of requirements to list of extensions to load automatically when |
|
898 | # Map of requirements to list of extensions to load automatically when | |
899 | # requirement is present. |
|
899 | # requirement is present. | |
900 | autoextensions = { |
|
900 | autoextensions = { | |
901 | b'git': [b'git'], |
|
901 | b'git': [b'git'], | |
902 | b'largefiles': [b'largefiles'], |
|
902 | b'largefiles': [b'largefiles'], | |
903 | b'lfs': [b'lfs'], |
|
903 | b'lfs': [b'lfs'], | |
904 | } |
|
904 | } | |
905 |
|
905 | |||
906 | for requirement, names in sorted(autoextensions.items()): |
|
906 | for requirement, names in sorted(autoextensions.items()): | |
907 | if requirement not in requirements: |
|
907 | if requirement not in requirements: | |
908 | continue |
|
908 | continue | |
909 |
|
909 | |||
910 | for name in names: |
|
910 | for name in names: | |
911 | if not ui.hasconfig(b'extensions', name): |
|
911 | if not ui.hasconfig(b'extensions', name): | |
912 | ui.setconfig(b'extensions', name, b'', source=b'autoload') |
|
912 | ui.setconfig(b'extensions', name, b'', source=b'autoload') | |
913 |
|
913 | |||
914 |
|
914 | |||
915 | def gathersupportedrequirements(ui): |
|
915 | def gathersupportedrequirements(ui): | |
916 | """Determine the complete set of recognized requirements.""" |
|
916 | """Determine the complete set of recognized requirements.""" | |
917 | # Start with all requirements supported by this file. |
|
917 | # Start with all requirements supported by this file. | |
918 | supported = set(localrepository._basesupported) |
|
918 | supported = set(localrepository._basesupported) | |
919 |
|
919 | |||
920 | # Execute ``featuresetupfuncs`` entries if they belong to an extension |
|
920 | # Execute ``featuresetupfuncs`` entries if they belong to an extension | |
921 | # relevant to this ui instance. |
|
921 | # relevant to this ui instance. | |
922 | modules = {m.__name__ for n, m in extensions.extensions(ui)} |
|
922 | modules = {m.__name__ for n, m in extensions.extensions(ui)} | |
923 |
|
923 | |||
924 | for fn in featuresetupfuncs: |
|
924 | for fn in featuresetupfuncs: | |
925 | if fn.__module__ in modules: |
|
925 | if fn.__module__ in modules: | |
926 | fn(ui, supported) |
|
926 | fn(ui, supported) | |
927 |
|
927 | |||
928 | # Add derived requirements from registered compression engines. |
|
928 | # Add derived requirements from registered compression engines. | |
929 | for name in util.compengines: |
|
929 | for name in util.compengines: | |
930 | engine = util.compengines[name] |
|
930 | engine = util.compengines[name] | |
931 | if engine.available() and engine.revlogheader(): |
|
931 | if engine.available() and engine.revlogheader(): | |
932 | supported.add(b'exp-compression-%s' % name) |
|
932 | supported.add(b'exp-compression-%s' % name) | |
933 | if engine.name() == b'zstd': |
|
933 | if engine.name() == b'zstd': | |
934 | supported.add(b'revlog-compression-zstd') |
|
934 | supported.add(b'revlog-compression-zstd') | |
935 |
|
935 | |||
936 | return supported |
|
936 | return supported | |
937 |
|
937 | |||
938 |
|
938 | |||
939 | def ensurerequirementsrecognized(requirements, supported): |
|
939 | def ensurerequirementsrecognized(requirements, supported): | |
940 | """Validate that a set of local requirements is recognized. |
|
940 | """Validate that a set of local requirements is recognized. | |
941 |
|
941 | |||
942 | Receives a set of requirements. Raises an ``error.RepoError`` if there |
|
942 | Receives a set of requirements. Raises an ``error.RepoError`` if there | |
943 | exists any requirement in that set that currently loaded code doesn't |
|
943 | exists any requirement in that set that currently loaded code doesn't | |
944 | recognize. |
|
944 | recognize. | |
945 |
|
945 | |||
946 | Returns a set of supported requirements. |
|
946 | Returns a set of supported requirements. | |
947 | """ |
|
947 | """ | |
948 | missing = set() |
|
948 | missing = set() | |
949 |
|
949 | |||
950 | for requirement in requirements: |
|
950 | for requirement in requirements: | |
951 | if requirement in supported: |
|
951 | if requirement in supported: | |
952 | continue |
|
952 | continue | |
953 |
|
953 | |||
954 | if not requirement or not requirement[0:1].isalnum(): |
|
954 | if not requirement or not requirement[0:1].isalnum(): | |
955 | raise error.RequirementError(_(b'.hg/requires file is corrupt')) |
|
955 | raise error.RequirementError(_(b'.hg/requires file is corrupt')) | |
956 |
|
956 | |||
957 | missing.add(requirement) |
|
957 | missing.add(requirement) | |
958 |
|
958 | |||
959 | if missing: |
|
959 | if missing: | |
960 | raise error.RequirementError( |
|
960 | raise error.RequirementError( | |
961 | _(b'repository requires features unknown to this Mercurial: %s') |
|
961 | _(b'repository requires features unknown to this Mercurial: %s') | |
962 | % b' '.join(sorted(missing)), |
|
962 | % b' '.join(sorted(missing)), | |
963 | hint=_( |
|
963 | hint=_( | |
964 | b'see https://mercurial-scm.org/wiki/MissingRequirement ' |
|
964 | b'see https://mercurial-scm.org/wiki/MissingRequirement ' | |
965 | b'for more information' |
|
965 | b'for more information' | |
966 | ), |
|
966 | ), | |
967 | ) |
|
967 | ) | |
968 |
|
968 | |||
969 |
|
969 | |||
970 | def ensurerequirementscompatible(ui, requirements): |
|
970 | def ensurerequirementscompatible(ui, requirements): | |
971 | """Validates that a set of recognized requirements is mutually compatible. |
|
971 | """Validates that a set of recognized requirements is mutually compatible. | |
972 |
|
972 | |||
973 | Some requirements may not be compatible with others or require |
|
973 | Some requirements may not be compatible with others or require | |
974 | config options that aren't enabled. This function is called during |
|
974 | config options that aren't enabled. This function is called during | |
975 | repository opening to ensure that the set of requirements needed |
|
975 | repository opening to ensure that the set of requirements needed | |
976 | to open a repository is sane and compatible with config options. |
|
976 | to open a repository is sane and compatible with config options. | |
977 |
|
977 | |||
978 | Extensions can monkeypatch this function to perform additional |
|
978 | Extensions can monkeypatch this function to perform additional | |
979 | checking. |
|
979 | checking. | |
980 |
|
980 | |||
981 | ``error.RepoError`` should be raised on failure. |
|
981 | ``error.RepoError`` should be raised on failure. | |
982 | """ |
|
982 | """ | |
983 | if ( |
|
983 | if ( | |
984 | requirementsmod.SPARSE_REQUIREMENT in requirements |
|
984 | requirementsmod.SPARSE_REQUIREMENT in requirements | |
985 | and not sparse.enabled |
|
985 | and not sparse.enabled | |
986 | ): |
|
986 | ): | |
987 | raise error.RepoError( |
|
987 | raise error.RepoError( | |
988 | _( |
|
988 | _( | |
989 | b'repository is using sparse feature but ' |
|
989 | b'repository is using sparse feature but ' | |
990 | b'sparse is not enabled; enable the ' |
|
990 | b'sparse is not enabled; enable the ' | |
991 | b'"sparse" extensions to access' |
|
991 | b'"sparse" extensions to access' | |
992 | ) |
|
992 | ) | |
993 | ) |
|
993 | ) | |
994 |
|
994 | |||
995 |
|
995 | |||
996 | def makestore(requirements, path, vfstype): |
|
996 | def makestore(requirements, path, vfstype): | |
997 | """Construct a storage object for a repository.""" |
|
997 | """Construct a storage object for a repository.""" | |
998 | if requirementsmod.STORE_REQUIREMENT in requirements: |
|
998 | if requirementsmod.STORE_REQUIREMENT in requirements: | |
999 | if requirementsmod.FNCACHE_REQUIREMENT in requirements: |
|
999 | if requirementsmod.FNCACHE_REQUIREMENT in requirements: | |
1000 | dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements |
|
1000 | dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements | |
1001 | return storemod.fncachestore(path, vfstype, dotencode) |
|
1001 | return storemod.fncachestore(path, vfstype, dotencode) | |
1002 |
|
1002 | |||
1003 | return storemod.encodedstore(path, vfstype) |
|
1003 | return storemod.encodedstore(path, vfstype) | |
1004 |
|
1004 | |||
1005 | return storemod.basicstore(path, vfstype) |
|
1005 | return storemod.basicstore(path, vfstype) | |
1006 |
|
1006 | |||
1007 |
|
1007 | |||
1008 | def resolvestorevfsoptions(ui, requirements, features): |
|
1008 | def resolvestorevfsoptions(ui, requirements, features): | |
1009 | """Resolve the options to pass to the store vfs opener. |
|
1009 | """Resolve the options to pass to the store vfs opener. | |
1010 |
|
1010 | |||
1011 | The returned dict is used to influence behavior of the storage layer. |
|
1011 | The returned dict is used to influence behavior of the storage layer. | |
1012 | """ |
|
1012 | """ | |
1013 | options = {} |
|
1013 | options = {} | |
1014 |
|
1014 | |||
1015 | if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements: |
|
1015 | if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements: | |
1016 | options[b'treemanifest'] = True |
|
1016 | options[b'treemanifest'] = True | |
1017 |
|
1017 | |||
1018 | # experimental config: format.manifestcachesize |
|
1018 | # experimental config: format.manifestcachesize | |
1019 | manifestcachesize = ui.configint(b'format', b'manifestcachesize') |
|
1019 | manifestcachesize = ui.configint(b'format', b'manifestcachesize') | |
1020 | if manifestcachesize is not None: |
|
1020 | if manifestcachesize is not None: | |
1021 | options[b'manifestcachesize'] = manifestcachesize |
|
1021 | options[b'manifestcachesize'] = manifestcachesize | |
1022 |
|
1022 | |||
1023 | # In the absence of another requirement superseding a revlog-related |
|
1023 | # In the absence of another requirement superseding a revlog-related | |
1024 | # requirement, we have to assume the repo is using revlog version 0. |
|
1024 | # requirement, we have to assume the repo is using revlog version 0. | |
1025 | # This revlog format is super old and we don't bother trying to parse |
|
1025 | # This revlog format is super old and we don't bother trying to parse | |
1026 | # opener options for it because those options wouldn't do anything |
|
1026 | # opener options for it because those options wouldn't do anything | |
1027 | # meaningful on such old repos. |
|
1027 | # meaningful on such old repos. | |
1028 | if ( |
|
1028 | if ( | |
1029 | requirementsmod.REVLOGV1_REQUIREMENT in requirements |
|
1029 | requirementsmod.REVLOGV1_REQUIREMENT in requirements | |
1030 | or requirementsmod.REVLOGV2_REQUIREMENT in requirements |
|
1030 | or requirementsmod.REVLOGV2_REQUIREMENT in requirements | |
1031 | ): |
|
1031 | ): | |
1032 | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) |
|
1032 | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) | |
1033 | else: # explicitly mark repo as using revlogv0 |
|
1033 | else: # explicitly mark repo as using revlogv0 | |
1034 | options[b'revlogv0'] = True |
|
1034 | options[b'revlogv0'] = True | |
1035 |
|
1035 | |||
1036 | if requirementsmod.COPIESSDC_REQUIREMENT in requirements: |
|
1036 | if requirementsmod.COPIESSDC_REQUIREMENT in requirements: | |
1037 | options[b'copies-storage'] = b'changeset-sidedata' |
|
1037 | options[b'copies-storage'] = b'changeset-sidedata' | |
1038 | else: |
|
1038 | else: | |
1039 | writecopiesto = ui.config(b'experimental', b'copies.write-to') |
|
1039 | writecopiesto = ui.config(b'experimental', b'copies.write-to') | |
1040 | copiesextramode = (b'changeset-only', b'compatibility') |
|
1040 | copiesextramode = (b'changeset-only', b'compatibility') | |
1041 | if writecopiesto in copiesextramode: |
|
1041 | if writecopiesto in copiesextramode: | |
1042 | options[b'copies-storage'] = b'extra' |
|
1042 | options[b'copies-storage'] = b'extra' | |
1043 |
|
1043 | |||
1044 | return options |
|
1044 | return options | |
1045 |
|
1045 | |||
1046 |
|
1046 | |||
1047 | def resolverevlogstorevfsoptions(ui, requirements, features): |
|
1047 | def resolverevlogstorevfsoptions(ui, requirements, features): | |
1048 | """Resolve opener options specific to revlogs.""" |
|
1048 | """Resolve opener options specific to revlogs.""" | |
1049 |
|
1049 | |||
1050 | options = {} |
|
1050 | options = {} | |
1051 | options[b'flagprocessors'] = {} |
|
1051 | options[b'flagprocessors'] = {} | |
1052 |
|
1052 | |||
1053 | if requirementsmod.REVLOGV1_REQUIREMENT in requirements: |
|
1053 | if requirementsmod.REVLOGV1_REQUIREMENT in requirements: | |
1054 | options[b'revlogv1'] = True |
|
1054 | options[b'revlogv1'] = True | |
1055 | if requirementsmod.REVLOGV2_REQUIREMENT in requirements: |
|
1055 | if requirementsmod.REVLOGV2_REQUIREMENT in requirements: | |
1056 | options[b'revlogv2'] = True |
|
1056 | options[b'revlogv2'] = True | |
1057 | if requirementsmod.CHANGELOGV2_REQUIREMENT in requirements: |
|
1057 | if requirementsmod.CHANGELOGV2_REQUIREMENT in requirements: | |
1058 | options[b'changelogv2'] = True |
|
1058 | options[b'changelogv2'] = True | |
1059 |
|
1059 | |||
1060 | if requirementsmod.GENERALDELTA_REQUIREMENT in requirements: |
|
1060 | if requirementsmod.GENERALDELTA_REQUIREMENT in requirements: | |
1061 | options[b'generaldelta'] = True |
|
1061 | options[b'generaldelta'] = True | |
1062 |
|
1062 | |||
1063 | # experimental config: format.chunkcachesize |
|
1063 | # experimental config: format.chunkcachesize | |
1064 | chunkcachesize = ui.configint(b'format', b'chunkcachesize') |
|
1064 | chunkcachesize = ui.configint(b'format', b'chunkcachesize') | |
1065 | if chunkcachesize is not None: |
|
1065 | if chunkcachesize is not None: | |
1066 | options[b'chunkcachesize'] = chunkcachesize |
|
1066 | options[b'chunkcachesize'] = chunkcachesize | |
1067 |
|
1067 | |||
1068 | deltabothparents = ui.configbool( |
|
1068 | deltabothparents = ui.configbool( | |
1069 | b'storage', b'revlog.optimize-delta-parent-choice' |
|
1069 | b'storage', b'revlog.optimize-delta-parent-choice' | |
1070 | ) |
|
1070 | ) | |
1071 | options[b'deltabothparents'] = deltabothparents |
|
1071 | options[b'deltabothparents'] = deltabothparents | |
1072 |
|
1072 | |||
1073 | issue6528 = ui.configbool(b'storage', b'revlog.issue6528.fix-incoming') |
|
1073 | issue6528 = ui.configbool(b'storage', b'revlog.issue6528.fix-incoming') | |
1074 | options[b'issue6528.fix-incoming'] = issue6528 |
|
1074 | options[b'issue6528.fix-incoming'] = issue6528 | |
1075 |
|
1075 | |||
1076 | lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta') |
|
1076 | lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta') | |
1077 | lazydeltabase = False |
|
1077 | lazydeltabase = False | |
1078 | if lazydelta: |
|
1078 | if lazydelta: | |
1079 | lazydeltabase = ui.configbool( |
|
1079 | lazydeltabase = ui.configbool( | |
1080 | b'storage', b'revlog.reuse-external-delta-parent' |
|
1080 | b'storage', b'revlog.reuse-external-delta-parent' | |
1081 | ) |
|
1081 | ) | |
1082 | if lazydeltabase is None: |
|
1082 | if lazydeltabase is None: | |
1083 | lazydeltabase = not scmutil.gddeltaconfig(ui) |
|
1083 | lazydeltabase = not scmutil.gddeltaconfig(ui) | |
1084 | options[b'lazydelta'] = lazydelta |
|
1084 | options[b'lazydelta'] = lazydelta | |
1085 | options[b'lazydeltabase'] = lazydeltabase |
|
1085 | options[b'lazydeltabase'] = lazydeltabase | |
1086 |
|
1086 | |||
1087 | chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan') |
|
1087 | chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan') | |
1088 | if 0 <= chainspan: |
|
1088 | if 0 <= chainspan: | |
1089 | options[b'maxdeltachainspan'] = chainspan |
|
1089 | options[b'maxdeltachainspan'] = chainspan | |
1090 |
|
1090 | |||
1091 | mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold') |
|
1091 | mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold') | |
1092 | if mmapindexthreshold is not None: |
|
1092 | if mmapindexthreshold is not None: | |
1093 | options[b'mmapindexthreshold'] = mmapindexthreshold |
|
1093 | options[b'mmapindexthreshold'] = mmapindexthreshold | |
1094 |
|
1094 | |||
1095 | withsparseread = ui.configbool(b'experimental', b'sparse-read') |
|
1095 | withsparseread = ui.configbool(b'experimental', b'sparse-read') | |
1096 | srdensitythres = float( |
|
1096 | srdensitythres = float( | |
1097 | ui.config(b'experimental', b'sparse-read.density-threshold') |
|
1097 | ui.config(b'experimental', b'sparse-read.density-threshold') | |
1098 | ) |
|
1098 | ) | |
1099 | srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') |
|
1099 | srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') | |
1100 | options[b'with-sparse-read'] = withsparseread |
|
1100 | options[b'with-sparse-read'] = withsparseread | |
1101 | options[b'sparse-read-density-threshold'] = srdensitythres |
|
1101 | options[b'sparse-read-density-threshold'] = srdensitythres | |
1102 | options[b'sparse-read-min-gap-size'] = srmingapsize |
|
1102 | options[b'sparse-read-min-gap-size'] = srmingapsize | |
1103 |
|
1103 | |||
1104 | sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements |
|
1104 | sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements | |
1105 | options[b'sparse-revlog'] = sparserevlog |
|
1105 | options[b'sparse-revlog'] = sparserevlog | |
1106 | if sparserevlog: |
|
1106 | if sparserevlog: | |
1107 | options[b'generaldelta'] = True |
|
1107 | options[b'generaldelta'] = True | |
1108 |
|
1108 | |||
1109 | maxchainlen = None |
|
1109 | maxchainlen = None | |
1110 | if sparserevlog: |
|
1110 | if sparserevlog: | |
1111 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH |
|
1111 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH | |
1112 | # experimental config: format.maxchainlen |
|
1112 | # experimental config: format.maxchainlen | |
1113 | maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) |
|
1113 | maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) | |
1114 | if maxchainlen is not None: |
|
1114 | if maxchainlen is not None: | |
1115 | options[b'maxchainlen'] = maxchainlen |
|
1115 | options[b'maxchainlen'] = maxchainlen | |
1116 |
|
1116 | |||
1117 | for r in requirements: |
|
1117 | for r in requirements: | |
1118 | # we allow multiple compression engine requirement to co-exist because |
|
1118 | # we allow multiple compression engine requirement to co-exist because | |
1119 | # strickly speaking, revlog seems to support mixed compression style. |
|
1119 | # strickly speaking, revlog seems to support mixed compression style. | |
1120 | # |
|
1120 | # | |
1121 | # The compression used for new entries will be "the last one" |
|
1121 | # The compression used for new entries will be "the last one" | |
1122 | prefix = r.startswith |
|
1122 | prefix = r.startswith | |
1123 | if prefix(b'revlog-compression-') or prefix(b'exp-compression-'): |
|
1123 | if prefix(b'revlog-compression-') or prefix(b'exp-compression-'): | |
1124 | options[b'compengine'] = r.split(b'-', 2)[2] |
|
1124 | options[b'compengine'] = r.split(b'-', 2)[2] | |
1125 |
|
1125 | |||
1126 | options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level') |
|
1126 | options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level') | |
1127 | if options[b'zlib.level'] is not None: |
|
1127 | if options[b'zlib.level'] is not None: | |
1128 | if not (0 <= options[b'zlib.level'] <= 9): |
|
1128 | if not (0 <= options[b'zlib.level'] <= 9): | |
1129 | msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d') |
|
1129 | msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d') | |
1130 | raise error.Abort(msg % options[b'zlib.level']) |
|
1130 | raise error.Abort(msg % options[b'zlib.level']) | |
1131 | options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level') |
|
1131 | options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level') | |
1132 | if options[b'zstd.level'] is not None: |
|
1132 | if options[b'zstd.level'] is not None: | |
1133 | if not (0 <= options[b'zstd.level'] <= 22): |
|
1133 | if not (0 <= options[b'zstd.level'] <= 22): | |
1134 | msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') |
|
1134 | msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') | |
1135 | raise error.Abort(msg % options[b'zstd.level']) |
|
1135 | raise error.Abort(msg % options[b'zstd.level']) | |
1136 |
|
1136 | |||
1137 | if requirementsmod.NARROW_REQUIREMENT in requirements: |
|
1137 | if requirementsmod.NARROW_REQUIREMENT in requirements: | |
1138 | options[b'enableellipsis'] = True |
|
1138 | options[b'enableellipsis'] = True | |
1139 |
|
1139 | |||
1140 | if ui.configbool(b'experimental', b'rust.index'): |
|
1140 | if ui.configbool(b'experimental', b'rust.index'): | |
1141 | options[b'rust.index'] = True |
|
1141 | options[b'rust.index'] = True | |
1142 | if requirementsmod.NODEMAP_REQUIREMENT in requirements: |
|
1142 | if requirementsmod.NODEMAP_REQUIREMENT in requirements: | |
1143 | slow_path = ui.config( |
|
1143 | slow_path = ui.config( | |
1144 | b'storage', b'revlog.persistent-nodemap.slow-path' |
|
1144 | b'storage', b'revlog.persistent-nodemap.slow-path' | |
1145 | ) |
|
1145 | ) | |
1146 | if slow_path not in (b'allow', b'warn', b'abort'): |
|
1146 | if slow_path not in (b'allow', b'warn', b'abort'): | |
1147 | default = ui.config_default( |
|
1147 | default = ui.config_default( | |
1148 | b'storage', b'revlog.persistent-nodemap.slow-path' |
|
1148 | b'storage', b'revlog.persistent-nodemap.slow-path' | |
1149 | ) |
|
1149 | ) | |
1150 | msg = _( |
|
1150 | msg = _( | |
1151 | b'unknown value for config ' |
|
1151 | b'unknown value for config ' | |
1152 | b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n' |
|
1152 | b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n' | |
1153 | ) |
|
1153 | ) | |
1154 | ui.warn(msg % slow_path) |
|
1154 | ui.warn(msg % slow_path) | |
1155 | if not ui.quiet: |
|
1155 | if not ui.quiet: | |
1156 | ui.warn(_(b'falling back to default value: %s\n') % default) |
|
1156 | ui.warn(_(b'falling back to default value: %s\n') % default) | |
1157 | slow_path = default |
|
1157 | slow_path = default | |
1158 |
|
1158 | |||
1159 | msg = _( |
|
1159 | msg = _( | |
1160 | b"accessing `persistent-nodemap` repository without associated " |
|
1160 | b"accessing `persistent-nodemap` repository without associated " | |
1161 | b"fast implementation." |
|
1161 | b"fast implementation." | |
1162 | ) |
|
1162 | ) | |
1163 | hint = _( |
|
1163 | hint = _( | |
1164 | b"check `hg help config.format.use-persistent-nodemap` " |
|
1164 | b"check `hg help config.format.use-persistent-nodemap` " | |
1165 | b"for details" |
|
1165 | b"for details" | |
1166 | ) |
|
1166 | ) | |
1167 | if not revlog.HAS_FAST_PERSISTENT_NODEMAP: |
|
1167 | if not revlog.HAS_FAST_PERSISTENT_NODEMAP: | |
1168 | if slow_path == b'warn': |
|
1168 | if slow_path == b'warn': | |
1169 | msg = b"warning: " + msg + b'\n' |
|
1169 | msg = b"warning: " + msg + b'\n' | |
1170 | ui.warn(msg) |
|
1170 | ui.warn(msg) | |
1171 | if not ui.quiet: |
|
1171 | if not ui.quiet: | |
1172 | hint = b'(' + hint + b')\n' |
|
1172 | hint = b'(' + hint + b')\n' | |
1173 | ui.warn(hint) |
|
1173 | ui.warn(hint) | |
1174 | if slow_path == b'abort': |
|
1174 | if slow_path == b'abort': | |
1175 | raise error.Abort(msg, hint=hint) |
|
1175 | raise error.Abort(msg, hint=hint) | |
1176 | options[b'persistent-nodemap'] = True |
|
1176 | options[b'persistent-nodemap'] = True | |
1177 | if requirementsmod.DIRSTATE_V2_REQUIREMENT in requirements: |
|
1177 | if requirementsmod.DIRSTATE_V2_REQUIREMENT in requirements: | |
1178 | slow_path = ui.config(b'storage', b'dirstate-v2.slow-path') |
|
1178 | slow_path = ui.config(b'storage', b'dirstate-v2.slow-path') | |
1179 | if slow_path not in (b'allow', b'warn', b'abort'): |
|
1179 | if slow_path not in (b'allow', b'warn', b'abort'): | |
1180 | default = ui.config_default(b'storage', b'dirstate-v2.slow-path') |
|
1180 | default = ui.config_default(b'storage', b'dirstate-v2.slow-path') | |
1181 | msg = _(b'unknown value for config "dirstate-v2.slow-path": "%s"\n') |
|
1181 | msg = _(b'unknown value for config "dirstate-v2.slow-path": "%s"\n') | |
1182 | ui.warn(msg % slow_path) |
|
1182 | ui.warn(msg % slow_path) | |
1183 | if not ui.quiet: |
|
1183 | if not ui.quiet: | |
1184 | ui.warn(_(b'falling back to default value: %s\n') % default) |
|
1184 | ui.warn(_(b'falling back to default value: %s\n') % default) | |
1185 | slow_path = default |
|
1185 | slow_path = default | |
1186 |
|
1186 | |||
1187 | msg = _( |
|
1187 | msg = _( | |
1188 | b"accessing `dirstate-v2` repository without associated " |
|
1188 | b"accessing `dirstate-v2` repository without associated " | |
1189 | b"fast implementation." |
|
1189 | b"fast implementation." | |
1190 | ) |
|
1190 | ) | |
1191 | hint = _( |
|
1191 | hint = _( | |
1192 | b"check `hg help config.format.use-dirstate-v2` " b"for details" |
|
1192 | b"check `hg help config.format.use-dirstate-v2` " b"for details" | |
1193 | ) |
|
1193 | ) | |
1194 | if not dirstate.HAS_FAST_DIRSTATE_V2: |
|
1194 | if not dirstate.HAS_FAST_DIRSTATE_V2: | |
1195 | if slow_path == b'warn': |
|
1195 | if slow_path == b'warn': | |
1196 | msg = b"warning: " + msg + b'\n' |
|
1196 | msg = b"warning: " + msg + b'\n' | |
1197 | ui.warn(msg) |
|
1197 | ui.warn(msg) | |
1198 | if not ui.quiet: |
|
1198 | if not ui.quiet: | |
1199 | hint = b'(' + hint + b')\n' |
|
1199 | hint = b'(' + hint + b')\n' | |
1200 | ui.warn(hint) |
|
1200 | ui.warn(hint) | |
1201 | if slow_path == b'abort': |
|
1201 | if slow_path == b'abort': | |
1202 | raise error.Abort(msg, hint=hint) |
|
1202 | raise error.Abort(msg, hint=hint) | |
1203 | if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): |
|
1203 | if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): | |
1204 | options[b'persistent-nodemap.mmap'] = True |
|
1204 | options[b'persistent-nodemap.mmap'] = True | |
1205 | if ui.configbool(b'devel', b'persistent-nodemap'): |
|
1205 | if ui.configbool(b'devel', b'persistent-nodemap'): | |
1206 | options[b'devel-force-nodemap'] = True |
|
1206 | options[b'devel-force-nodemap'] = True | |
1207 |
|
1207 | |||
1208 | return options |
|
1208 | return options | |
1209 |
|
1209 | |||
1210 |
|
1210 | |||
1211 | def makemain(**kwargs): |
|
1211 | def makemain(**kwargs): | |
1212 | """Produce a type conforming to ``ilocalrepositorymain``.""" |
|
1212 | """Produce a type conforming to ``ilocalrepositorymain``.""" | |
1213 | return localrepository |
|
1213 | return localrepository | |
1214 |
|
1214 | |||
1215 |
|
1215 | |||
1216 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
1216 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) | |
1217 | class revlogfilestorage(object): |
|
1217 | class revlogfilestorage(object): | |
1218 | """File storage when using revlogs.""" |
|
1218 | """File storage when using revlogs.""" | |
1219 |
|
1219 | |||
1220 | def file(self, path): |
|
1220 | def file(self, path): | |
1221 | if path.startswith(b'/'): |
|
1221 | if path.startswith(b'/'): | |
1222 | path = path[1:] |
|
1222 | path = path[1:] | |
1223 |
|
1223 | |||
1224 | return filelog.filelog(self.svfs, path) |
|
1224 | return filelog.filelog(self.svfs, path) | |
1225 |
|
1225 | |||
1226 |
|
1226 | |||
1227 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
1227 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) | |
1228 | class revlognarrowfilestorage(object): |
|
1228 | class revlognarrowfilestorage(object): | |
1229 | """File storage when using revlogs and narrow files.""" |
|
1229 | """File storage when using revlogs and narrow files.""" | |
1230 |
|
1230 | |||
1231 | def file(self, path): |
|
1231 | def file(self, path): | |
1232 | if path.startswith(b'/'): |
|
1232 | if path.startswith(b'/'): | |
1233 | path = path[1:] |
|
1233 | path = path[1:] | |
1234 |
|
1234 | |||
1235 | return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch) |
|
1235 | return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch) | |
1236 |
|
1236 | |||
1237 |
|
1237 | |||
1238 | def makefilestorage(requirements, features, **kwargs): |
|
1238 | def makefilestorage(requirements, features, **kwargs): | |
1239 | """Produce a type conforming to ``ilocalrepositoryfilestorage``.""" |
|
1239 | """Produce a type conforming to ``ilocalrepositoryfilestorage``.""" | |
1240 | features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE) |
|
1240 | features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE) | |
1241 | features.add(repository.REPO_FEATURE_STREAM_CLONE) |
|
1241 | features.add(repository.REPO_FEATURE_STREAM_CLONE) | |
1242 |
|
1242 | |||
1243 | if requirementsmod.NARROW_REQUIREMENT in requirements: |
|
1243 | if requirementsmod.NARROW_REQUIREMENT in requirements: | |
1244 | return revlognarrowfilestorage |
|
1244 | return revlognarrowfilestorage | |
1245 | else: |
|
1245 | else: | |
1246 | return revlogfilestorage |
|
1246 | return revlogfilestorage | |
1247 |
|
1247 | |||
1248 |
|
1248 | |||
1249 | # List of repository interfaces and factory functions for them. Each |
|
1249 | # List of repository interfaces and factory functions for them. Each | |
1250 | # will be called in order during ``makelocalrepository()`` to iteratively |
|
1250 | # will be called in order during ``makelocalrepository()`` to iteratively | |
1251 | # derive the final type for a local repository instance. We capture the |
|
1251 | # derive the final type for a local repository instance. We capture the | |
1252 | # function as a lambda so we don't hold a reference and the module-level |
|
1252 | # function as a lambda so we don't hold a reference and the module-level | |
1253 | # functions can be wrapped. |
|
1253 | # functions can be wrapped. | |
1254 | REPO_INTERFACES = [ |
|
1254 | REPO_INTERFACES = [ | |
1255 | (repository.ilocalrepositorymain, lambda: makemain), |
|
1255 | (repository.ilocalrepositorymain, lambda: makemain), | |
1256 | (repository.ilocalrepositoryfilestorage, lambda: makefilestorage), |
|
1256 | (repository.ilocalrepositoryfilestorage, lambda: makefilestorage), | |
1257 | ] |
|
1257 | ] | |
1258 |
|
1258 | |||
1259 |
|
1259 | |||
1260 | @interfaceutil.implementer(repository.ilocalrepositorymain) |
|
1260 | @interfaceutil.implementer(repository.ilocalrepositorymain) | |
1261 | class localrepository(object): |
|
1261 | class localrepository(object): | |
1262 | """Main class for representing local repositories. |
|
1262 | """Main class for representing local repositories. | |
1263 |
|
1263 | |||
1264 | All local repositories are instances of this class. |
|
1264 | All local repositories are instances of this class. | |
1265 |
|
1265 | |||
1266 | Constructed on its own, instances of this class are not usable as |
|
1266 | Constructed on its own, instances of this class are not usable as | |
1267 | repository objects. To obtain a usable repository object, call |
|
1267 | repository objects. To obtain a usable repository object, call | |
1268 | ``hg.repository()``, ``localrepo.instance()``, or |
|
1268 | ``hg.repository()``, ``localrepo.instance()``, or | |
1269 | ``localrepo.makelocalrepository()``. The latter is the lowest-level. |
|
1269 | ``localrepo.makelocalrepository()``. The latter is the lowest-level. | |
1270 | ``instance()`` adds support for creating new repositories. |
|
1270 | ``instance()`` adds support for creating new repositories. | |
1271 | ``hg.repository()`` adds more extension integration, including calling |
|
1271 | ``hg.repository()`` adds more extension integration, including calling | |
1272 | ``reposetup()``. Generally speaking, ``hg.repository()`` should be |
|
1272 | ``reposetup()``. Generally speaking, ``hg.repository()`` should be | |
1273 | used. |
|
1273 | used. | |
1274 | """ |
|
1274 | """ | |
1275 |
|
1275 | |||
1276 | # obsolete experimental requirements: |
|
1276 | # obsolete experimental requirements: | |
1277 | # - manifestv2: An experimental new manifest format that allowed |
|
1277 | # - manifestv2: An experimental new manifest format that allowed | |
1278 | # for stem compression of long paths. Experiment ended up not |
|
1278 | # for stem compression of long paths. Experiment ended up not | |
1279 | # being successful (repository sizes went up due to worse delta |
|
1279 | # being successful (repository sizes went up due to worse delta | |
1280 | # chains), and the code was deleted in 4.6. |
|
1280 | # chains), and the code was deleted in 4.6. | |
1281 | supportedformats = { |
|
1281 | supportedformats = { | |
1282 | requirementsmod.REVLOGV1_REQUIREMENT, |
|
1282 | requirementsmod.REVLOGV1_REQUIREMENT, | |
1283 | requirementsmod.GENERALDELTA_REQUIREMENT, |
|
1283 | requirementsmod.GENERALDELTA_REQUIREMENT, | |
1284 | requirementsmod.TREEMANIFEST_REQUIREMENT, |
|
1284 | requirementsmod.TREEMANIFEST_REQUIREMENT, | |
1285 | requirementsmod.COPIESSDC_REQUIREMENT, |
|
1285 | requirementsmod.COPIESSDC_REQUIREMENT, | |
1286 | requirementsmod.REVLOGV2_REQUIREMENT, |
|
1286 | requirementsmod.REVLOGV2_REQUIREMENT, | |
1287 | requirementsmod.CHANGELOGV2_REQUIREMENT, |
|
1287 | requirementsmod.CHANGELOGV2_REQUIREMENT, | |
1288 | requirementsmod.SPARSEREVLOG_REQUIREMENT, |
|
1288 | requirementsmod.SPARSEREVLOG_REQUIREMENT, | |
1289 | requirementsmod.NODEMAP_REQUIREMENT, |
|
1289 | requirementsmod.NODEMAP_REQUIREMENT, | |
1290 | bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, |
|
1290 | bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, | |
1291 | requirementsmod.SHARESAFE_REQUIREMENT, |
|
1291 | requirementsmod.SHARESAFE_REQUIREMENT, | |
1292 | requirementsmod.DIRSTATE_V2_REQUIREMENT, |
|
1292 | requirementsmod.DIRSTATE_V2_REQUIREMENT, | |
1293 | } |
|
1293 | } | |
1294 | _basesupported = supportedformats | { |
|
1294 | _basesupported = supportedformats | { | |
1295 | requirementsmod.STORE_REQUIREMENT, |
|
1295 | requirementsmod.STORE_REQUIREMENT, | |
1296 | requirementsmod.FNCACHE_REQUIREMENT, |
|
1296 | requirementsmod.FNCACHE_REQUIREMENT, | |
1297 | requirementsmod.SHARED_REQUIREMENT, |
|
1297 | requirementsmod.SHARED_REQUIREMENT, | |
1298 | requirementsmod.RELATIVE_SHARED_REQUIREMENT, |
|
1298 | requirementsmod.RELATIVE_SHARED_REQUIREMENT, | |
1299 | requirementsmod.DOTENCODE_REQUIREMENT, |
|
1299 | requirementsmod.DOTENCODE_REQUIREMENT, | |
1300 | requirementsmod.SPARSE_REQUIREMENT, |
|
1300 | requirementsmod.SPARSE_REQUIREMENT, | |
1301 | requirementsmod.INTERNAL_PHASE_REQUIREMENT, |
|
1301 | requirementsmod.INTERNAL_PHASE_REQUIREMENT, | |
1302 | } |
|
1302 | } | |
1303 |
|
1303 | |||
1304 | # list of prefix for file which can be written without 'wlock' |
|
1304 | # list of prefix for file which can be written without 'wlock' | |
1305 | # Extensions should extend this list when needed |
|
1305 | # Extensions should extend this list when needed | |
1306 | _wlockfreeprefix = { |
|
1306 | _wlockfreeprefix = { | |
1307 | # We migh consider requiring 'wlock' for the next |
|
1307 | # We migh consider requiring 'wlock' for the next | |
1308 | # two, but pretty much all the existing code assume |
|
1308 | # two, but pretty much all the existing code assume | |
1309 | # wlock is not needed so we keep them excluded for |
|
1309 | # wlock is not needed so we keep them excluded for | |
1310 | # now. |
|
1310 | # now. | |
1311 | b'hgrc', |
|
1311 | b'hgrc', | |
1312 | b'requires', |
|
1312 | b'requires', | |
1313 | # XXX cache is a complicatged business someone |
|
1313 | # XXX cache is a complicatged business someone | |
1314 | # should investigate this in depth at some point |
|
1314 | # should investigate this in depth at some point | |
1315 | b'cache/', |
|
1315 | b'cache/', | |
1316 | # XXX shouldn't be dirstate covered by the wlock? |
|
1316 | # XXX shouldn't be dirstate covered by the wlock? | |
1317 | b'dirstate', |
|
1317 | b'dirstate', | |
1318 | # XXX bisect was still a bit too messy at the time |
|
1318 | # XXX bisect was still a bit too messy at the time | |
1319 | # this changeset was introduced. Someone should fix |
|
1319 | # this changeset was introduced. Someone should fix | |
1320 | # the remainig bit and drop this line |
|
1320 | # the remainig bit and drop this line | |
1321 | b'bisect.state', |
|
1321 | b'bisect.state', | |
1322 | } |
|
1322 | } | |
1323 |
|
1323 | |||
1324 | def __init__( |
|
1324 | def __init__( | |
1325 | self, |
|
1325 | self, | |
1326 | baseui, |
|
1326 | baseui, | |
1327 | ui, |
|
1327 | ui, | |
1328 | origroot, |
|
1328 | origroot, | |
1329 | wdirvfs, |
|
1329 | wdirvfs, | |
1330 | hgvfs, |
|
1330 | hgvfs, | |
1331 | requirements, |
|
1331 | requirements, | |
1332 | supportedrequirements, |
|
1332 | supportedrequirements, | |
1333 | sharedpath, |
|
1333 | sharedpath, | |
1334 | store, |
|
1334 | store, | |
1335 | cachevfs, |
|
1335 | cachevfs, | |
1336 | wcachevfs, |
|
1336 | wcachevfs, | |
1337 | features, |
|
1337 | features, | |
1338 | intents=None, |
|
1338 | intents=None, | |
1339 | ): |
|
1339 | ): | |
1340 | """Create a new local repository instance. |
|
1340 | """Create a new local repository instance. | |
1341 |
|
1341 | |||
1342 | Most callers should use ``hg.repository()``, ``localrepo.instance()``, |
|
1342 | Most callers should use ``hg.repository()``, ``localrepo.instance()``, | |
1343 | or ``localrepo.makelocalrepository()`` for obtaining a new repository |
|
1343 | or ``localrepo.makelocalrepository()`` for obtaining a new repository | |
1344 | object. |
|
1344 | object. | |
1345 |
|
1345 | |||
1346 | Arguments: |
|
1346 | Arguments: | |
1347 |
|
1347 | |||
1348 | baseui |
|
1348 | baseui | |
1349 | ``ui.ui`` instance that ``ui`` argument was based off of. |
|
1349 | ``ui.ui`` instance that ``ui`` argument was based off of. | |
1350 |
|
1350 | |||
1351 | ui |
|
1351 | ui | |
1352 | ``ui.ui`` instance for use by the repository. |
|
1352 | ``ui.ui`` instance for use by the repository. | |
1353 |
|
1353 | |||
1354 | origroot |
|
1354 | origroot | |
1355 | ``bytes`` path to working directory root of this repository. |
|
1355 | ``bytes`` path to working directory root of this repository. | |
1356 |
|
1356 | |||
1357 | wdirvfs |
|
1357 | wdirvfs | |
1358 | ``vfs.vfs`` rooted at the working directory. |
|
1358 | ``vfs.vfs`` rooted at the working directory. | |
1359 |
|
1359 | |||
1360 | hgvfs |
|
1360 | hgvfs | |
1361 | ``vfs.vfs`` rooted at .hg/ |
|
1361 | ``vfs.vfs`` rooted at .hg/ | |
1362 |
|
1362 | |||
1363 | requirements |
|
1363 | requirements | |
1364 | ``set`` of bytestrings representing repository opening requirements. |
|
1364 | ``set`` of bytestrings representing repository opening requirements. | |
1365 |
|
1365 | |||
1366 | supportedrequirements |
|
1366 | supportedrequirements | |
1367 | ``set`` of bytestrings representing repository requirements that we |
|
1367 | ``set`` of bytestrings representing repository requirements that we | |
1368 | know how to open. May be a supetset of ``requirements``. |
|
1368 | know how to open. May be a supetset of ``requirements``. | |
1369 |
|
1369 | |||
1370 | sharedpath |
|
1370 | sharedpath | |
1371 | ``bytes`` Defining path to storage base directory. Points to a |
|
1371 | ``bytes`` Defining path to storage base directory. Points to a | |
1372 | ``.hg/`` directory somewhere. |
|
1372 | ``.hg/`` directory somewhere. | |
1373 |
|
1373 | |||
1374 | store |
|
1374 | store | |
1375 | ``store.basicstore`` (or derived) instance providing access to |
|
1375 | ``store.basicstore`` (or derived) instance providing access to | |
1376 | versioned storage. |
|
1376 | versioned storage. | |
1377 |
|
1377 | |||
1378 | cachevfs |
|
1378 | cachevfs | |
1379 | ``vfs.vfs`` used for cache files. |
|
1379 | ``vfs.vfs`` used for cache files. | |
1380 |
|
1380 | |||
1381 | wcachevfs |
|
1381 | wcachevfs | |
1382 | ``vfs.vfs`` used for cache files related to the working copy. |
|
1382 | ``vfs.vfs`` used for cache files related to the working copy. | |
1383 |
|
1383 | |||
1384 | features |
|
1384 | features | |
1385 | ``set`` of bytestrings defining features/capabilities of this |
|
1385 | ``set`` of bytestrings defining features/capabilities of this | |
1386 | instance. |
|
1386 | instance. | |
1387 |
|
1387 | |||
1388 | intents |
|
1388 | intents | |
1389 | ``set`` of system strings indicating what this repo will be used |
|
1389 | ``set`` of system strings indicating what this repo will be used | |
1390 | for. |
|
1390 | for. | |
1391 | """ |
|
1391 | """ | |
1392 | self.baseui = baseui |
|
1392 | self.baseui = baseui | |
1393 | self.ui = ui |
|
1393 | self.ui = ui | |
1394 | self.origroot = origroot |
|
1394 | self.origroot = origroot | |
1395 | # vfs rooted at working directory. |
|
1395 | # vfs rooted at working directory. | |
1396 | self.wvfs = wdirvfs |
|
1396 | self.wvfs = wdirvfs | |
1397 | self.root = wdirvfs.base |
|
1397 | self.root = wdirvfs.base | |
1398 | # vfs rooted at .hg/. Used to access most non-store paths. |
|
1398 | # vfs rooted at .hg/. Used to access most non-store paths. | |
1399 | self.vfs = hgvfs |
|
1399 | self.vfs = hgvfs | |
1400 | self.path = hgvfs.base |
|
1400 | self.path = hgvfs.base | |
1401 | self.requirements = requirements |
|
1401 | self.requirements = requirements | |
1402 | self.nodeconstants = sha1nodeconstants |
|
1402 | self.nodeconstants = sha1nodeconstants | |
1403 | self.nullid = self.nodeconstants.nullid |
|
1403 | self.nullid = self.nodeconstants.nullid | |
1404 | self.supported = supportedrequirements |
|
1404 | self.supported = supportedrequirements | |
1405 | self.sharedpath = sharedpath |
|
1405 | self.sharedpath = sharedpath | |
1406 | self.store = store |
|
1406 | self.store = store | |
1407 | self.cachevfs = cachevfs |
|
1407 | self.cachevfs = cachevfs | |
1408 | self.wcachevfs = wcachevfs |
|
1408 | self.wcachevfs = wcachevfs | |
1409 | self.features = features |
|
1409 | self.features = features | |
1410 |
|
1410 | |||
1411 | self.filtername = None |
|
1411 | self.filtername = None | |
1412 |
|
1412 | |||
1413 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1413 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
1414 | b'devel', b'check-locks' |
|
1414 | b'devel', b'check-locks' | |
1415 | ): |
|
1415 | ): | |
1416 | self.vfs.audit = self._getvfsward(self.vfs.audit) |
|
1416 | self.vfs.audit = self._getvfsward(self.vfs.audit) | |
1417 | # A list of callback to shape the phase if no data were found. |
|
1417 | # A list of callback to shape the phase if no data were found. | |
1418 | # Callback are in the form: func(repo, roots) --> processed root. |
|
1418 | # Callback are in the form: func(repo, roots) --> processed root. | |
1419 | # This list it to be filled by extension during repo setup |
|
1419 | # This list it to be filled by extension during repo setup | |
1420 | self._phasedefaults = [] |
|
1420 | self._phasedefaults = [] | |
1421 |
|
1421 | |||
1422 | color.setup(self.ui) |
|
1422 | color.setup(self.ui) | |
1423 |
|
1423 | |||
1424 | self.spath = self.store.path |
|
1424 | self.spath = self.store.path | |
1425 | self.svfs = self.store.vfs |
|
1425 | self.svfs = self.store.vfs | |
1426 | self.sjoin = self.store.join |
|
1426 | self.sjoin = self.store.join | |
1427 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1427 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
1428 | b'devel', b'check-locks' |
|
1428 | b'devel', b'check-locks' | |
1429 | ): |
|
1429 | ): | |
1430 | if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs |
|
1430 | if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs | |
1431 | self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) |
|
1431 | self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) | |
1432 | else: # standard vfs |
|
1432 | else: # standard vfs | |
1433 | self.svfs.audit = self._getsvfsward(self.svfs.audit) |
|
1433 | self.svfs.audit = self._getsvfsward(self.svfs.audit) | |
1434 |
|
1434 | |||
1435 | self._dirstatevalidatewarned = False |
|
1435 | self._dirstatevalidatewarned = False | |
1436 |
|
1436 | |||
1437 | self._branchcaches = branchmap.BranchMapCache() |
|
1437 | self._branchcaches = branchmap.BranchMapCache() | |
1438 | self._revbranchcache = None |
|
1438 | self._revbranchcache = None | |
1439 | self._filterpats = {} |
|
1439 | self._filterpats = {} | |
1440 | self._datafilters = {} |
|
1440 | self._datafilters = {} | |
1441 | self._transref = self._lockref = self._wlockref = None |
|
1441 | self._transref = self._lockref = self._wlockref = None | |
1442 |
|
1442 | |||
1443 | # A cache for various files under .hg/ that tracks file changes, |
|
1443 | # A cache for various files under .hg/ that tracks file changes, | |
1444 | # (used by the filecache decorator) |
|
1444 | # (used by the filecache decorator) | |
1445 | # |
|
1445 | # | |
1446 | # Maps a property name to its util.filecacheentry |
|
1446 | # Maps a property name to its util.filecacheentry | |
1447 | self._filecache = {} |
|
1447 | self._filecache = {} | |
1448 |
|
1448 | |||
1449 | # hold sets of revision to be filtered |
|
1449 | # hold sets of revision to be filtered | |
1450 | # should be cleared when something might have changed the filter value: |
|
1450 | # should be cleared when something might have changed the filter value: | |
1451 | # - new changesets, |
|
1451 | # - new changesets, | |
1452 | # - phase change, |
|
1452 | # - phase change, | |
1453 | # - new obsolescence marker, |
|
1453 | # - new obsolescence marker, | |
1454 | # - working directory parent change, |
|
1454 | # - working directory parent change, | |
1455 | # - bookmark changes |
|
1455 | # - bookmark changes | |
1456 | self.filteredrevcache = {} |
|
1456 | self.filteredrevcache = {} | |
1457 |
|
1457 | |||
1458 | # post-dirstate-status hooks |
|
1458 | # post-dirstate-status hooks | |
1459 | self._postdsstatus = [] |
|
1459 | self._postdsstatus = [] | |
1460 |
|
1460 | |||
1461 | # generic mapping between names and nodes |
|
1461 | # generic mapping between names and nodes | |
1462 | self.names = namespaces.namespaces() |
|
1462 | self.names = namespaces.namespaces() | |
1463 |
|
1463 | |||
1464 | # Key to signature value. |
|
1464 | # Key to signature value. | |
1465 | self._sparsesignaturecache = {} |
|
1465 | self._sparsesignaturecache = {} | |
1466 | # Signature to cached matcher instance. |
|
1466 | # Signature to cached matcher instance. | |
1467 | self._sparsematchercache = {} |
|
1467 | self._sparsematchercache = {} | |
1468 |
|
1468 | |||
1469 | self._extrafilterid = repoview.extrafilter(ui) |
|
1469 | self._extrafilterid = repoview.extrafilter(ui) | |
1470 |
|
1470 | |||
1471 | self.filecopiesmode = None |
|
1471 | self.filecopiesmode = None | |
1472 | if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements: |
|
1472 | if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements: | |
1473 | self.filecopiesmode = b'changeset-sidedata' |
|
1473 | self.filecopiesmode = b'changeset-sidedata' | |
1474 |
|
1474 | |||
1475 | self._wanted_sidedata = set() |
|
1475 | self._wanted_sidedata = set() | |
1476 | self._sidedata_computers = {} |
|
1476 | self._sidedata_computers = {} | |
1477 | sidedatamod.set_sidedata_spec_for_repo(self) |
|
1477 | sidedatamod.set_sidedata_spec_for_repo(self) | |
1478 |
|
1478 | |||
1479 | def _getvfsward(self, origfunc): |
|
1479 | def _getvfsward(self, origfunc): | |
1480 | """build a ward for self.vfs""" |
|
1480 | """build a ward for self.vfs""" | |
1481 | rref = weakref.ref(self) |
|
1481 | rref = weakref.ref(self) | |
1482 |
|
1482 | |||
1483 | def checkvfs(path, mode=None): |
|
1483 | def checkvfs(path, mode=None): | |
1484 | ret = origfunc(path, mode=mode) |
|
1484 | ret = origfunc(path, mode=mode) | |
1485 | repo = rref() |
|
1485 | repo = rref() | |
1486 | if ( |
|
1486 | if ( | |
1487 | repo is None |
|
1487 | repo is None | |
1488 | or not util.safehasattr(repo, b'_wlockref') |
|
1488 | or not util.safehasattr(repo, b'_wlockref') | |
1489 | or not util.safehasattr(repo, b'_lockref') |
|
1489 | or not util.safehasattr(repo, b'_lockref') | |
1490 | ): |
|
1490 | ): | |
1491 | return |
|
1491 | return | |
1492 | if mode in (None, b'r', b'rb'): |
|
1492 | if mode in (None, b'r', b'rb'): | |
1493 | return |
|
1493 | return | |
1494 | if path.startswith(repo.path): |
|
1494 | if path.startswith(repo.path): | |
1495 | # truncate name relative to the repository (.hg) |
|
1495 | # truncate name relative to the repository (.hg) | |
1496 | path = path[len(repo.path) + 1 :] |
|
1496 | path = path[len(repo.path) + 1 :] | |
1497 | if path.startswith(b'cache/'): |
|
1497 | if path.startswith(b'cache/'): | |
1498 | msg = b'accessing cache with vfs instead of cachevfs: "%s"' |
|
1498 | msg = b'accessing cache with vfs instead of cachevfs: "%s"' | |
1499 | repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs") |
|
1499 | repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs") | |
1500 | # path prefixes covered by 'lock' |
|
1500 | # path prefixes covered by 'lock' | |
1501 | vfs_path_prefixes = ( |
|
1501 | vfs_path_prefixes = ( | |
1502 | b'journal.', |
|
1502 | b'journal.', | |
1503 | b'undo.', |
|
1503 | b'undo.', | |
1504 | b'strip-backup/', |
|
1504 | b'strip-backup/', | |
1505 | b'cache/', |
|
1505 | b'cache/', | |
1506 | ) |
|
1506 | ) | |
1507 | if any(path.startswith(prefix) for prefix in vfs_path_prefixes): |
|
1507 | if any(path.startswith(prefix) for prefix in vfs_path_prefixes): | |
1508 | if repo._currentlock(repo._lockref) is None: |
|
1508 | if repo._currentlock(repo._lockref) is None: | |
1509 | repo.ui.develwarn( |
|
1509 | repo.ui.develwarn( | |
1510 | b'write with no lock: "%s"' % path, |
|
1510 | b'write with no lock: "%s"' % path, | |
1511 | stacklevel=3, |
|
1511 | stacklevel=3, | |
1512 | config=b'check-locks', |
|
1512 | config=b'check-locks', | |
1513 | ) |
|
1513 | ) | |
1514 | elif repo._currentlock(repo._wlockref) is None: |
|
1514 | elif repo._currentlock(repo._wlockref) is None: | |
1515 | # rest of vfs files are covered by 'wlock' |
|
1515 | # rest of vfs files are covered by 'wlock' | |
1516 | # |
|
1516 | # | |
1517 | # exclude special files |
|
1517 | # exclude special files | |
1518 | for prefix in self._wlockfreeprefix: |
|
1518 | for prefix in self._wlockfreeprefix: | |
1519 | if path.startswith(prefix): |
|
1519 | if path.startswith(prefix): | |
1520 | return |
|
1520 | return | |
1521 | repo.ui.develwarn( |
|
1521 | repo.ui.develwarn( | |
1522 | b'write with no wlock: "%s"' % path, |
|
1522 | b'write with no wlock: "%s"' % path, | |
1523 | stacklevel=3, |
|
1523 | stacklevel=3, | |
1524 | config=b'check-locks', |
|
1524 | config=b'check-locks', | |
1525 | ) |
|
1525 | ) | |
1526 | return ret |
|
1526 | return ret | |
1527 |
|
1527 | |||
1528 | return checkvfs |
|
1528 | return checkvfs | |
1529 |
|
1529 | |||
1530 | def _getsvfsward(self, origfunc): |
|
1530 | def _getsvfsward(self, origfunc): | |
1531 | """build a ward for self.svfs""" |
|
1531 | """build a ward for self.svfs""" | |
1532 | rref = weakref.ref(self) |
|
1532 | rref = weakref.ref(self) | |
1533 |
|
1533 | |||
1534 | def checksvfs(path, mode=None): |
|
1534 | def checksvfs(path, mode=None): | |
1535 | ret = origfunc(path, mode=mode) |
|
1535 | ret = origfunc(path, mode=mode) | |
1536 | repo = rref() |
|
1536 | repo = rref() | |
1537 | if repo is None or not util.safehasattr(repo, b'_lockref'): |
|
1537 | if repo is None or not util.safehasattr(repo, b'_lockref'): | |
1538 | return |
|
1538 | return | |
1539 | if mode in (None, b'r', b'rb'): |
|
1539 | if mode in (None, b'r', b'rb'): | |
1540 | return |
|
1540 | return | |
1541 | if path.startswith(repo.sharedpath): |
|
1541 | if path.startswith(repo.sharedpath): | |
1542 | # truncate name relative to the repository (.hg) |
|
1542 | # truncate name relative to the repository (.hg) | |
1543 | path = path[len(repo.sharedpath) + 1 :] |
|
1543 | path = path[len(repo.sharedpath) + 1 :] | |
1544 | if repo._currentlock(repo._lockref) is None: |
|
1544 | if repo._currentlock(repo._lockref) is None: | |
1545 | repo.ui.develwarn( |
|
1545 | repo.ui.develwarn( | |
1546 | b'write with no lock: "%s"' % path, stacklevel=4 |
|
1546 | b'write with no lock: "%s"' % path, stacklevel=4 | |
1547 | ) |
|
1547 | ) | |
1548 | return ret |
|
1548 | return ret | |
1549 |
|
1549 | |||
1550 | return checksvfs |
|
1550 | return checksvfs | |
1551 |
|
1551 | |||
1552 | def close(self): |
|
1552 | def close(self): | |
1553 | self._writecaches() |
|
1553 | self._writecaches() | |
1554 |
|
1554 | |||
1555 | def _writecaches(self): |
|
1555 | def _writecaches(self): | |
1556 | if self._revbranchcache: |
|
1556 | if self._revbranchcache: | |
1557 | self._revbranchcache.write() |
|
1557 | self._revbranchcache.write() | |
1558 |
|
1558 | |||
1559 | def _restrictcapabilities(self, caps): |
|
1559 | def _restrictcapabilities(self, caps): | |
1560 | if self.ui.configbool(b'experimental', b'bundle2-advertise'): |
|
1560 | if self.ui.configbool(b'experimental', b'bundle2-advertise'): | |
1561 | caps = set(caps) |
|
1561 | caps = set(caps) | |
1562 | capsblob = bundle2.encodecaps( |
|
1562 | capsblob = bundle2.encodecaps( | |
1563 | bundle2.getrepocaps(self, role=b'client') |
|
1563 | bundle2.getrepocaps(self, role=b'client') | |
1564 | ) |
|
1564 | ) | |
1565 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) |
|
1565 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) | |
1566 | if self.ui.configbool(b'experimental', b'narrow'): |
|
1566 | if self.ui.configbool(b'experimental', b'narrow'): | |
1567 | caps.add(wireprototypes.NARROWCAP) |
|
1567 | caps.add(wireprototypes.NARROWCAP) | |
1568 | return caps |
|
1568 | return caps | |
1569 |
|
1569 | |||
1570 | # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: |
|
1570 | # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: | |
1571 | # self -> auditor -> self._checknested -> self |
|
1571 | # self -> auditor -> self._checknested -> self | |
1572 |
|
1572 | |||
1573 | @property |
|
1573 | @property | |
1574 | def auditor(self): |
|
1574 | def auditor(self): | |
1575 | # This is only used by context.workingctx.match in order to |
|
1575 | # This is only used by context.workingctx.match in order to | |
1576 | # detect files in subrepos. |
|
1576 | # detect files in subrepos. | |
1577 | return pathutil.pathauditor(self.root, callback=self._checknested) |
|
1577 | return pathutil.pathauditor(self.root, callback=self._checknested) | |
1578 |
|
1578 | |||
1579 | @property |
|
1579 | @property | |
1580 | def nofsauditor(self): |
|
1580 | def nofsauditor(self): | |
1581 | # This is only used by context.basectx.match in order to detect |
|
1581 | # This is only used by context.basectx.match in order to detect | |
1582 | # files in subrepos. |
|
1582 | # files in subrepos. | |
1583 | return pathutil.pathauditor( |
|
1583 | return pathutil.pathauditor( | |
1584 | self.root, callback=self._checknested, realfs=False, cached=True |
|
1584 | self.root, callback=self._checknested, realfs=False, cached=True | |
1585 | ) |
|
1585 | ) | |
1586 |
|
1586 | |||
1587 | def _checknested(self, path): |
|
1587 | def _checknested(self, path): | |
1588 | """Determine if path is a legal nested repository.""" |
|
1588 | """Determine if path is a legal nested repository.""" | |
1589 | if not path.startswith(self.root): |
|
1589 | if not path.startswith(self.root): | |
1590 | return False |
|
1590 | return False | |
1591 | subpath = path[len(self.root) + 1 :] |
|
1591 | subpath = path[len(self.root) + 1 :] | |
1592 | normsubpath = util.pconvert(subpath) |
|
1592 | normsubpath = util.pconvert(subpath) | |
1593 |
|
1593 | |||
1594 | # XXX: Checking against the current working copy is wrong in |
|
1594 | # XXX: Checking against the current working copy is wrong in | |
1595 | # the sense that it can reject things like |
|
1595 | # the sense that it can reject things like | |
1596 | # |
|
1596 | # | |
1597 | # $ hg cat -r 10 sub/x.txt |
|
1597 | # $ hg cat -r 10 sub/x.txt | |
1598 | # |
|
1598 | # | |
1599 | # if sub/ is no longer a subrepository in the working copy |
|
1599 | # if sub/ is no longer a subrepository in the working copy | |
1600 | # parent revision. |
|
1600 | # parent revision. | |
1601 | # |
|
1601 | # | |
1602 | # However, it can of course also allow things that would have |
|
1602 | # However, it can of course also allow things that would have | |
1603 | # been rejected before, such as the above cat command if sub/ |
|
1603 | # been rejected before, such as the above cat command if sub/ | |
1604 | # is a subrepository now, but was a normal directory before. |
|
1604 | # is a subrepository now, but was a normal directory before. | |
1605 | # The old path auditor would have rejected by mistake since it |
|
1605 | # The old path auditor would have rejected by mistake since it | |
1606 | # panics when it sees sub/.hg/. |
|
1606 | # panics when it sees sub/.hg/. | |
1607 | # |
|
1607 | # | |
1608 | # All in all, checking against the working copy seems sensible |
|
1608 | # All in all, checking against the working copy seems sensible | |
1609 | # since we want to prevent access to nested repositories on |
|
1609 | # since we want to prevent access to nested repositories on | |
1610 | # the filesystem *now*. |
|
1610 | # the filesystem *now*. | |
1611 | ctx = self[None] |
|
1611 | ctx = self[None] | |
1612 | parts = util.splitpath(subpath) |
|
1612 | parts = util.splitpath(subpath) | |
1613 | while parts: |
|
1613 | while parts: | |
1614 | prefix = b'/'.join(parts) |
|
1614 | prefix = b'/'.join(parts) | |
1615 | if prefix in ctx.substate: |
|
1615 | if prefix in ctx.substate: | |
1616 | if prefix == normsubpath: |
|
1616 | if prefix == normsubpath: | |
1617 | return True |
|
1617 | return True | |
1618 | else: |
|
1618 | else: | |
1619 | sub = ctx.sub(prefix) |
|
1619 | sub = ctx.sub(prefix) | |
1620 | return sub.checknested(subpath[len(prefix) + 1 :]) |
|
1620 | return sub.checknested(subpath[len(prefix) + 1 :]) | |
1621 | else: |
|
1621 | else: | |
1622 | parts.pop() |
|
1622 | parts.pop() | |
1623 | return False |
|
1623 | return False | |
1624 |
|
1624 | |||
1625 | def peer(self): |
|
1625 | def peer(self): | |
1626 | return localpeer(self) # not cached to avoid reference cycle |
|
1626 | return localpeer(self) # not cached to avoid reference cycle | |
1627 |
|
1627 | |||
1628 | def unfiltered(self): |
|
1628 | def unfiltered(self): | |
1629 | """Return unfiltered version of the repository |
|
1629 | """Return unfiltered version of the repository | |
1630 |
|
1630 | |||
1631 | Intended to be overwritten by filtered repo.""" |
|
1631 | Intended to be overwritten by filtered repo.""" | |
1632 | return self |
|
1632 | return self | |
1633 |
|
1633 | |||
1634 | def filtered(self, name, visibilityexceptions=None): |
|
1634 | def filtered(self, name, visibilityexceptions=None): | |
1635 | """Return a filtered version of a repository |
|
1635 | """Return a filtered version of a repository | |
1636 |
|
1636 | |||
1637 | The `name` parameter is the identifier of the requested view. This |
|
1637 | The `name` parameter is the identifier of the requested view. This | |
1638 | will return a repoview object set "exactly" to the specified view. |
|
1638 | will return a repoview object set "exactly" to the specified view. | |
1639 |
|
1639 | |||
1640 | This function does not apply recursive filtering to a repository. For |
|
1640 | This function does not apply recursive filtering to a repository. For | |
1641 | example calling `repo.filtered("served")` will return a repoview using |
|
1641 | example calling `repo.filtered("served")` will return a repoview using | |
1642 | the "served" view, regardless of the initial view used by `repo`. |
|
1642 | the "served" view, regardless of the initial view used by `repo`. | |
1643 |
|
1643 | |||
1644 | In other word, there is always only one level of `repoview` "filtering". |
|
1644 | In other word, there is always only one level of `repoview` "filtering". | |
1645 | """ |
|
1645 | """ | |
1646 | if self._extrafilterid is not None and b'%' not in name: |
|
1646 | if self._extrafilterid is not None and b'%' not in name: | |
1647 | name = name + b'%' + self._extrafilterid |
|
1647 | name = name + b'%' + self._extrafilterid | |
1648 |
|
1648 | |||
1649 | cls = repoview.newtype(self.unfiltered().__class__) |
|
1649 | cls = repoview.newtype(self.unfiltered().__class__) | |
1650 | return cls(self, name, visibilityexceptions) |
|
1650 | return cls(self, name, visibilityexceptions) | |
1651 |
|
1651 | |||
1652 | @mixedrepostorecache( |
|
1652 | @mixedrepostorecache( | |
1653 | (b'bookmarks', b'plain'), |
|
1653 | (b'bookmarks', b'plain'), | |
1654 | (b'bookmarks.current', b'plain'), |
|
1654 | (b'bookmarks.current', b'plain'), | |
1655 | (b'bookmarks', b''), |
|
1655 | (b'bookmarks', b''), | |
1656 | (b'00changelog.i', b''), |
|
1656 | (b'00changelog.i', b''), | |
1657 | ) |
|
1657 | ) | |
1658 | def _bookmarks(self): |
|
1658 | def _bookmarks(self): | |
1659 | # Since the multiple files involved in the transaction cannot be |
|
1659 | # Since the multiple files involved in the transaction cannot be | |
1660 | # written atomically (with current repository format), there is a race |
|
1660 | # written atomically (with current repository format), there is a race | |
1661 | # condition here. |
|
1661 | # condition here. | |
1662 | # |
|
1662 | # | |
1663 | # 1) changelog content A is read |
|
1663 | # 1) changelog content A is read | |
1664 | # 2) outside transaction update changelog to content B |
|
1664 | # 2) outside transaction update changelog to content B | |
1665 | # 3) outside transaction update bookmark file referring to content B |
|
1665 | # 3) outside transaction update bookmark file referring to content B | |
1666 | # 4) bookmarks file content is read and filtered against changelog-A |
|
1666 | # 4) bookmarks file content is read and filtered against changelog-A | |
1667 | # |
|
1667 | # | |
1668 | # When this happens, bookmarks against nodes missing from A are dropped. |
|
1668 | # When this happens, bookmarks against nodes missing from A are dropped. | |
1669 | # |
|
1669 | # | |
1670 | # Having this happening during read is not great, but it become worse |
|
1670 | # Having this happening during read is not great, but it become worse | |
1671 | # when this happen during write because the bookmarks to the "unknown" |
|
1671 | # when this happen during write because the bookmarks to the "unknown" | |
1672 | # nodes will be dropped for good. However, writes happen within locks. |
|
1672 | # nodes will be dropped for good. However, writes happen within locks. | |
1673 | # This locking makes it possible to have a race free consistent read. |
|
1673 | # This locking makes it possible to have a race free consistent read. | |
1674 | # For this purpose data read from disc before locking are |
|
1674 | # For this purpose data read from disc before locking are | |
1675 | # "invalidated" right after the locks are taken. This invalidations are |
|
1675 | # "invalidated" right after the locks are taken. This invalidations are | |
1676 | # "light", the `filecache` mechanism keep the data in memory and will |
|
1676 | # "light", the `filecache` mechanism keep the data in memory and will | |
1677 | # reuse them if the underlying files did not changed. Not parsing the |
|
1677 | # reuse them if the underlying files did not changed. Not parsing the | |
1678 | # same data multiple times helps performances. |
|
1678 | # same data multiple times helps performances. | |
1679 | # |
|
1679 | # | |
1680 | # Unfortunately in the case describe above, the files tracked by the |
|
1680 | # Unfortunately in the case describe above, the files tracked by the | |
1681 | # bookmarks file cache might not have changed, but the in-memory |
|
1681 | # bookmarks file cache might not have changed, but the in-memory | |
1682 | # content is still "wrong" because we used an older changelog content |
|
1682 | # content is still "wrong" because we used an older changelog content | |
1683 | # to process the on-disk data. So after locking, the changelog would be |
|
1683 | # to process the on-disk data. So after locking, the changelog would be | |
1684 | # refreshed but `_bookmarks` would be preserved. |
|
1684 | # refreshed but `_bookmarks` would be preserved. | |
1685 | # Adding `00changelog.i` to the list of tracked file is not |
|
1685 | # Adding `00changelog.i` to the list of tracked file is not | |
1686 | # enough, because at the time we build the content for `_bookmarks` in |
|
1686 | # enough, because at the time we build the content for `_bookmarks` in | |
1687 | # (4), the changelog file has already diverged from the content used |
|
1687 | # (4), the changelog file has already diverged from the content used | |
1688 | # for loading `changelog` in (1) |
|
1688 | # for loading `changelog` in (1) | |
1689 | # |
|
1689 | # | |
1690 | # To prevent the issue, we force the changelog to be explicitly |
|
1690 | # To prevent the issue, we force the changelog to be explicitly | |
1691 | # reloaded while computing `_bookmarks`. The data race can still happen |
|
1691 | # reloaded while computing `_bookmarks`. The data race can still happen | |
1692 | # without the lock (with a narrower window), but it would no longer go |
|
1692 | # without the lock (with a narrower window), but it would no longer go | |
1693 | # undetected during the lock time refresh. |
|
1693 | # undetected during the lock time refresh. | |
1694 | # |
|
1694 | # | |
1695 | # The new schedule is as follow |
|
1695 | # The new schedule is as follow | |
1696 | # |
|
1696 | # | |
1697 | # 1) filecache logic detect that `_bookmarks` needs to be computed |
|
1697 | # 1) filecache logic detect that `_bookmarks` needs to be computed | |
1698 | # 2) cachestat for `bookmarks` and `changelog` are captured (for book) |
|
1698 | # 2) cachestat for `bookmarks` and `changelog` are captured (for book) | |
1699 | # 3) We force `changelog` filecache to be tested |
|
1699 | # 3) We force `changelog` filecache to be tested | |
1700 | # 4) cachestat for `changelog` are captured (for changelog) |
|
1700 | # 4) cachestat for `changelog` are captured (for changelog) | |
1701 | # 5) `_bookmarks` is computed and cached |
|
1701 | # 5) `_bookmarks` is computed and cached | |
1702 | # |
|
1702 | # | |
1703 | # The step in (3) ensure we have a changelog at least as recent as the |
|
1703 | # The step in (3) ensure we have a changelog at least as recent as the | |
1704 | # cache stat computed in (1). As a result at locking time: |
|
1704 | # cache stat computed in (1). As a result at locking time: | |
1705 | # * if the changelog did not changed since (1) -> we can reuse the data |
|
1705 | # * if the changelog did not changed since (1) -> we can reuse the data | |
1706 | # * otherwise -> the bookmarks get refreshed. |
|
1706 | # * otherwise -> the bookmarks get refreshed. | |
1707 | self._refreshchangelog() |
|
1707 | self._refreshchangelog() | |
1708 | return bookmarks.bmstore(self) |
|
1708 | return bookmarks.bmstore(self) | |
1709 |
|
1709 | |||
1710 | def _refreshchangelog(self): |
|
1710 | def _refreshchangelog(self): | |
1711 | """make sure the in memory changelog match the on-disk one""" |
|
1711 | """make sure the in memory changelog match the on-disk one""" | |
1712 | if 'changelog' in vars(self) and self.currenttransaction() is None: |
|
1712 | if 'changelog' in vars(self) and self.currenttransaction() is None: | |
1713 | del self.changelog |
|
1713 | del self.changelog | |
1714 |
|
1714 | |||
1715 | @property |
|
1715 | @property | |
1716 | def _activebookmark(self): |
|
1716 | def _activebookmark(self): | |
1717 | return self._bookmarks.active |
|
1717 | return self._bookmarks.active | |
1718 |
|
1718 | |||
1719 | # _phasesets depend on changelog. what we need is to call |
|
1719 | # _phasesets depend on changelog. what we need is to call | |
1720 | # _phasecache.invalidate() if '00changelog.i' was changed, but it |
|
1720 | # _phasecache.invalidate() if '00changelog.i' was changed, but it | |
1721 | # can't be easily expressed in filecache mechanism. |
|
1721 | # can't be easily expressed in filecache mechanism. | |
1722 | @storecache(b'phaseroots', b'00changelog.i') |
|
1722 | @storecache(b'phaseroots', b'00changelog.i') | |
1723 | def _phasecache(self): |
|
1723 | def _phasecache(self): | |
1724 | return phases.phasecache(self, self._phasedefaults) |
|
1724 | return phases.phasecache(self, self._phasedefaults) | |
1725 |
|
1725 | |||
1726 | @storecache(b'obsstore') |
|
1726 | @storecache(b'obsstore') | |
1727 | def obsstore(self): |
|
1727 | def obsstore(self): | |
1728 | return obsolete.makestore(self.ui, self) |
|
1728 | return obsolete.makestore(self.ui, self) | |
1729 |
|
1729 | |||
1730 | @changelogcache() |
|
1730 | @changelogcache() | |
1731 | def changelog(repo): |
|
1731 | def changelog(repo): | |
1732 | # load dirstate before changelog to avoid race see issue6303 |
|
1732 | # load dirstate before changelog to avoid race see issue6303 | |
1733 | repo.dirstate.prefetch_parents() |
|
1733 | repo.dirstate.prefetch_parents() | |
1734 | return repo.store.changelog( |
|
1734 | return repo.store.changelog( | |
1735 | txnutil.mayhavepending(repo.root), |
|
1735 | txnutil.mayhavepending(repo.root), | |
1736 | concurrencychecker=revlogchecker.get_checker(repo.ui, b'changelog'), |
|
1736 | concurrencychecker=revlogchecker.get_checker(repo.ui, b'changelog'), | |
1737 | ) |
|
1737 | ) | |
1738 |
|
1738 | |||
1739 | @manifestlogcache() |
|
1739 | @manifestlogcache() | |
1740 | def manifestlog(self): |
|
1740 | def manifestlog(self): | |
1741 | return self.store.manifestlog(self, self._storenarrowmatch) |
|
1741 | return self.store.manifestlog(self, self._storenarrowmatch) | |
1742 |
|
1742 | |||
1743 | @repofilecache(b'dirstate') |
|
1743 | @repofilecache(b'dirstate') | |
1744 | def dirstate(self): |
|
1744 | def dirstate(self): | |
1745 | return self._makedirstate() |
|
1745 | return self._makedirstate() | |
1746 |
|
1746 | |||
1747 | def _makedirstate(self): |
|
1747 | def _makedirstate(self): | |
1748 | """Extension point for wrapping the dirstate per-repo.""" |
|
1748 | """Extension point for wrapping the dirstate per-repo.""" | |
1749 | sparsematchfn = lambda: sparse.matcher(self) |
|
1749 | sparsematchfn = lambda: sparse.matcher(self) | |
1750 | v2_req = requirementsmod.DIRSTATE_V2_REQUIREMENT |
|
1750 | v2_req = requirementsmod.DIRSTATE_V2_REQUIREMENT | |
1751 | use_dirstate_v2 = v2_req in self.requirements |
|
1751 | use_dirstate_v2 = v2_req in self.requirements | |
1752 |
|
1752 | |||
1753 | return dirstate.dirstate( |
|
1753 | return dirstate.dirstate( | |
1754 | self.vfs, |
|
1754 | self.vfs, | |
1755 | self.ui, |
|
1755 | self.ui, | |
1756 | self.root, |
|
1756 | self.root, | |
1757 | self._dirstatevalidate, |
|
1757 | self._dirstatevalidate, | |
1758 | sparsematchfn, |
|
1758 | sparsematchfn, | |
1759 | self.nodeconstants, |
|
1759 | self.nodeconstants, | |
1760 | use_dirstate_v2, |
|
1760 | use_dirstate_v2, | |
1761 | ) |
|
1761 | ) | |
1762 |
|
1762 | |||
1763 | def _dirstatevalidate(self, node): |
|
1763 | def _dirstatevalidate(self, node): | |
1764 | try: |
|
1764 | try: | |
1765 | self.changelog.rev(node) |
|
1765 | self.changelog.rev(node) | |
1766 | return node |
|
1766 | return node | |
1767 | except error.LookupError: |
|
1767 | except error.LookupError: | |
1768 | if not self._dirstatevalidatewarned: |
|
1768 | if not self._dirstatevalidatewarned: | |
1769 | self._dirstatevalidatewarned = True |
|
1769 | self._dirstatevalidatewarned = True | |
1770 | self.ui.warn( |
|
1770 | self.ui.warn( | |
1771 | _(b"warning: ignoring unknown working parent %s!\n") |
|
1771 | _(b"warning: ignoring unknown working parent %s!\n") | |
1772 | % short(node) |
|
1772 | % short(node) | |
1773 | ) |
|
1773 | ) | |
1774 | return self.nullid |
|
1774 | return self.nullid | |
1775 |
|
1775 | |||
1776 | @storecache(narrowspec.FILENAME) |
|
1776 | @storecache(narrowspec.FILENAME) | |
1777 | def narrowpats(self): |
|
1777 | def narrowpats(self): | |
1778 | """matcher patterns for this repository's narrowspec |
|
1778 | """matcher patterns for this repository's narrowspec | |
1779 |
|
1779 | |||
1780 | A tuple of (includes, excludes). |
|
1780 | A tuple of (includes, excludes). | |
1781 | """ |
|
1781 | """ | |
1782 | return narrowspec.load(self) |
|
1782 | return narrowspec.load(self) | |
1783 |
|
1783 | |||
1784 | @storecache(narrowspec.FILENAME) |
|
1784 | @storecache(narrowspec.FILENAME) | |
1785 | def _storenarrowmatch(self): |
|
1785 | def _storenarrowmatch(self): | |
1786 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: |
|
1786 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: | |
1787 | return matchmod.always() |
|
1787 | return matchmod.always() | |
1788 | include, exclude = self.narrowpats |
|
1788 | include, exclude = self.narrowpats | |
1789 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1789 | return narrowspec.match(self.root, include=include, exclude=exclude) | |
1790 |
|
1790 | |||
1791 | @storecache(narrowspec.FILENAME) |
|
1791 | @storecache(narrowspec.FILENAME) | |
1792 | def _narrowmatch(self): |
|
1792 | def _narrowmatch(self): | |
1793 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: |
|
1793 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: | |
1794 | return matchmod.always() |
|
1794 | return matchmod.always() | |
1795 | narrowspec.checkworkingcopynarrowspec(self) |
|
1795 | narrowspec.checkworkingcopynarrowspec(self) | |
1796 | include, exclude = self.narrowpats |
|
1796 | include, exclude = self.narrowpats | |
1797 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1797 | return narrowspec.match(self.root, include=include, exclude=exclude) | |
1798 |
|
1798 | |||
1799 | def narrowmatch(self, match=None, includeexact=False): |
|
1799 | def narrowmatch(self, match=None, includeexact=False): | |
1800 | """matcher corresponding the the repo's narrowspec |
|
1800 | """matcher corresponding the the repo's narrowspec | |
1801 |
|
1801 | |||
1802 | If `match` is given, then that will be intersected with the narrow |
|
1802 | If `match` is given, then that will be intersected with the narrow | |
1803 | matcher. |
|
1803 | matcher. | |
1804 |
|
1804 | |||
1805 | If `includeexact` is True, then any exact matches from `match` will |
|
1805 | If `includeexact` is True, then any exact matches from `match` will | |
1806 | be included even if they're outside the narrowspec. |
|
1806 | be included even if they're outside the narrowspec. | |
1807 | """ |
|
1807 | """ | |
1808 | if match: |
|
1808 | if match: | |
1809 | if includeexact and not self._narrowmatch.always(): |
|
1809 | if includeexact and not self._narrowmatch.always(): | |
1810 | # do not exclude explicitly-specified paths so that they can |
|
1810 | # do not exclude explicitly-specified paths so that they can | |
1811 | # be warned later on |
|
1811 | # be warned later on | |
1812 | em = matchmod.exact(match.files()) |
|
1812 | em = matchmod.exact(match.files()) | |
1813 | nm = matchmod.unionmatcher([self._narrowmatch, em]) |
|
1813 | nm = matchmod.unionmatcher([self._narrowmatch, em]) | |
1814 | return matchmod.intersectmatchers(match, nm) |
|
1814 | return matchmod.intersectmatchers(match, nm) | |
1815 | return matchmod.intersectmatchers(match, self._narrowmatch) |
|
1815 | return matchmod.intersectmatchers(match, self._narrowmatch) | |
1816 | return self._narrowmatch |
|
1816 | return self._narrowmatch | |
1817 |
|
1817 | |||
1818 | def setnarrowpats(self, newincludes, newexcludes): |
|
1818 | def setnarrowpats(self, newincludes, newexcludes): | |
1819 | narrowspec.save(self, newincludes, newexcludes) |
|
1819 | narrowspec.save(self, newincludes, newexcludes) | |
1820 | self.invalidate(clearfilecache=True) |
|
1820 | self.invalidate(clearfilecache=True) | |
1821 |
|
1821 | |||
1822 | @unfilteredpropertycache |
|
1822 | @unfilteredpropertycache | |
1823 | def _quick_access_changeid_null(self): |
|
1823 | def _quick_access_changeid_null(self): | |
1824 | return { |
|
1824 | return { | |
1825 | b'null': (nullrev, self.nodeconstants.nullid), |
|
1825 | b'null': (nullrev, self.nodeconstants.nullid), | |
1826 | nullrev: (nullrev, self.nodeconstants.nullid), |
|
1826 | nullrev: (nullrev, self.nodeconstants.nullid), | |
1827 | self.nullid: (nullrev, self.nullid), |
|
1827 | self.nullid: (nullrev, self.nullid), | |
1828 | } |
|
1828 | } | |
1829 |
|
1829 | |||
1830 | @unfilteredpropertycache |
|
1830 | @unfilteredpropertycache | |
1831 | def _quick_access_changeid_wc(self): |
|
1831 | def _quick_access_changeid_wc(self): | |
1832 | # also fast path access to the working copy parents |
|
1832 | # also fast path access to the working copy parents | |
1833 | # however, only do it for filter that ensure wc is visible. |
|
1833 | # however, only do it for filter that ensure wc is visible. | |
1834 | quick = self._quick_access_changeid_null.copy() |
|
1834 | quick = self._quick_access_changeid_null.copy() | |
1835 | cl = self.unfiltered().changelog |
|
1835 | cl = self.unfiltered().changelog | |
1836 | for node in self.dirstate.parents(): |
|
1836 | for node in self.dirstate.parents(): | |
1837 | if node == self.nullid: |
|
1837 | if node == self.nullid: | |
1838 | continue |
|
1838 | continue | |
1839 | rev = cl.index.get_rev(node) |
|
1839 | rev = cl.index.get_rev(node) | |
1840 | if rev is None: |
|
1840 | if rev is None: | |
1841 | # unknown working copy parent case: |
|
1841 | # unknown working copy parent case: | |
1842 | # |
|
1842 | # | |
1843 | # skip the fast path and let higher code deal with it |
|
1843 | # skip the fast path and let higher code deal with it | |
1844 | continue |
|
1844 | continue | |
1845 | pair = (rev, node) |
|
1845 | pair = (rev, node) | |
1846 | quick[rev] = pair |
|
1846 | quick[rev] = pair | |
1847 | quick[node] = pair |
|
1847 | quick[node] = pair | |
1848 | # also add the parents of the parents |
|
1848 | # also add the parents of the parents | |
1849 | for r in cl.parentrevs(rev): |
|
1849 | for r in cl.parentrevs(rev): | |
1850 | if r == nullrev: |
|
1850 | if r == nullrev: | |
1851 | continue |
|
1851 | continue | |
1852 | n = cl.node(r) |
|
1852 | n = cl.node(r) | |
1853 | pair = (r, n) |
|
1853 | pair = (r, n) | |
1854 | quick[r] = pair |
|
1854 | quick[r] = pair | |
1855 | quick[n] = pair |
|
1855 | quick[n] = pair | |
1856 | p1node = self.dirstate.p1() |
|
1856 | p1node = self.dirstate.p1() | |
1857 | if p1node != self.nullid: |
|
1857 | if p1node != self.nullid: | |
1858 | quick[b'.'] = quick[p1node] |
|
1858 | quick[b'.'] = quick[p1node] | |
1859 | return quick |
|
1859 | return quick | |
1860 |
|
1860 | |||
1861 | @unfilteredmethod |
|
1861 | @unfilteredmethod | |
1862 | def _quick_access_changeid_invalidate(self): |
|
1862 | def _quick_access_changeid_invalidate(self): | |
1863 | if '_quick_access_changeid_wc' in vars(self): |
|
1863 | if '_quick_access_changeid_wc' in vars(self): | |
1864 | del self.__dict__['_quick_access_changeid_wc'] |
|
1864 | del self.__dict__['_quick_access_changeid_wc'] | |
1865 |
|
1865 | |||
1866 | @property |
|
1866 | @property | |
1867 | def _quick_access_changeid(self): |
|
1867 | def _quick_access_changeid(self): | |
1868 | """an helper dictionnary for __getitem__ calls |
|
1868 | """an helper dictionnary for __getitem__ calls | |
1869 |
|
1869 | |||
1870 | This contains a list of symbol we can recognise right away without |
|
1870 | This contains a list of symbol we can recognise right away without | |
1871 | further processing. |
|
1871 | further processing. | |
1872 | """ |
|
1872 | """ | |
1873 | if self.filtername in repoview.filter_has_wc: |
|
1873 | if self.filtername in repoview.filter_has_wc: | |
1874 | return self._quick_access_changeid_wc |
|
1874 | return self._quick_access_changeid_wc | |
1875 | return self._quick_access_changeid_null |
|
1875 | return self._quick_access_changeid_null | |
1876 |
|
1876 | |||
1877 | def __getitem__(self, changeid): |
|
1877 | def __getitem__(self, changeid): | |
1878 | # dealing with special cases |
|
1878 | # dealing with special cases | |
1879 | if changeid is None: |
|
1879 | if changeid is None: | |
1880 | return context.workingctx(self) |
|
1880 | return context.workingctx(self) | |
1881 | if isinstance(changeid, context.basectx): |
|
1881 | if isinstance(changeid, context.basectx): | |
1882 | return changeid |
|
1882 | return changeid | |
1883 |
|
1883 | |||
1884 | # dealing with multiple revisions |
|
1884 | # dealing with multiple revisions | |
1885 | if isinstance(changeid, slice): |
|
1885 | if isinstance(changeid, slice): | |
1886 | # wdirrev isn't contiguous so the slice shouldn't include it |
|
1886 | # wdirrev isn't contiguous so the slice shouldn't include it | |
1887 | return [ |
|
1887 | return [ | |
1888 | self[i] |
|
1888 | self[i] | |
1889 | for i in pycompat.xrange(*changeid.indices(len(self))) |
|
1889 | for i in pycompat.xrange(*changeid.indices(len(self))) | |
1890 | if i not in self.changelog.filteredrevs |
|
1890 | if i not in self.changelog.filteredrevs | |
1891 | ] |
|
1891 | ] | |
1892 |
|
1892 | |||
1893 | # dealing with some special values |
|
1893 | # dealing with some special values | |
1894 | quick_access = self._quick_access_changeid.get(changeid) |
|
1894 | quick_access = self._quick_access_changeid.get(changeid) | |
1895 | if quick_access is not None: |
|
1895 | if quick_access is not None: | |
1896 | rev, node = quick_access |
|
1896 | rev, node = quick_access | |
1897 | return context.changectx(self, rev, node, maybe_filtered=False) |
|
1897 | return context.changectx(self, rev, node, maybe_filtered=False) | |
1898 | if changeid == b'tip': |
|
1898 | if changeid == b'tip': | |
1899 | node = self.changelog.tip() |
|
1899 | node = self.changelog.tip() | |
1900 | rev = self.changelog.rev(node) |
|
1900 | rev = self.changelog.rev(node) | |
1901 | return context.changectx(self, rev, node) |
|
1901 | return context.changectx(self, rev, node) | |
1902 |
|
1902 | |||
1903 | # dealing with arbitrary values |
|
1903 | # dealing with arbitrary values | |
1904 | try: |
|
1904 | try: | |
1905 | if isinstance(changeid, int): |
|
1905 | if isinstance(changeid, int): | |
1906 | node = self.changelog.node(changeid) |
|
1906 | node = self.changelog.node(changeid) | |
1907 | rev = changeid |
|
1907 | rev = changeid | |
1908 | elif changeid == b'.': |
|
1908 | elif changeid == b'.': | |
1909 | # this is a hack to delay/avoid loading obsmarkers |
|
1909 | # this is a hack to delay/avoid loading obsmarkers | |
1910 | # when we know that '.' won't be hidden |
|
1910 | # when we know that '.' won't be hidden | |
1911 | node = self.dirstate.p1() |
|
1911 | node = self.dirstate.p1() | |
1912 | rev = self.unfiltered().changelog.rev(node) |
|
1912 | rev = self.unfiltered().changelog.rev(node) | |
1913 | elif len(changeid) == self.nodeconstants.nodelen: |
|
1913 | elif len(changeid) == self.nodeconstants.nodelen: | |
1914 | try: |
|
1914 | try: | |
1915 | node = changeid |
|
1915 | node = changeid | |
1916 | rev = self.changelog.rev(changeid) |
|
1916 | rev = self.changelog.rev(changeid) | |
1917 | except error.FilteredLookupError: |
|
1917 | except error.FilteredLookupError: | |
1918 | changeid = hex(changeid) # for the error message |
|
1918 | changeid = hex(changeid) # for the error message | |
1919 | raise |
|
1919 | raise | |
1920 | except LookupError: |
|
1920 | except LookupError: | |
1921 | # check if it might have come from damaged dirstate |
|
1921 | # check if it might have come from damaged dirstate | |
1922 | # |
|
1922 | # | |
1923 | # XXX we could avoid the unfiltered if we had a recognizable |
|
1923 | # XXX we could avoid the unfiltered if we had a recognizable | |
1924 | # exception for filtered changeset access |
|
1924 | # exception for filtered changeset access | |
1925 | if ( |
|
1925 | if ( | |
1926 | self.local() |
|
1926 | self.local() | |
1927 | and changeid in self.unfiltered().dirstate.parents() |
|
1927 | and changeid in self.unfiltered().dirstate.parents() | |
1928 | ): |
|
1928 | ): | |
1929 | msg = _(b"working directory has unknown parent '%s'!") |
|
1929 | msg = _(b"working directory has unknown parent '%s'!") | |
1930 | raise error.Abort(msg % short(changeid)) |
|
1930 | raise error.Abort(msg % short(changeid)) | |
1931 | changeid = hex(changeid) # for the error message |
|
1931 | changeid = hex(changeid) # for the error message | |
1932 | raise |
|
1932 | raise | |
1933 |
|
1933 | |||
1934 | elif len(changeid) == 2 * self.nodeconstants.nodelen: |
|
1934 | elif len(changeid) == 2 * self.nodeconstants.nodelen: | |
1935 | node = bin(changeid) |
|
1935 | node = bin(changeid) | |
1936 | rev = self.changelog.rev(node) |
|
1936 | rev = self.changelog.rev(node) | |
1937 | else: |
|
1937 | else: | |
1938 | raise error.ProgrammingError( |
|
1938 | raise error.ProgrammingError( | |
1939 | b"unsupported changeid '%s' of type %s" |
|
1939 | b"unsupported changeid '%s' of type %s" | |
1940 | % (changeid, pycompat.bytestr(type(changeid))) |
|
1940 | % (changeid, pycompat.bytestr(type(changeid))) | |
1941 | ) |
|
1941 | ) | |
1942 |
|
1942 | |||
1943 | return context.changectx(self, rev, node) |
|
1943 | return context.changectx(self, rev, node) | |
1944 |
|
1944 | |||
1945 | except (error.FilteredIndexError, error.FilteredLookupError): |
|
1945 | except (error.FilteredIndexError, error.FilteredLookupError): | |
1946 | raise error.FilteredRepoLookupError( |
|
1946 | raise error.FilteredRepoLookupError( | |
1947 | _(b"filtered revision '%s'") % pycompat.bytestr(changeid) |
|
1947 | _(b"filtered revision '%s'") % pycompat.bytestr(changeid) | |
1948 | ) |
|
1948 | ) | |
1949 | except (IndexError, LookupError): |
|
1949 | except (IndexError, LookupError): | |
1950 | raise error.RepoLookupError( |
|
1950 | raise error.RepoLookupError( | |
1951 | _(b"unknown revision '%s'") % pycompat.bytestr(changeid) |
|
1951 | _(b"unknown revision '%s'") % pycompat.bytestr(changeid) | |
1952 | ) |
|
1952 | ) | |
1953 | except error.WdirUnsupported: |
|
1953 | except error.WdirUnsupported: | |
1954 | return context.workingctx(self) |
|
1954 | return context.workingctx(self) | |
1955 |
|
1955 | |||
1956 | def __contains__(self, changeid): |
|
1956 | def __contains__(self, changeid): | |
1957 | """True if the given changeid exists""" |
|
1957 | """True if the given changeid exists""" | |
1958 | try: |
|
1958 | try: | |
1959 | self[changeid] |
|
1959 | self[changeid] | |
1960 | return True |
|
1960 | return True | |
1961 | except error.RepoLookupError: |
|
1961 | except error.RepoLookupError: | |
1962 | return False |
|
1962 | return False | |
1963 |
|
1963 | |||
1964 | def __nonzero__(self): |
|
1964 | def __nonzero__(self): | |
1965 | return True |
|
1965 | return True | |
1966 |
|
1966 | |||
1967 | __bool__ = __nonzero__ |
|
1967 | __bool__ = __nonzero__ | |
1968 |
|
1968 | |||
1969 | def __len__(self): |
|
1969 | def __len__(self): | |
1970 | # no need to pay the cost of repoview.changelog |
|
1970 | # no need to pay the cost of repoview.changelog | |
1971 | unfi = self.unfiltered() |
|
1971 | unfi = self.unfiltered() | |
1972 | return len(unfi.changelog) |
|
1972 | return len(unfi.changelog) | |
1973 |
|
1973 | |||
1974 | def __iter__(self): |
|
1974 | def __iter__(self): | |
1975 | return iter(self.changelog) |
|
1975 | return iter(self.changelog) | |
1976 |
|
1976 | |||
1977 | def revs(self, expr, *args): |
|
1977 | def revs(self, expr, *args): | |
1978 | """Find revisions matching a revset. |
|
1978 | """Find revisions matching a revset. | |
1979 |
|
1979 | |||
1980 | The revset is specified as a string ``expr`` that may contain |
|
1980 | The revset is specified as a string ``expr`` that may contain | |
1981 | %-formatting to escape certain types. See ``revsetlang.formatspec``. |
|
1981 | %-formatting to escape certain types. See ``revsetlang.formatspec``. | |
1982 |
|
1982 | |||
1983 | Revset aliases from the configuration are not expanded. To expand |
|
1983 | Revset aliases from the configuration are not expanded. To expand | |
1984 | user aliases, consider calling ``scmutil.revrange()`` or |
|
1984 | user aliases, consider calling ``scmutil.revrange()`` or | |
1985 | ``repo.anyrevs([expr], user=True)``. |
|
1985 | ``repo.anyrevs([expr], user=True)``. | |
1986 |
|
1986 | |||
1987 | Returns a smartset.abstractsmartset, which is a list-like interface |
|
1987 | Returns a smartset.abstractsmartset, which is a list-like interface | |
1988 | that contains integer revisions. |
|
1988 | that contains integer revisions. | |
1989 | """ |
|
1989 | """ | |
1990 | tree = revsetlang.spectree(expr, *args) |
|
1990 | tree = revsetlang.spectree(expr, *args) | |
1991 | return revset.makematcher(tree)(self) |
|
1991 | return revset.makematcher(tree)(self) | |
1992 |
|
1992 | |||
1993 | def set(self, expr, *args): |
|
1993 | def set(self, expr, *args): | |
1994 | """Find revisions matching a revset and emit changectx instances. |
|
1994 | """Find revisions matching a revset and emit changectx instances. | |
1995 |
|
1995 | |||
1996 | This is a convenience wrapper around ``revs()`` that iterates the |
|
1996 | This is a convenience wrapper around ``revs()`` that iterates the | |
1997 | result and is a generator of changectx instances. |
|
1997 | result and is a generator of changectx instances. | |
1998 |
|
1998 | |||
1999 | Revset aliases from the configuration are not expanded. To expand |
|
1999 | Revset aliases from the configuration are not expanded. To expand | |
2000 | user aliases, consider calling ``scmutil.revrange()``. |
|
2000 | user aliases, consider calling ``scmutil.revrange()``. | |
2001 | """ |
|
2001 | """ | |
2002 | for r in self.revs(expr, *args): |
|
2002 | for r in self.revs(expr, *args): | |
2003 | yield self[r] |
|
2003 | yield self[r] | |
2004 |
|
2004 | |||
2005 | def anyrevs(self, specs, user=False, localalias=None): |
|
2005 | def anyrevs(self, specs, user=False, localalias=None): | |
2006 | """Find revisions matching one of the given revsets. |
|
2006 | """Find revisions matching one of the given revsets. | |
2007 |
|
2007 | |||
2008 | Revset aliases from the configuration are not expanded by default. To |
|
2008 | Revset aliases from the configuration are not expanded by default. To | |
2009 | expand user aliases, specify ``user=True``. To provide some local |
|
2009 | expand user aliases, specify ``user=True``. To provide some local | |
2010 | definitions overriding user aliases, set ``localalias`` to |
|
2010 | definitions overriding user aliases, set ``localalias`` to | |
2011 | ``{name: definitionstring}``. |
|
2011 | ``{name: definitionstring}``. | |
2012 | """ |
|
2012 | """ | |
2013 | if specs == [b'null']: |
|
2013 | if specs == [b'null']: | |
2014 | return revset.baseset([nullrev]) |
|
2014 | return revset.baseset([nullrev]) | |
2015 | if specs == [b'.']: |
|
2015 | if specs == [b'.']: | |
2016 | quick_data = self._quick_access_changeid.get(b'.') |
|
2016 | quick_data = self._quick_access_changeid.get(b'.') | |
2017 | if quick_data is not None: |
|
2017 | if quick_data is not None: | |
2018 | return revset.baseset([quick_data[0]]) |
|
2018 | return revset.baseset([quick_data[0]]) | |
2019 | if user: |
|
2019 | if user: | |
2020 | m = revset.matchany( |
|
2020 | m = revset.matchany( | |
2021 | self.ui, |
|
2021 | self.ui, | |
2022 | specs, |
|
2022 | specs, | |
2023 | lookup=revset.lookupfn(self), |
|
2023 | lookup=revset.lookupfn(self), | |
2024 | localalias=localalias, |
|
2024 | localalias=localalias, | |
2025 | ) |
|
2025 | ) | |
2026 | else: |
|
2026 | else: | |
2027 | m = revset.matchany(None, specs, localalias=localalias) |
|
2027 | m = revset.matchany(None, specs, localalias=localalias) | |
2028 | return m(self) |
|
2028 | return m(self) | |
2029 |
|
2029 | |||
2030 | def url(self): |
|
2030 | def url(self): | |
2031 | return b'file:' + self.root |
|
2031 | return b'file:' + self.root | |
2032 |
|
2032 | |||
2033 | def hook(self, name, throw=False, **args): |
|
2033 | def hook(self, name, throw=False, **args): | |
2034 | """Call a hook, passing this repo instance. |
|
2034 | """Call a hook, passing this repo instance. | |
2035 |
|
2035 | |||
2036 | This a convenience method to aid invoking hooks. Extensions likely |
|
2036 | This a convenience method to aid invoking hooks. Extensions likely | |
2037 | won't call this unless they have registered a custom hook or are |
|
2037 | won't call this unless they have registered a custom hook or are | |
2038 | replacing code that is expected to call a hook. |
|
2038 | replacing code that is expected to call a hook. | |
2039 | """ |
|
2039 | """ | |
2040 | return hook.hook(self.ui, self, name, throw, **args) |
|
2040 | return hook.hook(self.ui, self, name, throw, **args) | |
2041 |
|
2041 | |||
2042 | @filteredpropertycache |
|
2042 | @filteredpropertycache | |
2043 | def _tagscache(self): |
|
2043 | def _tagscache(self): | |
2044 | """Returns a tagscache object that contains various tags related |
|
2044 | """Returns a tagscache object that contains various tags related | |
2045 | caches.""" |
|
2045 | caches.""" | |
2046 |
|
2046 | |||
2047 | # This simplifies its cache management by having one decorated |
|
2047 | # This simplifies its cache management by having one decorated | |
2048 | # function (this one) and the rest simply fetch things from it. |
|
2048 | # function (this one) and the rest simply fetch things from it. | |
2049 | class tagscache(object): |
|
2049 | class tagscache(object): | |
2050 | def __init__(self): |
|
2050 | def __init__(self): | |
2051 | # These two define the set of tags for this repository. tags |
|
2051 | # These two define the set of tags for this repository. tags | |
2052 | # maps tag name to node; tagtypes maps tag name to 'global' or |
|
2052 | # maps tag name to node; tagtypes maps tag name to 'global' or | |
2053 | # 'local'. (Global tags are defined by .hgtags across all |
|
2053 | # 'local'. (Global tags are defined by .hgtags across all | |
2054 | # heads, and local tags are defined in .hg/localtags.) |
|
2054 | # heads, and local tags are defined in .hg/localtags.) | |
2055 | # They constitute the in-memory cache of tags. |
|
2055 | # They constitute the in-memory cache of tags. | |
2056 | self.tags = self.tagtypes = None |
|
2056 | self.tags = self.tagtypes = None | |
2057 |
|
2057 | |||
2058 | self.nodetagscache = self.tagslist = None |
|
2058 | self.nodetagscache = self.tagslist = None | |
2059 |
|
2059 | |||
2060 | cache = tagscache() |
|
2060 | cache = tagscache() | |
2061 | cache.tags, cache.tagtypes = self._findtags() |
|
2061 | cache.tags, cache.tagtypes = self._findtags() | |
2062 |
|
2062 | |||
2063 | return cache |
|
2063 | return cache | |
2064 |
|
2064 | |||
2065 | def tags(self): |
|
2065 | def tags(self): | |
2066 | '''return a mapping of tag to node''' |
|
2066 | '''return a mapping of tag to node''' | |
2067 | t = {} |
|
2067 | t = {} | |
2068 | if self.changelog.filteredrevs: |
|
2068 | if self.changelog.filteredrevs: | |
2069 | tags, tt = self._findtags() |
|
2069 | tags, tt = self._findtags() | |
2070 | else: |
|
2070 | else: | |
2071 | tags = self._tagscache.tags |
|
2071 | tags = self._tagscache.tags | |
2072 | rev = self.changelog.rev |
|
2072 | rev = self.changelog.rev | |
2073 | for k, v in pycompat.iteritems(tags): |
|
2073 | for k, v in pycompat.iteritems(tags): | |
2074 | try: |
|
2074 | try: | |
2075 | # ignore tags to unknown nodes |
|
2075 | # ignore tags to unknown nodes | |
2076 | rev(v) |
|
2076 | rev(v) | |
2077 | t[k] = v |
|
2077 | t[k] = v | |
2078 | except (error.LookupError, ValueError): |
|
2078 | except (error.LookupError, ValueError): | |
2079 | pass |
|
2079 | pass | |
2080 | return t |
|
2080 | return t | |
2081 |
|
2081 | |||
2082 | def _findtags(self): |
|
2082 | def _findtags(self): | |
2083 | """Do the hard work of finding tags. Return a pair of dicts |
|
2083 | """Do the hard work of finding tags. Return a pair of dicts | |
2084 | (tags, tagtypes) where tags maps tag name to node, and tagtypes |
|
2084 | (tags, tagtypes) where tags maps tag name to node, and tagtypes | |
2085 | maps tag name to a string like \'global\' or \'local\'. |
|
2085 | maps tag name to a string like \'global\' or \'local\'. | |
2086 | Subclasses or extensions are free to add their own tags, but |
|
2086 | Subclasses or extensions are free to add their own tags, but | |
2087 | should be aware that the returned dicts will be retained for the |
|
2087 | should be aware that the returned dicts will be retained for the | |
2088 | duration of the localrepo object.""" |
|
2088 | duration of the localrepo object.""" | |
2089 |
|
2089 | |||
2090 | # XXX what tagtype should subclasses/extensions use? Currently |
|
2090 | # XXX what tagtype should subclasses/extensions use? Currently | |
2091 | # mq and bookmarks add tags, but do not set the tagtype at all. |
|
2091 | # mq and bookmarks add tags, but do not set the tagtype at all. | |
2092 | # Should each extension invent its own tag type? Should there |
|
2092 | # Should each extension invent its own tag type? Should there | |
2093 | # be one tagtype for all such "virtual" tags? Or is the status |
|
2093 | # be one tagtype for all such "virtual" tags? Or is the status | |
2094 | # quo fine? |
|
2094 | # quo fine? | |
2095 |
|
2095 | |||
2096 | # map tag name to (node, hist) |
|
2096 | # map tag name to (node, hist) | |
2097 | alltags = tagsmod.findglobaltags(self.ui, self) |
|
2097 | alltags = tagsmod.findglobaltags(self.ui, self) | |
2098 | # map tag name to tag type |
|
2098 | # map tag name to tag type | |
2099 | tagtypes = {tag: b'global' for tag in alltags} |
|
2099 | tagtypes = {tag: b'global' for tag in alltags} | |
2100 |
|
2100 | |||
2101 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) |
|
2101 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) | |
2102 |
|
2102 | |||
2103 | # Build the return dicts. Have to re-encode tag names because |
|
2103 | # Build the return dicts. Have to re-encode tag names because | |
2104 | # the tags module always uses UTF-8 (in order not to lose info |
|
2104 | # the tags module always uses UTF-8 (in order not to lose info | |
2105 | # writing to the cache), but the rest of Mercurial wants them in |
|
2105 | # writing to the cache), but the rest of Mercurial wants them in | |
2106 | # local encoding. |
|
2106 | # local encoding. | |
2107 | tags = {} |
|
2107 | tags = {} | |
2108 | for (name, (node, hist)) in pycompat.iteritems(alltags): |
|
2108 | for (name, (node, hist)) in pycompat.iteritems(alltags): | |
2109 | if node != self.nullid: |
|
2109 | if node != self.nullid: | |
2110 | tags[encoding.tolocal(name)] = node |
|
2110 | tags[encoding.tolocal(name)] = node | |
2111 | tags[b'tip'] = self.changelog.tip() |
|
2111 | tags[b'tip'] = self.changelog.tip() | |
2112 | tagtypes = { |
|
2112 | tagtypes = { | |
2113 | encoding.tolocal(name): value |
|
2113 | encoding.tolocal(name): value | |
2114 | for (name, value) in pycompat.iteritems(tagtypes) |
|
2114 | for (name, value) in pycompat.iteritems(tagtypes) | |
2115 | } |
|
2115 | } | |
2116 | return (tags, tagtypes) |
|
2116 | return (tags, tagtypes) | |
2117 |
|
2117 | |||
2118 | def tagtype(self, tagname): |
|
2118 | def tagtype(self, tagname): | |
2119 | """ |
|
2119 | """ | |
2120 | return the type of the given tag. result can be: |
|
2120 | return the type of the given tag. result can be: | |
2121 |
|
2121 | |||
2122 | 'local' : a local tag |
|
2122 | 'local' : a local tag | |
2123 | 'global' : a global tag |
|
2123 | 'global' : a global tag | |
2124 | None : tag does not exist |
|
2124 | None : tag does not exist | |
2125 | """ |
|
2125 | """ | |
2126 |
|
2126 | |||
2127 | return self._tagscache.tagtypes.get(tagname) |
|
2127 | return self._tagscache.tagtypes.get(tagname) | |
2128 |
|
2128 | |||
2129 | def tagslist(self): |
|
2129 | def tagslist(self): | |
2130 | '''return a list of tags ordered by revision''' |
|
2130 | '''return a list of tags ordered by revision''' | |
2131 | if not self._tagscache.tagslist: |
|
2131 | if not self._tagscache.tagslist: | |
2132 | l = [] |
|
2132 | l = [] | |
2133 | for t, n in pycompat.iteritems(self.tags()): |
|
2133 | for t, n in pycompat.iteritems(self.tags()): | |
2134 | l.append((self.changelog.rev(n), t, n)) |
|
2134 | l.append((self.changelog.rev(n), t, n)) | |
2135 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] |
|
2135 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] | |
2136 |
|
2136 | |||
2137 | return self._tagscache.tagslist |
|
2137 | return self._tagscache.tagslist | |
2138 |
|
2138 | |||
2139 | def nodetags(self, node): |
|
2139 | def nodetags(self, node): | |
2140 | '''return the tags associated with a node''' |
|
2140 | '''return the tags associated with a node''' | |
2141 | if not self._tagscache.nodetagscache: |
|
2141 | if not self._tagscache.nodetagscache: | |
2142 | nodetagscache = {} |
|
2142 | nodetagscache = {} | |
2143 | for t, n in pycompat.iteritems(self._tagscache.tags): |
|
2143 | for t, n in pycompat.iteritems(self._tagscache.tags): | |
2144 | nodetagscache.setdefault(n, []).append(t) |
|
2144 | nodetagscache.setdefault(n, []).append(t) | |
2145 | for tags in pycompat.itervalues(nodetagscache): |
|
2145 | for tags in pycompat.itervalues(nodetagscache): | |
2146 | tags.sort() |
|
2146 | tags.sort() | |
2147 | self._tagscache.nodetagscache = nodetagscache |
|
2147 | self._tagscache.nodetagscache = nodetagscache | |
2148 | return self._tagscache.nodetagscache.get(node, []) |
|
2148 | return self._tagscache.nodetagscache.get(node, []) | |
2149 |
|
2149 | |||
2150 | def nodebookmarks(self, node): |
|
2150 | def nodebookmarks(self, node): | |
2151 | """return the list of bookmarks pointing to the specified node""" |
|
2151 | """return the list of bookmarks pointing to the specified node""" | |
2152 | return self._bookmarks.names(node) |
|
2152 | return self._bookmarks.names(node) | |
2153 |
|
2153 | |||
2154 | def branchmap(self): |
|
2154 | def branchmap(self): | |
2155 | """returns a dictionary {branch: [branchheads]} with branchheads |
|
2155 | """returns a dictionary {branch: [branchheads]} with branchheads | |
2156 | ordered by increasing revision number""" |
|
2156 | ordered by increasing revision number""" | |
2157 | return self._branchcaches[self] |
|
2157 | return self._branchcaches[self] | |
2158 |
|
2158 | |||
2159 | @unfilteredmethod |
|
2159 | @unfilteredmethod | |
2160 | def revbranchcache(self): |
|
2160 | def revbranchcache(self): | |
2161 | if not self._revbranchcache: |
|
2161 | if not self._revbranchcache: | |
2162 | self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) |
|
2162 | self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) | |
2163 | return self._revbranchcache |
|
2163 | return self._revbranchcache | |
2164 |
|
2164 | |||
2165 | def register_changeset(self, rev, changelogrevision): |
|
2165 | def register_changeset(self, rev, changelogrevision): | |
2166 | self.revbranchcache().setdata(rev, changelogrevision) |
|
2166 | self.revbranchcache().setdata(rev, changelogrevision) | |
2167 |
|
2167 | |||
2168 | def branchtip(self, branch, ignoremissing=False): |
|
2168 | def branchtip(self, branch, ignoremissing=False): | |
2169 | """return the tip node for a given branch |
|
2169 | """return the tip node for a given branch | |
2170 |
|
2170 | |||
2171 | If ignoremissing is True, then this method will not raise an error. |
|
2171 | If ignoremissing is True, then this method will not raise an error. | |
2172 | This is helpful for callers that only expect None for a missing branch |
|
2172 | This is helpful for callers that only expect None for a missing branch | |
2173 | (e.g. namespace). |
|
2173 | (e.g. namespace). | |
2174 |
|
2174 | |||
2175 | """ |
|
2175 | """ | |
2176 | try: |
|
2176 | try: | |
2177 | return self.branchmap().branchtip(branch) |
|
2177 | return self.branchmap().branchtip(branch) | |
2178 | except KeyError: |
|
2178 | except KeyError: | |
2179 | if not ignoremissing: |
|
2179 | if not ignoremissing: | |
2180 | raise error.RepoLookupError(_(b"unknown branch '%s'") % branch) |
|
2180 | raise error.RepoLookupError(_(b"unknown branch '%s'") % branch) | |
2181 | else: |
|
2181 | else: | |
2182 | pass |
|
2182 | pass | |
2183 |
|
2183 | |||
2184 | def lookup(self, key): |
|
2184 | def lookup(self, key): | |
2185 | node = scmutil.revsymbol(self, key).node() |
|
2185 | node = scmutil.revsymbol(self, key).node() | |
2186 | if node is None: |
|
2186 | if node is None: | |
2187 | raise error.RepoLookupError(_(b"unknown revision '%s'") % key) |
|
2187 | raise error.RepoLookupError(_(b"unknown revision '%s'") % key) | |
2188 | return node |
|
2188 | return node | |
2189 |
|
2189 | |||
2190 | def lookupbranch(self, key): |
|
2190 | def lookupbranch(self, key): | |
2191 | if self.branchmap().hasbranch(key): |
|
2191 | if self.branchmap().hasbranch(key): | |
2192 | return key |
|
2192 | return key | |
2193 |
|
2193 | |||
2194 | return scmutil.revsymbol(self, key).branch() |
|
2194 | return scmutil.revsymbol(self, key).branch() | |
2195 |
|
2195 | |||
2196 | def known(self, nodes): |
|
2196 | def known(self, nodes): | |
2197 | cl = self.changelog |
|
2197 | cl = self.changelog | |
2198 | get_rev = cl.index.get_rev |
|
2198 | get_rev = cl.index.get_rev | |
2199 | filtered = cl.filteredrevs |
|
2199 | filtered = cl.filteredrevs | |
2200 | result = [] |
|
2200 | result = [] | |
2201 | for n in nodes: |
|
2201 | for n in nodes: | |
2202 | r = get_rev(n) |
|
2202 | r = get_rev(n) | |
2203 | resp = not (r is None or r in filtered) |
|
2203 | resp = not (r is None or r in filtered) | |
2204 | result.append(resp) |
|
2204 | result.append(resp) | |
2205 | return result |
|
2205 | return result | |
2206 |
|
2206 | |||
2207 | def local(self): |
|
2207 | def local(self): | |
2208 | return self |
|
2208 | return self | |
2209 |
|
2209 | |||
2210 | def publishing(self): |
|
2210 | def publishing(self): | |
2211 | # it's safe (and desirable) to trust the publish flag unconditionally |
|
2211 | # it's safe (and desirable) to trust the publish flag unconditionally | |
2212 | # so that we don't finalize changes shared between users via ssh or nfs |
|
2212 | # so that we don't finalize changes shared between users via ssh or nfs | |
2213 | return self.ui.configbool(b'phases', b'publish', untrusted=True) |
|
2213 | return self.ui.configbool(b'phases', b'publish', untrusted=True) | |
2214 |
|
2214 | |||
2215 | def cancopy(self): |
|
2215 | def cancopy(self): | |
2216 | # so statichttprepo's override of local() works |
|
2216 | # so statichttprepo's override of local() works | |
2217 | if not self.local(): |
|
2217 | if not self.local(): | |
2218 | return False |
|
2218 | return False | |
2219 | if not self.publishing(): |
|
2219 | if not self.publishing(): | |
2220 | return True |
|
2220 | return True | |
2221 | # if publishing we can't copy if there is filtered content |
|
2221 | # if publishing we can't copy if there is filtered content | |
2222 | return not self.filtered(b'visible').changelog.filteredrevs |
|
2222 | return not self.filtered(b'visible').changelog.filteredrevs | |
2223 |
|
2223 | |||
2224 | def shared(self): |
|
2224 | def shared(self): | |
2225 | '''the type of shared repository (None if not shared)''' |
|
2225 | '''the type of shared repository (None if not shared)''' | |
2226 | if self.sharedpath != self.path: |
|
2226 | if self.sharedpath != self.path: | |
2227 | return b'store' |
|
2227 | return b'store' | |
2228 | return None |
|
2228 | return None | |
2229 |
|
2229 | |||
2230 | def wjoin(self, f, *insidef): |
|
2230 | def wjoin(self, f, *insidef): | |
2231 | return self.vfs.reljoin(self.root, f, *insidef) |
|
2231 | return self.vfs.reljoin(self.root, f, *insidef) | |
2232 |
|
2232 | |||
2233 | def setparents(self, p1, p2=None): |
|
2233 | def setparents(self, p1, p2=None): | |
2234 | if p2 is None: |
|
2234 | if p2 is None: | |
2235 | p2 = self.nullid |
|
2235 | p2 = self.nullid | |
2236 | self[None].setparents(p1, p2) |
|
2236 | self[None].setparents(p1, p2) | |
2237 | self._quick_access_changeid_invalidate() |
|
2237 | self._quick_access_changeid_invalidate() | |
2238 |
|
2238 | |||
2239 | def filectx(self, path, changeid=None, fileid=None, changectx=None): |
|
2239 | def filectx(self, path, changeid=None, fileid=None, changectx=None): | |
2240 | """changeid must be a changeset revision, if specified. |
|
2240 | """changeid must be a changeset revision, if specified. | |
2241 | fileid can be a file revision or node.""" |
|
2241 | fileid can be a file revision or node.""" | |
2242 | return context.filectx( |
|
2242 | return context.filectx( | |
2243 | self, path, changeid, fileid, changectx=changectx |
|
2243 | self, path, changeid, fileid, changectx=changectx | |
2244 | ) |
|
2244 | ) | |
2245 |
|
2245 | |||
2246 | def getcwd(self): |
|
2246 | def getcwd(self): | |
2247 | return self.dirstate.getcwd() |
|
2247 | return self.dirstate.getcwd() | |
2248 |
|
2248 | |||
2249 | def pathto(self, f, cwd=None): |
|
2249 | def pathto(self, f, cwd=None): | |
2250 | return self.dirstate.pathto(f, cwd) |
|
2250 | return self.dirstate.pathto(f, cwd) | |
2251 |
|
2251 | |||
2252 | def _loadfilter(self, filter): |
|
2252 | def _loadfilter(self, filter): | |
2253 | if filter not in self._filterpats: |
|
2253 | if filter not in self._filterpats: | |
2254 | l = [] |
|
2254 | l = [] | |
2255 | for pat, cmd in self.ui.configitems(filter): |
|
2255 | for pat, cmd in self.ui.configitems(filter): | |
2256 | if cmd == b'!': |
|
2256 | if cmd == b'!': | |
2257 | continue |
|
2257 | continue | |
2258 | mf = matchmod.match(self.root, b'', [pat]) |
|
2258 | mf = matchmod.match(self.root, b'', [pat]) | |
2259 | fn = None |
|
2259 | fn = None | |
2260 | params = cmd |
|
2260 | params = cmd | |
2261 | for name, filterfn in pycompat.iteritems(self._datafilters): |
|
2261 | for name, filterfn in pycompat.iteritems(self._datafilters): | |
2262 | if cmd.startswith(name): |
|
2262 | if cmd.startswith(name): | |
2263 | fn = filterfn |
|
2263 | fn = filterfn | |
2264 | params = cmd[len(name) :].lstrip() |
|
2264 | params = cmd[len(name) :].lstrip() | |
2265 | break |
|
2265 | break | |
2266 | if not fn: |
|
2266 | if not fn: | |
2267 | fn = lambda s, c, **kwargs: procutil.filter(s, c) |
|
2267 | fn = lambda s, c, **kwargs: procutil.filter(s, c) | |
2268 | fn.__name__ = 'commandfilter' |
|
2268 | fn.__name__ = 'commandfilter' | |
2269 | # Wrap old filters not supporting keyword arguments |
|
2269 | # Wrap old filters not supporting keyword arguments | |
2270 | if not pycompat.getargspec(fn)[2]: |
|
2270 | if not pycompat.getargspec(fn)[2]: | |
2271 | oldfn = fn |
|
2271 | oldfn = fn | |
2272 | fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c) |
|
2272 | fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c) | |
2273 | fn.__name__ = 'compat-' + oldfn.__name__ |
|
2273 | fn.__name__ = 'compat-' + oldfn.__name__ | |
2274 | l.append((mf, fn, params)) |
|
2274 | l.append((mf, fn, params)) | |
2275 | self._filterpats[filter] = l |
|
2275 | self._filterpats[filter] = l | |
2276 | return self._filterpats[filter] |
|
2276 | return self._filterpats[filter] | |
2277 |
|
2277 | |||
2278 | def _filter(self, filterpats, filename, data): |
|
2278 | def _filter(self, filterpats, filename, data): | |
2279 | for mf, fn, cmd in filterpats: |
|
2279 | for mf, fn, cmd in filterpats: | |
2280 | if mf(filename): |
|
2280 | if mf(filename): | |
2281 | self.ui.debug( |
|
2281 | self.ui.debug( | |
2282 | b"filtering %s through %s\n" |
|
2282 | b"filtering %s through %s\n" | |
2283 | % (filename, cmd or pycompat.sysbytes(fn.__name__)) |
|
2283 | % (filename, cmd or pycompat.sysbytes(fn.__name__)) | |
2284 | ) |
|
2284 | ) | |
2285 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) |
|
2285 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) | |
2286 | break |
|
2286 | break | |
2287 |
|
2287 | |||
2288 | return data |
|
2288 | return data | |
2289 |
|
2289 | |||
2290 | @unfilteredpropertycache |
|
2290 | @unfilteredpropertycache | |
2291 | def _encodefilterpats(self): |
|
2291 | def _encodefilterpats(self): | |
2292 | return self._loadfilter(b'encode') |
|
2292 | return self._loadfilter(b'encode') | |
2293 |
|
2293 | |||
2294 | @unfilteredpropertycache |
|
2294 | @unfilteredpropertycache | |
2295 | def _decodefilterpats(self): |
|
2295 | def _decodefilterpats(self): | |
2296 | return self._loadfilter(b'decode') |
|
2296 | return self._loadfilter(b'decode') | |
2297 |
|
2297 | |||
2298 | def adddatafilter(self, name, filter): |
|
2298 | def adddatafilter(self, name, filter): | |
2299 | self._datafilters[name] = filter |
|
2299 | self._datafilters[name] = filter | |
2300 |
|
2300 | |||
2301 | def wread(self, filename): |
|
2301 | def wread(self, filename): | |
2302 | if self.wvfs.islink(filename): |
|
2302 | if self.wvfs.islink(filename): | |
2303 | data = self.wvfs.readlink(filename) |
|
2303 | data = self.wvfs.readlink(filename) | |
2304 | else: |
|
2304 | else: | |
2305 | data = self.wvfs.read(filename) |
|
2305 | data = self.wvfs.read(filename) | |
2306 | return self._filter(self._encodefilterpats, filename, data) |
|
2306 | return self._filter(self._encodefilterpats, filename, data) | |
2307 |
|
2307 | |||
2308 | def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs): |
|
2308 | def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs): | |
2309 | """write ``data`` into ``filename`` in the working directory |
|
2309 | """write ``data`` into ``filename`` in the working directory | |
2310 |
|
2310 | |||
2311 | This returns length of written (maybe decoded) data. |
|
2311 | This returns length of written (maybe decoded) data. | |
2312 | """ |
|
2312 | """ | |
2313 | data = self._filter(self._decodefilterpats, filename, data) |
|
2313 | data = self._filter(self._decodefilterpats, filename, data) | |
2314 | if b'l' in flags: |
|
2314 | if b'l' in flags: | |
2315 | self.wvfs.symlink(data, filename) |
|
2315 | self.wvfs.symlink(data, filename) | |
2316 | else: |
|
2316 | else: | |
2317 | self.wvfs.write( |
|
2317 | self.wvfs.write( | |
2318 | filename, data, backgroundclose=backgroundclose, **kwargs |
|
2318 | filename, data, backgroundclose=backgroundclose, **kwargs | |
2319 | ) |
|
2319 | ) | |
2320 | if b'x' in flags: |
|
2320 | if b'x' in flags: | |
2321 | self.wvfs.setflags(filename, False, True) |
|
2321 | self.wvfs.setflags(filename, False, True) | |
2322 | else: |
|
2322 | else: | |
2323 | self.wvfs.setflags(filename, False, False) |
|
2323 | self.wvfs.setflags(filename, False, False) | |
2324 | return len(data) |
|
2324 | return len(data) | |
2325 |
|
2325 | |||
2326 | def wwritedata(self, filename, data): |
|
2326 | def wwritedata(self, filename, data): | |
2327 | return self._filter(self._decodefilterpats, filename, data) |
|
2327 | return self._filter(self._decodefilterpats, filename, data) | |
2328 |
|
2328 | |||
2329 | def currenttransaction(self): |
|
2329 | def currenttransaction(self): | |
2330 | """return the current transaction or None if non exists""" |
|
2330 | """return the current transaction or None if non exists""" | |
2331 | if self._transref: |
|
2331 | if self._transref: | |
2332 | tr = self._transref() |
|
2332 | tr = self._transref() | |
2333 | else: |
|
2333 | else: | |
2334 | tr = None |
|
2334 | tr = None | |
2335 |
|
2335 | |||
2336 | if tr and tr.running(): |
|
2336 | if tr and tr.running(): | |
2337 | return tr |
|
2337 | return tr | |
2338 | return None |
|
2338 | return None | |
2339 |
|
2339 | |||
2340 | def transaction(self, desc, report=None): |
|
2340 | def transaction(self, desc, report=None): | |
2341 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
2341 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( | |
2342 | b'devel', b'check-locks' |
|
2342 | b'devel', b'check-locks' | |
2343 | ): |
|
2343 | ): | |
2344 | if self._currentlock(self._lockref) is None: |
|
2344 | if self._currentlock(self._lockref) is None: | |
2345 | raise error.ProgrammingError(b'transaction requires locking') |
|
2345 | raise error.ProgrammingError(b'transaction requires locking') | |
2346 | tr = self.currenttransaction() |
|
2346 | tr = self.currenttransaction() | |
2347 | if tr is not None: |
|
2347 | if tr is not None: | |
2348 | return tr.nest(name=desc) |
|
2348 | return tr.nest(name=desc) | |
2349 |
|
2349 | |||
2350 | # abort here if the journal already exists |
|
2350 | # abort here if the journal already exists | |
2351 | if self.svfs.exists(b"journal"): |
|
2351 | if self.svfs.exists(b"journal"): | |
2352 | raise error.RepoError( |
|
2352 | raise error.RepoError( | |
2353 | _(b"abandoned transaction found"), |
|
2353 | _(b"abandoned transaction found"), | |
2354 | hint=_(b"run 'hg recover' to clean up transaction"), |
|
2354 | hint=_(b"run 'hg recover' to clean up transaction"), | |
2355 | ) |
|
2355 | ) | |
2356 |
|
2356 | |||
2357 | idbase = b"%.40f#%f" % (random.random(), time.time()) |
|
2357 | idbase = b"%.40f#%f" % (random.random(), time.time()) | |
2358 | ha = hex(hashutil.sha1(idbase).digest()) |
|
2358 | ha = hex(hashutil.sha1(idbase).digest()) | |
2359 | txnid = b'TXN:' + ha |
|
2359 | txnid = b'TXN:' + ha | |
2360 | self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid) |
|
2360 | self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid) | |
2361 |
|
2361 | |||
2362 | self._writejournal(desc) |
|
2362 | self._writejournal(desc) | |
2363 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
|
2363 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] | |
2364 | if report: |
|
2364 | if report: | |
2365 | rp = report |
|
2365 | rp = report | |
2366 | else: |
|
2366 | else: | |
2367 | rp = self.ui.warn |
|
2367 | rp = self.ui.warn | |
2368 | vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/ |
|
2368 | vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/ | |
2369 | # we must avoid cyclic reference between repo and transaction. |
|
2369 | # we must avoid cyclic reference between repo and transaction. | |
2370 | reporef = weakref.ref(self) |
|
2370 | reporef = weakref.ref(self) | |
2371 | # Code to track tag movement |
|
2371 | # Code to track tag movement | |
2372 | # |
|
2372 | # | |
2373 | # Since tags are all handled as file content, it is actually quite hard |
|
2373 | # Since tags are all handled as file content, it is actually quite hard | |
2374 | # to track these movement from a code perspective. So we fallback to a |
|
2374 | # to track these movement from a code perspective. So we fallback to a | |
2375 | # tracking at the repository level. One could envision to track changes |
|
2375 | # tracking at the repository level. One could envision to track changes | |
2376 | # to the '.hgtags' file through changegroup apply but that fails to |
|
2376 | # to the '.hgtags' file through changegroup apply but that fails to | |
2377 | # cope with case where transaction expose new heads without changegroup |
|
2377 | # cope with case where transaction expose new heads without changegroup | |
2378 | # being involved (eg: phase movement). |
|
2378 | # being involved (eg: phase movement). | |
2379 | # |
|
2379 | # | |
2380 | # For now, We gate the feature behind a flag since this likely comes |
|
2380 | # For now, We gate the feature behind a flag since this likely comes | |
2381 | # with performance impacts. The current code run more often than needed |
|
2381 | # with performance impacts. The current code run more often than needed | |
2382 | # and do not use caches as much as it could. The current focus is on |
|
2382 | # and do not use caches as much as it could. The current focus is on | |
2383 | # the behavior of the feature so we disable it by default. The flag |
|
2383 | # the behavior of the feature so we disable it by default. The flag | |
2384 | # will be removed when we are happy with the performance impact. |
|
2384 | # will be removed when we are happy with the performance impact. | |
2385 | # |
|
2385 | # | |
2386 | # Once this feature is no longer experimental move the following |
|
2386 | # Once this feature is no longer experimental move the following | |
2387 | # documentation to the appropriate help section: |
|
2387 | # documentation to the appropriate help section: | |
2388 | # |
|
2388 | # | |
2389 | # The ``HG_TAG_MOVED`` variable will be set if the transaction touched |
|
2389 | # The ``HG_TAG_MOVED`` variable will be set if the transaction touched | |
2390 | # tags (new or changed or deleted tags). In addition the details of |
|
2390 | # tags (new or changed or deleted tags). In addition the details of | |
2391 | # these changes are made available in a file at: |
|
2391 | # these changes are made available in a file at: | |
2392 | # ``REPOROOT/.hg/changes/tags.changes``. |
|
2392 | # ``REPOROOT/.hg/changes/tags.changes``. | |
2393 | # Make sure you check for HG_TAG_MOVED before reading that file as it |
|
2393 | # Make sure you check for HG_TAG_MOVED before reading that file as it | |
2394 | # might exist from a previous transaction even if no tag were touched |
|
2394 | # might exist from a previous transaction even if no tag were touched | |
2395 | # in this one. Changes are recorded in a line base format:: |
|
2395 | # in this one. Changes are recorded in a line base format:: | |
2396 | # |
|
2396 | # | |
2397 | # <action> <hex-node> <tag-name>\n |
|
2397 | # <action> <hex-node> <tag-name>\n | |
2398 | # |
|
2398 | # | |
2399 | # Actions are defined as follow: |
|
2399 | # Actions are defined as follow: | |
2400 | # "-R": tag is removed, |
|
2400 | # "-R": tag is removed, | |
2401 | # "+A": tag is added, |
|
2401 | # "+A": tag is added, | |
2402 | # "-M": tag is moved (old value), |
|
2402 | # "-M": tag is moved (old value), | |
2403 | # "+M": tag is moved (new value), |
|
2403 | # "+M": tag is moved (new value), | |
2404 | tracktags = lambda x: None |
|
2404 | tracktags = lambda x: None | |
2405 | # experimental config: experimental.hook-track-tags |
|
2405 | # experimental config: experimental.hook-track-tags | |
2406 | shouldtracktags = self.ui.configbool( |
|
2406 | shouldtracktags = self.ui.configbool( | |
2407 | b'experimental', b'hook-track-tags' |
|
2407 | b'experimental', b'hook-track-tags' | |
2408 | ) |
|
2408 | ) | |
2409 | if desc != b'strip' and shouldtracktags: |
|
2409 | if desc != b'strip' and shouldtracktags: | |
2410 | oldheads = self.changelog.headrevs() |
|
2410 | oldheads = self.changelog.headrevs() | |
2411 |
|
2411 | |||
2412 | def tracktags(tr2): |
|
2412 | def tracktags(tr2): | |
2413 | repo = reporef() |
|
2413 | repo = reporef() | |
2414 | assert repo is not None # help pytype |
|
2414 | assert repo is not None # help pytype | |
2415 | oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads) |
|
2415 | oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads) | |
2416 | newheads = repo.changelog.headrevs() |
|
2416 | newheads = repo.changelog.headrevs() | |
2417 | newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads) |
|
2417 | newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads) | |
2418 | # notes: we compare lists here. |
|
2418 | # notes: we compare lists here. | |
2419 | # As we do it only once buiding set would not be cheaper |
|
2419 | # As we do it only once buiding set would not be cheaper | |
2420 | changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes) |
|
2420 | changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes) | |
2421 | if changes: |
|
2421 | if changes: | |
2422 | tr2.hookargs[b'tag_moved'] = b'1' |
|
2422 | tr2.hookargs[b'tag_moved'] = b'1' | |
2423 | with repo.vfs( |
|
2423 | with repo.vfs( | |
2424 | b'changes/tags.changes', b'w', atomictemp=True |
|
2424 | b'changes/tags.changes', b'w', atomictemp=True | |
2425 | ) as changesfile: |
|
2425 | ) as changesfile: | |
2426 | # note: we do not register the file to the transaction |
|
2426 | # note: we do not register the file to the transaction | |
2427 | # because we needs it to still exist on the transaction |
|
2427 | # because we needs it to still exist on the transaction | |
2428 | # is close (for txnclose hooks) |
|
2428 | # is close (for txnclose hooks) | |
2429 | tagsmod.writediff(changesfile, changes) |
|
2429 | tagsmod.writediff(changesfile, changes) | |
2430 |
|
2430 | |||
2431 | def validate(tr2): |
|
2431 | def validate(tr2): | |
2432 | """will run pre-closing hooks""" |
|
2432 | """will run pre-closing hooks""" | |
2433 | # XXX the transaction API is a bit lacking here so we take a hacky |
|
2433 | # XXX the transaction API is a bit lacking here so we take a hacky | |
2434 | # path for now |
|
2434 | # path for now | |
2435 | # |
|
2435 | # | |
2436 | # We cannot add this as a "pending" hooks since the 'tr.hookargs' |
|
2436 | # We cannot add this as a "pending" hooks since the 'tr.hookargs' | |
2437 | # dict is copied before these run. In addition we needs the data |
|
2437 | # dict is copied before these run. In addition we needs the data | |
2438 | # available to in memory hooks too. |
|
2438 | # available to in memory hooks too. | |
2439 | # |
|
2439 | # | |
2440 | # Moreover, we also need to make sure this runs before txnclose |
|
2440 | # Moreover, we also need to make sure this runs before txnclose | |
2441 | # hooks and there is no "pending" mechanism that would execute |
|
2441 | # hooks and there is no "pending" mechanism that would execute | |
2442 | # logic only if hooks are about to run. |
|
2442 | # logic only if hooks are about to run. | |
2443 | # |
|
2443 | # | |
2444 | # Fixing this limitation of the transaction is also needed to track |
|
2444 | # Fixing this limitation of the transaction is also needed to track | |
2445 | # other families of changes (bookmarks, phases, obsolescence). |
|
2445 | # other families of changes (bookmarks, phases, obsolescence). | |
2446 | # |
|
2446 | # | |
2447 | # This will have to be fixed before we remove the experimental |
|
2447 | # This will have to be fixed before we remove the experimental | |
2448 | # gating. |
|
2448 | # gating. | |
2449 | tracktags(tr2) |
|
2449 | tracktags(tr2) | |
2450 | repo = reporef() |
|
2450 | repo = reporef() | |
2451 | assert repo is not None # help pytype |
|
2451 | assert repo is not None # help pytype | |
2452 |
|
2452 | |||
2453 | singleheadopt = (b'experimental', b'single-head-per-branch') |
|
2453 | singleheadopt = (b'experimental', b'single-head-per-branch') | |
2454 | singlehead = repo.ui.configbool(*singleheadopt) |
|
2454 | singlehead = repo.ui.configbool(*singleheadopt) | |
2455 | if singlehead: |
|
2455 | if singlehead: | |
2456 | singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1] |
|
2456 | singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1] | |
2457 | accountclosed = singleheadsub.get( |
|
2457 | accountclosed = singleheadsub.get( | |
2458 | b"account-closed-heads", False |
|
2458 | b"account-closed-heads", False | |
2459 | ) |
|
2459 | ) | |
2460 | if singleheadsub.get(b"public-changes-only", False): |
|
2460 | if singleheadsub.get(b"public-changes-only", False): | |
2461 | filtername = b"immutable" |
|
2461 | filtername = b"immutable" | |
2462 | else: |
|
2462 | else: | |
2463 | filtername = b"visible" |
|
2463 | filtername = b"visible" | |
2464 | scmutil.enforcesinglehead( |
|
2464 | scmutil.enforcesinglehead( | |
2465 | repo, tr2, desc, accountclosed, filtername |
|
2465 | repo, tr2, desc, accountclosed, filtername | |
2466 | ) |
|
2466 | ) | |
2467 | if hook.hashook(repo.ui, b'pretxnclose-bookmark'): |
|
2467 | if hook.hashook(repo.ui, b'pretxnclose-bookmark'): | |
2468 | for name, (old, new) in sorted( |
|
2468 | for name, (old, new) in sorted( | |
2469 | tr.changes[b'bookmarks'].items() |
|
2469 | tr.changes[b'bookmarks'].items() | |
2470 | ): |
|
2470 | ): | |
2471 | args = tr.hookargs.copy() |
|
2471 | args = tr.hookargs.copy() | |
2472 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2472 | args.update(bookmarks.preparehookargs(name, old, new)) | |
2473 | repo.hook( |
|
2473 | repo.hook( | |
2474 | b'pretxnclose-bookmark', |
|
2474 | b'pretxnclose-bookmark', | |
2475 | throw=True, |
|
2475 | throw=True, | |
2476 | **pycompat.strkwargs(args) |
|
2476 | **pycompat.strkwargs(args) | |
2477 | ) |
|
2477 | ) | |
2478 | if hook.hashook(repo.ui, b'pretxnclose-phase'): |
|
2478 | if hook.hashook(repo.ui, b'pretxnclose-phase'): | |
2479 | cl = repo.unfiltered().changelog |
|
2479 | cl = repo.unfiltered().changelog | |
2480 | for revs, (old, new) in tr.changes[b'phases']: |
|
2480 | for revs, (old, new) in tr.changes[b'phases']: | |
2481 | for rev in revs: |
|
2481 | for rev in revs: | |
2482 | args = tr.hookargs.copy() |
|
2482 | args = tr.hookargs.copy() | |
2483 | node = hex(cl.node(rev)) |
|
2483 | node = hex(cl.node(rev)) | |
2484 | args.update(phases.preparehookargs(node, old, new)) |
|
2484 | args.update(phases.preparehookargs(node, old, new)) | |
2485 | repo.hook( |
|
2485 | repo.hook( | |
2486 | b'pretxnclose-phase', |
|
2486 | b'pretxnclose-phase', | |
2487 | throw=True, |
|
2487 | throw=True, | |
2488 | **pycompat.strkwargs(args) |
|
2488 | **pycompat.strkwargs(args) | |
2489 | ) |
|
2489 | ) | |
2490 |
|
2490 | |||
2491 | repo.hook( |
|
2491 | repo.hook( | |
2492 | b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs) |
|
2492 | b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs) | |
2493 | ) |
|
2493 | ) | |
2494 |
|
2494 | |||
2495 | def releasefn(tr, success): |
|
2495 | def releasefn(tr, success): | |
2496 | repo = reporef() |
|
2496 | repo = reporef() | |
2497 | if repo is None: |
|
2497 | if repo is None: | |
2498 | # If the repo has been GC'd (and this release function is being |
|
2498 | # If the repo has been GC'd (and this release function is being | |
2499 | # called from transaction.__del__), there's not much we can do, |
|
2499 | # called from transaction.__del__), there's not much we can do, | |
2500 | # so just leave the unfinished transaction there and let the |
|
2500 | # so just leave the unfinished transaction there and let the | |
2501 | # user run `hg recover`. |
|
2501 | # user run `hg recover`. | |
2502 | return |
|
2502 | return | |
2503 | if success: |
|
2503 | if success: | |
2504 | # this should be explicitly invoked here, because |
|
2504 | # this should be explicitly invoked here, because | |
2505 | # in-memory changes aren't written out at closing |
|
2505 | # in-memory changes aren't written out at closing | |
2506 | # transaction, if tr.addfilegenerator (via |
|
2506 | # transaction, if tr.addfilegenerator (via | |
2507 | # dirstate.write or so) isn't invoked while |
|
2507 | # dirstate.write or so) isn't invoked while | |
2508 | # transaction running |
|
2508 | # transaction running | |
2509 | repo.dirstate.write(None) |
|
2509 | repo.dirstate.write(None) | |
2510 | else: |
|
2510 | else: | |
2511 | # discard all changes (including ones already written |
|
2511 | # discard all changes (including ones already written | |
2512 | # out) in this transaction |
|
2512 | # out) in this transaction | |
2513 | narrowspec.restorebackup(self, b'journal.narrowspec') |
|
2513 | narrowspec.restorebackup(self, b'journal.narrowspec') | |
2514 | narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate') |
|
2514 | narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate') | |
2515 | repo.dirstate.restorebackup(None, b'journal.dirstate') |
|
2515 | repo.dirstate.restorebackup(None, b'journal.dirstate') | |
2516 |
|
2516 | |||
2517 | repo.invalidate(clearfilecache=True) |
|
2517 | repo.invalidate(clearfilecache=True) | |
2518 |
|
2518 | |||
2519 | tr = transaction.transaction( |
|
2519 | tr = transaction.transaction( | |
2520 | rp, |
|
2520 | rp, | |
2521 | self.svfs, |
|
2521 | self.svfs, | |
2522 | vfsmap, |
|
2522 | vfsmap, | |
2523 | b"journal", |
|
2523 | b"journal", | |
2524 | b"undo", |
|
2524 | b"undo", | |
2525 | aftertrans(renames), |
|
2525 | aftertrans(renames), | |
2526 | self.store.createmode, |
|
2526 | self.store.createmode, | |
2527 | validator=validate, |
|
2527 | validator=validate, | |
2528 | releasefn=releasefn, |
|
2528 | releasefn=releasefn, | |
2529 | checkambigfiles=_cachedfiles, |
|
2529 | checkambigfiles=_cachedfiles, | |
2530 | name=desc, |
|
2530 | name=desc, | |
2531 | ) |
|
2531 | ) | |
2532 | tr.changes[b'origrepolen'] = len(self) |
|
2532 | tr.changes[b'origrepolen'] = len(self) | |
2533 | tr.changes[b'obsmarkers'] = set() |
|
2533 | tr.changes[b'obsmarkers'] = set() | |
2534 | tr.changes[b'phases'] = [] |
|
2534 | tr.changes[b'phases'] = [] | |
2535 | tr.changes[b'bookmarks'] = {} |
|
2535 | tr.changes[b'bookmarks'] = {} | |
2536 |
|
2536 | |||
2537 | tr.hookargs[b'txnid'] = txnid |
|
2537 | tr.hookargs[b'txnid'] = txnid | |
2538 | tr.hookargs[b'txnname'] = desc |
|
2538 | tr.hookargs[b'txnname'] = desc | |
2539 | tr.hookargs[b'changes'] = tr.changes |
|
2539 | tr.hookargs[b'changes'] = tr.changes | |
2540 | # note: writing the fncache only during finalize mean that the file is |
|
2540 | # note: writing the fncache only during finalize mean that the file is | |
2541 | # outdated when running hooks. As fncache is used for streaming clone, |
|
2541 | # outdated when running hooks. As fncache is used for streaming clone, | |
2542 | # this is not expected to break anything that happen during the hooks. |
|
2542 | # this is not expected to break anything that happen during the hooks. | |
2543 | tr.addfinalize(b'flush-fncache', self.store.write) |
|
2543 | tr.addfinalize(b'flush-fncache', self.store.write) | |
2544 |
|
2544 | |||
2545 | def txnclosehook(tr2): |
|
2545 | def txnclosehook(tr2): | |
2546 | """To be run if transaction is successful, will schedule a hook run""" |
|
2546 | """To be run if transaction is successful, will schedule a hook run""" | |
2547 | # Don't reference tr2 in hook() so we don't hold a reference. |
|
2547 | # Don't reference tr2 in hook() so we don't hold a reference. | |
2548 | # This reduces memory consumption when there are multiple |
|
2548 | # This reduces memory consumption when there are multiple | |
2549 | # transactions per lock. This can likely go away if issue5045 |
|
2549 | # transactions per lock. This can likely go away if issue5045 | |
2550 | # fixes the function accumulation. |
|
2550 | # fixes the function accumulation. | |
2551 | hookargs = tr2.hookargs |
|
2551 | hookargs = tr2.hookargs | |
2552 |
|
2552 | |||
2553 | def hookfunc(unused_success): |
|
2553 | def hookfunc(unused_success): | |
2554 | repo = reporef() |
|
2554 | repo = reporef() | |
2555 | assert repo is not None # help pytype |
|
2555 | assert repo is not None # help pytype | |
2556 |
|
2556 | |||
2557 | if hook.hashook(repo.ui, b'txnclose-bookmark'): |
|
2557 | if hook.hashook(repo.ui, b'txnclose-bookmark'): | |
2558 | bmchanges = sorted(tr.changes[b'bookmarks'].items()) |
|
2558 | bmchanges = sorted(tr.changes[b'bookmarks'].items()) | |
2559 | for name, (old, new) in bmchanges: |
|
2559 | for name, (old, new) in bmchanges: | |
2560 | args = tr.hookargs.copy() |
|
2560 | args = tr.hookargs.copy() | |
2561 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2561 | args.update(bookmarks.preparehookargs(name, old, new)) | |
2562 | repo.hook( |
|
2562 | repo.hook( | |
2563 | b'txnclose-bookmark', |
|
2563 | b'txnclose-bookmark', | |
2564 | throw=False, |
|
2564 | throw=False, | |
2565 | **pycompat.strkwargs(args) |
|
2565 | **pycompat.strkwargs(args) | |
2566 | ) |
|
2566 | ) | |
2567 |
|
2567 | |||
2568 | if hook.hashook(repo.ui, b'txnclose-phase'): |
|
2568 | if hook.hashook(repo.ui, b'txnclose-phase'): | |
2569 | cl = repo.unfiltered().changelog |
|
2569 | cl = repo.unfiltered().changelog | |
2570 | phasemv = sorted( |
|
2570 | phasemv = sorted( | |
2571 | tr.changes[b'phases'], key=lambda r: r[0][0] |
|
2571 | tr.changes[b'phases'], key=lambda r: r[0][0] | |
2572 | ) |
|
2572 | ) | |
2573 | for revs, (old, new) in phasemv: |
|
2573 | for revs, (old, new) in phasemv: | |
2574 | for rev in revs: |
|
2574 | for rev in revs: | |
2575 | args = tr.hookargs.copy() |
|
2575 | args = tr.hookargs.copy() | |
2576 | node = hex(cl.node(rev)) |
|
2576 | node = hex(cl.node(rev)) | |
2577 | args.update(phases.preparehookargs(node, old, new)) |
|
2577 | args.update(phases.preparehookargs(node, old, new)) | |
2578 | repo.hook( |
|
2578 | repo.hook( | |
2579 | b'txnclose-phase', |
|
2579 | b'txnclose-phase', | |
2580 | throw=False, |
|
2580 | throw=False, | |
2581 | **pycompat.strkwargs(args) |
|
2581 | **pycompat.strkwargs(args) | |
2582 | ) |
|
2582 | ) | |
2583 |
|
2583 | |||
2584 | repo.hook( |
|
2584 | repo.hook( | |
2585 | b'txnclose', throw=False, **pycompat.strkwargs(hookargs) |
|
2585 | b'txnclose', throw=False, **pycompat.strkwargs(hookargs) | |
2586 | ) |
|
2586 | ) | |
2587 |
|
2587 | |||
2588 | repo = reporef() |
|
2588 | repo = reporef() | |
2589 | assert repo is not None # help pytype |
|
2589 | assert repo is not None # help pytype | |
2590 | repo._afterlock(hookfunc) |
|
2590 | repo._afterlock(hookfunc) | |
2591 |
|
2591 | |||
2592 | tr.addfinalize(b'txnclose-hook', txnclosehook) |
|
2592 | tr.addfinalize(b'txnclose-hook', txnclosehook) | |
2593 | # Include a leading "-" to make it happen before the transaction summary |
|
2593 | # Include a leading "-" to make it happen before the transaction summary | |
2594 | # reports registered via scmutil.registersummarycallback() whose names |
|
2594 | # reports registered via scmutil.registersummarycallback() whose names | |
2595 | # are 00-txnreport etc. That way, the caches will be warm when the |
|
2595 | # are 00-txnreport etc. That way, the caches will be warm when the | |
2596 | # callbacks run. |
|
2596 | # callbacks run. | |
2597 | tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr)) |
|
2597 | tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr)) | |
2598 |
|
2598 | |||
2599 | def txnaborthook(tr2): |
|
2599 | def txnaborthook(tr2): | |
2600 | """To be run if transaction is aborted""" |
|
2600 | """To be run if transaction is aborted""" | |
2601 | repo = reporef() |
|
2601 | repo = reporef() | |
2602 | assert repo is not None # help pytype |
|
2602 | assert repo is not None # help pytype | |
2603 | repo.hook( |
|
2603 | repo.hook( | |
2604 | b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs) |
|
2604 | b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs) | |
2605 | ) |
|
2605 | ) | |
2606 |
|
2606 | |||
2607 | tr.addabort(b'txnabort-hook', txnaborthook) |
|
2607 | tr.addabort(b'txnabort-hook', txnaborthook) | |
2608 | # avoid eager cache invalidation. in-memory data should be identical |
|
2608 | # avoid eager cache invalidation. in-memory data should be identical | |
2609 | # to stored data if transaction has no error. |
|
2609 | # to stored data if transaction has no error. | |
2610 | tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats) |
|
2610 | tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats) | |
2611 | self._transref = weakref.ref(tr) |
|
2611 | self._transref = weakref.ref(tr) | |
2612 | scmutil.registersummarycallback(self, tr, desc) |
|
2612 | scmutil.registersummarycallback(self, tr, desc) | |
2613 | return tr |
|
2613 | return tr | |
2614 |
|
2614 | |||
2615 | def _journalfiles(self): |
|
2615 | def _journalfiles(self): | |
2616 | return ( |
|
2616 | return ( | |
2617 | (self.svfs, b'journal'), |
|
2617 | (self.svfs, b'journal'), | |
2618 | (self.svfs, b'journal.narrowspec'), |
|
2618 | (self.svfs, b'journal.narrowspec'), | |
2619 | (self.vfs, b'journal.narrowspec.dirstate'), |
|
2619 | (self.vfs, b'journal.narrowspec.dirstate'), | |
2620 | (self.vfs, b'journal.dirstate'), |
|
2620 | (self.vfs, b'journal.dirstate'), | |
2621 | (self.vfs, b'journal.branch'), |
|
2621 | (self.vfs, b'journal.branch'), | |
2622 | (self.vfs, b'journal.desc'), |
|
2622 | (self.vfs, b'journal.desc'), | |
2623 | (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), |
|
2623 | (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), | |
2624 | (self.svfs, b'journal.phaseroots'), |
|
2624 | (self.svfs, b'journal.phaseroots'), | |
2625 | ) |
|
2625 | ) | |
2626 |
|
2626 | |||
2627 | def undofiles(self): |
|
2627 | def undofiles(self): | |
2628 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] |
|
2628 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] | |
2629 |
|
2629 | |||
2630 | @unfilteredmethod |
|
2630 | @unfilteredmethod | |
2631 | def _writejournal(self, desc): |
|
2631 | def _writejournal(self, desc): | |
2632 | self.dirstate.savebackup(None, b'journal.dirstate') |
|
2632 | self.dirstate.savebackup(None, b'journal.dirstate') | |
2633 | narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate') |
|
2633 | narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate') | |
2634 | narrowspec.savebackup(self, b'journal.narrowspec') |
|
2634 | narrowspec.savebackup(self, b'journal.narrowspec') | |
2635 | self.vfs.write( |
|
2635 | self.vfs.write( | |
2636 | b"journal.branch", encoding.fromlocal(self.dirstate.branch()) |
|
2636 | b"journal.branch", encoding.fromlocal(self.dirstate.branch()) | |
2637 | ) |
|
2637 | ) | |
2638 | self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc)) |
|
2638 | self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc)) | |
2639 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2639 | bookmarksvfs = bookmarks.bookmarksvfs(self) | |
2640 | bookmarksvfs.write( |
|
2640 | bookmarksvfs.write( | |
2641 | b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks") |
|
2641 | b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks") | |
2642 | ) |
|
2642 | ) | |
2643 | self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots")) |
|
2643 | self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots")) | |
2644 |
|
2644 | |||
2645 | def recover(self): |
|
2645 | def recover(self): | |
2646 | with self.lock(): |
|
2646 | with self.lock(): | |
2647 | if self.svfs.exists(b"journal"): |
|
2647 | if self.svfs.exists(b"journal"): | |
2648 | self.ui.status(_(b"rolling back interrupted transaction\n")) |
|
2648 | self.ui.status(_(b"rolling back interrupted transaction\n")) | |
2649 | vfsmap = { |
|
2649 | vfsmap = { | |
2650 | b'': self.svfs, |
|
2650 | b'': self.svfs, | |
2651 | b'plain': self.vfs, |
|
2651 | b'plain': self.vfs, | |
2652 | } |
|
2652 | } | |
2653 | transaction.rollback( |
|
2653 | transaction.rollback( | |
2654 | self.svfs, |
|
2654 | self.svfs, | |
2655 | vfsmap, |
|
2655 | vfsmap, | |
2656 | b"journal", |
|
2656 | b"journal", | |
2657 | self.ui.warn, |
|
2657 | self.ui.warn, | |
2658 | checkambigfiles=_cachedfiles, |
|
2658 | checkambigfiles=_cachedfiles, | |
2659 | ) |
|
2659 | ) | |
2660 | self.invalidate() |
|
2660 | self.invalidate() | |
2661 | return True |
|
2661 | return True | |
2662 | else: |
|
2662 | else: | |
2663 | self.ui.warn(_(b"no interrupted transaction available\n")) |
|
2663 | self.ui.warn(_(b"no interrupted transaction available\n")) | |
2664 | return False |
|
2664 | return False | |
2665 |
|
2665 | |||
2666 | def rollback(self, dryrun=False, force=False): |
|
2666 | def rollback(self, dryrun=False, force=False): | |
2667 | wlock = lock = dsguard = None |
|
2667 | wlock = lock = dsguard = None | |
2668 | try: |
|
2668 | try: | |
2669 | wlock = self.wlock() |
|
2669 | wlock = self.wlock() | |
2670 | lock = self.lock() |
|
2670 | lock = self.lock() | |
2671 | if self.svfs.exists(b"undo"): |
|
2671 | if self.svfs.exists(b"undo"): | |
2672 | dsguard = dirstateguard.dirstateguard(self, b'rollback') |
|
2672 | dsguard = dirstateguard.dirstateguard(self, b'rollback') | |
2673 |
|
2673 | |||
2674 | return self._rollback(dryrun, force, dsguard) |
|
2674 | return self._rollback(dryrun, force, dsguard) | |
2675 | else: |
|
2675 | else: | |
2676 | self.ui.warn(_(b"no rollback information available\n")) |
|
2676 | self.ui.warn(_(b"no rollback information available\n")) | |
2677 | return 1 |
|
2677 | return 1 | |
2678 | finally: |
|
2678 | finally: | |
2679 | release(dsguard, lock, wlock) |
|
2679 | release(dsguard, lock, wlock) | |
2680 |
|
2680 | |||
2681 | @unfilteredmethod # Until we get smarter cache management |
|
2681 | @unfilteredmethod # Until we get smarter cache management | |
2682 | def _rollback(self, dryrun, force, dsguard): |
|
2682 | def _rollback(self, dryrun, force, dsguard): | |
2683 | ui = self.ui |
|
2683 | ui = self.ui | |
2684 | try: |
|
2684 | try: | |
2685 | args = self.vfs.read(b'undo.desc').splitlines() |
|
2685 | args = self.vfs.read(b'undo.desc').splitlines() | |
2686 | (oldlen, desc, detail) = (int(args[0]), args[1], None) |
|
2686 | (oldlen, desc, detail) = (int(args[0]), args[1], None) | |
2687 | if len(args) >= 3: |
|
2687 | if len(args) >= 3: | |
2688 | detail = args[2] |
|
2688 | detail = args[2] | |
2689 | oldtip = oldlen - 1 |
|
2689 | oldtip = oldlen - 1 | |
2690 |
|
2690 | |||
2691 | if detail and ui.verbose: |
|
2691 | if detail and ui.verbose: | |
2692 | msg = _( |
|
2692 | msg = _( | |
2693 | b'repository tip rolled back to revision %d' |
|
2693 | b'repository tip rolled back to revision %d' | |
2694 | b' (undo %s: %s)\n' |
|
2694 | b' (undo %s: %s)\n' | |
2695 | ) % (oldtip, desc, detail) |
|
2695 | ) % (oldtip, desc, detail) | |
2696 | else: |
|
2696 | else: | |
2697 | msg = _( |
|
2697 | msg = _( | |
2698 | b'repository tip rolled back to revision %d (undo %s)\n' |
|
2698 | b'repository tip rolled back to revision %d (undo %s)\n' | |
2699 | ) % (oldtip, desc) |
|
2699 | ) % (oldtip, desc) | |
2700 | except IOError: |
|
2700 | except IOError: | |
2701 | msg = _(b'rolling back unknown transaction\n') |
|
2701 | msg = _(b'rolling back unknown transaction\n') | |
2702 | desc = None |
|
2702 | desc = None | |
2703 |
|
2703 | |||
2704 | if not force and self[b'.'] != self[b'tip'] and desc == b'commit': |
|
2704 | if not force and self[b'.'] != self[b'tip'] and desc == b'commit': | |
2705 | raise error.Abort( |
|
2705 | raise error.Abort( | |
2706 | _( |
|
2706 | _( | |
2707 | b'rollback of last commit while not checked out ' |
|
2707 | b'rollback of last commit while not checked out ' | |
2708 | b'may lose data' |
|
2708 | b'may lose data' | |
2709 | ), |
|
2709 | ), | |
2710 | hint=_(b'use -f to force'), |
|
2710 | hint=_(b'use -f to force'), | |
2711 | ) |
|
2711 | ) | |
2712 |
|
2712 | |||
2713 | ui.status(msg) |
|
2713 | ui.status(msg) | |
2714 | if dryrun: |
|
2714 | if dryrun: | |
2715 | return 0 |
|
2715 | return 0 | |
2716 |
|
2716 | |||
2717 | parents = self.dirstate.parents() |
|
2717 | parents = self.dirstate.parents() | |
2718 | self.destroying() |
|
2718 | self.destroying() | |
2719 | vfsmap = {b'plain': self.vfs, b'': self.svfs} |
|
2719 | vfsmap = {b'plain': self.vfs, b'': self.svfs} | |
2720 | transaction.rollback( |
|
2720 | transaction.rollback( | |
2721 | self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles |
|
2721 | self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles | |
2722 | ) |
|
2722 | ) | |
2723 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2723 | bookmarksvfs = bookmarks.bookmarksvfs(self) | |
2724 | if bookmarksvfs.exists(b'undo.bookmarks'): |
|
2724 | if bookmarksvfs.exists(b'undo.bookmarks'): | |
2725 | bookmarksvfs.rename( |
|
2725 | bookmarksvfs.rename( | |
2726 | b'undo.bookmarks', b'bookmarks', checkambig=True |
|
2726 | b'undo.bookmarks', b'bookmarks', checkambig=True | |
2727 | ) |
|
2727 | ) | |
2728 | if self.svfs.exists(b'undo.phaseroots'): |
|
2728 | if self.svfs.exists(b'undo.phaseroots'): | |
2729 | self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) |
|
2729 | self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) | |
2730 | self.invalidate() |
|
2730 | self.invalidate() | |
2731 |
|
2731 | |||
2732 | has_node = self.changelog.index.has_node |
|
2732 | has_node = self.changelog.index.has_node | |
2733 | parentgone = any(not has_node(p) for p in parents) |
|
2733 | parentgone = any(not has_node(p) for p in parents) | |
2734 | if parentgone: |
|
2734 | if parentgone: | |
2735 | # prevent dirstateguard from overwriting already restored one |
|
2735 | # prevent dirstateguard from overwriting already restored one | |
2736 | dsguard.close() |
|
2736 | dsguard.close() | |
2737 |
|
2737 | |||
2738 | narrowspec.restorebackup(self, b'undo.narrowspec') |
|
2738 | narrowspec.restorebackup(self, b'undo.narrowspec') | |
2739 | narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate') |
|
2739 | narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate') | |
2740 | self.dirstate.restorebackup(None, b'undo.dirstate') |
|
2740 | self.dirstate.restorebackup(None, b'undo.dirstate') | |
2741 | try: |
|
2741 | try: | |
2742 | branch = self.vfs.read(b'undo.branch') |
|
2742 | branch = self.vfs.read(b'undo.branch') | |
2743 | self.dirstate.setbranch(encoding.tolocal(branch)) |
|
2743 | self.dirstate.setbranch(encoding.tolocal(branch)) | |
2744 | except IOError: |
|
2744 | except IOError: | |
2745 | ui.warn( |
|
2745 | ui.warn( | |
2746 | _( |
|
2746 | _( | |
2747 | b'named branch could not be reset: ' |
|
2747 | b'named branch could not be reset: ' | |
2748 | b'current branch is still \'%s\'\n' |
|
2748 | b'current branch is still \'%s\'\n' | |
2749 | ) |
|
2749 | ) | |
2750 | % self.dirstate.branch() |
|
2750 | % self.dirstate.branch() | |
2751 | ) |
|
2751 | ) | |
2752 |
|
2752 | |||
2753 | parents = tuple([p.rev() for p in self[None].parents()]) |
|
2753 | parents = tuple([p.rev() for p in self[None].parents()]) | |
2754 | if len(parents) > 1: |
|
2754 | if len(parents) > 1: | |
2755 | ui.status( |
|
2755 | ui.status( | |
2756 | _( |
|
2756 | _( | |
2757 | b'working directory now based on ' |
|
2757 | b'working directory now based on ' | |
2758 | b'revisions %d and %d\n' |
|
2758 | b'revisions %d and %d\n' | |
2759 | ) |
|
2759 | ) | |
2760 | % parents |
|
2760 | % parents | |
2761 | ) |
|
2761 | ) | |
2762 | else: |
|
2762 | else: | |
2763 | ui.status( |
|
2763 | ui.status( | |
2764 | _(b'working directory now based on revision %d\n') % parents |
|
2764 | _(b'working directory now based on revision %d\n') % parents | |
2765 | ) |
|
2765 | ) | |
2766 | mergestatemod.mergestate.clean(self) |
|
2766 | mergestatemod.mergestate.clean(self) | |
2767 |
|
2767 | |||
2768 | # TODO: if we know which new heads may result from this rollback, pass |
|
2768 | # TODO: if we know which new heads may result from this rollback, pass | |
2769 | # them to destroy(), which will prevent the branchhead cache from being |
|
2769 | # them to destroy(), which will prevent the branchhead cache from being | |
2770 | # invalidated. |
|
2770 | # invalidated. | |
2771 | self.destroyed() |
|
2771 | self.destroyed() | |
2772 | return 0 |
|
2772 | return 0 | |
2773 |
|
2773 | |||
2774 | def _buildcacheupdater(self, newtransaction): |
|
2774 | def _buildcacheupdater(self, newtransaction): | |
2775 | """called during transaction to build the callback updating cache |
|
2775 | """called during transaction to build the callback updating cache | |
2776 |
|
2776 | |||
2777 | Lives on the repository to help extension who might want to augment |
|
2777 | Lives on the repository to help extension who might want to augment | |
2778 | this logic. For this purpose, the created transaction is passed to the |
|
2778 | this logic. For this purpose, the created transaction is passed to the | |
2779 | method. |
|
2779 | method. | |
2780 | """ |
|
2780 | """ | |
2781 | # we must avoid cyclic reference between repo and transaction. |
|
2781 | # we must avoid cyclic reference between repo and transaction. | |
2782 | reporef = weakref.ref(self) |
|
2782 | reporef = weakref.ref(self) | |
2783 |
|
2783 | |||
2784 | def updater(tr): |
|
2784 | def updater(tr): | |
2785 | repo = reporef() |
|
2785 | repo = reporef() | |
2786 | assert repo is not None # help pytype |
|
2786 | assert repo is not None # help pytype | |
2787 | repo.updatecaches(tr) |
|
2787 | repo.updatecaches(tr) | |
2788 |
|
2788 | |||
2789 | return updater |
|
2789 | return updater | |
2790 |
|
2790 | |||
2791 | @unfilteredmethod |
|
2791 | @unfilteredmethod | |
2792 | def updatecaches(self, tr=None, full=False, caches=None): |
|
2792 | def updatecaches(self, tr=None, full=False, caches=None): | |
2793 | """warm appropriate caches |
|
2793 | """warm appropriate caches | |
2794 |
|
2794 | |||
2795 | If this function is called after a transaction closed. The transaction |
|
2795 | If this function is called after a transaction closed. The transaction | |
2796 | will be available in the 'tr' argument. This can be used to selectively |
|
2796 | will be available in the 'tr' argument. This can be used to selectively | |
2797 | update caches relevant to the changes in that transaction. |
|
2797 | update caches relevant to the changes in that transaction. | |
2798 |
|
2798 | |||
2799 | If 'full' is set, make sure all caches the function knows about have |
|
2799 | If 'full' is set, make sure all caches the function knows about have | |
2800 | up-to-date data. Even the ones usually loaded more lazily. |
|
2800 | up-to-date data. Even the ones usually loaded more lazily. | |
2801 |
|
2801 | |||
2802 | The `full` argument can take a special "post-clone" value. In this case |
|
2802 | The `full` argument can take a special "post-clone" value. In this case | |
2803 | the cache warming is made after a clone and of the slower cache might |
|
2803 | the cache warming is made after a clone and of the slower cache might | |
2804 | be skipped, namely the `.fnodetags` one. This argument is 5.8 specific |
|
2804 | be skipped, namely the `.fnodetags` one. This argument is 5.8 specific | |
2805 | as we plan for a cleaner way to deal with this for 5.9. |
|
2805 | as we plan for a cleaner way to deal with this for 5.9. | |
2806 | """ |
|
2806 | """ | |
2807 | if tr is not None and tr.hookargs.get(b'source') == b'strip': |
|
2807 | if tr is not None and tr.hookargs.get(b'source') == b'strip': | |
2808 | # During strip, many caches are invalid but |
|
2808 | # During strip, many caches are invalid but | |
2809 | # later call to `destroyed` will refresh them. |
|
2809 | # later call to `destroyed` will refresh them. | |
2810 | return |
|
2810 | return | |
2811 |
|
2811 | |||
2812 | unfi = self.unfiltered() |
|
2812 | unfi = self.unfiltered() | |
2813 |
|
2813 | |||
2814 | if full: |
|
2814 | if full: | |
2815 | msg = ( |
|
2815 | msg = ( | |
2816 | "`full` argument for `repo.updatecaches` is deprecated\n" |
|
2816 | "`full` argument for `repo.updatecaches` is deprecated\n" | |
2817 | "(use `caches=repository.CACHE_ALL` instead)" |
|
2817 | "(use `caches=repository.CACHE_ALL` instead)" | |
2818 | ) |
|
2818 | ) | |
2819 | self.ui.deprecwarn(msg, b"5.9") |
|
2819 | self.ui.deprecwarn(msg, b"5.9") | |
2820 | caches = repository.CACHES_ALL |
|
2820 | caches = repository.CACHES_ALL | |
2821 | if full == b"post-clone": |
|
2821 | if full == b"post-clone": | |
2822 | caches = repository.CACHES_POST_CLONE |
|
2822 | caches = repository.CACHES_POST_CLONE | |
2823 | caches = repository.CACHES_ALL |
|
2823 | caches = repository.CACHES_ALL | |
2824 | elif caches is None: |
|
2824 | elif caches is None: | |
2825 | caches = repository.CACHES_DEFAULT |
|
2825 | caches = repository.CACHES_DEFAULT | |
2826 |
|
2826 | |||
2827 | if repository.CACHE_BRANCHMAP_SERVED in caches: |
|
2827 | if repository.CACHE_BRANCHMAP_SERVED in caches: | |
2828 | if tr is None or tr.changes[b'origrepolen'] < len(self): |
|
2828 | if tr is None or tr.changes[b'origrepolen'] < len(self): | |
2829 | # accessing the 'served' branchmap should refresh all the others, |
|
2829 | # accessing the 'served' branchmap should refresh all the others, | |
2830 | self.ui.debug(b'updating the branch cache\n') |
|
2830 | self.ui.debug(b'updating the branch cache\n') | |
2831 | self.filtered(b'served').branchmap() |
|
2831 | self.filtered(b'served').branchmap() | |
2832 | self.filtered(b'served.hidden').branchmap() |
|
2832 | self.filtered(b'served.hidden').branchmap() | |
|
2833 | # flush all possibly delayed write. | |||
|
2834 | self._branchcaches.write_delayed(self) | |||
2833 |
|
2835 | |||
2834 | if repository.CACHE_CHANGELOG_CACHE in caches: |
|
2836 | if repository.CACHE_CHANGELOG_CACHE in caches: | |
2835 | self.changelog.update_caches(transaction=tr) |
|
2837 | self.changelog.update_caches(transaction=tr) | |
2836 |
|
2838 | |||
2837 | if repository.CACHE_MANIFESTLOG_CACHE in caches: |
|
2839 | if repository.CACHE_MANIFESTLOG_CACHE in caches: | |
2838 | self.manifestlog.update_caches(transaction=tr) |
|
2840 | self.manifestlog.update_caches(transaction=tr) | |
2839 |
|
2841 | |||
2840 | if repository.CACHE_REV_BRANCH in caches: |
|
2842 | if repository.CACHE_REV_BRANCH in caches: | |
2841 | rbc = unfi.revbranchcache() |
|
2843 | rbc = unfi.revbranchcache() | |
2842 | for r in unfi.changelog: |
|
2844 | for r in unfi.changelog: | |
2843 | rbc.branchinfo(r) |
|
2845 | rbc.branchinfo(r) | |
2844 | rbc.write() |
|
2846 | rbc.write() | |
2845 |
|
2847 | |||
2846 | if repository.CACHE_FULL_MANIFEST in caches: |
|
2848 | if repository.CACHE_FULL_MANIFEST in caches: | |
2847 | # ensure the working copy parents are in the manifestfulltextcache |
|
2849 | # ensure the working copy parents are in the manifestfulltextcache | |
2848 | for ctx in self[b'.'].parents(): |
|
2850 | for ctx in self[b'.'].parents(): | |
2849 | ctx.manifest() # accessing the manifest is enough |
|
2851 | ctx.manifest() # accessing the manifest is enough | |
2850 |
|
2852 | |||
2851 | if repository.CACHE_FILE_NODE_TAGS in caches: |
|
2853 | if repository.CACHE_FILE_NODE_TAGS in caches: | |
2852 | # accessing fnode cache warms the cache |
|
2854 | # accessing fnode cache warms the cache | |
2853 | tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs()) |
|
2855 | tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs()) | |
2854 |
|
2856 | |||
2855 | if repository.CACHE_TAGS_DEFAULT in caches: |
|
2857 | if repository.CACHE_TAGS_DEFAULT in caches: | |
2856 | # accessing tags warm the cache |
|
2858 | # accessing tags warm the cache | |
2857 | self.tags() |
|
2859 | self.tags() | |
2858 | if repository.CACHE_TAGS_SERVED in caches: |
|
2860 | if repository.CACHE_TAGS_SERVED in caches: | |
2859 | self.filtered(b'served').tags() |
|
2861 | self.filtered(b'served').tags() | |
2860 |
|
2862 | |||
2861 | if repository.CACHE_BRANCHMAP_ALL in caches: |
|
2863 | if repository.CACHE_BRANCHMAP_ALL in caches: | |
2862 | # The CACHE_BRANCHMAP_ALL updates lazily-loaded caches immediately, |
|
2864 | # The CACHE_BRANCHMAP_ALL updates lazily-loaded caches immediately, | |
2863 | # so we're forcing a write to cause these caches to be warmed up |
|
2865 | # so we're forcing a write to cause these caches to be warmed up | |
2864 | # even if they haven't explicitly been requested yet (if they've |
|
2866 | # even if they haven't explicitly been requested yet (if they've | |
2865 | # never been used by hg, they won't ever have been written, even if |
|
2867 | # never been used by hg, they won't ever have been written, even if | |
2866 | # they're a subset of another kind of cache that *has* been used). |
|
2868 | # they're a subset of another kind of cache that *has* been used). | |
2867 | for filt in repoview.filtertable.keys(): |
|
2869 | for filt in repoview.filtertable.keys(): | |
2868 | filtered = self.filtered(filt) |
|
2870 | filtered = self.filtered(filt) | |
2869 | filtered.branchmap().write(filtered) |
|
2871 | filtered.branchmap().write(filtered) | |
2870 |
|
2872 | |||
2871 | def invalidatecaches(self): |
|
2873 | def invalidatecaches(self): | |
2872 |
|
2874 | |||
2873 | if '_tagscache' in vars(self): |
|
2875 | if '_tagscache' in vars(self): | |
2874 | # can't use delattr on proxy |
|
2876 | # can't use delattr on proxy | |
2875 | del self.__dict__['_tagscache'] |
|
2877 | del self.__dict__['_tagscache'] | |
2876 |
|
2878 | |||
2877 | self._branchcaches.clear() |
|
2879 | self._branchcaches.clear() | |
2878 | self.invalidatevolatilesets() |
|
2880 | self.invalidatevolatilesets() | |
2879 | self._sparsesignaturecache.clear() |
|
2881 | self._sparsesignaturecache.clear() | |
2880 |
|
2882 | |||
2881 | def invalidatevolatilesets(self): |
|
2883 | def invalidatevolatilesets(self): | |
2882 | self.filteredrevcache.clear() |
|
2884 | self.filteredrevcache.clear() | |
2883 | obsolete.clearobscaches(self) |
|
2885 | obsolete.clearobscaches(self) | |
2884 | self._quick_access_changeid_invalidate() |
|
2886 | self._quick_access_changeid_invalidate() | |
2885 |
|
2887 | |||
2886 | def invalidatedirstate(self): |
|
2888 | def invalidatedirstate(self): | |
2887 | """Invalidates the dirstate, causing the next call to dirstate |
|
2889 | """Invalidates the dirstate, causing the next call to dirstate | |
2888 | to check if it was modified since the last time it was read, |
|
2890 | to check if it was modified since the last time it was read, | |
2889 | rereading it if it has. |
|
2891 | rereading it if it has. | |
2890 |
|
2892 | |||
2891 | This is different to dirstate.invalidate() that it doesn't always |
|
2893 | This is different to dirstate.invalidate() that it doesn't always | |
2892 | rereads the dirstate. Use dirstate.invalidate() if you want to |
|
2894 | rereads the dirstate. Use dirstate.invalidate() if you want to | |
2893 | explicitly read the dirstate again (i.e. restoring it to a previous |
|
2895 | explicitly read the dirstate again (i.e. restoring it to a previous | |
2894 | known good state).""" |
|
2896 | known good state).""" | |
2895 | if hasunfilteredcache(self, 'dirstate'): |
|
2897 | if hasunfilteredcache(self, 'dirstate'): | |
2896 | for k in self.dirstate._filecache: |
|
2898 | for k in self.dirstate._filecache: | |
2897 | try: |
|
2899 | try: | |
2898 | delattr(self.dirstate, k) |
|
2900 | delattr(self.dirstate, k) | |
2899 | except AttributeError: |
|
2901 | except AttributeError: | |
2900 | pass |
|
2902 | pass | |
2901 | delattr(self.unfiltered(), 'dirstate') |
|
2903 | delattr(self.unfiltered(), 'dirstate') | |
2902 |
|
2904 | |||
2903 | def invalidate(self, clearfilecache=False): |
|
2905 | def invalidate(self, clearfilecache=False): | |
2904 | """Invalidates both store and non-store parts other than dirstate |
|
2906 | """Invalidates both store and non-store parts other than dirstate | |
2905 |
|
2907 | |||
2906 | If a transaction is running, invalidation of store is omitted, |
|
2908 | If a transaction is running, invalidation of store is omitted, | |
2907 | because discarding in-memory changes might cause inconsistency |
|
2909 | because discarding in-memory changes might cause inconsistency | |
2908 | (e.g. incomplete fncache causes unintentional failure, but |
|
2910 | (e.g. incomplete fncache causes unintentional failure, but | |
2909 | redundant one doesn't). |
|
2911 | redundant one doesn't). | |
2910 | """ |
|
2912 | """ | |
2911 | unfiltered = self.unfiltered() # all file caches are stored unfiltered |
|
2913 | unfiltered = self.unfiltered() # all file caches are stored unfiltered | |
2912 | for k in list(self._filecache.keys()): |
|
2914 | for k in list(self._filecache.keys()): | |
2913 | # dirstate is invalidated separately in invalidatedirstate() |
|
2915 | # dirstate is invalidated separately in invalidatedirstate() | |
2914 | if k == b'dirstate': |
|
2916 | if k == b'dirstate': | |
2915 | continue |
|
2917 | continue | |
2916 | if ( |
|
2918 | if ( | |
2917 | k == b'changelog' |
|
2919 | k == b'changelog' | |
2918 | and self.currenttransaction() |
|
2920 | and self.currenttransaction() | |
2919 | and self.changelog._delayed |
|
2921 | and self.changelog._delayed | |
2920 | ): |
|
2922 | ): | |
2921 | # The changelog object may store unwritten revisions. We don't |
|
2923 | # The changelog object may store unwritten revisions. We don't | |
2922 | # want to lose them. |
|
2924 | # want to lose them. | |
2923 | # TODO: Solve the problem instead of working around it. |
|
2925 | # TODO: Solve the problem instead of working around it. | |
2924 | continue |
|
2926 | continue | |
2925 |
|
2927 | |||
2926 | if clearfilecache: |
|
2928 | if clearfilecache: | |
2927 | del self._filecache[k] |
|
2929 | del self._filecache[k] | |
2928 | try: |
|
2930 | try: | |
2929 | delattr(unfiltered, k) |
|
2931 | delattr(unfiltered, k) | |
2930 | except AttributeError: |
|
2932 | except AttributeError: | |
2931 | pass |
|
2933 | pass | |
2932 | self.invalidatecaches() |
|
2934 | self.invalidatecaches() | |
2933 | if not self.currenttransaction(): |
|
2935 | if not self.currenttransaction(): | |
2934 | # TODO: Changing contents of store outside transaction |
|
2936 | # TODO: Changing contents of store outside transaction | |
2935 | # causes inconsistency. We should make in-memory store |
|
2937 | # causes inconsistency. We should make in-memory store | |
2936 | # changes detectable, and abort if changed. |
|
2938 | # changes detectable, and abort if changed. | |
2937 | self.store.invalidatecaches() |
|
2939 | self.store.invalidatecaches() | |
2938 |
|
2940 | |||
2939 | def invalidateall(self): |
|
2941 | def invalidateall(self): | |
2940 | """Fully invalidates both store and non-store parts, causing the |
|
2942 | """Fully invalidates both store and non-store parts, causing the | |
2941 | subsequent operation to reread any outside changes.""" |
|
2943 | subsequent operation to reread any outside changes.""" | |
2942 | # extension should hook this to invalidate its caches |
|
2944 | # extension should hook this to invalidate its caches | |
2943 | self.invalidate() |
|
2945 | self.invalidate() | |
2944 | self.invalidatedirstate() |
|
2946 | self.invalidatedirstate() | |
2945 |
|
2947 | |||
2946 | @unfilteredmethod |
|
2948 | @unfilteredmethod | |
2947 | def _refreshfilecachestats(self, tr): |
|
2949 | def _refreshfilecachestats(self, tr): | |
2948 | """Reload stats of cached files so that they are flagged as valid""" |
|
2950 | """Reload stats of cached files so that they are flagged as valid""" | |
2949 | for k, ce in self._filecache.items(): |
|
2951 | for k, ce in self._filecache.items(): | |
2950 | k = pycompat.sysstr(k) |
|
2952 | k = pycompat.sysstr(k) | |
2951 | if k == 'dirstate' or k not in self.__dict__: |
|
2953 | if k == 'dirstate' or k not in self.__dict__: | |
2952 | continue |
|
2954 | continue | |
2953 | ce.refresh() |
|
2955 | ce.refresh() | |
2954 |
|
2956 | |||
2955 | def _lock( |
|
2957 | def _lock( | |
2956 | self, |
|
2958 | self, | |
2957 | vfs, |
|
2959 | vfs, | |
2958 | lockname, |
|
2960 | lockname, | |
2959 | wait, |
|
2961 | wait, | |
2960 | releasefn, |
|
2962 | releasefn, | |
2961 | acquirefn, |
|
2963 | acquirefn, | |
2962 | desc, |
|
2964 | desc, | |
2963 | ): |
|
2965 | ): | |
2964 | timeout = 0 |
|
2966 | timeout = 0 | |
2965 | warntimeout = 0 |
|
2967 | warntimeout = 0 | |
2966 | if wait: |
|
2968 | if wait: | |
2967 | timeout = self.ui.configint(b"ui", b"timeout") |
|
2969 | timeout = self.ui.configint(b"ui", b"timeout") | |
2968 | warntimeout = self.ui.configint(b"ui", b"timeout.warn") |
|
2970 | warntimeout = self.ui.configint(b"ui", b"timeout.warn") | |
2969 | # internal config: ui.signal-safe-lock |
|
2971 | # internal config: ui.signal-safe-lock | |
2970 | signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock') |
|
2972 | signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock') | |
2971 |
|
2973 | |||
2972 | l = lockmod.trylock( |
|
2974 | l = lockmod.trylock( | |
2973 | self.ui, |
|
2975 | self.ui, | |
2974 | vfs, |
|
2976 | vfs, | |
2975 | lockname, |
|
2977 | lockname, | |
2976 | timeout, |
|
2978 | timeout, | |
2977 | warntimeout, |
|
2979 | warntimeout, | |
2978 | releasefn=releasefn, |
|
2980 | releasefn=releasefn, | |
2979 | acquirefn=acquirefn, |
|
2981 | acquirefn=acquirefn, | |
2980 | desc=desc, |
|
2982 | desc=desc, | |
2981 | signalsafe=signalsafe, |
|
2983 | signalsafe=signalsafe, | |
2982 | ) |
|
2984 | ) | |
2983 | return l |
|
2985 | return l | |
2984 |
|
2986 | |||
2985 | def _afterlock(self, callback): |
|
2987 | def _afterlock(self, callback): | |
2986 | """add a callback to be run when the repository is fully unlocked |
|
2988 | """add a callback to be run when the repository is fully unlocked | |
2987 |
|
2989 | |||
2988 | The callback will be executed when the outermost lock is released |
|
2990 | The callback will be executed when the outermost lock is released | |
2989 | (with wlock being higher level than 'lock').""" |
|
2991 | (with wlock being higher level than 'lock').""" | |
2990 | for ref in (self._wlockref, self._lockref): |
|
2992 | for ref in (self._wlockref, self._lockref): | |
2991 | l = ref and ref() |
|
2993 | l = ref and ref() | |
2992 | if l and l.held: |
|
2994 | if l and l.held: | |
2993 | l.postrelease.append(callback) |
|
2995 | l.postrelease.append(callback) | |
2994 | break |
|
2996 | break | |
2995 | else: # no lock have been found. |
|
2997 | else: # no lock have been found. | |
2996 | callback(True) |
|
2998 | callback(True) | |
2997 |
|
2999 | |||
2998 | def lock(self, wait=True): |
|
3000 | def lock(self, wait=True): | |
2999 | """Lock the repository store (.hg/store) and return a weak reference |
|
3001 | """Lock the repository store (.hg/store) and return a weak reference | |
3000 | to the lock. Use this before modifying the store (e.g. committing or |
|
3002 | to the lock. Use this before modifying the store (e.g. committing or | |
3001 | stripping). If you are opening a transaction, get a lock as well.) |
|
3003 | stripping). If you are opening a transaction, get a lock as well.) | |
3002 |
|
3004 | |||
3003 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
3005 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires | |
3004 | 'wlock' first to avoid a dead-lock hazard.""" |
|
3006 | 'wlock' first to avoid a dead-lock hazard.""" | |
3005 | l = self._currentlock(self._lockref) |
|
3007 | l = self._currentlock(self._lockref) | |
3006 | if l is not None: |
|
3008 | if l is not None: | |
3007 | l.lock() |
|
3009 | l.lock() | |
3008 | return l |
|
3010 | return l | |
3009 |
|
3011 | |||
3010 | l = self._lock( |
|
3012 | l = self._lock( | |
3011 | vfs=self.svfs, |
|
3013 | vfs=self.svfs, | |
3012 | lockname=b"lock", |
|
3014 | lockname=b"lock", | |
3013 | wait=wait, |
|
3015 | wait=wait, | |
3014 | releasefn=None, |
|
3016 | releasefn=None, | |
3015 | acquirefn=self.invalidate, |
|
3017 | acquirefn=self.invalidate, | |
3016 | desc=_(b'repository %s') % self.origroot, |
|
3018 | desc=_(b'repository %s') % self.origroot, | |
3017 | ) |
|
3019 | ) | |
3018 | self._lockref = weakref.ref(l) |
|
3020 | self._lockref = weakref.ref(l) | |
3019 | return l |
|
3021 | return l | |
3020 |
|
3022 | |||
3021 | def wlock(self, wait=True): |
|
3023 | def wlock(self, wait=True): | |
3022 | """Lock the non-store parts of the repository (everything under |
|
3024 | """Lock the non-store parts of the repository (everything under | |
3023 | .hg except .hg/store) and return a weak reference to the lock. |
|
3025 | .hg except .hg/store) and return a weak reference to the lock. | |
3024 |
|
3026 | |||
3025 | Use this before modifying files in .hg. |
|
3027 | Use this before modifying files in .hg. | |
3026 |
|
3028 | |||
3027 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
3029 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires | |
3028 | 'wlock' first to avoid a dead-lock hazard.""" |
|
3030 | 'wlock' first to avoid a dead-lock hazard.""" | |
3029 | l = self._wlockref() if self._wlockref else None |
|
3031 | l = self._wlockref() if self._wlockref else None | |
3030 | if l is not None and l.held: |
|
3032 | if l is not None and l.held: | |
3031 | l.lock() |
|
3033 | l.lock() | |
3032 | return l |
|
3034 | return l | |
3033 |
|
3035 | |||
3034 | # We do not need to check for non-waiting lock acquisition. Such |
|
3036 | # We do not need to check for non-waiting lock acquisition. Such | |
3035 | # acquisition would not cause dead-lock as they would just fail. |
|
3037 | # acquisition would not cause dead-lock as they would just fail. | |
3036 | if wait and ( |
|
3038 | if wait and ( | |
3037 | self.ui.configbool(b'devel', b'all-warnings') |
|
3039 | self.ui.configbool(b'devel', b'all-warnings') | |
3038 | or self.ui.configbool(b'devel', b'check-locks') |
|
3040 | or self.ui.configbool(b'devel', b'check-locks') | |
3039 | ): |
|
3041 | ): | |
3040 | if self._currentlock(self._lockref) is not None: |
|
3042 | if self._currentlock(self._lockref) is not None: | |
3041 | self.ui.develwarn(b'"wlock" acquired after "lock"') |
|
3043 | self.ui.develwarn(b'"wlock" acquired after "lock"') | |
3042 |
|
3044 | |||
3043 | def unlock(): |
|
3045 | def unlock(): | |
3044 | if self.dirstate.pendingparentchange(): |
|
3046 | if self.dirstate.pendingparentchange(): | |
3045 | self.dirstate.invalidate() |
|
3047 | self.dirstate.invalidate() | |
3046 | else: |
|
3048 | else: | |
3047 | self.dirstate.write(None) |
|
3049 | self.dirstate.write(None) | |
3048 |
|
3050 | |||
3049 | self._filecache[b'dirstate'].refresh() |
|
3051 | self._filecache[b'dirstate'].refresh() | |
3050 |
|
3052 | |||
3051 | l = self._lock( |
|
3053 | l = self._lock( | |
3052 | self.vfs, |
|
3054 | self.vfs, | |
3053 | b"wlock", |
|
3055 | b"wlock", | |
3054 | wait, |
|
3056 | wait, | |
3055 | unlock, |
|
3057 | unlock, | |
3056 | self.invalidatedirstate, |
|
3058 | self.invalidatedirstate, | |
3057 | _(b'working directory of %s') % self.origroot, |
|
3059 | _(b'working directory of %s') % self.origroot, | |
3058 | ) |
|
3060 | ) | |
3059 | self._wlockref = weakref.ref(l) |
|
3061 | self._wlockref = weakref.ref(l) | |
3060 | return l |
|
3062 | return l | |
3061 |
|
3063 | |||
3062 | def _currentlock(self, lockref): |
|
3064 | def _currentlock(self, lockref): | |
3063 | """Returns the lock if it's held, or None if it's not.""" |
|
3065 | """Returns the lock if it's held, or None if it's not.""" | |
3064 | if lockref is None: |
|
3066 | if lockref is None: | |
3065 | return None |
|
3067 | return None | |
3066 | l = lockref() |
|
3068 | l = lockref() | |
3067 | if l is None or not l.held: |
|
3069 | if l is None or not l.held: | |
3068 | return None |
|
3070 | return None | |
3069 | return l |
|
3071 | return l | |
3070 |
|
3072 | |||
3071 | def currentwlock(self): |
|
3073 | def currentwlock(self): | |
3072 | """Returns the wlock if it's held, or None if it's not.""" |
|
3074 | """Returns the wlock if it's held, or None if it's not.""" | |
3073 | return self._currentlock(self._wlockref) |
|
3075 | return self._currentlock(self._wlockref) | |
3074 |
|
3076 | |||
3075 | def checkcommitpatterns(self, wctx, match, status, fail): |
|
3077 | def checkcommitpatterns(self, wctx, match, status, fail): | |
3076 | """check for commit arguments that aren't committable""" |
|
3078 | """check for commit arguments that aren't committable""" | |
3077 | if match.isexact() or match.prefix(): |
|
3079 | if match.isexact() or match.prefix(): | |
3078 | matched = set(status.modified + status.added + status.removed) |
|
3080 | matched = set(status.modified + status.added + status.removed) | |
3079 |
|
3081 | |||
3080 | for f in match.files(): |
|
3082 | for f in match.files(): | |
3081 | f = self.dirstate.normalize(f) |
|
3083 | f = self.dirstate.normalize(f) | |
3082 | if f == b'.' or f in matched or f in wctx.substate: |
|
3084 | if f == b'.' or f in matched or f in wctx.substate: | |
3083 | continue |
|
3085 | continue | |
3084 | if f in status.deleted: |
|
3086 | if f in status.deleted: | |
3085 | fail(f, _(b'file not found!')) |
|
3087 | fail(f, _(b'file not found!')) | |
3086 | # Is it a directory that exists or used to exist? |
|
3088 | # Is it a directory that exists or used to exist? | |
3087 | if self.wvfs.isdir(f) or wctx.p1().hasdir(f): |
|
3089 | if self.wvfs.isdir(f) or wctx.p1().hasdir(f): | |
3088 | d = f + b'/' |
|
3090 | d = f + b'/' | |
3089 | for mf in matched: |
|
3091 | for mf in matched: | |
3090 | if mf.startswith(d): |
|
3092 | if mf.startswith(d): | |
3091 | break |
|
3093 | break | |
3092 | else: |
|
3094 | else: | |
3093 | fail(f, _(b"no match under directory!")) |
|
3095 | fail(f, _(b"no match under directory!")) | |
3094 | elif f not in self.dirstate: |
|
3096 | elif f not in self.dirstate: | |
3095 | fail(f, _(b"file not tracked!")) |
|
3097 | fail(f, _(b"file not tracked!")) | |
3096 |
|
3098 | |||
3097 | @unfilteredmethod |
|
3099 | @unfilteredmethod | |
3098 | def commit( |
|
3100 | def commit( | |
3099 | self, |
|
3101 | self, | |
3100 | text=b"", |
|
3102 | text=b"", | |
3101 | user=None, |
|
3103 | user=None, | |
3102 | date=None, |
|
3104 | date=None, | |
3103 | match=None, |
|
3105 | match=None, | |
3104 | force=False, |
|
3106 | force=False, | |
3105 | editor=None, |
|
3107 | editor=None, | |
3106 | extra=None, |
|
3108 | extra=None, | |
3107 | ): |
|
3109 | ): | |
3108 | """Add a new revision to current repository. |
|
3110 | """Add a new revision to current repository. | |
3109 |
|
3111 | |||
3110 | Revision information is gathered from the working directory, |
|
3112 | Revision information is gathered from the working directory, | |
3111 | match can be used to filter the committed files. If editor is |
|
3113 | match can be used to filter the committed files. If editor is | |
3112 | supplied, it is called to get a commit message. |
|
3114 | supplied, it is called to get a commit message. | |
3113 | """ |
|
3115 | """ | |
3114 | if extra is None: |
|
3116 | if extra is None: | |
3115 | extra = {} |
|
3117 | extra = {} | |
3116 |
|
3118 | |||
3117 | def fail(f, msg): |
|
3119 | def fail(f, msg): | |
3118 | raise error.InputError(b'%s: %s' % (f, msg)) |
|
3120 | raise error.InputError(b'%s: %s' % (f, msg)) | |
3119 |
|
3121 | |||
3120 | if not match: |
|
3122 | if not match: | |
3121 | match = matchmod.always() |
|
3123 | match = matchmod.always() | |
3122 |
|
3124 | |||
3123 | if not force: |
|
3125 | if not force: | |
3124 | match.bad = fail |
|
3126 | match.bad = fail | |
3125 |
|
3127 | |||
3126 | # lock() for recent changelog (see issue4368) |
|
3128 | # lock() for recent changelog (see issue4368) | |
3127 | with self.wlock(), self.lock(): |
|
3129 | with self.wlock(), self.lock(): | |
3128 | wctx = self[None] |
|
3130 | wctx = self[None] | |
3129 | merge = len(wctx.parents()) > 1 |
|
3131 | merge = len(wctx.parents()) > 1 | |
3130 |
|
3132 | |||
3131 | if not force and merge and not match.always(): |
|
3133 | if not force and merge and not match.always(): | |
3132 | raise error.Abort( |
|
3134 | raise error.Abort( | |
3133 | _( |
|
3135 | _( | |
3134 | b'cannot partially commit a merge ' |
|
3136 | b'cannot partially commit a merge ' | |
3135 | b'(do not specify files or patterns)' |
|
3137 | b'(do not specify files or patterns)' | |
3136 | ) |
|
3138 | ) | |
3137 | ) |
|
3139 | ) | |
3138 |
|
3140 | |||
3139 | status = self.status(match=match, clean=force) |
|
3141 | status = self.status(match=match, clean=force) | |
3140 | if force: |
|
3142 | if force: | |
3141 | status.modified.extend( |
|
3143 | status.modified.extend( | |
3142 | status.clean |
|
3144 | status.clean | |
3143 | ) # mq may commit clean files |
|
3145 | ) # mq may commit clean files | |
3144 |
|
3146 | |||
3145 | # check subrepos |
|
3147 | # check subrepos | |
3146 | subs, commitsubs, newstate = subrepoutil.precommit( |
|
3148 | subs, commitsubs, newstate = subrepoutil.precommit( | |
3147 | self.ui, wctx, status, match, force=force |
|
3149 | self.ui, wctx, status, match, force=force | |
3148 | ) |
|
3150 | ) | |
3149 |
|
3151 | |||
3150 | # make sure all explicit patterns are matched |
|
3152 | # make sure all explicit patterns are matched | |
3151 | if not force: |
|
3153 | if not force: | |
3152 | self.checkcommitpatterns(wctx, match, status, fail) |
|
3154 | self.checkcommitpatterns(wctx, match, status, fail) | |
3153 |
|
3155 | |||
3154 | cctx = context.workingcommitctx( |
|
3156 | cctx = context.workingcommitctx( | |
3155 | self, status, text, user, date, extra |
|
3157 | self, status, text, user, date, extra | |
3156 | ) |
|
3158 | ) | |
3157 |
|
3159 | |||
3158 | ms = mergestatemod.mergestate.read(self) |
|
3160 | ms = mergestatemod.mergestate.read(self) | |
3159 | mergeutil.checkunresolved(ms) |
|
3161 | mergeutil.checkunresolved(ms) | |
3160 |
|
3162 | |||
3161 | # internal config: ui.allowemptycommit |
|
3163 | # internal config: ui.allowemptycommit | |
3162 | if cctx.isempty() and not self.ui.configbool( |
|
3164 | if cctx.isempty() and not self.ui.configbool( | |
3163 | b'ui', b'allowemptycommit' |
|
3165 | b'ui', b'allowemptycommit' | |
3164 | ): |
|
3166 | ): | |
3165 | self.ui.debug(b'nothing to commit, clearing merge state\n') |
|
3167 | self.ui.debug(b'nothing to commit, clearing merge state\n') | |
3166 | ms.reset() |
|
3168 | ms.reset() | |
3167 | return None |
|
3169 | return None | |
3168 |
|
3170 | |||
3169 | if merge and cctx.deleted(): |
|
3171 | if merge and cctx.deleted(): | |
3170 | raise error.Abort(_(b"cannot commit merge with missing files")) |
|
3172 | raise error.Abort(_(b"cannot commit merge with missing files")) | |
3171 |
|
3173 | |||
3172 | if editor: |
|
3174 | if editor: | |
3173 | cctx._text = editor(self, cctx, subs) |
|
3175 | cctx._text = editor(self, cctx, subs) | |
3174 | edited = text != cctx._text |
|
3176 | edited = text != cctx._text | |
3175 |
|
3177 | |||
3176 | # Save commit message in case this transaction gets rolled back |
|
3178 | # Save commit message in case this transaction gets rolled back | |
3177 | # (e.g. by a pretxncommit hook). Leave the content alone on |
|
3179 | # (e.g. by a pretxncommit hook). Leave the content alone on | |
3178 | # the assumption that the user will use the same editor again. |
|
3180 | # the assumption that the user will use the same editor again. | |
3179 | msgfn = self.savecommitmessage(cctx._text) |
|
3181 | msgfn = self.savecommitmessage(cctx._text) | |
3180 |
|
3182 | |||
3181 | # commit subs and write new state |
|
3183 | # commit subs and write new state | |
3182 | if subs: |
|
3184 | if subs: | |
3183 | uipathfn = scmutil.getuipathfn(self) |
|
3185 | uipathfn = scmutil.getuipathfn(self) | |
3184 | for s in sorted(commitsubs): |
|
3186 | for s in sorted(commitsubs): | |
3185 | sub = wctx.sub(s) |
|
3187 | sub = wctx.sub(s) | |
3186 | self.ui.status( |
|
3188 | self.ui.status( | |
3187 | _(b'committing subrepository %s\n') |
|
3189 | _(b'committing subrepository %s\n') | |
3188 | % uipathfn(subrepoutil.subrelpath(sub)) |
|
3190 | % uipathfn(subrepoutil.subrelpath(sub)) | |
3189 | ) |
|
3191 | ) | |
3190 | sr = sub.commit(cctx._text, user, date) |
|
3192 | sr = sub.commit(cctx._text, user, date) | |
3191 | newstate[s] = (newstate[s][0], sr) |
|
3193 | newstate[s] = (newstate[s][0], sr) | |
3192 | subrepoutil.writestate(self, newstate) |
|
3194 | subrepoutil.writestate(self, newstate) | |
3193 |
|
3195 | |||
3194 | p1, p2 = self.dirstate.parents() |
|
3196 | p1, p2 = self.dirstate.parents() | |
3195 | hookp1, hookp2 = hex(p1), (p2 != self.nullid and hex(p2) or b'') |
|
3197 | hookp1, hookp2 = hex(p1), (p2 != self.nullid and hex(p2) or b'') | |
3196 | try: |
|
3198 | try: | |
3197 | self.hook( |
|
3199 | self.hook( | |
3198 | b"precommit", throw=True, parent1=hookp1, parent2=hookp2 |
|
3200 | b"precommit", throw=True, parent1=hookp1, parent2=hookp2 | |
3199 | ) |
|
3201 | ) | |
3200 | with self.transaction(b'commit'): |
|
3202 | with self.transaction(b'commit'): | |
3201 | ret = self.commitctx(cctx, True) |
|
3203 | ret = self.commitctx(cctx, True) | |
3202 | # update bookmarks, dirstate and mergestate |
|
3204 | # update bookmarks, dirstate and mergestate | |
3203 | bookmarks.update(self, [p1, p2], ret) |
|
3205 | bookmarks.update(self, [p1, p2], ret) | |
3204 | cctx.markcommitted(ret) |
|
3206 | cctx.markcommitted(ret) | |
3205 | ms.reset() |
|
3207 | ms.reset() | |
3206 | except: # re-raises |
|
3208 | except: # re-raises | |
3207 | if edited: |
|
3209 | if edited: | |
3208 | self.ui.write( |
|
3210 | self.ui.write( | |
3209 | _(b'note: commit message saved in %s\n') % msgfn |
|
3211 | _(b'note: commit message saved in %s\n') % msgfn | |
3210 | ) |
|
3212 | ) | |
3211 | self.ui.write( |
|
3213 | self.ui.write( | |
3212 | _( |
|
3214 | _( | |
3213 | b"note: use 'hg commit --logfile " |
|
3215 | b"note: use 'hg commit --logfile " | |
3214 | b".hg/last-message.txt --edit' to reuse it\n" |
|
3216 | b".hg/last-message.txt --edit' to reuse it\n" | |
3215 | ) |
|
3217 | ) | |
3216 | ) |
|
3218 | ) | |
3217 | raise |
|
3219 | raise | |
3218 |
|
3220 | |||
3219 | def commithook(unused_success): |
|
3221 | def commithook(unused_success): | |
3220 | # hack for command that use a temporary commit (eg: histedit) |
|
3222 | # hack for command that use a temporary commit (eg: histedit) | |
3221 | # temporary commit got stripped before hook release |
|
3223 | # temporary commit got stripped before hook release | |
3222 | if self.changelog.hasnode(ret): |
|
3224 | if self.changelog.hasnode(ret): | |
3223 | self.hook( |
|
3225 | self.hook( | |
3224 | b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2 |
|
3226 | b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2 | |
3225 | ) |
|
3227 | ) | |
3226 |
|
3228 | |||
3227 | self._afterlock(commithook) |
|
3229 | self._afterlock(commithook) | |
3228 | return ret |
|
3230 | return ret | |
3229 |
|
3231 | |||
3230 | @unfilteredmethod |
|
3232 | @unfilteredmethod | |
3231 | def commitctx(self, ctx, error=False, origctx=None): |
|
3233 | def commitctx(self, ctx, error=False, origctx=None): | |
3232 | return commit.commitctx(self, ctx, error=error, origctx=origctx) |
|
3234 | return commit.commitctx(self, ctx, error=error, origctx=origctx) | |
3233 |
|
3235 | |||
3234 | @unfilteredmethod |
|
3236 | @unfilteredmethod | |
3235 | def destroying(self): |
|
3237 | def destroying(self): | |
3236 | """Inform the repository that nodes are about to be destroyed. |
|
3238 | """Inform the repository that nodes are about to be destroyed. | |
3237 | Intended for use by strip and rollback, so there's a common |
|
3239 | Intended for use by strip and rollback, so there's a common | |
3238 | place for anything that has to be done before destroying history. |
|
3240 | place for anything that has to be done before destroying history. | |
3239 |
|
3241 | |||
3240 | This is mostly useful for saving state that is in memory and waiting |
|
3242 | This is mostly useful for saving state that is in memory and waiting | |
3241 | to be flushed when the current lock is released. Because a call to |
|
3243 | to be flushed when the current lock is released. Because a call to | |
3242 | destroyed is imminent, the repo will be invalidated causing those |
|
3244 | destroyed is imminent, the repo will be invalidated causing those | |
3243 | changes to stay in memory (waiting for the next unlock), or vanish |
|
3245 | changes to stay in memory (waiting for the next unlock), or vanish | |
3244 | completely. |
|
3246 | completely. | |
3245 | """ |
|
3247 | """ | |
3246 | # When using the same lock to commit and strip, the phasecache is left |
|
3248 | # When using the same lock to commit and strip, the phasecache is left | |
3247 | # dirty after committing. Then when we strip, the repo is invalidated, |
|
3249 | # dirty after committing. Then when we strip, the repo is invalidated, | |
3248 | # causing those changes to disappear. |
|
3250 | # causing those changes to disappear. | |
3249 | if '_phasecache' in vars(self): |
|
3251 | if '_phasecache' in vars(self): | |
3250 | self._phasecache.write() |
|
3252 | self._phasecache.write() | |
3251 |
|
3253 | |||
3252 | @unfilteredmethod |
|
3254 | @unfilteredmethod | |
3253 | def destroyed(self): |
|
3255 | def destroyed(self): | |
3254 | """Inform the repository that nodes have been destroyed. |
|
3256 | """Inform the repository that nodes have been destroyed. | |
3255 | Intended for use by strip and rollback, so there's a common |
|
3257 | Intended for use by strip and rollback, so there's a common | |
3256 | place for anything that has to be done after destroying history. |
|
3258 | place for anything that has to be done after destroying history. | |
3257 | """ |
|
3259 | """ | |
3258 | # When one tries to: |
|
3260 | # When one tries to: | |
3259 | # 1) destroy nodes thus calling this method (e.g. strip) |
|
3261 | # 1) destroy nodes thus calling this method (e.g. strip) | |
3260 | # 2) use phasecache somewhere (e.g. commit) |
|
3262 | # 2) use phasecache somewhere (e.g. commit) | |
3261 | # |
|
3263 | # | |
3262 | # then 2) will fail because the phasecache contains nodes that were |
|
3264 | # then 2) will fail because the phasecache contains nodes that were | |
3263 | # removed. We can either remove phasecache from the filecache, |
|
3265 | # removed. We can either remove phasecache from the filecache, | |
3264 | # causing it to reload next time it is accessed, or simply filter |
|
3266 | # causing it to reload next time it is accessed, or simply filter | |
3265 | # the removed nodes now and write the updated cache. |
|
3267 | # the removed nodes now and write the updated cache. | |
3266 | self._phasecache.filterunknown(self) |
|
3268 | self._phasecache.filterunknown(self) | |
3267 | self._phasecache.write() |
|
3269 | self._phasecache.write() | |
3268 |
|
3270 | |||
3269 | # refresh all repository caches |
|
3271 | # refresh all repository caches | |
3270 | self.updatecaches() |
|
3272 | self.updatecaches() | |
3271 |
|
3273 | |||
3272 | # Ensure the persistent tag cache is updated. Doing it now |
|
3274 | # Ensure the persistent tag cache is updated. Doing it now | |
3273 | # means that the tag cache only has to worry about destroyed |
|
3275 | # means that the tag cache only has to worry about destroyed | |
3274 | # heads immediately after a strip/rollback. That in turn |
|
3276 | # heads immediately after a strip/rollback. That in turn | |
3275 | # guarantees that "cachetip == currenttip" (comparing both rev |
|
3277 | # guarantees that "cachetip == currenttip" (comparing both rev | |
3276 | # and node) always means no nodes have been added or destroyed. |
|
3278 | # and node) always means no nodes have been added or destroyed. | |
3277 |
|
3279 | |||
3278 | # XXX this is suboptimal when qrefresh'ing: we strip the current |
|
3280 | # XXX this is suboptimal when qrefresh'ing: we strip the current | |
3279 | # head, refresh the tag cache, then immediately add a new head. |
|
3281 | # head, refresh the tag cache, then immediately add a new head. | |
3280 | # But I think doing it this way is necessary for the "instant |
|
3282 | # But I think doing it this way is necessary for the "instant | |
3281 | # tag cache retrieval" case to work. |
|
3283 | # tag cache retrieval" case to work. | |
3282 | self.invalidate() |
|
3284 | self.invalidate() | |
3283 |
|
3285 | |||
3284 | def status( |
|
3286 | def status( | |
3285 | self, |
|
3287 | self, | |
3286 | node1=b'.', |
|
3288 | node1=b'.', | |
3287 | node2=None, |
|
3289 | node2=None, | |
3288 | match=None, |
|
3290 | match=None, | |
3289 | ignored=False, |
|
3291 | ignored=False, | |
3290 | clean=False, |
|
3292 | clean=False, | |
3291 | unknown=False, |
|
3293 | unknown=False, | |
3292 | listsubrepos=False, |
|
3294 | listsubrepos=False, | |
3293 | ): |
|
3295 | ): | |
3294 | '''a convenience method that calls node1.status(node2)''' |
|
3296 | '''a convenience method that calls node1.status(node2)''' | |
3295 | return self[node1].status( |
|
3297 | return self[node1].status( | |
3296 | node2, match, ignored, clean, unknown, listsubrepos |
|
3298 | node2, match, ignored, clean, unknown, listsubrepos | |
3297 | ) |
|
3299 | ) | |
3298 |
|
3300 | |||
3299 | def addpostdsstatus(self, ps): |
|
3301 | def addpostdsstatus(self, ps): | |
3300 | """Add a callback to run within the wlock, at the point at which status |
|
3302 | """Add a callback to run within the wlock, at the point at which status | |
3301 | fixups happen. |
|
3303 | fixups happen. | |
3302 |
|
3304 | |||
3303 | On status completion, callback(wctx, status) will be called with the |
|
3305 | On status completion, callback(wctx, status) will be called with the | |
3304 | wlock held, unless the dirstate has changed from underneath or the wlock |
|
3306 | wlock held, unless the dirstate has changed from underneath or the wlock | |
3305 | couldn't be grabbed. |
|
3307 | couldn't be grabbed. | |
3306 |
|
3308 | |||
3307 | Callbacks should not capture and use a cached copy of the dirstate -- |
|
3309 | Callbacks should not capture and use a cached copy of the dirstate -- | |
3308 | it might change in the meanwhile. Instead, they should access the |
|
3310 | it might change in the meanwhile. Instead, they should access the | |
3309 | dirstate via wctx.repo().dirstate. |
|
3311 | dirstate via wctx.repo().dirstate. | |
3310 |
|
3312 | |||
3311 | This list is emptied out after each status run -- extensions should |
|
3313 | This list is emptied out after each status run -- extensions should | |
3312 | make sure it adds to this list each time dirstate.status is called. |
|
3314 | make sure it adds to this list each time dirstate.status is called. | |
3313 | Extensions should also make sure they don't call this for statuses |
|
3315 | Extensions should also make sure they don't call this for statuses | |
3314 | that don't involve the dirstate. |
|
3316 | that don't involve the dirstate. | |
3315 | """ |
|
3317 | """ | |
3316 |
|
3318 | |||
3317 | # The list is located here for uniqueness reasons -- it is actually |
|
3319 | # The list is located here for uniqueness reasons -- it is actually | |
3318 | # managed by the workingctx, but that isn't unique per-repo. |
|
3320 | # managed by the workingctx, but that isn't unique per-repo. | |
3319 | self._postdsstatus.append(ps) |
|
3321 | self._postdsstatus.append(ps) | |
3320 |
|
3322 | |||
3321 | def postdsstatus(self): |
|
3323 | def postdsstatus(self): | |
3322 | """Used by workingctx to get the list of post-dirstate-status hooks.""" |
|
3324 | """Used by workingctx to get the list of post-dirstate-status hooks.""" | |
3323 | return self._postdsstatus |
|
3325 | return self._postdsstatus | |
3324 |
|
3326 | |||
3325 | def clearpostdsstatus(self): |
|
3327 | def clearpostdsstatus(self): | |
3326 | """Used by workingctx to clear post-dirstate-status hooks.""" |
|
3328 | """Used by workingctx to clear post-dirstate-status hooks.""" | |
3327 | del self._postdsstatus[:] |
|
3329 | del self._postdsstatus[:] | |
3328 |
|
3330 | |||
3329 | def heads(self, start=None): |
|
3331 | def heads(self, start=None): | |
3330 | if start is None: |
|
3332 | if start is None: | |
3331 | cl = self.changelog |
|
3333 | cl = self.changelog | |
3332 | headrevs = reversed(cl.headrevs()) |
|
3334 | headrevs = reversed(cl.headrevs()) | |
3333 | return [cl.node(rev) for rev in headrevs] |
|
3335 | return [cl.node(rev) for rev in headrevs] | |
3334 |
|
3336 | |||
3335 | heads = self.changelog.heads(start) |
|
3337 | heads = self.changelog.heads(start) | |
3336 | # sort the output in rev descending order |
|
3338 | # sort the output in rev descending order | |
3337 | return sorted(heads, key=self.changelog.rev, reverse=True) |
|
3339 | return sorted(heads, key=self.changelog.rev, reverse=True) | |
3338 |
|
3340 | |||
3339 | def branchheads(self, branch=None, start=None, closed=False): |
|
3341 | def branchheads(self, branch=None, start=None, closed=False): | |
3340 | """return a (possibly filtered) list of heads for the given branch |
|
3342 | """return a (possibly filtered) list of heads for the given branch | |
3341 |
|
3343 | |||
3342 | Heads are returned in topological order, from newest to oldest. |
|
3344 | Heads are returned in topological order, from newest to oldest. | |
3343 | If branch is None, use the dirstate branch. |
|
3345 | If branch is None, use the dirstate branch. | |
3344 | If start is not None, return only heads reachable from start. |
|
3346 | If start is not None, return only heads reachable from start. | |
3345 | If closed is True, return heads that are marked as closed as well. |
|
3347 | If closed is True, return heads that are marked as closed as well. | |
3346 | """ |
|
3348 | """ | |
3347 | if branch is None: |
|
3349 | if branch is None: | |
3348 | branch = self[None].branch() |
|
3350 | branch = self[None].branch() | |
3349 | branches = self.branchmap() |
|
3351 | branches = self.branchmap() | |
3350 | if not branches.hasbranch(branch): |
|
3352 | if not branches.hasbranch(branch): | |
3351 | return [] |
|
3353 | return [] | |
3352 | # the cache returns heads ordered lowest to highest |
|
3354 | # the cache returns heads ordered lowest to highest | |
3353 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) |
|
3355 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) | |
3354 | if start is not None: |
|
3356 | if start is not None: | |
3355 | # filter out the heads that cannot be reached from startrev |
|
3357 | # filter out the heads that cannot be reached from startrev | |
3356 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) |
|
3358 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) | |
3357 | bheads = [h for h in bheads if h in fbheads] |
|
3359 | bheads = [h for h in bheads if h in fbheads] | |
3358 | return bheads |
|
3360 | return bheads | |
3359 |
|
3361 | |||
3360 | def branches(self, nodes): |
|
3362 | def branches(self, nodes): | |
3361 | if not nodes: |
|
3363 | if not nodes: | |
3362 | nodes = [self.changelog.tip()] |
|
3364 | nodes = [self.changelog.tip()] | |
3363 | b = [] |
|
3365 | b = [] | |
3364 | for n in nodes: |
|
3366 | for n in nodes: | |
3365 | t = n |
|
3367 | t = n | |
3366 | while True: |
|
3368 | while True: | |
3367 | p = self.changelog.parents(n) |
|
3369 | p = self.changelog.parents(n) | |
3368 | if p[1] != self.nullid or p[0] == self.nullid: |
|
3370 | if p[1] != self.nullid or p[0] == self.nullid: | |
3369 | b.append((t, n, p[0], p[1])) |
|
3371 | b.append((t, n, p[0], p[1])) | |
3370 | break |
|
3372 | break | |
3371 | n = p[0] |
|
3373 | n = p[0] | |
3372 | return b |
|
3374 | return b | |
3373 |
|
3375 | |||
3374 | def between(self, pairs): |
|
3376 | def between(self, pairs): | |
3375 | r = [] |
|
3377 | r = [] | |
3376 |
|
3378 | |||
3377 | for top, bottom in pairs: |
|
3379 | for top, bottom in pairs: | |
3378 | n, l, i = top, [], 0 |
|
3380 | n, l, i = top, [], 0 | |
3379 | f = 1 |
|
3381 | f = 1 | |
3380 |
|
3382 | |||
3381 | while n != bottom and n != self.nullid: |
|
3383 | while n != bottom and n != self.nullid: | |
3382 | p = self.changelog.parents(n)[0] |
|
3384 | p = self.changelog.parents(n)[0] | |
3383 | if i == f: |
|
3385 | if i == f: | |
3384 | l.append(n) |
|
3386 | l.append(n) | |
3385 | f = f * 2 |
|
3387 | f = f * 2 | |
3386 | n = p |
|
3388 | n = p | |
3387 | i += 1 |
|
3389 | i += 1 | |
3388 |
|
3390 | |||
3389 | r.append(l) |
|
3391 | r.append(l) | |
3390 |
|
3392 | |||
3391 | return r |
|
3393 | return r | |
3392 |
|
3394 | |||
3393 | def checkpush(self, pushop): |
|
3395 | def checkpush(self, pushop): | |
3394 | """Extensions can override this function if additional checks have |
|
3396 | """Extensions can override this function if additional checks have | |
3395 | to be performed before pushing, or call it if they override push |
|
3397 | to be performed before pushing, or call it if they override push | |
3396 | command. |
|
3398 | command. | |
3397 | """ |
|
3399 | """ | |
3398 |
|
3400 | |||
3399 | @unfilteredpropertycache |
|
3401 | @unfilteredpropertycache | |
3400 | def prepushoutgoinghooks(self): |
|
3402 | def prepushoutgoinghooks(self): | |
3401 | """Return util.hooks consists of a pushop with repo, remote, outgoing |
|
3403 | """Return util.hooks consists of a pushop with repo, remote, outgoing | |
3402 | methods, which are called before pushing changesets. |
|
3404 | methods, which are called before pushing changesets. | |
3403 | """ |
|
3405 | """ | |
3404 | return util.hooks() |
|
3406 | return util.hooks() | |
3405 |
|
3407 | |||
3406 | def pushkey(self, namespace, key, old, new): |
|
3408 | def pushkey(self, namespace, key, old, new): | |
3407 | try: |
|
3409 | try: | |
3408 | tr = self.currenttransaction() |
|
3410 | tr = self.currenttransaction() | |
3409 | hookargs = {} |
|
3411 | hookargs = {} | |
3410 | if tr is not None: |
|
3412 | if tr is not None: | |
3411 | hookargs.update(tr.hookargs) |
|
3413 | hookargs.update(tr.hookargs) | |
3412 | hookargs = pycompat.strkwargs(hookargs) |
|
3414 | hookargs = pycompat.strkwargs(hookargs) | |
3413 | hookargs['namespace'] = namespace |
|
3415 | hookargs['namespace'] = namespace | |
3414 | hookargs['key'] = key |
|
3416 | hookargs['key'] = key | |
3415 | hookargs['old'] = old |
|
3417 | hookargs['old'] = old | |
3416 | hookargs['new'] = new |
|
3418 | hookargs['new'] = new | |
3417 | self.hook(b'prepushkey', throw=True, **hookargs) |
|
3419 | self.hook(b'prepushkey', throw=True, **hookargs) | |
3418 | except error.HookAbort as exc: |
|
3420 | except error.HookAbort as exc: | |
3419 | self.ui.write_err(_(b"pushkey-abort: %s\n") % exc) |
|
3421 | self.ui.write_err(_(b"pushkey-abort: %s\n") % exc) | |
3420 | if exc.hint: |
|
3422 | if exc.hint: | |
3421 | self.ui.write_err(_(b"(%s)\n") % exc.hint) |
|
3423 | self.ui.write_err(_(b"(%s)\n") % exc.hint) | |
3422 | return False |
|
3424 | return False | |
3423 | self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key)) |
|
3425 | self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key)) | |
3424 | ret = pushkey.push(self, namespace, key, old, new) |
|
3426 | ret = pushkey.push(self, namespace, key, old, new) | |
3425 |
|
3427 | |||
3426 | def runhook(unused_success): |
|
3428 | def runhook(unused_success): | |
3427 | self.hook( |
|
3429 | self.hook( | |
3428 | b'pushkey', |
|
3430 | b'pushkey', | |
3429 | namespace=namespace, |
|
3431 | namespace=namespace, | |
3430 | key=key, |
|
3432 | key=key, | |
3431 | old=old, |
|
3433 | old=old, | |
3432 | new=new, |
|
3434 | new=new, | |
3433 | ret=ret, |
|
3435 | ret=ret, | |
3434 | ) |
|
3436 | ) | |
3435 |
|
3437 | |||
3436 | self._afterlock(runhook) |
|
3438 | self._afterlock(runhook) | |
3437 | return ret |
|
3439 | return ret | |
3438 |
|
3440 | |||
3439 | def listkeys(self, namespace): |
|
3441 | def listkeys(self, namespace): | |
3440 | self.hook(b'prelistkeys', throw=True, namespace=namespace) |
|
3442 | self.hook(b'prelistkeys', throw=True, namespace=namespace) | |
3441 | self.ui.debug(b'listing keys for "%s"\n' % namespace) |
|
3443 | self.ui.debug(b'listing keys for "%s"\n' % namespace) | |
3442 | values = pushkey.list(self, namespace) |
|
3444 | values = pushkey.list(self, namespace) | |
3443 | self.hook(b'listkeys', namespace=namespace, values=values) |
|
3445 | self.hook(b'listkeys', namespace=namespace, values=values) | |
3444 | return values |
|
3446 | return values | |
3445 |
|
3447 | |||
3446 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
3448 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
3447 | '''used to test argument passing over the wire''' |
|
3449 | '''used to test argument passing over the wire''' | |
3448 | return b"%s %s %s %s %s" % ( |
|
3450 | return b"%s %s %s %s %s" % ( | |
3449 | one, |
|
3451 | one, | |
3450 | two, |
|
3452 | two, | |
3451 | pycompat.bytestr(three), |
|
3453 | pycompat.bytestr(three), | |
3452 | pycompat.bytestr(four), |
|
3454 | pycompat.bytestr(four), | |
3453 | pycompat.bytestr(five), |
|
3455 | pycompat.bytestr(five), | |
3454 | ) |
|
3456 | ) | |
3455 |
|
3457 | |||
3456 | def savecommitmessage(self, text): |
|
3458 | def savecommitmessage(self, text): | |
3457 | fp = self.vfs(b'last-message.txt', b'wb') |
|
3459 | fp = self.vfs(b'last-message.txt', b'wb') | |
3458 | try: |
|
3460 | try: | |
3459 | fp.write(text) |
|
3461 | fp.write(text) | |
3460 | finally: |
|
3462 | finally: | |
3461 | fp.close() |
|
3463 | fp.close() | |
3462 | return self.pathto(fp.name[len(self.root) + 1 :]) |
|
3464 | return self.pathto(fp.name[len(self.root) + 1 :]) | |
3463 |
|
3465 | |||
3464 | def register_wanted_sidedata(self, category): |
|
3466 | def register_wanted_sidedata(self, category): | |
3465 | if repository.REPO_FEATURE_SIDE_DATA not in self.features: |
|
3467 | if repository.REPO_FEATURE_SIDE_DATA not in self.features: | |
3466 | # Only revlogv2 repos can want sidedata. |
|
3468 | # Only revlogv2 repos can want sidedata. | |
3467 | return |
|
3469 | return | |
3468 | self._wanted_sidedata.add(pycompat.bytestr(category)) |
|
3470 | self._wanted_sidedata.add(pycompat.bytestr(category)) | |
3469 |
|
3471 | |||
3470 | def register_sidedata_computer( |
|
3472 | def register_sidedata_computer( | |
3471 | self, kind, category, keys, computer, flags, replace=False |
|
3473 | self, kind, category, keys, computer, flags, replace=False | |
3472 | ): |
|
3474 | ): | |
3473 | if kind not in revlogconst.ALL_KINDS: |
|
3475 | if kind not in revlogconst.ALL_KINDS: | |
3474 | msg = _(b"unexpected revlog kind '%s'.") |
|
3476 | msg = _(b"unexpected revlog kind '%s'.") | |
3475 | raise error.ProgrammingError(msg % kind) |
|
3477 | raise error.ProgrammingError(msg % kind) | |
3476 | category = pycompat.bytestr(category) |
|
3478 | category = pycompat.bytestr(category) | |
3477 | already_registered = category in self._sidedata_computers.get(kind, []) |
|
3479 | already_registered = category in self._sidedata_computers.get(kind, []) | |
3478 | if already_registered and not replace: |
|
3480 | if already_registered and not replace: | |
3479 | msg = _( |
|
3481 | msg = _( | |
3480 | b"cannot register a sidedata computer twice for category '%s'." |
|
3482 | b"cannot register a sidedata computer twice for category '%s'." | |
3481 | ) |
|
3483 | ) | |
3482 | raise error.ProgrammingError(msg % category) |
|
3484 | raise error.ProgrammingError(msg % category) | |
3483 | if replace and not already_registered: |
|
3485 | if replace and not already_registered: | |
3484 | msg = _( |
|
3486 | msg = _( | |
3485 | b"cannot replace a sidedata computer that isn't registered " |
|
3487 | b"cannot replace a sidedata computer that isn't registered " | |
3486 | b"for category '%s'." |
|
3488 | b"for category '%s'." | |
3487 | ) |
|
3489 | ) | |
3488 | raise error.ProgrammingError(msg % category) |
|
3490 | raise error.ProgrammingError(msg % category) | |
3489 | self._sidedata_computers.setdefault(kind, {}) |
|
3491 | self._sidedata_computers.setdefault(kind, {}) | |
3490 | self._sidedata_computers[kind][category] = (keys, computer, flags) |
|
3492 | self._sidedata_computers[kind][category] = (keys, computer, flags) | |
3491 |
|
3493 | |||
3492 |
|
3494 | |||
3493 | # used to avoid circular references so destructors work |
|
3495 | # used to avoid circular references so destructors work | |
3494 | def aftertrans(files): |
|
3496 | def aftertrans(files): | |
3495 | renamefiles = [tuple(t) for t in files] |
|
3497 | renamefiles = [tuple(t) for t in files] | |
3496 |
|
3498 | |||
3497 | def a(): |
|
3499 | def a(): | |
3498 | for vfs, src, dest in renamefiles: |
|
3500 | for vfs, src, dest in renamefiles: | |
3499 | # if src and dest refer to a same file, vfs.rename is a no-op, |
|
3501 | # if src and dest refer to a same file, vfs.rename is a no-op, | |
3500 | # leaving both src and dest on disk. delete dest to make sure |
|
3502 | # leaving both src and dest on disk. delete dest to make sure | |
3501 | # the rename couldn't be such a no-op. |
|
3503 | # the rename couldn't be such a no-op. | |
3502 | vfs.tryunlink(dest) |
|
3504 | vfs.tryunlink(dest) | |
3503 | try: |
|
3505 | try: | |
3504 | vfs.rename(src, dest) |
|
3506 | vfs.rename(src, dest) | |
3505 | except OSError as exc: # journal file does not yet exist |
|
3507 | except OSError as exc: # journal file does not yet exist | |
3506 | if exc.errno != errno.ENOENT: |
|
3508 | if exc.errno != errno.ENOENT: | |
3507 | raise |
|
3509 | raise | |
3508 |
|
3510 | |||
3509 | return a |
|
3511 | return a | |
3510 |
|
3512 | |||
3511 |
|
3513 | |||
3512 | def undoname(fn): |
|
3514 | def undoname(fn): | |
3513 | base, name = os.path.split(fn) |
|
3515 | base, name = os.path.split(fn) | |
3514 | assert name.startswith(b'journal') |
|
3516 | assert name.startswith(b'journal') | |
3515 | return os.path.join(base, name.replace(b'journal', b'undo', 1)) |
|
3517 | return os.path.join(base, name.replace(b'journal', b'undo', 1)) | |
3516 |
|
3518 | |||
3517 |
|
3519 | |||
3518 | def instance(ui, path, create, intents=None, createopts=None): |
|
3520 | def instance(ui, path, create, intents=None, createopts=None): | |
3519 | localpath = urlutil.urllocalpath(path) |
|
3521 | localpath = urlutil.urllocalpath(path) | |
3520 | if create: |
|
3522 | if create: | |
3521 | createrepository(ui, localpath, createopts=createopts) |
|
3523 | createrepository(ui, localpath, createopts=createopts) | |
3522 |
|
3524 | |||
3523 | return makelocalrepository(ui, localpath, intents=intents) |
|
3525 | return makelocalrepository(ui, localpath, intents=intents) | |
3524 |
|
3526 | |||
3525 |
|
3527 | |||
3526 | def islocal(path): |
|
3528 | def islocal(path): | |
3527 | return True |
|
3529 | return True | |
3528 |
|
3530 | |||
3529 |
|
3531 | |||
3530 | def defaultcreateopts(ui, createopts=None): |
|
3532 | def defaultcreateopts(ui, createopts=None): | |
3531 | """Populate the default creation options for a repository. |
|
3533 | """Populate the default creation options for a repository. | |
3532 |
|
3534 | |||
3533 | A dictionary of explicitly requested creation options can be passed |
|
3535 | A dictionary of explicitly requested creation options can be passed | |
3534 | in. Missing keys will be populated. |
|
3536 | in. Missing keys will be populated. | |
3535 | """ |
|
3537 | """ | |
3536 | createopts = dict(createopts or {}) |
|
3538 | createopts = dict(createopts or {}) | |
3537 |
|
3539 | |||
3538 | if b'backend' not in createopts: |
|
3540 | if b'backend' not in createopts: | |
3539 | # experimental config: storage.new-repo-backend |
|
3541 | # experimental config: storage.new-repo-backend | |
3540 | createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend') |
|
3542 | createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend') | |
3541 |
|
3543 | |||
3542 | return createopts |
|
3544 | return createopts | |
3543 |
|
3545 | |||
3544 |
|
3546 | |||
3545 | def clone_requirements(ui, createopts, srcrepo): |
|
3547 | def clone_requirements(ui, createopts, srcrepo): | |
3546 | """clone the requirements of a local repo for a local clone |
|
3548 | """clone the requirements of a local repo for a local clone | |
3547 |
|
3549 | |||
3548 | The store requirements are unchanged while the working copy requirements |
|
3550 | The store requirements are unchanged while the working copy requirements | |
3549 | depends on the configuration |
|
3551 | depends on the configuration | |
3550 | """ |
|
3552 | """ | |
3551 | target_requirements = set() |
|
3553 | target_requirements = set() | |
3552 | createopts = defaultcreateopts(ui, createopts=createopts) |
|
3554 | createopts = defaultcreateopts(ui, createopts=createopts) | |
3553 | for r in newreporequirements(ui, createopts): |
|
3555 | for r in newreporequirements(ui, createopts): | |
3554 | if r in requirementsmod.WORKING_DIR_REQUIREMENTS: |
|
3556 | if r in requirementsmod.WORKING_DIR_REQUIREMENTS: | |
3555 | target_requirements.add(r) |
|
3557 | target_requirements.add(r) | |
3556 |
|
3558 | |||
3557 | for r in srcrepo.requirements: |
|
3559 | for r in srcrepo.requirements: | |
3558 | if r not in requirementsmod.WORKING_DIR_REQUIREMENTS: |
|
3560 | if r not in requirementsmod.WORKING_DIR_REQUIREMENTS: | |
3559 | target_requirements.add(r) |
|
3561 | target_requirements.add(r) | |
3560 | return target_requirements |
|
3562 | return target_requirements | |
3561 |
|
3563 | |||
3562 |
|
3564 | |||
3563 | def newreporequirements(ui, createopts): |
|
3565 | def newreporequirements(ui, createopts): | |
3564 | """Determine the set of requirements for a new local repository. |
|
3566 | """Determine the set of requirements for a new local repository. | |
3565 |
|
3567 | |||
3566 | Extensions can wrap this function to specify custom requirements for |
|
3568 | Extensions can wrap this function to specify custom requirements for | |
3567 | new repositories. |
|
3569 | new repositories. | |
3568 | """ |
|
3570 | """ | |
3569 | # If the repo is being created from a shared repository, we copy |
|
3571 | # If the repo is being created from a shared repository, we copy | |
3570 | # its requirements. |
|
3572 | # its requirements. | |
3571 | if b'sharedrepo' in createopts: |
|
3573 | if b'sharedrepo' in createopts: | |
3572 | requirements = set(createopts[b'sharedrepo'].requirements) |
|
3574 | requirements = set(createopts[b'sharedrepo'].requirements) | |
3573 | if createopts.get(b'sharedrelative'): |
|
3575 | if createopts.get(b'sharedrelative'): | |
3574 | requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT) |
|
3576 | requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT) | |
3575 | else: |
|
3577 | else: | |
3576 | requirements.add(requirementsmod.SHARED_REQUIREMENT) |
|
3578 | requirements.add(requirementsmod.SHARED_REQUIREMENT) | |
3577 |
|
3579 | |||
3578 | return requirements |
|
3580 | return requirements | |
3579 |
|
3581 | |||
3580 | if b'backend' not in createopts: |
|
3582 | if b'backend' not in createopts: | |
3581 | raise error.ProgrammingError( |
|
3583 | raise error.ProgrammingError( | |
3582 | b'backend key not present in createopts; ' |
|
3584 | b'backend key not present in createopts; ' | |
3583 | b'was defaultcreateopts() called?' |
|
3585 | b'was defaultcreateopts() called?' | |
3584 | ) |
|
3586 | ) | |
3585 |
|
3587 | |||
3586 | if createopts[b'backend'] != b'revlogv1': |
|
3588 | if createopts[b'backend'] != b'revlogv1': | |
3587 | raise error.Abort( |
|
3589 | raise error.Abort( | |
3588 | _( |
|
3590 | _( | |
3589 | b'unable to determine repository requirements for ' |
|
3591 | b'unable to determine repository requirements for ' | |
3590 | b'storage backend: %s' |
|
3592 | b'storage backend: %s' | |
3591 | ) |
|
3593 | ) | |
3592 | % createopts[b'backend'] |
|
3594 | % createopts[b'backend'] | |
3593 | ) |
|
3595 | ) | |
3594 |
|
3596 | |||
3595 | requirements = {requirementsmod.REVLOGV1_REQUIREMENT} |
|
3597 | requirements = {requirementsmod.REVLOGV1_REQUIREMENT} | |
3596 | if ui.configbool(b'format', b'usestore'): |
|
3598 | if ui.configbool(b'format', b'usestore'): | |
3597 | requirements.add(requirementsmod.STORE_REQUIREMENT) |
|
3599 | requirements.add(requirementsmod.STORE_REQUIREMENT) | |
3598 | if ui.configbool(b'format', b'usefncache'): |
|
3600 | if ui.configbool(b'format', b'usefncache'): | |
3599 | requirements.add(requirementsmod.FNCACHE_REQUIREMENT) |
|
3601 | requirements.add(requirementsmod.FNCACHE_REQUIREMENT) | |
3600 | if ui.configbool(b'format', b'dotencode'): |
|
3602 | if ui.configbool(b'format', b'dotencode'): | |
3601 | requirements.add(requirementsmod.DOTENCODE_REQUIREMENT) |
|
3603 | requirements.add(requirementsmod.DOTENCODE_REQUIREMENT) | |
3602 |
|
3604 | |||
3603 | compengines = ui.configlist(b'format', b'revlog-compression') |
|
3605 | compengines = ui.configlist(b'format', b'revlog-compression') | |
3604 | for compengine in compengines: |
|
3606 | for compengine in compengines: | |
3605 | if compengine in util.compengines: |
|
3607 | if compengine in util.compengines: | |
3606 | engine = util.compengines[compengine] |
|
3608 | engine = util.compengines[compengine] | |
3607 | if engine.available() and engine.revlogheader(): |
|
3609 | if engine.available() and engine.revlogheader(): | |
3608 | break |
|
3610 | break | |
3609 | else: |
|
3611 | else: | |
3610 | raise error.Abort( |
|
3612 | raise error.Abort( | |
3611 | _( |
|
3613 | _( | |
3612 | b'compression engines %s defined by ' |
|
3614 | b'compression engines %s defined by ' | |
3613 | b'format.revlog-compression not available' |
|
3615 | b'format.revlog-compression not available' | |
3614 | ) |
|
3616 | ) | |
3615 | % b', '.join(b'"%s"' % e for e in compengines), |
|
3617 | % b', '.join(b'"%s"' % e for e in compengines), | |
3616 | hint=_( |
|
3618 | hint=_( | |
3617 | b'run "hg debuginstall" to list available ' |
|
3619 | b'run "hg debuginstall" to list available ' | |
3618 | b'compression engines' |
|
3620 | b'compression engines' | |
3619 | ), |
|
3621 | ), | |
3620 | ) |
|
3622 | ) | |
3621 |
|
3623 | |||
3622 | # zlib is the historical default and doesn't need an explicit requirement. |
|
3624 | # zlib is the historical default and doesn't need an explicit requirement. | |
3623 | if compengine == b'zstd': |
|
3625 | if compengine == b'zstd': | |
3624 | requirements.add(b'revlog-compression-zstd') |
|
3626 | requirements.add(b'revlog-compression-zstd') | |
3625 | elif compengine != b'zlib': |
|
3627 | elif compengine != b'zlib': | |
3626 | requirements.add(b'exp-compression-%s' % compengine) |
|
3628 | requirements.add(b'exp-compression-%s' % compengine) | |
3627 |
|
3629 | |||
3628 | if scmutil.gdinitconfig(ui): |
|
3630 | if scmutil.gdinitconfig(ui): | |
3629 | requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT) |
|
3631 | requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT) | |
3630 | if ui.configbool(b'format', b'sparse-revlog'): |
|
3632 | if ui.configbool(b'format', b'sparse-revlog'): | |
3631 | requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) |
|
3633 | requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) | |
3632 |
|
3634 | |||
3633 | # experimental config: format.use-dirstate-v2 |
|
3635 | # experimental config: format.use-dirstate-v2 | |
3634 | # Keep this logic in sync with `has_dirstate_v2()` in `tests/hghave.py` |
|
3636 | # Keep this logic in sync with `has_dirstate_v2()` in `tests/hghave.py` | |
3635 | if ui.configbool(b'format', b'use-dirstate-v2'): |
|
3637 | if ui.configbool(b'format', b'use-dirstate-v2'): | |
3636 | requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT) |
|
3638 | requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT) | |
3637 |
|
3639 | |||
3638 | # experimental config: format.exp-use-copies-side-data-changeset |
|
3640 | # experimental config: format.exp-use-copies-side-data-changeset | |
3639 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): |
|
3641 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): | |
3640 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) |
|
3642 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) | |
3641 | requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) |
|
3643 | requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) | |
3642 | if ui.configbool(b'experimental', b'treemanifest'): |
|
3644 | if ui.configbool(b'experimental', b'treemanifest'): | |
3643 | requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) |
|
3645 | requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) | |
3644 |
|
3646 | |||
3645 | changelogv2 = ui.config(b'format', b'exp-use-changelog-v2') |
|
3647 | changelogv2 = ui.config(b'format', b'exp-use-changelog-v2') | |
3646 | if changelogv2 == b'enable-unstable-format-and-corrupt-my-data': |
|
3648 | if changelogv2 == b'enable-unstable-format-and-corrupt-my-data': | |
3647 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) |
|
3649 | requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) | |
3648 |
|
3650 | |||
3649 | revlogv2 = ui.config(b'experimental', b'revlogv2') |
|
3651 | revlogv2 = ui.config(b'experimental', b'revlogv2') | |
3650 | if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': |
|
3652 | if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': | |
3651 | requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) |
|
3653 | requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) | |
3652 | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) |
|
3654 | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) | |
3653 | # experimental config: format.internal-phase |
|
3655 | # experimental config: format.internal-phase | |
3654 | if ui.configbool(b'format', b'internal-phase'): |
|
3656 | if ui.configbool(b'format', b'internal-phase'): | |
3655 | requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) |
|
3657 | requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) | |
3656 |
|
3658 | |||
3657 | if createopts.get(b'narrowfiles'): |
|
3659 | if createopts.get(b'narrowfiles'): | |
3658 | requirements.add(requirementsmod.NARROW_REQUIREMENT) |
|
3660 | requirements.add(requirementsmod.NARROW_REQUIREMENT) | |
3659 |
|
3661 | |||
3660 | if createopts.get(b'lfs'): |
|
3662 | if createopts.get(b'lfs'): | |
3661 | requirements.add(b'lfs') |
|
3663 | requirements.add(b'lfs') | |
3662 |
|
3664 | |||
3663 | if ui.configbool(b'format', b'bookmarks-in-store'): |
|
3665 | if ui.configbool(b'format', b'bookmarks-in-store'): | |
3664 | requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) |
|
3666 | requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) | |
3665 |
|
3667 | |||
3666 | if ui.configbool(b'format', b'use-persistent-nodemap'): |
|
3668 | if ui.configbool(b'format', b'use-persistent-nodemap'): | |
3667 | requirements.add(requirementsmod.NODEMAP_REQUIREMENT) |
|
3669 | requirements.add(requirementsmod.NODEMAP_REQUIREMENT) | |
3668 |
|
3670 | |||
3669 | # if share-safe is enabled, let's create the new repository with the new |
|
3671 | # if share-safe is enabled, let's create the new repository with the new | |
3670 | # requirement |
|
3672 | # requirement | |
3671 | if ui.configbool(b'format', b'use-share-safe'): |
|
3673 | if ui.configbool(b'format', b'use-share-safe'): | |
3672 | requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) |
|
3674 | requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) | |
3673 |
|
3675 | |||
3674 | return requirements |
|
3676 | return requirements | |
3675 |
|
3677 | |||
3676 |
|
3678 | |||
3677 | def checkrequirementscompat(ui, requirements): |
|
3679 | def checkrequirementscompat(ui, requirements): | |
3678 | """Checks compatibility of repository requirements enabled and disabled. |
|
3680 | """Checks compatibility of repository requirements enabled and disabled. | |
3679 |
|
3681 | |||
3680 | Returns a set of requirements which needs to be dropped because dependend |
|
3682 | Returns a set of requirements which needs to be dropped because dependend | |
3681 | requirements are not enabled. Also warns users about it""" |
|
3683 | requirements are not enabled. Also warns users about it""" | |
3682 |
|
3684 | |||
3683 | dropped = set() |
|
3685 | dropped = set() | |
3684 |
|
3686 | |||
3685 | if requirementsmod.STORE_REQUIREMENT not in requirements: |
|
3687 | if requirementsmod.STORE_REQUIREMENT not in requirements: | |
3686 | if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements: |
|
3688 | if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements: | |
3687 | ui.warn( |
|
3689 | ui.warn( | |
3688 | _( |
|
3690 | _( | |
3689 | b'ignoring enabled \'format.bookmarks-in-store\' config ' |
|
3691 | b'ignoring enabled \'format.bookmarks-in-store\' config ' | |
3690 | b'beacuse it is incompatible with disabled ' |
|
3692 | b'beacuse it is incompatible with disabled ' | |
3691 | b'\'format.usestore\' config\n' |
|
3693 | b'\'format.usestore\' config\n' | |
3692 | ) |
|
3694 | ) | |
3693 | ) |
|
3695 | ) | |
3694 | dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) |
|
3696 | dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) | |
3695 |
|
3697 | |||
3696 | if ( |
|
3698 | if ( | |
3697 | requirementsmod.SHARED_REQUIREMENT in requirements |
|
3699 | requirementsmod.SHARED_REQUIREMENT in requirements | |
3698 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements |
|
3700 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements | |
3699 | ): |
|
3701 | ): | |
3700 | raise error.Abort( |
|
3702 | raise error.Abort( | |
3701 | _( |
|
3703 | _( | |
3702 | b"cannot create shared repository as source was created" |
|
3704 | b"cannot create shared repository as source was created" | |
3703 | b" with 'format.usestore' config disabled" |
|
3705 | b" with 'format.usestore' config disabled" | |
3704 | ) |
|
3706 | ) | |
3705 | ) |
|
3707 | ) | |
3706 |
|
3708 | |||
3707 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: |
|
3709 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: | |
3708 | ui.warn( |
|
3710 | ui.warn( | |
3709 | _( |
|
3711 | _( | |
3710 | b"ignoring enabled 'format.use-share-safe' config because " |
|
3712 | b"ignoring enabled 'format.use-share-safe' config because " | |
3711 | b"it is incompatible with disabled 'format.usestore'" |
|
3713 | b"it is incompatible with disabled 'format.usestore'" | |
3712 | b" config\n" |
|
3714 | b" config\n" | |
3713 | ) |
|
3715 | ) | |
3714 | ) |
|
3716 | ) | |
3715 | dropped.add(requirementsmod.SHARESAFE_REQUIREMENT) |
|
3717 | dropped.add(requirementsmod.SHARESAFE_REQUIREMENT) | |
3716 |
|
3718 | |||
3717 | return dropped |
|
3719 | return dropped | |
3718 |
|
3720 | |||
3719 |
|
3721 | |||
3720 | def filterknowncreateopts(ui, createopts): |
|
3722 | def filterknowncreateopts(ui, createopts): | |
3721 | """Filters a dict of repo creation options against options that are known. |
|
3723 | """Filters a dict of repo creation options against options that are known. | |
3722 |
|
3724 | |||
3723 | Receives a dict of repo creation options and returns a dict of those |
|
3725 | Receives a dict of repo creation options and returns a dict of those | |
3724 | options that we don't know how to handle. |
|
3726 | options that we don't know how to handle. | |
3725 |
|
3727 | |||
3726 | This function is called as part of repository creation. If the |
|
3728 | This function is called as part of repository creation. If the | |
3727 | returned dict contains any items, repository creation will not |
|
3729 | returned dict contains any items, repository creation will not | |
3728 | be allowed, as it means there was a request to create a repository |
|
3730 | be allowed, as it means there was a request to create a repository | |
3729 | with options not recognized by loaded code. |
|
3731 | with options not recognized by loaded code. | |
3730 |
|
3732 | |||
3731 | Extensions can wrap this function to filter out creation options |
|
3733 | Extensions can wrap this function to filter out creation options | |
3732 | they know how to handle. |
|
3734 | they know how to handle. | |
3733 | """ |
|
3735 | """ | |
3734 | known = { |
|
3736 | known = { | |
3735 | b'backend', |
|
3737 | b'backend', | |
3736 | b'lfs', |
|
3738 | b'lfs', | |
3737 | b'narrowfiles', |
|
3739 | b'narrowfiles', | |
3738 | b'sharedrepo', |
|
3740 | b'sharedrepo', | |
3739 | b'sharedrelative', |
|
3741 | b'sharedrelative', | |
3740 | b'shareditems', |
|
3742 | b'shareditems', | |
3741 | b'shallowfilestore', |
|
3743 | b'shallowfilestore', | |
3742 | } |
|
3744 | } | |
3743 |
|
3745 | |||
3744 | return {k: v for k, v in createopts.items() if k not in known} |
|
3746 | return {k: v for k, v in createopts.items() if k not in known} | |
3745 |
|
3747 | |||
3746 |
|
3748 | |||
3747 | def createrepository(ui, path, createopts=None, requirements=None): |
|
3749 | def createrepository(ui, path, createopts=None, requirements=None): | |
3748 | """Create a new repository in a vfs. |
|
3750 | """Create a new repository in a vfs. | |
3749 |
|
3751 | |||
3750 | ``path`` path to the new repo's working directory. |
|
3752 | ``path`` path to the new repo's working directory. | |
3751 | ``createopts`` options for the new repository. |
|
3753 | ``createopts`` options for the new repository. | |
3752 | ``requirement`` predefined set of requirements. |
|
3754 | ``requirement`` predefined set of requirements. | |
3753 | (incompatible with ``createopts``) |
|
3755 | (incompatible with ``createopts``) | |
3754 |
|
3756 | |||
3755 | The following keys for ``createopts`` are recognized: |
|
3757 | The following keys for ``createopts`` are recognized: | |
3756 |
|
3758 | |||
3757 | backend |
|
3759 | backend | |
3758 | The storage backend to use. |
|
3760 | The storage backend to use. | |
3759 | lfs |
|
3761 | lfs | |
3760 | Repository will be created with ``lfs`` requirement. The lfs extension |
|
3762 | Repository will be created with ``lfs`` requirement. The lfs extension | |
3761 | will automatically be loaded when the repository is accessed. |
|
3763 | will automatically be loaded when the repository is accessed. | |
3762 | narrowfiles |
|
3764 | narrowfiles | |
3763 | Set up repository to support narrow file storage. |
|
3765 | Set up repository to support narrow file storage. | |
3764 | sharedrepo |
|
3766 | sharedrepo | |
3765 | Repository object from which storage should be shared. |
|
3767 | Repository object from which storage should be shared. | |
3766 | sharedrelative |
|
3768 | sharedrelative | |
3767 | Boolean indicating if the path to the shared repo should be |
|
3769 | Boolean indicating if the path to the shared repo should be | |
3768 | stored as relative. By default, the pointer to the "parent" repo |
|
3770 | stored as relative. By default, the pointer to the "parent" repo | |
3769 | is stored as an absolute path. |
|
3771 | is stored as an absolute path. | |
3770 | shareditems |
|
3772 | shareditems | |
3771 | Set of items to share to the new repository (in addition to storage). |
|
3773 | Set of items to share to the new repository (in addition to storage). | |
3772 | shallowfilestore |
|
3774 | shallowfilestore | |
3773 | Indicates that storage for files should be shallow (not all ancestor |
|
3775 | Indicates that storage for files should be shallow (not all ancestor | |
3774 | revisions are known). |
|
3776 | revisions are known). | |
3775 | """ |
|
3777 | """ | |
3776 |
|
3778 | |||
3777 | if requirements is not None: |
|
3779 | if requirements is not None: | |
3778 | if createopts is not None: |
|
3780 | if createopts is not None: | |
3779 | msg = b'cannot specify both createopts and requirements' |
|
3781 | msg = b'cannot specify both createopts and requirements' | |
3780 | raise error.ProgrammingError(msg) |
|
3782 | raise error.ProgrammingError(msg) | |
3781 | createopts = {} |
|
3783 | createopts = {} | |
3782 | else: |
|
3784 | else: | |
3783 | createopts = defaultcreateopts(ui, createopts=createopts) |
|
3785 | createopts = defaultcreateopts(ui, createopts=createopts) | |
3784 |
|
3786 | |||
3785 | unknownopts = filterknowncreateopts(ui, createopts) |
|
3787 | unknownopts = filterknowncreateopts(ui, createopts) | |
3786 |
|
3788 | |||
3787 | if not isinstance(unknownopts, dict): |
|
3789 | if not isinstance(unknownopts, dict): | |
3788 | raise error.ProgrammingError( |
|
3790 | raise error.ProgrammingError( | |
3789 | b'filterknowncreateopts() did not return a dict' |
|
3791 | b'filterknowncreateopts() did not return a dict' | |
3790 | ) |
|
3792 | ) | |
3791 |
|
3793 | |||
3792 | if unknownopts: |
|
3794 | if unknownopts: | |
3793 | raise error.Abort( |
|
3795 | raise error.Abort( | |
3794 | _( |
|
3796 | _( | |
3795 | b'unable to create repository because of unknown ' |
|
3797 | b'unable to create repository because of unknown ' | |
3796 | b'creation option: %s' |
|
3798 | b'creation option: %s' | |
3797 | ) |
|
3799 | ) | |
3798 | % b', '.join(sorted(unknownopts)), |
|
3800 | % b', '.join(sorted(unknownopts)), | |
3799 | hint=_(b'is a required extension not loaded?'), |
|
3801 | hint=_(b'is a required extension not loaded?'), | |
3800 | ) |
|
3802 | ) | |
3801 |
|
3803 | |||
3802 | requirements = newreporequirements(ui, createopts=createopts) |
|
3804 | requirements = newreporequirements(ui, createopts=createopts) | |
3803 | requirements -= checkrequirementscompat(ui, requirements) |
|
3805 | requirements -= checkrequirementscompat(ui, requirements) | |
3804 |
|
3806 | |||
3805 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
3807 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) | |
3806 |
|
3808 | |||
3807 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) |
|
3809 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) | |
3808 | if hgvfs.exists(): |
|
3810 | if hgvfs.exists(): | |
3809 | raise error.RepoError(_(b'repository %s already exists') % path) |
|
3811 | raise error.RepoError(_(b'repository %s already exists') % path) | |
3810 |
|
3812 | |||
3811 | if b'sharedrepo' in createopts: |
|
3813 | if b'sharedrepo' in createopts: | |
3812 | sharedpath = createopts[b'sharedrepo'].sharedpath |
|
3814 | sharedpath = createopts[b'sharedrepo'].sharedpath | |
3813 |
|
3815 | |||
3814 | if createopts.get(b'sharedrelative'): |
|
3816 | if createopts.get(b'sharedrelative'): | |
3815 | try: |
|
3817 | try: | |
3816 | sharedpath = os.path.relpath(sharedpath, hgvfs.base) |
|
3818 | sharedpath = os.path.relpath(sharedpath, hgvfs.base) | |
3817 | sharedpath = util.pconvert(sharedpath) |
|
3819 | sharedpath = util.pconvert(sharedpath) | |
3818 | except (IOError, ValueError) as e: |
|
3820 | except (IOError, ValueError) as e: | |
3819 | # ValueError is raised on Windows if the drive letters differ |
|
3821 | # ValueError is raised on Windows if the drive letters differ | |
3820 | # on each path. |
|
3822 | # on each path. | |
3821 | raise error.Abort( |
|
3823 | raise error.Abort( | |
3822 | _(b'cannot calculate relative path'), |
|
3824 | _(b'cannot calculate relative path'), | |
3823 | hint=stringutil.forcebytestr(e), |
|
3825 | hint=stringutil.forcebytestr(e), | |
3824 | ) |
|
3826 | ) | |
3825 |
|
3827 | |||
3826 | if not wdirvfs.exists(): |
|
3828 | if not wdirvfs.exists(): | |
3827 | wdirvfs.makedirs() |
|
3829 | wdirvfs.makedirs() | |
3828 |
|
3830 | |||
3829 | hgvfs.makedir(notindexed=True) |
|
3831 | hgvfs.makedir(notindexed=True) | |
3830 | if b'sharedrepo' not in createopts: |
|
3832 | if b'sharedrepo' not in createopts: | |
3831 | hgvfs.mkdir(b'cache') |
|
3833 | hgvfs.mkdir(b'cache') | |
3832 | hgvfs.mkdir(b'wcache') |
|
3834 | hgvfs.mkdir(b'wcache') | |
3833 |
|
3835 | |||
3834 | has_store = requirementsmod.STORE_REQUIREMENT in requirements |
|
3836 | has_store = requirementsmod.STORE_REQUIREMENT in requirements | |
3835 | if has_store and b'sharedrepo' not in createopts: |
|
3837 | if has_store and b'sharedrepo' not in createopts: | |
3836 | hgvfs.mkdir(b'store') |
|
3838 | hgvfs.mkdir(b'store') | |
3837 |
|
3839 | |||
3838 | # We create an invalid changelog outside the store so very old |
|
3840 | # We create an invalid changelog outside the store so very old | |
3839 | # Mercurial versions (which didn't know about the requirements |
|
3841 | # Mercurial versions (which didn't know about the requirements | |
3840 | # file) encounter an error on reading the changelog. This |
|
3842 | # file) encounter an error on reading the changelog. This | |
3841 | # effectively locks out old clients and prevents them from |
|
3843 | # effectively locks out old clients and prevents them from | |
3842 | # mucking with a repo in an unknown format. |
|
3844 | # mucking with a repo in an unknown format. | |
3843 | # |
|
3845 | # | |
3844 | # The revlog header has version 65535, which won't be recognized by |
|
3846 | # The revlog header has version 65535, which won't be recognized by | |
3845 | # such old clients. |
|
3847 | # such old clients. | |
3846 | hgvfs.append( |
|
3848 | hgvfs.append( | |
3847 | b'00changelog.i', |
|
3849 | b'00changelog.i', | |
3848 | b'\0\0\xFF\xFF dummy changelog to prevent using the old repo ' |
|
3850 | b'\0\0\xFF\xFF dummy changelog to prevent using the old repo ' | |
3849 | b'layout', |
|
3851 | b'layout', | |
3850 | ) |
|
3852 | ) | |
3851 |
|
3853 | |||
3852 | # Filter the requirements into working copy and store ones |
|
3854 | # Filter the requirements into working copy and store ones | |
3853 | wcreq, storereq = scmutil.filterrequirements(requirements) |
|
3855 | wcreq, storereq = scmutil.filterrequirements(requirements) | |
3854 | # write working copy ones |
|
3856 | # write working copy ones | |
3855 | scmutil.writerequires(hgvfs, wcreq) |
|
3857 | scmutil.writerequires(hgvfs, wcreq) | |
3856 | # If there are store requirements and the current repository |
|
3858 | # If there are store requirements and the current repository | |
3857 | # is not a shared one, write stored requirements |
|
3859 | # is not a shared one, write stored requirements | |
3858 | # For new shared repository, we don't need to write the store |
|
3860 | # For new shared repository, we don't need to write the store | |
3859 | # requirements as they are already present in store requires |
|
3861 | # requirements as they are already present in store requires | |
3860 | if storereq and b'sharedrepo' not in createopts: |
|
3862 | if storereq and b'sharedrepo' not in createopts: | |
3861 | storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True) |
|
3863 | storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True) | |
3862 | scmutil.writerequires(storevfs, storereq) |
|
3864 | scmutil.writerequires(storevfs, storereq) | |
3863 |
|
3865 | |||
3864 | # Write out file telling readers where to find the shared store. |
|
3866 | # Write out file telling readers where to find the shared store. | |
3865 | if b'sharedrepo' in createopts: |
|
3867 | if b'sharedrepo' in createopts: | |
3866 | hgvfs.write(b'sharedpath', sharedpath) |
|
3868 | hgvfs.write(b'sharedpath', sharedpath) | |
3867 |
|
3869 | |||
3868 | if createopts.get(b'shareditems'): |
|
3870 | if createopts.get(b'shareditems'): | |
3869 | shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n' |
|
3871 | shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n' | |
3870 | hgvfs.write(b'shared', shared) |
|
3872 | hgvfs.write(b'shared', shared) | |
3871 |
|
3873 | |||
3872 |
|
3874 | |||
3873 | def poisonrepository(repo): |
|
3875 | def poisonrepository(repo): | |
3874 | """Poison a repository instance so it can no longer be used.""" |
|
3876 | """Poison a repository instance so it can no longer be used.""" | |
3875 | # Perform any cleanup on the instance. |
|
3877 | # Perform any cleanup on the instance. | |
3876 | repo.close() |
|
3878 | repo.close() | |
3877 |
|
3879 | |||
3878 | # Our strategy is to replace the type of the object with one that |
|
3880 | # Our strategy is to replace the type of the object with one that | |
3879 | # has all attribute lookups result in error. |
|
3881 | # has all attribute lookups result in error. | |
3880 | # |
|
3882 | # | |
3881 | # But we have to allow the close() method because some constructors |
|
3883 | # But we have to allow the close() method because some constructors | |
3882 | # of repos call close() on repo references. |
|
3884 | # of repos call close() on repo references. | |
3883 | class poisonedrepository(object): |
|
3885 | class poisonedrepository(object): | |
3884 | def __getattribute__(self, item): |
|
3886 | def __getattribute__(self, item): | |
3885 | if item == 'close': |
|
3887 | if item == 'close': | |
3886 | return object.__getattribute__(self, item) |
|
3888 | return object.__getattribute__(self, item) | |
3887 |
|
3889 | |||
3888 | raise error.ProgrammingError( |
|
3890 | raise error.ProgrammingError( | |
3889 | b'repo instances should not be used after unshare' |
|
3891 | b'repo instances should not be used after unshare' | |
3890 | ) |
|
3892 | ) | |
3891 |
|
3893 | |||
3892 | def close(self): |
|
3894 | def close(self): | |
3893 | pass |
|
3895 | pass | |
3894 |
|
3896 | |||
3895 | # We may have a repoview, which intercepts __setattr__. So be sure |
|
3897 | # We may have a repoview, which intercepts __setattr__. So be sure | |
3896 | # we operate at the lowest level possible. |
|
3898 | # we operate at the lowest level possible. | |
3897 | object.__setattr__(repo, '__class__', poisonedrepository) |
|
3899 | object.__setattr__(repo, '__class__', poisonedrepository) |
@@ -1,1342 +1,1340 b'' | |||||
1 | $ hg init a |
|
1 | $ hg init a | |
2 | $ cd a |
|
2 | $ cd a | |
3 |
|
3 | |||
4 | Verify checking branch of nullrev before the cache is created doesnt crash |
|
4 | Verify checking branch of nullrev before the cache is created doesnt crash | |
5 | $ hg log -r 'branch(.)' -T '{branch}\n' |
|
5 | $ hg log -r 'branch(.)' -T '{branch}\n' | |
6 |
|
6 | |||
7 | Basic test |
|
7 | Basic test | |
8 | $ echo 'root' >root |
|
8 | $ echo 'root' >root | |
9 | $ hg add root |
|
9 | $ hg add root | |
10 | $ hg commit -d '0 0' -m "Adding root node" |
|
10 | $ hg commit -d '0 0' -m "Adding root node" | |
11 |
|
11 | |||
12 | $ echo 'a' >a |
|
12 | $ echo 'a' >a | |
13 | $ hg add a |
|
13 | $ hg add a | |
14 | $ hg branch a |
|
14 | $ hg branch a | |
15 | marked working directory as branch a |
|
15 | marked working directory as branch a | |
16 | (branches are permanent and global, did you want a bookmark?) |
|
16 | (branches are permanent and global, did you want a bookmark?) | |
17 | $ hg commit -d '1 0' -m "Adding a branch" |
|
17 | $ hg commit -d '1 0' -m "Adding a branch" | |
18 |
|
18 | |||
19 | $ hg branch q |
|
19 | $ hg branch q | |
20 | marked working directory as branch q |
|
20 | marked working directory as branch q | |
21 | $ echo 'aa' >a |
|
21 | $ echo 'aa' >a | |
22 | $ hg branch -C |
|
22 | $ hg branch -C | |
23 | reset working directory to branch a |
|
23 | reset working directory to branch a | |
24 | $ hg commit -d '2 0' -m "Adding to a branch" |
|
24 | $ hg commit -d '2 0' -m "Adding to a branch" | |
25 |
|
25 | |||
26 | $ hg update -C 0 |
|
26 | $ hg update -C 0 | |
27 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
27 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
28 | $ echo 'b' >b |
|
28 | $ echo 'b' >b | |
29 | $ hg add b |
|
29 | $ hg add b | |
30 | $ hg branch b |
|
30 | $ hg branch b | |
31 | marked working directory as branch b |
|
31 | marked working directory as branch b | |
32 | $ hg commit -d '2 0' -m "Adding b branch" |
|
32 | $ hg commit -d '2 0' -m "Adding b branch" | |
33 |
|
33 | |||
34 | $ echo 'bh1' >bh1 |
|
34 | $ echo 'bh1' >bh1 | |
35 | $ hg add bh1 |
|
35 | $ hg add bh1 | |
36 | $ hg commit -d '3 0' -m "Adding b branch head 1" |
|
36 | $ hg commit -d '3 0' -m "Adding b branch head 1" | |
37 |
|
37 | |||
38 | $ hg update -C 2 |
|
38 | $ hg update -C 2 | |
39 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
39 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
40 | $ echo 'bh2' >bh2 |
|
40 | $ echo 'bh2' >bh2 | |
41 | $ hg add bh2 |
|
41 | $ hg add bh2 | |
42 | $ hg commit -d '4 0' -m "Adding b branch head 2" |
|
42 | $ hg commit -d '4 0' -m "Adding b branch head 2" | |
43 |
|
43 | |||
44 | $ echo 'c' >c |
|
44 | $ echo 'c' >c | |
45 | $ hg add c |
|
45 | $ hg add c | |
46 | $ hg branch c |
|
46 | $ hg branch c | |
47 | marked working directory as branch c |
|
47 | marked working directory as branch c | |
48 | $ hg commit -d '5 0' -m "Adding c branch" |
|
48 | $ hg commit -d '5 0' -m "Adding c branch" | |
49 |
|
49 | |||
50 | reserved names |
|
50 | reserved names | |
51 |
|
51 | |||
52 | $ hg branch tip |
|
52 | $ hg branch tip | |
53 | abort: the name 'tip' is reserved |
|
53 | abort: the name 'tip' is reserved | |
54 | [10] |
|
54 | [10] | |
55 | $ hg branch null |
|
55 | $ hg branch null | |
56 | abort: the name 'null' is reserved |
|
56 | abort: the name 'null' is reserved | |
57 | [10] |
|
57 | [10] | |
58 | $ hg branch . |
|
58 | $ hg branch . | |
59 | abort: the name '.' is reserved |
|
59 | abort: the name '.' is reserved | |
60 | [10] |
|
60 | [10] | |
61 |
|
61 | |||
62 | invalid characters |
|
62 | invalid characters | |
63 |
|
63 | |||
64 | $ hg branch 'foo:bar' |
|
64 | $ hg branch 'foo:bar' | |
65 | abort: ':' cannot be used in a name |
|
65 | abort: ':' cannot be used in a name | |
66 | [10] |
|
66 | [10] | |
67 |
|
67 | |||
68 | $ hg branch 'foo |
|
68 | $ hg branch 'foo | |
69 | > bar' |
|
69 | > bar' | |
70 | abort: '\n' cannot be used in a name |
|
70 | abort: '\n' cannot be used in a name | |
71 | [10] |
|
71 | [10] | |
72 |
|
72 | |||
73 | trailing or leading spaces should be stripped before testing duplicates |
|
73 | trailing or leading spaces should be stripped before testing duplicates | |
74 |
|
74 | |||
75 | $ hg branch 'b ' |
|
75 | $ hg branch 'b ' | |
76 | abort: a branch of the same name already exists |
|
76 | abort: a branch of the same name already exists | |
77 | (use 'hg update' to switch to it) |
|
77 | (use 'hg update' to switch to it) | |
78 | [10] |
|
78 | [10] | |
79 |
|
79 | |||
80 | $ hg branch ' b' |
|
80 | $ hg branch ' b' | |
81 | abort: a branch of the same name already exists |
|
81 | abort: a branch of the same name already exists | |
82 | (use 'hg update' to switch to it) |
|
82 | (use 'hg update' to switch to it) | |
83 | [10] |
|
83 | [10] | |
84 |
|
84 | |||
85 | verify update will accept invalid legacy branch names |
|
85 | verify update will accept invalid legacy branch names | |
86 |
|
86 | |||
87 | $ hg init test-invalid-branch-name |
|
87 | $ hg init test-invalid-branch-name | |
88 | $ cd test-invalid-branch-name |
|
88 | $ cd test-invalid-branch-name | |
89 | $ hg unbundle -u "$TESTDIR"/bundles/test-invalid-branch-name.hg |
|
89 | $ hg unbundle -u "$TESTDIR"/bundles/test-invalid-branch-name.hg | |
90 | adding changesets |
|
90 | adding changesets | |
91 | adding manifests |
|
91 | adding manifests | |
92 | adding file changes |
|
92 | adding file changes | |
93 | added 3 changesets with 3 changes to 2 files |
|
93 | added 3 changesets with 3 changes to 2 files | |
94 | new changesets f0e4c7f04036:33c2ceb9310b (3 drafts) |
|
94 | new changesets f0e4c7f04036:33c2ceb9310b (3 drafts) | |
95 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
95 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
96 |
|
96 | |||
97 | $ hg update '"colon:test"' |
|
97 | $ hg update '"colon:test"' | |
98 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
98 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
99 | $ cd .. |
|
99 | $ cd .. | |
100 |
|
100 | |||
101 | $ echo 'd' >d |
|
101 | $ echo 'd' >d | |
102 | $ hg add d |
|
102 | $ hg add d | |
103 | $ hg branch 'a branch name much longer than the default justification used by branches' |
|
103 | $ hg branch 'a branch name much longer than the default justification used by branches' | |
104 | marked working directory as branch a branch name much longer than the default justification used by branches |
|
104 | marked working directory as branch a branch name much longer than the default justification used by branches | |
105 | $ hg commit -d '6 0' -m "Adding d branch" |
|
105 | $ hg commit -d '6 0' -m "Adding d branch" | |
106 |
|
106 | |||
107 | $ hg branches |
|
107 | $ hg branches | |
108 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
108 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
109 | b 4:aee39cd168d0 |
|
109 | b 4:aee39cd168d0 | |
110 | c 6:589736a22561 (inactive) |
|
110 | c 6:589736a22561 (inactive) | |
111 | a 5:d8cbc61dbaa6 (inactive) |
|
111 | a 5:d8cbc61dbaa6 (inactive) | |
112 | default 0:19709c5a4e75 (inactive) |
|
112 | default 0:19709c5a4e75 (inactive) | |
113 |
|
113 | |||
114 | ------- |
|
114 | ------- | |
115 |
|
115 | |||
116 | $ hg branches -a |
|
116 | $ hg branches -a | |
117 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
117 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
118 | b 4:aee39cd168d0 |
|
118 | b 4:aee39cd168d0 | |
119 |
|
119 | |||
120 | --- Branch a |
|
120 | --- Branch a | |
121 |
|
121 | |||
122 | $ hg log -b a |
|
122 | $ hg log -b a | |
123 | changeset: 5:d8cbc61dbaa6 |
|
123 | changeset: 5:d8cbc61dbaa6 | |
124 | branch: a |
|
124 | branch: a | |
125 | parent: 2:881fe2b92ad0 |
|
125 | parent: 2:881fe2b92ad0 | |
126 | user: test |
|
126 | user: test | |
127 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
127 | date: Thu Jan 01 00:00:04 1970 +0000 | |
128 | summary: Adding b branch head 2 |
|
128 | summary: Adding b branch head 2 | |
129 |
|
129 | |||
130 | changeset: 2:881fe2b92ad0 |
|
130 | changeset: 2:881fe2b92ad0 | |
131 | branch: a |
|
131 | branch: a | |
132 | user: test |
|
132 | user: test | |
133 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
133 | date: Thu Jan 01 00:00:02 1970 +0000 | |
134 | summary: Adding to a branch |
|
134 | summary: Adding to a branch | |
135 |
|
135 | |||
136 | changeset: 1:dd6b440dd85a |
|
136 | changeset: 1:dd6b440dd85a | |
137 | branch: a |
|
137 | branch: a | |
138 | user: test |
|
138 | user: test | |
139 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
139 | date: Thu Jan 01 00:00:01 1970 +0000 | |
140 | summary: Adding a branch |
|
140 | summary: Adding a branch | |
141 |
|
141 | |||
142 |
|
142 | |||
143 | ---- Branch b |
|
143 | ---- Branch b | |
144 |
|
144 | |||
145 | $ hg log -b b |
|
145 | $ hg log -b b | |
146 | changeset: 4:aee39cd168d0 |
|
146 | changeset: 4:aee39cd168d0 | |
147 | branch: b |
|
147 | branch: b | |
148 | user: test |
|
148 | user: test | |
149 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
149 | date: Thu Jan 01 00:00:03 1970 +0000 | |
150 | summary: Adding b branch head 1 |
|
150 | summary: Adding b branch head 1 | |
151 |
|
151 | |||
152 | changeset: 3:ac22033332d1 |
|
152 | changeset: 3:ac22033332d1 | |
153 | branch: b |
|
153 | branch: b | |
154 | parent: 0:19709c5a4e75 |
|
154 | parent: 0:19709c5a4e75 | |
155 | user: test |
|
155 | user: test | |
156 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
156 | date: Thu Jan 01 00:00:02 1970 +0000 | |
157 | summary: Adding b branch |
|
157 | summary: Adding b branch | |
158 |
|
158 | |||
159 |
|
159 | |||
160 | ---- going to test branch listing by rev |
|
160 | ---- going to test branch listing by rev | |
161 | $ hg branches -r0 |
|
161 | $ hg branches -r0 | |
162 | default 0:19709c5a4e75 (inactive) |
|
162 | default 0:19709c5a4e75 (inactive) | |
163 | $ hg branches -qr0 |
|
163 | $ hg branches -qr0 | |
164 | default |
|
164 | default | |
165 | --- now more than one rev |
|
165 | --- now more than one rev | |
166 | $ hg branches -r2:5 |
|
166 | $ hg branches -r2:5 | |
167 | b 4:aee39cd168d0 |
|
167 | b 4:aee39cd168d0 | |
168 | a 5:d8cbc61dbaa6 (inactive) |
|
168 | a 5:d8cbc61dbaa6 (inactive) | |
169 | $ hg branches -qr2:5 |
|
169 | $ hg branches -qr2:5 | |
170 | b |
|
170 | b | |
171 | a |
|
171 | a | |
172 | ---- going to test branch closing |
|
172 | ---- going to test branch closing | |
173 |
|
173 | |||
174 | $ hg branches |
|
174 | $ hg branches | |
175 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
175 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
176 | b 4:aee39cd168d0 |
|
176 | b 4:aee39cd168d0 | |
177 | c 6:589736a22561 (inactive) |
|
177 | c 6:589736a22561 (inactive) | |
178 | a 5:d8cbc61dbaa6 (inactive) |
|
178 | a 5:d8cbc61dbaa6 (inactive) | |
179 | default 0:19709c5a4e75 (inactive) |
|
179 | default 0:19709c5a4e75 (inactive) | |
180 | $ hg up -C b |
|
180 | $ hg up -C b | |
181 | 2 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
181 | 2 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
182 | $ echo 'xxx1' >> b |
|
182 | $ echo 'xxx1' >> b | |
183 | $ hg commit -d '7 0' -m 'adding cset to branch b' |
|
183 | $ hg commit -d '7 0' -m 'adding cset to branch b' | |
184 | $ hg up -C aee39cd168d0 |
|
184 | $ hg up -C aee39cd168d0 | |
185 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
185 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
186 | $ echo 'xxx2' >> b |
|
186 | $ echo 'xxx2' >> b | |
187 | $ hg commit -d '8 0' -m 'adding head to branch b' |
|
187 | $ hg commit -d '8 0' -m 'adding head to branch b' | |
188 | created new head |
|
188 | created new head | |
189 | $ echo 'xxx3' >> b |
|
189 | $ echo 'xxx3' >> b | |
190 | $ hg commit -d '9 0' -m 'adding another cset to branch b' |
|
190 | $ hg commit -d '9 0' -m 'adding another cset to branch b' | |
191 | $ hg branches |
|
191 | $ hg branches | |
192 | b 10:bfbe841b666e |
|
192 | b 10:bfbe841b666e | |
193 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
193 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
194 | c 6:589736a22561 (inactive) |
|
194 | c 6:589736a22561 (inactive) | |
195 | a 5:d8cbc61dbaa6 (inactive) |
|
195 | a 5:d8cbc61dbaa6 (inactive) | |
196 | default 0:19709c5a4e75 (inactive) |
|
196 | default 0:19709c5a4e75 (inactive) | |
197 | $ hg heads --closed |
|
197 | $ hg heads --closed | |
198 | changeset: 10:bfbe841b666e |
|
198 | changeset: 10:bfbe841b666e | |
199 | branch: b |
|
199 | branch: b | |
200 | tag: tip |
|
200 | tag: tip | |
201 | user: test |
|
201 | user: test | |
202 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
202 | date: Thu Jan 01 00:00:09 1970 +0000 | |
203 | summary: adding another cset to branch b |
|
203 | summary: adding another cset to branch b | |
204 |
|
204 | |||
205 | changeset: 8:eebb944467c9 |
|
205 | changeset: 8:eebb944467c9 | |
206 | branch: b |
|
206 | branch: b | |
207 | parent: 4:aee39cd168d0 |
|
207 | parent: 4:aee39cd168d0 | |
208 | user: test |
|
208 | user: test | |
209 | date: Thu Jan 01 00:00:07 1970 +0000 |
|
209 | date: Thu Jan 01 00:00:07 1970 +0000 | |
210 | summary: adding cset to branch b |
|
210 | summary: adding cset to branch b | |
211 |
|
211 | |||
212 | changeset: 7:10ff5895aa57 |
|
212 | changeset: 7:10ff5895aa57 | |
213 | branch: a branch name much longer than the default justification used by branches |
|
213 | branch: a branch name much longer than the default justification used by branches | |
214 | user: test |
|
214 | user: test | |
215 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
215 | date: Thu Jan 01 00:00:06 1970 +0000 | |
216 | summary: Adding d branch |
|
216 | summary: Adding d branch | |
217 |
|
217 | |||
218 | changeset: 6:589736a22561 |
|
218 | changeset: 6:589736a22561 | |
219 | branch: c |
|
219 | branch: c | |
220 | user: test |
|
220 | user: test | |
221 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
221 | date: Thu Jan 01 00:00:05 1970 +0000 | |
222 | summary: Adding c branch |
|
222 | summary: Adding c branch | |
223 |
|
223 | |||
224 | changeset: 5:d8cbc61dbaa6 |
|
224 | changeset: 5:d8cbc61dbaa6 | |
225 | branch: a |
|
225 | branch: a | |
226 | parent: 2:881fe2b92ad0 |
|
226 | parent: 2:881fe2b92ad0 | |
227 | user: test |
|
227 | user: test | |
228 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
228 | date: Thu Jan 01 00:00:04 1970 +0000 | |
229 | summary: Adding b branch head 2 |
|
229 | summary: Adding b branch head 2 | |
230 |
|
230 | |||
231 | changeset: 0:19709c5a4e75 |
|
231 | changeset: 0:19709c5a4e75 | |
232 | user: test |
|
232 | user: test | |
233 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
233 | date: Thu Jan 01 00:00:00 1970 +0000 | |
234 | summary: Adding root node |
|
234 | summary: Adding root node | |
235 |
|
235 | |||
236 | $ hg heads |
|
236 | $ hg heads | |
237 | changeset: 10:bfbe841b666e |
|
237 | changeset: 10:bfbe841b666e | |
238 | branch: b |
|
238 | branch: b | |
239 | tag: tip |
|
239 | tag: tip | |
240 | user: test |
|
240 | user: test | |
241 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
241 | date: Thu Jan 01 00:00:09 1970 +0000 | |
242 | summary: adding another cset to branch b |
|
242 | summary: adding another cset to branch b | |
243 |
|
243 | |||
244 | changeset: 8:eebb944467c9 |
|
244 | changeset: 8:eebb944467c9 | |
245 | branch: b |
|
245 | branch: b | |
246 | parent: 4:aee39cd168d0 |
|
246 | parent: 4:aee39cd168d0 | |
247 | user: test |
|
247 | user: test | |
248 | date: Thu Jan 01 00:00:07 1970 +0000 |
|
248 | date: Thu Jan 01 00:00:07 1970 +0000 | |
249 | summary: adding cset to branch b |
|
249 | summary: adding cset to branch b | |
250 |
|
250 | |||
251 | changeset: 7:10ff5895aa57 |
|
251 | changeset: 7:10ff5895aa57 | |
252 | branch: a branch name much longer than the default justification used by branches |
|
252 | branch: a branch name much longer than the default justification used by branches | |
253 | user: test |
|
253 | user: test | |
254 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
254 | date: Thu Jan 01 00:00:06 1970 +0000 | |
255 | summary: Adding d branch |
|
255 | summary: Adding d branch | |
256 |
|
256 | |||
257 | changeset: 6:589736a22561 |
|
257 | changeset: 6:589736a22561 | |
258 | branch: c |
|
258 | branch: c | |
259 | user: test |
|
259 | user: test | |
260 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
260 | date: Thu Jan 01 00:00:05 1970 +0000 | |
261 | summary: Adding c branch |
|
261 | summary: Adding c branch | |
262 |
|
262 | |||
263 | changeset: 5:d8cbc61dbaa6 |
|
263 | changeset: 5:d8cbc61dbaa6 | |
264 | branch: a |
|
264 | branch: a | |
265 | parent: 2:881fe2b92ad0 |
|
265 | parent: 2:881fe2b92ad0 | |
266 | user: test |
|
266 | user: test | |
267 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
267 | date: Thu Jan 01 00:00:04 1970 +0000 | |
268 | summary: Adding b branch head 2 |
|
268 | summary: Adding b branch head 2 | |
269 |
|
269 | |||
270 | changeset: 0:19709c5a4e75 |
|
270 | changeset: 0:19709c5a4e75 | |
271 | user: test |
|
271 | user: test | |
272 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
272 | date: Thu Jan 01 00:00:00 1970 +0000 | |
273 | summary: Adding root node |
|
273 | summary: Adding root node | |
274 |
|
274 | |||
275 | $ hg commit -d '9 0' --close-branch -m 'prune bad branch' |
|
275 | $ hg commit -d '9 0' --close-branch -m 'prune bad branch' | |
276 | $ hg branches -a |
|
276 | $ hg branches -a | |
277 | b 8:eebb944467c9 |
|
277 | b 8:eebb944467c9 | |
278 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
278 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
279 | $ hg up -C b |
|
279 | $ hg up -C b | |
280 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
280 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
281 | $ hg commit -d '9 0' --close-branch -m 'close this part branch too' |
|
281 | $ hg commit -d '9 0' --close-branch -m 'close this part branch too' | |
282 | $ hg commit -d '9 0' --close-branch -m 're-closing this branch' |
|
282 | $ hg commit -d '9 0' --close-branch -m 're-closing this branch' | |
283 | abort: current revision is already a branch closing head |
|
283 | abort: current revision is already a branch closing head | |
284 | [10] |
|
284 | [10] | |
285 |
|
285 | |||
286 | $ hg log -r tip --debug |
|
286 | $ hg log -r tip --debug | |
287 | changeset: 12:e3d49c0575d8fc2cb1cd6859c747c14f5f6d499f |
|
287 | changeset: 12:e3d49c0575d8fc2cb1cd6859c747c14f5f6d499f | |
288 | branch: b |
|
288 | branch: b | |
289 | tag: tip |
|
289 | tag: tip | |
290 | phase: draft |
|
290 | phase: draft | |
291 | parent: 8:eebb944467c9fb9651ed232aeaf31b3c0a7fc6c1 |
|
291 | parent: 8:eebb944467c9fb9651ed232aeaf31b3c0a7fc6c1 | |
292 | parent: -1:0000000000000000000000000000000000000000 |
|
292 | parent: -1:0000000000000000000000000000000000000000 | |
293 | manifest: 8:6f9ed32d2b310e391a4f107d5f0f071df785bfee |
|
293 | manifest: 8:6f9ed32d2b310e391a4f107d5f0f071df785bfee | |
294 | user: test |
|
294 | user: test | |
295 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
295 | date: Thu Jan 01 00:00:09 1970 +0000 | |
296 | extra: branch=b |
|
296 | extra: branch=b | |
297 | extra: close=1 |
|
297 | extra: close=1 | |
298 | description: |
|
298 | description: | |
299 | close this part branch too |
|
299 | close this part branch too | |
300 |
|
300 | |||
301 |
|
301 | |||
302 | --- b branch should be inactive |
|
302 | --- b branch should be inactive | |
303 |
|
303 | |||
304 | $ hg branches |
|
304 | $ hg branches | |
305 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
305 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
306 | c 6:589736a22561 (inactive) |
|
306 | c 6:589736a22561 (inactive) | |
307 | a 5:d8cbc61dbaa6 (inactive) |
|
307 | a 5:d8cbc61dbaa6 (inactive) | |
308 | default 0:19709c5a4e75 (inactive) |
|
308 | default 0:19709c5a4e75 (inactive) | |
309 | $ hg branches -c |
|
309 | $ hg branches -c | |
310 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
310 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
311 | b 12:e3d49c0575d8 (closed) |
|
311 | b 12:e3d49c0575d8 (closed) | |
312 | c 6:589736a22561 (inactive) |
|
312 | c 6:589736a22561 (inactive) | |
313 | a 5:d8cbc61dbaa6 (inactive) |
|
313 | a 5:d8cbc61dbaa6 (inactive) | |
314 | default 0:19709c5a4e75 (inactive) |
|
314 | default 0:19709c5a4e75 (inactive) | |
315 | $ hg branches -a |
|
315 | $ hg branches -a | |
316 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
316 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
317 | $ hg branches -q |
|
317 | $ hg branches -q | |
318 | a branch name much longer than the default justification used by branches |
|
318 | a branch name much longer than the default justification used by branches | |
319 | c |
|
319 | c | |
320 | a |
|
320 | a | |
321 | default |
|
321 | default | |
322 | $ hg heads b |
|
322 | $ hg heads b | |
323 | no open branch heads found on branches b |
|
323 | no open branch heads found on branches b | |
324 | [1] |
|
324 | [1] | |
325 | $ hg heads --closed b |
|
325 | $ hg heads --closed b | |
326 | changeset: 12:e3d49c0575d8 |
|
326 | changeset: 12:e3d49c0575d8 | |
327 | branch: b |
|
327 | branch: b | |
328 | tag: tip |
|
328 | tag: tip | |
329 | parent: 8:eebb944467c9 |
|
329 | parent: 8:eebb944467c9 | |
330 | user: test |
|
330 | user: test | |
331 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
331 | date: Thu Jan 01 00:00:09 1970 +0000 | |
332 | summary: close this part branch too |
|
332 | summary: close this part branch too | |
333 |
|
333 | |||
334 | changeset: 11:d3f163457ebf |
|
334 | changeset: 11:d3f163457ebf | |
335 | branch: b |
|
335 | branch: b | |
336 | user: test |
|
336 | user: test | |
337 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
337 | date: Thu Jan 01 00:00:09 1970 +0000 | |
338 | summary: prune bad branch |
|
338 | summary: prune bad branch | |
339 |
|
339 | |||
340 | $ echo 'xxx4' >> b |
|
340 | $ echo 'xxx4' >> b | |
341 | $ hg commit -d '9 0' -m 'reopen branch with a change' |
|
341 | $ hg commit -d '9 0' -m 'reopen branch with a change' | |
342 | reopening closed branch head 12 |
|
342 | reopening closed branch head 12 | |
343 |
|
343 | |||
344 | --- branch b is back in action |
|
344 | --- branch b is back in action | |
345 |
|
345 | |||
346 | $ hg branches -a |
|
346 | $ hg branches -a | |
347 | b 13:e23b5505d1ad |
|
347 | b 13:e23b5505d1ad | |
348 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
348 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
349 |
|
349 | |||
350 | ---- test heads listings |
|
350 | ---- test heads listings | |
351 |
|
351 | |||
352 | $ hg heads |
|
352 | $ hg heads | |
353 | changeset: 13:e23b5505d1ad |
|
353 | changeset: 13:e23b5505d1ad | |
354 | branch: b |
|
354 | branch: b | |
355 | tag: tip |
|
355 | tag: tip | |
356 | user: test |
|
356 | user: test | |
357 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
357 | date: Thu Jan 01 00:00:09 1970 +0000 | |
358 | summary: reopen branch with a change |
|
358 | summary: reopen branch with a change | |
359 |
|
359 | |||
360 | changeset: 7:10ff5895aa57 |
|
360 | changeset: 7:10ff5895aa57 | |
361 | branch: a branch name much longer than the default justification used by branches |
|
361 | branch: a branch name much longer than the default justification used by branches | |
362 | user: test |
|
362 | user: test | |
363 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
363 | date: Thu Jan 01 00:00:06 1970 +0000 | |
364 | summary: Adding d branch |
|
364 | summary: Adding d branch | |
365 |
|
365 | |||
366 | changeset: 6:589736a22561 |
|
366 | changeset: 6:589736a22561 | |
367 | branch: c |
|
367 | branch: c | |
368 | user: test |
|
368 | user: test | |
369 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
369 | date: Thu Jan 01 00:00:05 1970 +0000 | |
370 | summary: Adding c branch |
|
370 | summary: Adding c branch | |
371 |
|
371 | |||
372 | changeset: 5:d8cbc61dbaa6 |
|
372 | changeset: 5:d8cbc61dbaa6 | |
373 | branch: a |
|
373 | branch: a | |
374 | parent: 2:881fe2b92ad0 |
|
374 | parent: 2:881fe2b92ad0 | |
375 | user: test |
|
375 | user: test | |
376 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
376 | date: Thu Jan 01 00:00:04 1970 +0000 | |
377 | summary: Adding b branch head 2 |
|
377 | summary: Adding b branch head 2 | |
378 |
|
378 | |||
379 | changeset: 0:19709c5a4e75 |
|
379 | changeset: 0:19709c5a4e75 | |
380 | user: test |
|
380 | user: test | |
381 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
381 | date: Thu Jan 01 00:00:00 1970 +0000 | |
382 | summary: Adding root node |
|
382 | summary: Adding root node | |
383 |
|
383 | |||
384 |
|
384 | |||
385 | branch default |
|
385 | branch default | |
386 |
|
386 | |||
387 | $ hg heads default |
|
387 | $ hg heads default | |
388 | changeset: 0:19709c5a4e75 |
|
388 | changeset: 0:19709c5a4e75 | |
389 | user: test |
|
389 | user: test | |
390 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
390 | date: Thu Jan 01 00:00:00 1970 +0000 | |
391 | summary: Adding root node |
|
391 | summary: Adding root node | |
392 |
|
392 | |||
393 |
|
393 | |||
394 | branch a |
|
394 | branch a | |
395 |
|
395 | |||
396 | $ hg heads a |
|
396 | $ hg heads a | |
397 | changeset: 5:d8cbc61dbaa6 |
|
397 | changeset: 5:d8cbc61dbaa6 | |
398 | branch: a |
|
398 | branch: a | |
399 | parent: 2:881fe2b92ad0 |
|
399 | parent: 2:881fe2b92ad0 | |
400 | user: test |
|
400 | user: test | |
401 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
401 | date: Thu Jan 01 00:00:04 1970 +0000 | |
402 | summary: Adding b branch head 2 |
|
402 | summary: Adding b branch head 2 | |
403 |
|
403 | |||
404 | $ hg heads --active a |
|
404 | $ hg heads --active a | |
405 | no open branch heads found on branches a |
|
405 | no open branch heads found on branches a | |
406 | [1] |
|
406 | [1] | |
407 |
|
407 | |||
408 | branch b |
|
408 | branch b | |
409 |
|
409 | |||
410 | $ hg heads b |
|
410 | $ hg heads b | |
411 | changeset: 13:e23b5505d1ad |
|
411 | changeset: 13:e23b5505d1ad | |
412 | branch: b |
|
412 | branch: b | |
413 | tag: tip |
|
413 | tag: tip | |
414 | user: test |
|
414 | user: test | |
415 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
415 | date: Thu Jan 01 00:00:09 1970 +0000 | |
416 | summary: reopen branch with a change |
|
416 | summary: reopen branch with a change | |
417 |
|
417 | |||
418 | $ hg heads --closed b |
|
418 | $ hg heads --closed b | |
419 | changeset: 13:e23b5505d1ad |
|
419 | changeset: 13:e23b5505d1ad | |
420 | branch: b |
|
420 | branch: b | |
421 | tag: tip |
|
421 | tag: tip | |
422 | user: test |
|
422 | user: test | |
423 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
423 | date: Thu Jan 01 00:00:09 1970 +0000 | |
424 | summary: reopen branch with a change |
|
424 | summary: reopen branch with a change | |
425 |
|
425 | |||
426 | changeset: 11:d3f163457ebf |
|
426 | changeset: 11:d3f163457ebf | |
427 | branch: b |
|
427 | branch: b | |
428 | user: test |
|
428 | user: test | |
429 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
429 | date: Thu Jan 01 00:00:09 1970 +0000 | |
430 | summary: prune bad branch |
|
430 | summary: prune bad branch | |
431 |
|
431 | |||
432 |
|
432 | |||
433 | reclose branch |
|
433 | reclose branch | |
434 |
|
434 | |||
435 | $ hg up -C c |
|
435 | $ hg up -C c | |
436 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
436 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
437 | $ hg commit -d '9 0' --close-branch -m 'reclosing this branch' |
|
437 | $ hg commit -d '9 0' --close-branch -m 'reclosing this branch' | |
438 | $ hg branches |
|
438 | $ hg branches | |
439 | b 13:e23b5505d1ad |
|
439 | b 13:e23b5505d1ad | |
440 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
440 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
441 | a 5:d8cbc61dbaa6 (inactive) |
|
441 | a 5:d8cbc61dbaa6 (inactive) | |
442 | default 0:19709c5a4e75 (inactive) |
|
442 | default 0:19709c5a4e75 (inactive) | |
443 | $ hg branches --closed |
|
443 | $ hg branches --closed | |
444 | b 13:e23b5505d1ad |
|
444 | b 13:e23b5505d1ad | |
445 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
445 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
446 | c 14:f894c25619d3 (closed) |
|
446 | c 14:f894c25619d3 (closed) | |
447 | a 5:d8cbc61dbaa6 (inactive) |
|
447 | a 5:d8cbc61dbaa6 (inactive) | |
448 | default 0:19709c5a4e75 (inactive) |
|
448 | default 0:19709c5a4e75 (inactive) | |
449 |
|
449 | |||
450 | multihead branch |
|
450 | multihead branch | |
451 |
|
451 | |||
452 | $ hg up -C default |
|
452 | $ hg up -C default | |
453 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
453 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
454 | $ hg branch m |
|
454 | $ hg branch m | |
455 | marked working directory as branch m |
|
455 | marked working directory as branch m | |
456 | $ touch m |
|
456 | $ touch m | |
457 | $ hg add m |
|
457 | $ hg add m | |
458 | $ hg commit -d '10 0' -m 'multihead base' |
|
458 | $ hg commit -d '10 0' -m 'multihead base' | |
459 | $ echo "m1" >m |
|
459 | $ echo "m1" >m | |
460 | $ hg commit -d '10 0' -m 'head 1' |
|
460 | $ hg commit -d '10 0' -m 'head 1' | |
461 | $ hg up -C '.^' |
|
461 | $ hg up -C '.^' | |
462 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
462 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
463 | $ echo "m2" >m |
|
463 | $ echo "m2" >m | |
464 | $ hg commit -d '10 0' -m 'head 2' |
|
464 | $ hg commit -d '10 0' -m 'head 2' | |
465 | created new head |
|
465 | created new head | |
466 | $ hg log -b m |
|
466 | $ hg log -b m | |
467 | changeset: 17:df343b0df04f |
|
467 | changeset: 17:df343b0df04f | |
468 | branch: m |
|
468 | branch: m | |
469 | tag: tip |
|
469 | tag: tip | |
470 | parent: 15:f3447637f53e |
|
470 | parent: 15:f3447637f53e | |
471 | user: test |
|
471 | user: test | |
472 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
472 | date: Thu Jan 01 00:00:10 1970 +0000 | |
473 | summary: head 2 |
|
473 | summary: head 2 | |
474 |
|
474 | |||
475 | changeset: 16:a58ca5d3bdf3 |
|
475 | changeset: 16:a58ca5d3bdf3 | |
476 | branch: m |
|
476 | branch: m | |
477 | user: test |
|
477 | user: test | |
478 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
478 | date: Thu Jan 01 00:00:10 1970 +0000 | |
479 | summary: head 1 |
|
479 | summary: head 1 | |
480 |
|
480 | |||
481 | changeset: 15:f3447637f53e |
|
481 | changeset: 15:f3447637f53e | |
482 | branch: m |
|
482 | branch: m | |
483 | parent: 0:19709c5a4e75 |
|
483 | parent: 0:19709c5a4e75 | |
484 | user: test |
|
484 | user: test | |
485 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
485 | date: Thu Jan 01 00:00:10 1970 +0000 | |
486 | summary: multihead base |
|
486 | summary: multihead base | |
487 |
|
487 | |||
488 | $ hg heads --topo m |
|
488 | $ hg heads --topo m | |
489 | changeset: 17:df343b0df04f |
|
489 | changeset: 17:df343b0df04f | |
490 | branch: m |
|
490 | branch: m | |
491 | tag: tip |
|
491 | tag: tip | |
492 | parent: 15:f3447637f53e |
|
492 | parent: 15:f3447637f53e | |
493 | user: test |
|
493 | user: test | |
494 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
494 | date: Thu Jan 01 00:00:10 1970 +0000 | |
495 | summary: head 2 |
|
495 | summary: head 2 | |
496 |
|
496 | |||
497 | changeset: 16:a58ca5d3bdf3 |
|
497 | changeset: 16:a58ca5d3bdf3 | |
498 | branch: m |
|
498 | branch: m | |
499 | user: test |
|
499 | user: test | |
500 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
500 | date: Thu Jan 01 00:00:10 1970 +0000 | |
501 | summary: head 1 |
|
501 | summary: head 1 | |
502 |
|
502 | |||
503 | $ hg branches |
|
503 | $ hg branches | |
504 | m 17:df343b0df04f |
|
504 | m 17:df343b0df04f | |
505 | b 13:e23b5505d1ad |
|
505 | b 13:e23b5505d1ad | |
506 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
506 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
507 | a 5:d8cbc61dbaa6 (inactive) |
|
507 | a 5:d8cbc61dbaa6 (inactive) | |
508 | default 0:19709c5a4e75 (inactive) |
|
508 | default 0:19709c5a4e75 (inactive) | |
509 |
|
509 | |||
510 | partially merge multihead branch |
|
510 | partially merge multihead branch | |
511 |
|
511 | |||
512 | $ hg up -C default |
|
512 | $ hg up -C default | |
513 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
513 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
514 | $ hg branch md |
|
514 | $ hg branch md | |
515 | marked working directory as branch md |
|
515 | marked working directory as branch md | |
516 | $ hg merge m |
|
516 | $ hg merge m | |
517 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
517 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
518 | (branch merge, don't forget to commit) |
|
518 | (branch merge, don't forget to commit) | |
519 | $ hg commit -d '11 0' -m 'merge head 2' |
|
519 | $ hg commit -d '11 0' -m 'merge head 2' | |
520 | $ hg heads --topo m |
|
520 | $ hg heads --topo m | |
521 | changeset: 16:a58ca5d3bdf3 |
|
521 | changeset: 16:a58ca5d3bdf3 | |
522 | branch: m |
|
522 | branch: m | |
523 | user: test |
|
523 | user: test | |
524 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
524 | date: Thu Jan 01 00:00:10 1970 +0000 | |
525 | summary: head 1 |
|
525 | summary: head 1 | |
526 |
|
526 | |||
527 | $ hg branches |
|
527 | $ hg branches | |
528 | md 18:c914c99f1fbb |
|
528 | md 18:c914c99f1fbb | |
529 | m 17:df343b0df04f |
|
529 | m 17:df343b0df04f | |
530 | b 13:e23b5505d1ad |
|
530 | b 13:e23b5505d1ad | |
531 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
531 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
532 | a 5:d8cbc61dbaa6 (inactive) |
|
532 | a 5:d8cbc61dbaa6 (inactive) | |
533 | default 0:19709c5a4e75 (inactive) |
|
533 | default 0:19709c5a4e75 (inactive) | |
534 |
|
534 | |||
535 | partially close multihead branch |
|
535 | partially close multihead branch | |
536 |
|
536 | |||
537 | $ hg up -C a58ca5d3bdf3 |
|
537 | $ hg up -C a58ca5d3bdf3 | |
538 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
538 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
539 | $ hg commit -d '12 0' -m 'close head 1' --close-branch |
|
539 | $ hg commit -d '12 0' -m 'close head 1' --close-branch | |
540 | $ hg heads --topo m |
|
540 | $ hg heads --topo m | |
541 | changeset: 19:cd21a80baa3d |
|
541 | changeset: 19:cd21a80baa3d | |
542 | branch: m |
|
542 | branch: m | |
543 | tag: tip |
|
543 | tag: tip | |
544 | parent: 16:a58ca5d3bdf3 |
|
544 | parent: 16:a58ca5d3bdf3 | |
545 | user: test |
|
545 | user: test | |
546 | date: Thu Jan 01 00:00:12 1970 +0000 |
|
546 | date: Thu Jan 01 00:00:12 1970 +0000 | |
547 | summary: close head 1 |
|
547 | summary: close head 1 | |
548 |
|
548 | |||
549 | $ hg branches |
|
549 | $ hg branches | |
550 | md 18:c914c99f1fbb |
|
550 | md 18:c914c99f1fbb | |
551 | b 13:e23b5505d1ad |
|
551 | b 13:e23b5505d1ad | |
552 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
552 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
553 | m 17:df343b0df04f (inactive) |
|
553 | m 17:df343b0df04f (inactive) | |
554 | a 5:d8cbc61dbaa6 (inactive) |
|
554 | a 5:d8cbc61dbaa6 (inactive) | |
555 | default 0:19709c5a4e75 (inactive) |
|
555 | default 0:19709c5a4e75 (inactive) | |
556 |
|
556 | |||
557 | default branch colors: |
|
557 | default branch colors: | |
558 |
|
558 | |||
559 | $ cat <<EOF >> $HGRCPATH |
|
559 | $ cat <<EOF >> $HGRCPATH | |
560 | > [extensions] |
|
560 | > [extensions] | |
561 | > color = |
|
561 | > color = | |
562 | > [color] |
|
562 | > [color] | |
563 | > mode = ansi |
|
563 | > mode = ansi | |
564 | > EOF |
|
564 | > EOF | |
565 |
|
565 | |||
566 | $ hg up -C b |
|
566 | $ hg up -C b | |
567 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
567 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
568 | $ hg branches --color=always |
|
568 | $ hg branches --color=always | |
569 | \x1b[0;0mmd\x1b[0m\x1b[0;33m 18:c914c99f1fbb\x1b[0m (esc) |
|
569 | \x1b[0;0mmd\x1b[0m\x1b[0;33m 18:c914c99f1fbb\x1b[0m (esc) | |
570 | \x1b[0;32mb\x1b[0m\x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc) |
|
570 | \x1b[0;32mb\x1b[0m\x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc) | |
571 | \x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;33m 7:10ff5895aa57\x1b[0m (esc) |
|
571 | \x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;33m 7:10ff5895aa57\x1b[0m (esc) | |
572 | \x1b[0;0mm\x1b[0m\x1b[0;33m 17:df343b0df04f\x1b[0m (inactive) (esc) |
|
572 | \x1b[0;0mm\x1b[0m\x1b[0;33m 17:df343b0df04f\x1b[0m (inactive) (esc) | |
573 | \x1b[0;0ma\x1b[0m\x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
|
573 | \x1b[0;0ma\x1b[0m\x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | |
574 | \x1b[0;0mdefault\x1b[0m\x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
|
574 | \x1b[0;0mdefault\x1b[0m\x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) | |
575 |
|
575 | |||
576 | default closed branch color: |
|
576 | default closed branch color: | |
577 |
|
577 | |||
578 | $ hg branches --color=always --closed |
|
578 | $ hg branches --color=always --closed | |
579 | \x1b[0;0mmd\x1b[0m\x1b[0;33m 18:c914c99f1fbb\x1b[0m (esc) |
|
579 | \x1b[0;0mmd\x1b[0m\x1b[0;33m 18:c914c99f1fbb\x1b[0m (esc) | |
580 | \x1b[0;32mb\x1b[0m\x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc) |
|
580 | \x1b[0;32mb\x1b[0m\x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc) | |
581 | \x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;33m 7:10ff5895aa57\x1b[0m (esc) |
|
581 | \x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;33m 7:10ff5895aa57\x1b[0m (esc) | |
582 | \x1b[0;0mm\x1b[0m\x1b[0;33m 17:df343b0df04f\x1b[0m (inactive) (esc) |
|
582 | \x1b[0;0mm\x1b[0m\x1b[0;33m 17:df343b0df04f\x1b[0m (inactive) (esc) | |
583 | \x1b[0;30;1mc\x1b[0m\x1b[0;33m 14:f894c25619d3\x1b[0m (closed) (esc) |
|
583 | \x1b[0;30;1mc\x1b[0m\x1b[0;33m 14:f894c25619d3\x1b[0m (closed) (esc) | |
584 | \x1b[0;0ma\x1b[0m\x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
|
584 | \x1b[0;0ma\x1b[0m\x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | |
585 | \x1b[0;0mdefault\x1b[0m\x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
|
585 | \x1b[0;0mdefault\x1b[0m\x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) | |
586 |
|
586 | |||
587 | $ cat <<EOF >> $HGRCPATH |
|
587 | $ cat <<EOF >> $HGRCPATH | |
588 | > [extensions] |
|
588 | > [extensions] | |
589 | > color = |
|
589 | > color = | |
590 | > [color] |
|
590 | > [color] | |
591 | > branches.active = green |
|
591 | > branches.active = green | |
592 | > branches.closed = blue |
|
592 | > branches.closed = blue | |
593 | > branches.current = red |
|
593 | > branches.current = red | |
594 | > branches.inactive = magenta |
|
594 | > branches.inactive = magenta | |
595 | > log.changeset = cyan |
|
595 | > log.changeset = cyan | |
596 | > EOF |
|
596 | > EOF | |
597 |
|
597 | |||
598 | custom branch colors: |
|
598 | custom branch colors: | |
599 |
|
599 | |||
600 | $ hg branches --color=always |
|
600 | $ hg branches --color=always | |
601 | \x1b[0;32mmd\x1b[0m\x1b[0;36m 18:c914c99f1fbb\x1b[0m (esc) |
|
601 | \x1b[0;32mmd\x1b[0m\x1b[0;36m 18:c914c99f1fbb\x1b[0m (esc) | |
602 | \x1b[0;31mb\x1b[0m\x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc) |
|
602 | \x1b[0;31mb\x1b[0m\x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc) | |
603 | \x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;36m 7:10ff5895aa57\x1b[0m (esc) |
|
603 | \x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;36m 7:10ff5895aa57\x1b[0m (esc) | |
604 | \x1b[0;35mm\x1b[0m\x1b[0;36m 17:df343b0df04f\x1b[0m (inactive) (esc) |
|
604 | \x1b[0;35mm\x1b[0m\x1b[0;36m 17:df343b0df04f\x1b[0m (inactive) (esc) | |
605 | \x1b[0;35ma\x1b[0m\x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
|
605 | \x1b[0;35ma\x1b[0m\x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | |
606 | \x1b[0;35mdefault\x1b[0m\x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
|
606 | \x1b[0;35mdefault\x1b[0m\x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) | |
607 |
|
607 | |||
608 | custom closed branch color: |
|
608 | custom closed branch color: | |
609 |
|
609 | |||
610 | $ hg branches --color=always --closed |
|
610 | $ hg branches --color=always --closed | |
611 | \x1b[0;32mmd\x1b[0m\x1b[0;36m 18:c914c99f1fbb\x1b[0m (esc) |
|
611 | \x1b[0;32mmd\x1b[0m\x1b[0;36m 18:c914c99f1fbb\x1b[0m (esc) | |
612 | \x1b[0;31mb\x1b[0m\x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc) |
|
612 | \x1b[0;31mb\x1b[0m\x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc) | |
613 | \x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;36m 7:10ff5895aa57\x1b[0m (esc) |
|
613 | \x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m\x1b[0;36m 7:10ff5895aa57\x1b[0m (esc) | |
614 | \x1b[0;35mm\x1b[0m\x1b[0;36m 17:df343b0df04f\x1b[0m (inactive) (esc) |
|
614 | \x1b[0;35mm\x1b[0m\x1b[0;36m 17:df343b0df04f\x1b[0m (inactive) (esc) | |
615 | \x1b[0;34mc\x1b[0m\x1b[0;36m 14:f894c25619d3\x1b[0m (closed) (esc) |
|
615 | \x1b[0;34mc\x1b[0m\x1b[0;36m 14:f894c25619d3\x1b[0m (closed) (esc) | |
616 | \x1b[0;35ma\x1b[0m\x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) |
|
616 | \x1b[0;35ma\x1b[0m\x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | |
617 | \x1b[0;35mdefault\x1b[0m\x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
|
617 | \x1b[0;35mdefault\x1b[0m\x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) | |
618 |
|
618 | |||
619 | template output: |
|
619 | template output: | |
620 |
|
620 | |||
621 | $ hg branches -Tjson --closed |
|
621 | $ hg branches -Tjson --closed | |
622 | [ |
|
622 | [ | |
623 | { |
|
623 | { | |
624 | "active": true, |
|
624 | "active": true, | |
625 | "branch": "md", |
|
625 | "branch": "md", | |
626 | "closed": false, |
|
626 | "closed": false, | |
627 | "current": false, |
|
627 | "current": false, | |
628 | "node": "c914c99f1fbb2b1d785a0a939ed3f67275df18e9", |
|
628 | "node": "c914c99f1fbb2b1d785a0a939ed3f67275df18e9", | |
629 | "rev": 18 |
|
629 | "rev": 18 | |
630 | }, |
|
630 | }, | |
631 | { |
|
631 | { | |
632 | "active": true, |
|
632 | "active": true, | |
633 | "branch": "b", |
|
633 | "branch": "b", | |
634 | "closed": false, |
|
634 | "closed": false, | |
635 | "current": true, |
|
635 | "current": true, | |
636 | "node": "e23b5505d1ad24aab6f84fd8c7cb8cd8e5e93be0", |
|
636 | "node": "e23b5505d1ad24aab6f84fd8c7cb8cd8e5e93be0", | |
637 | "rev": 13 |
|
637 | "rev": 13 | |
638 | }, |
|
638 | }, | |
639 | { |
|
639 | { | |
640 | "active": true, |
|
640 | "active": true, | |
641 | "branch": "a branch name much longer than the default justification used by branches", |
|
641 | "branch": "a branch name much longer than the default justification used by branches", | |
642 | "closed": false, |
|
642 | "closed": false, | |
643 | "current": false, |
|
643 | "current": false, | |
644 | "node": "10ff5895aa5793bd378da574af8cec8ea408d831", |
|
644 | "node": "10ff5895aa5793bd378da574af8cec8ea408d831", | |
645 | "rev": 7 |
|
645 | "rev": 7 | |
646 | }, |
|
646 | }, | |
647 | { |
|
647 | { | |
648 | "active": false, |
|
648 | "active": false, | |
649 | "branch": "m", |
|
649 | "branch": "m", | |
650 | "closed": false, |
|
650 | "closed": false, | |
651 | "current": false, |
|
651 | "current": false, | |
652 | "node": "df343b0df04feb2a946cd4b6e9520e552fef14ee", |
|
652 | "node": "df343b0df04feb2a946cd4b6e9520e552fef14ee", | |
653 | "rev": 17 |
|
653 | "rev": 17 | |
654 | }, |
|
654 | }, | |
655 | { |
|
655 | { | |
656 | "active": false, |
|
656 | "active": false, | |
657 | "branch": "c", |
|
657 | "branch": "c", | |
658 | "closed": true, |
|
658 | "closed": true, | |
659 | "current": false, |
|
659 | "current": false, | |
660 | "node": "f894c25619d3f1484639d81be950e0a07bc6f1f6", |
|
660 | "node": "f894c25619d3f1484639d81be950e0a07bc6f1f6", | |
661 | "rev": 14 |
|
661 | "rev": 14 | |
662 | }, |
|
662 | }, | |
663 | { |
|
663 | { | |
664 | "active": false, |
|
664 | "active": false, | |
665 | "branch": "a", |
|
665 | "branch": "a", | |
666 | "closed": false, |
|
666 | "closed": false, | |
667 | "current": false, |
|
667 | "current": false, | |
668 | "node": "d8cbc61dbaa6dc817175d1e301eecb863f280832", |
|
668 | "node": "d8cbc61dbaa6dc817175d1e301eecb863f280832", | |
669 | "rev": 5 |
|
669 | "rev": 5 | |
670 | }, |
|
670 | }, | |
671 | { |
|
671 | { | |
672 | "active": false, |
|
672 | "active": false, | |
673 | "branch": "default", |
|
673 | "branch": "default", | |
674 | "closed": false, |
|
674 | "closed": false, | |
675 | "current": false, |
|
675 | "current": false, | |
676 | "node": "19709c5a4e75bf938f8e349aff97438539bb729e", |
|
676 | "node": "19709c5a4e75bf938f8e349aff97438539bb729e", | |
677 | "rev": 0 |
|
677 | "rev": 0 | |
678 | } |
|
678 | } | |
679 | ] |
|
679 | ] | |
680 |
|
680 | |||
681 | $ hg branches --closed -T '{if(closed, "{branch}\n")}' |
|
681 | $ hg branches --closed -T '{if(closed, "{branch}\n")}' | |
682 | c |
|
682 | c | |
683 |
|
683 | |||
684 | $ hg branches -T '{word(0, branch)}: {desc|firstline}\n' |
|
684 | $ hg branches -T '{word(0, branch)}: {desc|firstline}\n' | |
685 | md: merge head 2 |
|
685 | md: merge head 2 | |
686 | b: reopen branch with a change |
|
686 | b: reopen branch with a change | |
687 | a: Adding d branch |
|
687 | a: Adding d branch | |
688 | m: head 2 |
|
688 | m: head 2 | |
689 | a: Adding b branch head 2 |
|
689 | a: Adding b branch head 2 | |
690 | default: Adding root node |
|
690 | default: Adding root node | |
691 |
|
691 | |||
692 | $ cat <<'EOF' > "$TESTTMP/map-myjson" |
|
692 | $ cat <<'EOF' > "$TESTTMP/map-myjson" | |
693 | > docheader = '\{\n' |
|
693 | > docheader = '\{\n' | |
694 | > docfooter = '\n}\n' |
|
694 | > docfooter = '\n}\n' | |
695 | > separator = ',\n' |
|
695 | > separator = ',\n' | |
696 | > branches = ' {dict(branch, node|short)|json}' |
|
696 | > branches = ' {dict(branch, node|short)|json}' | |
697 | > EOF |
|
697 | > EOF | |
698 | $ hg branches -T "$TESTTMP/map-myjson" |
|
698 | $ hg branches -T "$TESTTMP/map-myjson" | |
699 | { |
|
699 | { | |
700 | {"branch": "md", "node": "c914c99f1fbb"}, |
|
700 | {"branch": "md", "node": "c914c99f1fbb"}, | |
701 | {"branch": "b", "node": "e23b5505d1ad"}, |
|
701 | {"branch": "b", "node": "e23b5505d1ad"}, | |
702 | {"branch": "a branch *", "node": "10ff5895aa57"}, (glob) |
|
702 | {"branch": "a branch *", "node": "10ff5895aa57"}, (glob) | |
703 | {"branch": "m", "node": "df343b0df04f"}, |
|
703 | {"branch": "m", "node": "df343b0df04f"}, | |
704 | {"branch": "a", "node": "d8cbc61dbaa6"}, |
|
704 | {"branch": "a", "node": "d8cbc61dbaa6"}, | |
705 | {"branch": "default", "node": "19709c5a4e75"} |
|
705 | {"branch": "default", "node": "19709c5a4e75"} | |
706 | } |
|
706 | } | |
707 |
|
707 | |||
708 | $ cat <<'EOF' >> .hg/hgrc |
|
708 | $ cat <<'EOF' >> .hg/hgrc | |
709 | > [templates] |
|
709 | > [templates] | |
710 | > myjson = ' {dict(branch, node|short)|json}' |
|
710 | > myjson = ' {dict(branch, node|short)|json}' | |
711 | > myjson:docheader = '\{\n' |
|
711 | > myjson:docheader = '\{\n' | |
712 | > myjson:docfooter = '\n}\n' |
|
712 | > myjson:docfooter = '\n}\n' | |
713 | > myjson:separator = ',\n' |
|
713 | > myjson:separator = ',\n' | |
714 | > EOF |
|
714 | > EOF | |
715 | $ hg branches -T myjson |
|
715 | $ hg branches -T myjson | |
716 | { |
|
716 | { | |
717 | {"branch": "md", "node": "c914c99f1fbb"}, |
|
717 | {"branch": "md", "node": "c914c99f1fbb"}, | |
718 | {"branch": "b", "node": "e23b5505d1ad"}, |
|
718 | {"branch": "b", "node": "e23b5505d1ad"}, | |
719 | {"branch": "a branch *", "node": "10ff5895aa57"}, (glob) |
|
719 | {"branch": "a branch *", "node": "10ff5895aa57"}, (glob) | |
720 | {"branch": "m", "node": "df343b0df04f"}, |
|
720 | {"branch": "m", "node": "df343b0df04f"}, | |
721 | {"branch": "a", "node": "d8cbc61dbaa6"}, |
|
721 | {"branch": "a", "node": "d8cbc61dbaa6"}, | |
722 | {"branch": "default", "node": "19709c5a4e75"} |
|
722 | {"branch": "default", "node": "19709c5a4e75"} | |
723 | } |
|
723 | } | |
724 |
|
724 | |||
725 | $ cat <<'EOF' >> .hg/hgrc |
|
725 | $ cat <<'EOF' >> .hg/hgrc | |
726 | > [templates] |
|
726 | > [templates] | |
727 | > :docheader = 'should not be selected as a docheader for literal templates\n' |
|
727 | > :docheader = 'should not be selected as a docheader for literal templates\n' | |
728 | > EOF |
|
728 | > EOF | |
729 | $ hg branches -T '{branch}\n' |
|
729 | $ hg branches -T '{branch}\n' | |
730 | md |
|
730 | md | |
731 | b |
|
731 | b | |
732 | a branch name much longer than the default justification used by branches |
|
732 | a branch name much longer than the default justification used by branches | |
733 | m |
|
733 | m | |
734 | a |
|
734 | a | |
735 | default |
|
735 | default | |
736 |
|
736 | |||
737 | Tests of revision branch name caching |
|
737 | Tests of revision branch name caching | |
738 |
|
738 | |||
739 | We rev branch cache is updated automatically. In these tests we use a trick to |
|
739 | We rev branch cache is updated automatically. In these tests we use a trick to | |
740 | trigger rebuilds. We remove the branch head cache and run 'hg head' to cause a |
|
740 | trigger rebuilds. We remove the branch head cache and run 'hg head' to cause a | |
741 | rebuild that also will populate the rev branch cache. |
|
741 | rebuild that also will populate the rev branch cache. | |
742 |
|
742 | |||
743 | revision branch cache is created when building the branch head cache |
|
743 | revision branch cache is created when building the branch head cache | |
744 | $ rm -rf .hg/cache; hg head a -T '{rev}\n' |
|
744 | $ rm -rf .hg/cache; hg head a -T '{rev}\n' | |
745 | 5 |
|
745 | 5 | |
746 | $ f --hexdump --size .hg/cache/rbc-* |
|
746 | $ f --hexdump --size .hg/cache/rbc-* | |
747 | .hg/cache/rbc-names-v1: size=92 |
|
747 | .hg/cache/rbc-names-v1: size=92 | |
748 | 0000: 64 65 66 61 75 6c 74 00 61 00 62 00 63 00 61 20 |default.a.b.c.a | |
|
748 | 0000: 64 65 66 61 75 6c 74 00 61 00 62 00 63 00 61 20 |default.a.b.c.a | | |
749 | 0010: 62 72 61 6e 63 68 20 6e 61 6d 65 20 6d 75 63 68 |branch name much| |
|
749 | 0010: 62 72 61 6e 63 68 20 6e 61 6d 65 20 6d 75 63 68 |branch name much| | |
750 | 0020: 20 6c 6f 6e 67 65 72 20 74 68 61 6e 20 74 68 65 | longer than the| |
|
750 | 0020: 20 6c 6f 6e 67 65 72 20 74 68 61 6e 20 74 68 65 | longer than the| | |
751 | 0030: 20 64 65 66 61 75 6c 74 20 6a 75 73 74 69 66 69 | default justifi| |
|
751 | 0030: 20 64 65 66 61 75 6c 74 20 6a 75 73 74 69 66 69 | default justifi| | |
752 | 0040: 63 61 74 69 6f 6e 20 75 73 65 64 20 62 79 20 62 |cation used by b| |
|
752 | 0040: 63 61 74 69 6f 6e 20 75 73 65 64 20 62 79 20 62 |cation used by b| | |
753 | 0050: 72 61 6e 63 68 65 73 00 6d 00 6d 64 |ranches.m.md| |
|
753 | 0050: 72 61 6e 63 68 65 73 00 6d 00 6d 64 |ranches.m.md| | |
754 | .hg/cache/rbc-revs-v1: size=160 |
|
754 | .hg/cache/rbc-revs-v1: size=160 | |
755 | 0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....| |
|
755 | 0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....| | |
756 | 0010: 88 1f e2 b9 00 00 00 01 ac 22 03 33 00 00 00 02 |.........".3....| |
|
756 | 0010: 88 1f e2 b9 00 00 00 01 ac 22 03 33 00 00 00 02 |.........".3....| | |
757 | 0020: ae e3 9c d1 00 00 00 02 d8 cb c6 1d 00 00 00 01 |................| |
|
757 | 0020: ae e3 9c d1 00 00 00 02 d8 cb c6 1d 00 00 00 01 |................| | |
758 | 0030: 58 97 36 a2 00 00 00 03 10 ff 58 95 00 00 00 04 |X.6.......X.....| |
|
758 | 0030: 58 97 36 a2 00 00 00 03 10 ff 58 95 00 00 00 04 |X.6.......X.....| | |
759 | 0040: ee bb 94 44 00 00 00 02 5f 40 61 bb 00 00 00 02 |...D...._@a.....| |
|
759 | 0040: ee bb 94 44 00 00 00 02 5f 40 61 bb 00 00 00 02 |...D...._@a.....| | |
760 | 0050: bf be 84 1b 00 00 00 02 d3 f1 63 45 80 00 00 02 |..........cE....| |
|
760 | 0050: bf be 84 1b 00 00 00 02 d3 f1 63 45 80 00 00 02 |..........cE....| | |
761 | 0060: e3 d4 9c 05 80 00 00 02 e2 3b 55 05 00 00 00 02 |.........;U.....| |
|
761 | 0060: e3 d4 9c 05 80 00 00 02 e2 3b 55 05 00 00 00 02 |.........;U.....| | |
762 | 0070: f8 94 c2 56 80 00 00 03 f3 44 76 37 00 00 00 05 |...V.....Dv7....| |
|
762 | 0070: f8 94 c2 56 80 00 00 03 f3 44 76 37 00 00 00 05 |...V.....Dv7....| | |
763 | 0080: a5 8c a5 d3 00 00 00 05 df 34 3b 0d 00 00 00 05 |.........4;.....| |
|
763 | 0080: a5 8c a5 d3 00 00 00 05 df 34 3b 0d 00 00 00 05 |.........4;.....| | |
764 | 0090: c9 14 c9 9f 00 00 00 06 cd 21 a8 0b 80 00 00 05 |.........!......| |
|
764 | 0090: c9 14 c9 9f 00 00 00 06 cd 21 a8 0b 80 00 00 05 |.........!......| | |
765 |
|
765 | |||
766 | no errors when revbranchcache is not writable |
|
766 | no errors when revbranchcache is not writable | |
767 |
|
767 | |||
768 | $ echo >> .hg/cache/rbc-revs-v1 |
|
768 | $ echo >> .hg/cache/rbc-revs-v1 | |
769 | $ mv .hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1_ |
|
769 | $ mv .hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1_ | |
770 | $ mkdir .hg/cache/rbc-revs-v1 |
|
770 | $ mkdir .hg/cache/rbc-revs-v1 | |
771 | $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' |
|
771 | $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' | |
772 | 5 |
|
772 | 5 | |
773 | $ rmdir .hg/cache/rbc-revs-v1 |
|
773 | $ rmdir .hg/cache/rbc-revs-v1 | |
774 | $ mv .hg/cache/rbc-revs-v1_ .hg/cache/rbc-revs-v1 |
|
774 | $ mv .hg/cache/rbc-revs-v1_ .hg/cache/rbc-revs-v1 | |
775 |
|
775 | |||
776 | no errors when wlock cannot be acquired |
|
776 | no errors when wlock cannot be acquired | |
777 |
|
777 | |||
778 | #if unix-permissions |
|
778 | #if unix-permissions | |
779 | $ mv .hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1_ |
|
779 | $ mv .hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1_ | |
780 | $ rm -f .hg/cache/branch* |
|
780 | $ rm -f .hg/cache/branch* | |
781 | $ chmod 555 .hg |
|
781 | $ chmod 555 .hg | |
782 | $ hg head a -T '{rev}\n' |
|
782 | $ hg head a -T '{rev}\n' | |
783 | 5 |
|
783 | 5 | |
784 | $ chmod 755 .hg |
|
784 | $ chmod 755 .hg | |
785 | $ mv .hg/cache/rbc-revs-v1_ .hg/cache/rbc-revs-v1 |
|
785 | $ mv .hg/cache/rbc-revs-v1_ .hg/cache/rbc-revs-v1 | |
786 | #endif |
|
786 | #endif | |
787 |
|
787 | |||
788 | recovery from invalid cache revs file with trailing data |
|
788 | recovery from invalid cache revs file with trailing data | |
789 | $ echo >> .hg/cache/rbc-revs-v1 |
|
789 | $ echo >> .hg/cache/rbc-revs-v1 | |
790 | $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug |
|
790 | $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug | |
791 | 5 |
|
791 | 5 | |
792 | truncating cache/rbc-revs-v1 to 160 |
|
792 | truncating cache/rbc-revs-v1 to 160 | |
793 | $ f --size .hg/cache/rbc-revs* |
|
793 | $ f --size .hg/cache/rbc-revs* | |
794 | .hg/cache/rbc-revs-v1: size=160 |
|
794 | .hg/cache/rbc-revs-v1: size=160 | |
795 | recovery from invalid cache file with partial last record |
|
795 | recovery from invalid cache file with partial last record | |
796 | $ mv .hg/cache/rbc-revs-v1 . |
|
796 | $ mv .hg/cache/rbc-revs-v1 . | |
797 | $ f -qDB 119 rbc-revs-v1 > .hg/cache/rbc-revs-v1 |
|
797 | $ f -qDB 119 rbc-revs-v1 > .hg/cache/rbc-revs-v1 | |
798 | $ f --size .hg/cache/rbc-revs* |
|
798 | $ f --size .hg/cache/rbc-revs* | |
799 | .hg/cache/rbc-revs-v1: size=119 |
|
799 | .hg/cache/rbc-revs-v1: size=119 | |
800 | $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug |
|
800 | $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug | |
801 | 5 |
|
801 | 5 | |
802 | truncating cache/rbc-revs-v1 to 112 |
|
802 | truncating cache/rbc-revs-v1 to 112 | |
803 | $ f --size .hg/cache/rbc-revs* |
|
803 | $ f --size .hg/cache/rbc-revs* | |
804 | .hg/cache/rbc-revs-v1: size=160 |
|
804 | .hg/cache/rbc-revs-v1: size=160 | |
805 | recovery from invalid cache file with missing record - no truncation |
|
805 | recovery from invalid cache file with missing record - no truncation | |
806 | $ mv .hg/cache/rbc-revs-v1 . |
|
806 | $ mv .hg/cache/rbc-revs-v1 . | |
807 | $ f -qDB 112 rbc-revs-v1 > .hg/cache/rbc-revs-v1 |
|
807 | $ f -qDB 112 rbc-revs-v1 > .hg/cache/rbc-revs-v1 | |
808 | $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug |
|
808 | $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug | |
809 | 5 |
|
809 | 5 | |
810 | $ f --size .hg/cache/rbc-revs* |
|
810 | $ f --size .hg/cache/rbc-revs* | |
811 | .hg/cache/rbc-revs-v1: size=160 |
|
811 | .hg/cache/rbc-revs-v1: size=160 | |
812 | recovery from invalid cache file with some bad records |
|
812 | recovery from invalid cache file with some bad records | |
813 | $ mv .hg/cache/rbc-revs-v1 . |
|
813 | $ mv .hg/cache/rbc-revs-v1 . | |
814 | $ f -qDB 8 rbc-revs-v1 > .hg/cache/rbc-revs-v1 |
|
814 | $ f -qDB 8 rbc-revs-v1 > .hg/cache/rbc-revs-v1 | |
815 | $ f --size .hg/cache/rbc-revs* |
|
815 | $ f --size .hg/cache/rbc-revs* | |
816 | .hg/cache/rbc-revs-v1: size=8 |
|
816 | .hg/cache/rbc-revs-v1: size=8 | |
817 | $ f -qDB 112 rbc-revs-v1 >> .hg/cache/rbc-revs-v1 |
|
817 | $ f -qDB 112 rbc-revs-v1 >> .hg/cache/rbc-revs-v1 | |
818 | $ f --size .hg/cache/rbc-revs* |
|
818 | $ f --size .hg/cache/rbc-revs* | |
819 | .hg/cache/rbc-revs-v1: size=120 |
|
819 | .hg/cache/rbc-revs-v1: size=120 | |
820 | $ hg log -r 'branch(.)' -T '{rev} ' --debug |
|
820 | $ hg log -r 'branch(.)' -T '{rev} ' --debug | |
821 | history modification detected - truncating revision branch cache to revision 13 |
|
821 | history modification detected - truncating revision branch cache to revision 13 | |
822 | history modification detected - truncating revision branch cache to revision 1 |
|
822 | history modification detected - truncating revision branch cache to revision 1 | |
823 | 3 4 8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 8 |
|
823 | 3 4 8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 8 | |
824 | $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug |
|
824 | $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug | |
825 | 5 |
|
825 | 5 | |
826 | truncating cache/rbc-revs-v1 to 104 |
|
826 | truncating cache/rbc-revs-v1 to 104 | |
827 | $ f --size --hexdump --bytes=16 .hg/cache/rbc-revs* |
|
827 | $ f --size --hexdump --bytes=16 .hg/cache/rbc-revs* | |
828 | .hg/cache/rbc-revs-v1: size=160 |
|
828 | .hg/cache/rbc-revs-v1: size=160 | |
829 | 0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....| |
|
829 | 0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....| | |
830 | cache is updated when committing |
|
830 | cache is updated when committing | |
831 | $ hg branch i-will-regret-this |
|
831 | $ hg branch i-will-regret-this | |
832 | marked working directory as branch i-will-regret-this |
|
832 | marked working directory as branch i-will-regret-this | |
833 | $ hg ci -m regrets |
|
833 | $ hg ci -m regrets | |
834 | $ f --size .hg/cache/rbc-* |
|
834 | $ f --size .hg/cache/rbc-* | |
835 | .hg/cache/rbc-names-v1: size=111 |
|
835 | .hg/cache/rbc-names-v1: size=111 | |
836 | .hg/cache/rbc-revs-v1: size=168 |
|
836 | .hg/cache/rbc-revs-v1: size=168 | |
837 | update after rollback - the cache will be correct but rbc-names will will still |
|
837 | update after rollback - the cache will be correct but rbc-names will will still | |
838 | contain the branch name even though it no longer is used |
|
838 | contain the branch name even though it no longer is used | |
839 | $ hg up -qr '.^' |
|
839 | $ hg up -qr '.^' | |
840 | $ hg rollback -qf |
|
840 | $ hg rollback -qf | |
841 | $ f --size --hexdump .hg/cache/rbc-* |
|
841 | $ f --size --hexdump .hg/cache/rbc-* | |
842 | .hg/cache/rbc-names-v1: size=111 |
|
842 | .hg/cache/rbc-names-v1: size=111 | |
843 | 0000: 64 65 66 61 75 6c 74 00 61 00 62 00 63 00 61 20 |default.a.b.c.a | |
|
843 | 0000: 64 65 66 61 75 6c 74 00 61 00 62 00 63 00 61 20 |default.a.b.c.a | | |
844 | 0010: 62 72 61 6e 63 68 20 6e 61 6d 65 20 6d 75 63 68 |branch name much| |
|
844 | 0010: 62 72 61 6e 63 68 20 6e 61 6d 65 20 6d 75 63 68 |branch name much| | |
845 | 0020: 20 6c 6f 6e 67 65 72 20 74 68 61 6e 20 74 68 65 | longer than the| |
|
845 | 0020: 20 6c 6f 6e 67 65 72 20 74 68 61 6e 20 74 68 65 | longer than the| | |
846 | 0030: 20 64 65 66 61 75 6c 74 20 6a 75 73 74 69 66 69 | default justifi| |
|
846 | 0030: 20 64 65 66 61 75 6c 74 20 6a 75 73 74 69 66 69 | default justifi| | |
847 | 0040: 63 61 74 69 6f 6e 20 75 73 65 64 20 62 79 20 62 |cation used by b| |
|
847 | 0040: 63 61 74 69 6f 6e 20 75 73 65 64 20 62 79 20 62 |cation used by b| | |
848 | 0050: 72 61 6e 63 68 65 73 00 6d 00 6d 64 00 69 2d 77 |ranches.m.md.i-w| |
|
848 | 0050: 72 61 6e 63 68 65 73 00 6d 00 6d 64 00 69 2d 77 |ranches.m.md.i-w| | |
849 | 0060: 69 6c 6c 2d 72 65 67 72 65 74 2d 74 68 69 73 |ill-regret-this| |
|
849 | 0060: 69 6c 6c 2d 72 65 67 72 65 74 2d 74 68 69 73 |ill-regret-this| | |
850 | .hg/cache/rbc-revs-v1: size=160 |
|
850 | .hg/cache/rbc-revs-v1: size=160 | |
851 | 0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....| |
|
851 | 0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....| | |
852 | 0010: 88 1f e2 b9 00 00 00 01 ac 22 03 33 00 00 00 02 |.........".3....| |
|
852 | 0010: 88 1f e2 b9 00 00 00 01 ac 22 03 33 00 00 00 02 |.........".3....| | |
853 | 0020: ae e3 9c d1 00 00 00 02 d8 cb c6 1d 00 00 00 01 |................| |
|
853 | 0020: ae e3 9c d1 00 00 00 02 d8 cb c6 1d 00 00 00 01 |................| | |
854 | 0030: 58 97 36 a2 00 00 00 03 10 ff 58 95 00 00 00 04 |X.6.......X.....| |
|
854 | 0030: 58 97 36 a2 00 00 00 03 10 ff 58 95 00 00 00 04 |X.6.......X.....| | |
855 | 0040: ee bb 94 44 00 00 00 02 5f 40 61 bb 00 00 00 02 |...D...._@a.....| |
|
855 | 0040: ee bb 94 44 00 00 00 02 5f 40 61 bb 00 00 00 02 |...D...._@a.....| | |
856 | 0050: bf be 84 1b 00 00 00 02 d3 f1 63 45 80 00 00 02 |..........cE....| |
|
856 | 0050: bf be 84 1b 00 00 00 02 d3 f1 63 45 80 00 00 02 |..........cE....| | |
857 | 0060: e3 d4 9c 05 80 00 00 02 e2 3b 55 05 00 00 00 02 |.........;U.....| |
|
857 | 0060: e3 d4 9c 05 80 00 00 02 e2 3b 55 05 00 00 00 02 |.........;U.....| | |
858 | 0070: f8 94 c2 56 80 00 00 03 f3 44 76 37 00 00 00 05 |...V.....Dv7....| |
|
858 | 0070: f8 94 c2 56 80 00 00 03 f3 44 76 37 00 00 00 05 |...V.....Dv7....| | |
859 | 0080: a5 8c a5 d3 00 00 00 05 df 34 3b 0d 00 00 00 05 |.........4;.....| |
|
859 | 0080: a5 8c a5 d3 00 00 00 05 df 34 3b 0d 00 00 00 05 |.........4;.....| | |
860 | 0090: c9 14 c9 9f 00 00 00 06 cd 21 a8 0b 80 00 00 05 |.........!......| |
|
860 | 0090: c9 14 c9 9f 00 00 00 06 cd 21 a8 0b 80 00 00 05 |.........!......| | |
861 | cache is updated/truncated when stripping - it is thus very hard to get in a |
|
861 | cache is updated/truncated when stripping - it is thus very hard to get in a | |
862 | situation where the cache is out of sync and the hash check detects it |
|
862 | situation where the cache is out of sync and the hash check detects it | |
863 | $ hg --config extensions.strip= strip -r tip --nob |
|
863 | $ hg --config extensions.strip= strip -r tip --nob | |
864 | $ f --size .hg/cache/rbc-revs* |
|
864 | $ f --size .hg/cache/rbc-revs* | |
865 | .hg/cache/rbc-revs-v1: size=152 |
|
865 | .hg/cache/rbc-revs-v1: size=152 | |
866 |
|
866 | |||
867 | cache is rebuilt when corruption is detected |
|
867 | cache is rebuilt when corruption is detected | |
868 | $ echo > .hg/cache/rbc-names-v1 |
|
868 | $ echo > .hg/cache/rbc-names-v1 | |
869 | $ hg log -r '5:&branch(.)' -T '{rev} ' --debug |
|
869 | $ hg log -r '5:&branch(.)' -T '{rev} ' --debug | |
870 | referenced branch names not found - rebuilding revision branch cache from scratch |
|
870 | referenced branch names not found - rebuilding revision branch cache from scratch | |
871 | 8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 40 |
|
871 | 8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 40 | |
872 | $ f --size --hexdump .hg/cache/rbc-* |
|
872 | $ f --size --hexdump .hg/cache/rbc-* | |
873 | .hg/cache/rbc-names-v1: size=84 |
|
873 | .hg/cache/rbc-names-v1: size=84 | |
874 | 0000: 62 00 61 00 63 00 61 20 62 72 61 6e 63 68 20 6e |b.a.c.a branch n| |
|
874 | 0000: 62 00 61 00 63 00 61 20 62 72 61 6e 63 68 20 6e |b.a.c.a branch n| | |
875 | 0010: 61 6d 65 20 6d 75 63 68 20 6c 6f 6e 67 65 72 20 |ame much longer | |
|
875 | 0010: 61 6d 65 20 6d 75 63 68 20 6c 6f 6e 67 65 72 20 |ame much longer | | |
876 | 0020: 74 68 61 6e 20 74 68 65 20 64 65 66 61 75 6c 74 |than the default| |
|
876 | 0020: 74 68 61 6e 20 74 68 65 20 64 65 66 61 75 6c 74 |than the default| | |
877 | 0030: 20 6a 75 73 74 69 66 69 63 61 74 69 6f 6e 20 75 | justification u| |
|
877 | 0030: 20 6a 75 73 74 69 66 69 63 61 74 69 6f 6e 20 75 | justification u| | |
878 | 0040: 73 65 64 20 62 79 20 62 72 61 6e 63 68 65 73 00 |sed by branches.| |
|
878 | 0040: 73 65 64 20 62 79 20 62 72 61 6e 63 68 65 73 00 |sed by branches.| | |
879 | 0050: 6d 00 6d 64 |m.md| |
|
879 | 0050: 6d 00 6d 64 |m.md| | |
880 | .hg/cache/rbc-revs-v1: size=152 |
|
880 | .hg/cache/rbc-revs-v1: size=152 | |
881 | 0000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| |
|
881 | 0000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| | |
882 | 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| |
|
882 | 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| | |
883 | 0020: 00 00 00 00 00 00 00 00 d8 cb c6 1d 00 00 00 01 |................| |
|
883 | 0020: 00 00 00 00 00 00 00 00 d8 cb c6 1d 00 00 00 01 |................| | |
884 | 0030: 58 97 36 a2 00 00 00 02 10 ff 58 95 00 00 00 03 |X.6.......X.....| |
|
884 | 0030: 58 97 36 a2 00 00 00 02 10 ff 58 95 00 00 00 03 |X.6.......X.....| | |
885 | 0040: ee bb 94 44 00 00 00 00 5f 40 61 bb 00 00 00 00 |...D...._@a.....| |
|
885 | 0040: ee bb 94 44 00 00 00 00 5f 40 61 bb 00 00 00 00 |...D...._@a.....| | |
886 | 0050: bf be 84 1b 00 00 00 00 d3 f1 63 45 80 00 00 00 |..........cE....| |
|
886 | 0050: bf be 84 1b 00 00 00 00 d3 f1 63 45 80 00 00 00 |..........cE....| | |
887 | 0060: e3 d4 9c 05 80 00 00 00 e2 3b 55 05 00 00 00 00 |.........;U.....| |
|
887 | 0060: e3 d4 9c 05 80 00 00 00 e2 3b 55 05 00 00 00 00 |.........;U.....| | |
888 | 0070: f8 94 c2 56 80 00 00 02 f3 44 76 37 00 00 00 04 |...V.....Dv7....| |
|
888 | 0070: f8 94 c2 56 80 00 00 02 f3 44 76 37 00 00 00 04 |...V.....Dv7....| | |
889 | 0080: a5 8c a5 d3 00 00 00 04 df 34 3b 0d 00 00 00 04 |.........4;.....| |
|
889 | 0080: a5 8c a5 d3 00 00 00 04 df 34 3b 0d 00 00 00 04 |.........4;.....| | |
890 | 0090: c9 14 c9 9f 00 00 00 05 |........| |
|
890 | 0090: c9 14 c9 9f 00 00 00 05 |........| | |
891 |
|
891 | |||
892 | Test that cache files are created and grows correctly: |
|
892 | Test that cache files are created and grows correctly: | |
893 |
|
893 | |||
894 | $ rm .hg/cache/rbc* |
|
894 | $ rm .hg/cache/rbc* | |
895 | $ hg log -r "5 & branch(5)" -T "{rev}\n" |
|
895 | $ hg log -r "5 & branch(5)" -T "{rev}\n" | |
896 | 5 |
|
896 | 5 | |
897 | $ f --size --hexdump .hg/cache/rbc-* |
|
897 | $ f --size --hexdump .hg/cache/rbc-* | |
898 | .hg/cache/rbc-names-v1: size=1 |
|
898 | .hg/cache/rbc-names-v1: size=1 | |
899 | 0000: 61 |a| |
|
899 | 0000: 61 |a| | |
900 | .hg/cache/rbc-revs-v1: size=152 |
|
900 | .hg/cache/rbc-revs-v1: size=152 | |
901 | 0000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| |
|
901 | 0000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| | |
902 | 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| |
|
902 | 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| | |
903 | 0020: 00 00 00 00 00 00 00 00 d8 cb c6 1d 00 00 00 00 |................| |
|
903 | 0020: 00 00 00 00 00 00 00 00 d8 cb c6 1d 00 00 00 00 |................| | |
904 | 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| |
|
904 | 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| | |
905 | 0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| |
|
905 | 0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| | |
906 | 0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| |
|
906 | 0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| | |
907 | 0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| |
|
907 | 0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| | |
908 | 0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| |
|
908 | 0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| | |
909 | 0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| |
|
909 | 0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| | |
910 | 0090: 00 00 00 00 00 00 00 00 |........| |
|
910 | 0090: 00 00 00 00 00 00 00 00 |........| | |
911 |
|
911 | |||
912 | $ cd .. |
|
912 | $ cd .. | |
913 |
|
913 | |||
914 | Test for multiple incorrect branch cache entries: |
|
914 | Test for multiple incorrect branch cache entries: | |
915 |
|
915 | |||
916 | $ hg init b |
|
916 | $ hg init b | |
917 | $ cd b |
|
917 | $ cd b | |
918 | $ touch f |
|
918 | $ touch f | |
919 | $ hg ci -Aqmf |
|
919 | $ hg ci -Aqmf | |
920 | $ echo >> f |
|
920 | $ echo >> f | |
921 | $ hg ci -Amf |
|
921 | $ hg ci -Amf | |
922 | $ hg branch -q branch |
|
922 | $ hg branch -q branch | |
923 | $ hg ci -Amf |
|
923 | $ hg ci -Amf | |
924 |
|
924 | |||
925 | $ f --size --hexdump .hg/cache/rbc-* |
|
925 | $ f --size --hexdump .hg/cache/rbc-* | |
926 | .hg/cache/rbc-names-v1: size=14 |
|
926 | .hg/cache/rbc-names-v1: size=14 | |
927 | 0000: 64 65 66 61 75 6c 74 00 62 72 61 6e 63 68 |default.branch| |
|
927 | 0000: 64 65 66 61 75 6c 74 00 62 72 61 6e 63 68 |default.branch| | |
928 | .hg/cache/rbc-revs-v1: size=24 |
|
928 | .hg/cache/rbc-revs-v1: size=24 | |
929 | 0000: 66 e5 f5 aa 00 00 00 00 fa 4c 04 e5 00 00 00 00 |f........L......| |
|
929 | 0000: 66 e5 f5 aa 00 00 00 00 fa 4c 04 e5 00 00 00 00 |f........L......| | |
930 | 0010: 56 46 78 69 00 00 00 01 |VFxi....| |
|
930 | 0010: 56 46 78 69 00 00 00 01 |VFxi....| | |
931 | $ : > .hg/cache/rbc-revs-v1 |
|
931 | $ : > .hg/cache/rbc-revs-v1 | |
932 |
|
932 | |||
933 | No superfluous rebuilding of cache: |
|
933 | No superfluous rebuilding of cache: | |
934 | $ hg log -r "branch(null)&branch(branch)" --debug |
|
934 | $ hg log -r "branch(null)&branch(branch)" --debug | |
935 | $ f --size --hexdump .hg/cache/rbc-* |
|
935 | $ f --size --hexdump .hg/cache/rbc-* | |
936 | .hg/cache/rbc-names-v1: size=14 |
|
936 | .hg/cache/rbc-names-v1: size=14 | |
937 | 0000: 64 65 66 61 75 6c 74 00 62 72 61 6e 63 68 |default.branch| |
|
937 | 0000: 64 65 66 61 75 6c 74 00 62 72 61 6e 63 68 |default.branch| | |
938 | .hg/cache/rbc-revs-v1: size=24 |
|
938 | .hg/cache/rbc-revs-v1: size=24 | |
939 | 0000: 66 e5 f5 aa 00 00 00 00 fa 4c 04 e5 00 00 00 00 |f........L......| |
|
939 | 0000: 66 e5 f5 aa 00 00 00 00 fa 4c 04 e5 00 00 00 00 |f........L......| | |
940 | 0010: 56 46 78 69 00 00 00 01 |VFxi....| |
|
940 | 0010: 56 46 78 69 00 00 00 01 |VFxi....| | |
941 |
|
941 | |||
942 | $ cd .. |
|
942 | $ cd .. | |
943 |
|
943 | |||
944 | Test to make sure that `--close-branch` only works on a branch head: |
|
944 | Test to make sure that `--close-branch` only works on a branch head: | |
945 | -------------------------------------------------------------------- |
|
945 | -------------------------------------------------------------------- | |
946 | $ hg init closebranch |
|
946 | $ hg init closebranch | |
947 | $ cd closebranch |
|
947 | $ cd closebranch | |
948 | $ for ch in a b c; do |
|
948 | $ for ch in a b c; do | |
949 | > echo $ch > $ch |
|
949 | > echo $ch > $ch | |
950 | > hg add $ch |
|
950 | > hg add $ch | |
951 | > hg ci -m "added "$ch |
|
951 | > hg ci -m "added "$ch | |
952 | > done; |
|
952 | > done; | |
953 |
|
953 | |||
954 | $ hg up -r "desc('added b')" |
|
954 | $ hg up -r "desc('added b')" | |
955 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
955 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
956 |
|
956 | |||
957 | trying to close branch from a cset which is not a branch head |
|
957 | trying to close branch from a cset which is not a branch head | |
958 | it should abort: |
|
958 | it should abort: | |
959 | $ hg ci -m "closing branch" --close-branch |
|
959 | $ hg ci -m "closing branch" --close-branch | |
960 | abort: can only close branch heads |
|
960 | abort: can only close branch heads | |
961 | (use --force-close-branch to close branch from a non-head changeset) |
|
961 | (use --force-close-branch to close branch from a non-head changeset) | |
962 | [10] |
|
962 | [10] | |
963 |
|
963 | |||
964 | $ hg up 0 |
|
964 | $ hg up 0 | |
965 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
965 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
966 | $ hg log -GT "{rev}: {node|short} {desc|firstline}\n\t{branch}\n\n" |
|
966 | $ hg log -GT "{rev}: {node|short} {desc|firstline}\n\t{branch}\n\n" | |
967 | o 2: 155349b645be added c |
|
967 | o 2: 155349b645be added c | |
968 | | default |
|
968 | | default | |
969 | | |
|
969 | | | |
970 | o 1: 5f6d8a4bf34a added b |
|
970 | o 1: 5f6d8a4bf34a added b | |
971 | | default |
|
971 | | default | |
972 | | |
|
972 | | | |
973 | @ 0: 9092f1db7931 added a |
|
973 | @ 0: 9092f1db7931 added a | |
974 | default |
|
974 | default | |
975 |
|
975 | |||
976 | Test --force-close-branch to close a branch from a non-head changeset: |
|
976 | Test --force-close-branch to close a branch from a non-head changeset: | |
977 | --------------------------------------------------------------------- |
|
977 | --------------------------------------------------------------------- | |
978 |
|
978 | |||
979 | $ hg show stack --config extensions.show= |
|
979 | $ hg show stack --config extensions.show= | |
980 | o 1553 added c |
|
980 | o 1553 added c | |
981 | o 5f6d added b |
|
981 | o 5f6d added b | |
982 | @ 9092 added a |
|
982 | @ 9092 added a | |
983 |
|
983 | |||
984 | $ hg ci -m "branch closed" --close-branch |
|
984 | $ hg ci -m "branch closed" --close-branch | |
985 | abort: can only close branch heads |
|
985 | abort: can only close branch heads | |
986 | (use --force-close-branch to close branch from a non-head changeset) |
|
986 | (use --force-close-branch to close branch from a non-head changeset) | |
987 | [10] |
|
987 | [10] | |
988 |
|
988 | |||
989 | $ hg ci -m "branch closed" --force-close-branch |
|
989 | $ hg ci -m "branch closed" --force-close-branch | |
990 | created new head |
|
990 | created new head | |
991 | $ cd .. |
|
991 | $ cd .. | |
992 |
|
992 | |||
993 | Test various special cases for the branchmap |
|
993 | Test various special cases for the branchmap | |
994 | -------------------------------------------- |
|
994 | -------------------------------------------- | |
995 |
|
995 | |||
996 | Basic fork of the same branch |
|
996 | Basic fork of the same branch | |
997 |
|
997 | |||
998 | $ hg init branchmap-testing1 |
|
998 | $ hg init branchmap-testing1 | |
999 | $ cd branchmap-testing1 |
|
999 | $ cd branchmap-testing1 | |
1000 | $ hg debugbuild '@A . :base . :p1 *base /p1' |
|
1000 | $ hg debugbuild '@A . :base . :p1 *base /p1' | |
1001 | $ hg log -G |
|
1001 | $ hg log -G | |
1002 | o changeset: 3:71ca9a6d524e |
|
1002 | o changeset: 3:71ca9a6d524e | |
1003 | |\ branch: A |
|
1003 | |\ branch: A | |
1004 | | | tag: tip |
|
1004 | | | tag: tip | |
1005 | | | parent: 2:a3b807b3ff0b |
|
1005 | | | parent: 2:a3b807b3ff0b | |
1006 | | | parent: 1:99ba08759bc7 |
|
1006 | | | parent: 1:99ba08759bc7 | |
1007 | | | user: debugbuilddag |
|
1007 | | | user: debugbuilddag | |
1008 | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
1008 | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
1009 | | | summary: r3 |
|
1009 | | | summary: r3 | |
1010 | | | |
|
1010 | | | | |
1011 | | o changeset: 2:a3b807b3ff0b |
|
1011 | | o changeset: 2:a3b807b3ff0b | |
1012 | | | branch: A |
|
1012 | | | branch: A | |
1013 | | | parent: 0:2ab8003a1750 |
|
1013 | | | parent: 0:2ab8003a1750 | |
1014 | | | user: debugbuilddag |
|
1014 | | | user: debugbuilddag | |
1015 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
1015 | | | date: Thu Jan 01 00:00:02 1970 +0000 | |
1016 | | | summary: r2 |
|
1016 | | | summary: r2 | |
1017 | | | |
|
1017 | | | | |
1018 | o | changeset: 1:99ba08759bc7 |
|
1018 | o | changeset: 1:99ba08759bc7 | |
1019 | |/ branch: A |
|
1019 | |/ branch: A | |
1020 | | tag: p1 |
|
1020 | | tag: p1 | |
1021 | | user: debugbuilddag |
|
1021 | | user: debugbuilddag | |
1022 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1022 | | date: Thu Jan 01 00:00:01 1970 +0000 | |
1023 | | summary: r1 |
|
1023 | | summary: r1 | |
1024 | | |
|
1024 | | | |
1025 | o changeset: 0:2ab8003a1750 |
|
1025 | o changeset: 0:2ab8003a1750 | |
1026 | branch: A |
|
1026 | branch: A | |
1027 | tag: base |
|
1027 | tag: base | |
1028 | user: debugbuilddag |
|
1028 | user: debugbuilddag | |
1029 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1029 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1030 | summary: r0 |
|
1030 | summary: r0 | |
1031 |
|
1031 | |||
1032 | $ hg branches |
|
1032 | $ hg branches | |
1033 | A 3:71ca9a6d524e |
|
1033 | A 3:71ca9a6d524e | |
1034 | $ hg clone -r 1 -r 2 . ../branchmap-testing1-clone |
|
1034 | $ hg clone -r 1 -r 2 . ../branchmap-testing1-clone | |
1035 | adding changesets |
|
1035 | adding changesets | |
1036 | adding manifests |
|
1036 | adding manifests | |
1037 | adding file changes |
|
1037 | adding file changes | |
1038 | added 3 changesets with 0 changes to 0 files (+1 heads) |
|
1038 | added 3 changesets with 0 changes to 0 files (+1 heads) | |
1039 | new changesets 2ab8003a1750:a3b807b3ff0b |
|
1039 | new changesets 2ab8003a1750:a3b807b3ff0b | |
1040 | updating to branch A |
|
1040 | updating to branch A | |
1041 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1041 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1042 | $ cd ../branchmap-testing1-clone |
|
1042 | $ cd ../branchmap-testing1-clone | |
1043 | $ hg pull ../branchmap-testing1 |
|
1043 | $ hg pull ../branchmap-testing1 | |
1044 | pulling from ../branchmap-testing1 |
|
1044 | pulling from ../branchmap-testing1 | |
1045 | searching for changes |
|
1045 | searching for changes | |
1046 | adding changesets |
|
1046 | adding changesets | |
1047 | adding manifests |
|
1047 | adding manifests | |
1048 | adding file changes |
|
1048 | adding file changes | |
1049 | added 1 changesets with 0 changes to 0 files (-1 heads) |
|
1049 | added 1 changesets with 0 changes to 0 files (-1 heads) | |
1050 | new changesets 71ca9a6d524e |
|
1050 | new changesets 71ca9a6d524e | |
1051 | (run 'hg update' to get a working copy) |
|
1051 | (run 'hg update' to get a working copy) | |
1052 | $ hg branches |
|
1052 | $ hg branches | |
1053 | A 3:71ca9a6d524e |
|
1053 | A 3:71ca9a6d524e | |
1054 | $ cd .. |
|
1054 | $ cd .. | |
1055 |
|
1055 | |||
1056 | Switching to a different branch and back |
|
1056 | Switching to a different branch and back | |
1057 |
|
1057 | |||
1058 | $ hg init branchmap-testing2 |
|
1058 | $ hg init branchmap-testing2 | |
1059 | $ cd branchmap-testing2 |
|
1059 | $ cd branchmap-testing2 | |
1060 | $ hg debugbuild '@A . @B . @A .' |
|
1060 | $ hg debugbuild '@A . @B . @A .' | |
1061 | $ hg log -G |
|
1061 | $ hg log -G | |
1062 | o changeset: 2:9699e9f260b5 |
|
1062 | o changeset: 2:9699e9f260b5 | |
1063 | | branch: A |
|
1063 | | branch: A | |
1064 | | tag: tip |
|
1064 | | tag: tip | |
1065 | | user: debugbuilddag |
|
1065 | | user: debugbuilddag | |
1066 | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
1066 | | date: Thu Jan 01 00:00:02 1970 +0000 | |
1067 | | summary: r2 |
|
1067 | | summary: r2 | |
1068 | | |
|
1068 | | | |
1069 | o changeset: 1:0bc7d348d965 |
|
1069 | o changeset: 1:0bc7d348d965 | |
1070 | | branch: B |
|
1070 | | branch: B | |
1071 | | user: debugbuilddag |
|
1071 | | user: debugbuilddag | |
1072 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1072 | | date: Thu Jan 01 00:00:01 1970 +0000 | |
1073 | | summary: r1 |
|
1073 | | summary: r1 | |
1074 | | |
|
1074 | | | |
1075 | o changeset: 0:2ab8003a1750 |
|
1075 | o changeset: 0:2ab8003a1750 | |
1076 | branch: A |
|
1076 | branch: A | |
1077 | user: debugbuilddag |
|
1077 | user: debugbuilddag | |
1078 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1078 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1079 | summary: r0 |
|
1079 | summary: r0 | |
1080 |
|
1080 | |||
1081 | $ hg branches |
|
1081 | $ hg branches | |
1082 | A 2:9699e9f260b5 |
|
1082 | A 2:9699e9f260b5 | |
1083 | B 1:0bc7d348d965 (inactive) |
|
1083 | B 1:0bc7d348d965 (inactive) | |
1084 | $ hg clone -r 1 . ../branchmap-testing2-clone |
|
1084 | $ hg clone -r 1 . ../branchmap-testing2-clone | |
1085 | adding changesets |
|
1085 | adding changesets | |
1086 | adding manifests |
|
1086 | adding manifests | |
1087 | adding file changes |
|
1087 | adding file changes | |
1088 | added 2 changesets with 0 changes to 0 files |
|
1088 | added 2 changesets with 0 changes to 0 files | |
1089 | new changesets 2ab8003a1750:0bc7d348d965 |
|
1089 | new changesets 2ab8003a1750:0bc7d348d965 | |
1090 | updating to branch B |
|
1090 | updating to branch B | |
1091 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1091 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1092 | $ cd ../branchmap-testing2-clone |
|
1092 | $ cd ../branchmap-testing2-clone | |
1093 | $ hg pull ../branchmap-testing2 |
|
1093 | $ hg pull ../branchmap-testing2 | |
1094 | pulling from ../branchmap-testing2 |
|
1094 | pulling from ../branchmap-testing2 | |
1095 | searching for changes |
|
1095 | searching for changes | |
1096 | adding changesets |
|
1096 | adding changesets | |
1097 | adding manifests |
|
1097 | adding manifests | |
1098 | adding file changes |
|
1098 | adding file changes | |
1099 | added 1 changesets with 0 changes to 0 files |
|
1099 | added 1 changesets with 0 changes to 0 files | |
1100 | new changesets 9699e9f260b5 |
|
1100 | new changesets 9699e9f260b5 | |
1101 | (run 'hg update' to get a working copy) |
|
1101 | (run 'hg update' to get a working copy) | |
1102 | $ hg branches |
|
1102 | $ hg branches | |
1103 | A 2:9699e9f260b5 |
|
1103 | A 2:9699e9f260b5 | |
1104 | B 1:0bc7d348d965 (inactive) |
|
1104 | B 1:0bc7d348d965 (inactive) | |
1105 | $ cd .. |
|
1105 | $ cd .. | |
1106 |
|
1106 | |||
1107 | A fork on a branch switching to a different branch and back |
|
1107 | A fork on a branch switching to a different branch and back | |
1108 | is still collecting the fork. |
|
1108 | is still collecting the fork. | |
1109 |
|
1109 | |||
1110 | $ hg init branchmap-testing3 |
|
1110 | $ hg init branchmap-testing3 | |
1111 | $ cd branchmap-testing3 |
|
1111 | $ cd branchmap-testing3 | |
1112 | $ hg debugbuild '@A . :base . :p1 *base @B . @A /p1' |
|
1112 | $ hg debugbuild '@A . :base . :p1 *base @B . @A /p1' | |
1113 | $ hg log -G |
|
1113 | $ hg log -G | |
1114 | o changeset: 4:3614a1711d23 |
|
1114 | o changeset: 4:3614a1711d23 | |
1115 | |\ branch: A |
|
1115 | |\ branch: A | |
1116 | | | tag: tip |
|
1116 | | | tag: tip | |
1117 | | | parent: 3:e9c8abcf65aa |
|
1117 | | | parent: 3:e9c8abcf65aa | |
1118 | | | parent: 1:99ba08759bc7 |
|
1118 | | | parent: 1:99ba08759bc7 | |
1119 | | | user: debugbuilddag |
|
1119 | | | user: debugbuilddag | |
1120 | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
1120 | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
1121 | | | summary: r4 |
|
1121 | | | summary: r4 | |
1122 | | | |
|
1122 | | | | |
1123 | | o changeset: 3:e9c8abcf65aa |
|
1123 | | o changeset: 3:e9c8abcf65aa | |
1124 | | | branch: B |
|
1124 | | | branch: B | |
1125 | | | user: debugbuilddag |
|
1125 | | | user: debugbuilddag | |
1126 | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
1126 | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
1127 | | | summary: r3 |
|
1127 | | | summary: r3 | |
1128 | | | |
|
1128 | | | | |
1129 | | o changeset: 2:a3b807b3ff0b |
|
1129 | | o changeset: 2:a3b807b3ff0b | |
1130 | | | branch: A |
|
1130 | | | branch: A | |
1131 | | | parent: 0:2ab8003a1750 |
|
1131 | | | parent: 0:2ab8003a1750 | |
1132 | | | user: debugbuilddag |
|
1132 | | | user: debugbuilddag | |
1133 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
1133 | | | date: Thu Jan 01 00:00:02 1970 +0000 | |
1134 | | | summary: r2 |
|
1134 | | | summary: r2 | |
1135 | | | |
|
1135 | | | | |
1136 | o | changeset: 1:99ba08759bc7 |
|
1136 | o | changeset: 1:99ba08759bc7 | |
1137 | |/ branch: A |
|
1137 | |/ branch: A | |
1138 | | tag: p1 |
|
1138 | | tag: p1 | |
1139 | | user: debugbuilddag |
|
1139 | | user: debugbuilddag | |
1140 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1140 | | date: Thu Jan 01 00:00:01 1970 +0000 | |
1141 | | summary: r1 |
|
1141 | | summary: r1 | |
1142 | | |
|
1142 | | | |
1143 | o changeset: 0:2ab8003a1750 |
|
1143 | o changeset: 0:2ab8003a1750 | |
1144 | branch: A |
|
1144 | branch: A | |
1145 | tag: base |
|
1145 | tag: base | |
1146 | user: debugbuilddag |
|
1146 | user: debugbuilddag | |
1147 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1147 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1148 | summary: r0 |
|
1148 | summary: r0 | |
1149 |
|
1149 | |||
1150 | $ hg branches |
|
1150 | $ hg branches | |
1151 | A 4:3614a1711d23 |
|
1151 | A 4:3614a1711d23 | |
1152 | B 3:e9c8abcf65aa (inactive) |
|
1152 | B 3:e9c8abcf65aa (inactive) | |
1153 | $ hg clone -r 1 -r 3 . ../branchmap-testing3-clone |
|
1153 | $ hg clone -r 1 -r 3 . ../branchmap-testing3-clone | |
1154 | adding changesets |
|
1154 | adding changesets | |
1155 | adding manifests |
|
1155 | adding manifests | |
1156 | adding file changes |
|
1156 | adding file changes | |
1157 | added 4 changesets with 0 changes to 0 files (+1 heads) |
|
1157 | added 4 changesets with 0 changes to 0 files (+1 heads) | |
1158 | new changesets 2ab8003a1750:e9c8abcf65aa |
|
1158 | new changesets 2ab8003a1750:e9c8abcf65aa | |
1159 | updating to branch A |
|
1159 | updating to branch A | |
1160 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1160 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1161 | $ cd ../branchmap-testing3-clone |
|
1161 | $ cd ../branchmap-testing3-clone | |
1162 | $ hg pull ../branchmap-testing3 |
|
1162 | $ hg pull ../branchmap-testing3 | |
1163 | pulling from ../branchmap-testing3 |
|
1163 | pulling from ../branchmap-testing3 | |
1164 | searching for changes |
|
1164 | searching for changes | |
1165 | adding changesets |
|
1165 | adding changesets | |
1166 | adding manifests |
|
1166 | adding manifests | |
1167 | adding file changes |
|
1167 | adding file changes | |
1168 | added 1 changesets with 0 changes to 0 files (-1 heads) |
|
1168 | added 1 changesets with 0 changes to 0 files (-1 heads) | |
1169 | new changesets 3614a1711d23 |
|
1169 | new changesets 3614a1711d23 | |
1170 | (run 'hg update' to get a working copy) |
|
1170 | (run 'hg update' to get a working copy) | |
1171 | $ hg branches |
|
1171 | $ hg branches | |
1172 | A 4:3614a1711d23 |
|
1172 | A 4:3614a1711d23 | |
1173 | B 3:e9c8abcf65aa (inactive) |
|
1173 | B 3:e9c8abcf65aa (inactive) | |
1174 | $ cd .. |
|
1174 | $ cd .. | |
1175 |
|
1175 | |||
1176 | Intermediary parents are on different branches. |
|
1176 | Intermediary parents are on different branches. | |
1177 |
|
1177 | |||
1178 | $ hg init branchmap-testing4 |
|
1178 | $ hg init branchmap-testing4 | |
1179 | $ cd branchmap-testing4 |
|
1179 | $ cd branchmap-testing4 | |
1180 | $ hg debugbuild '@A . @B :base . @A :p1 *base @C . @A /p1' |
|
1180 | $ hg debugbuild '@A . @B :base . @A :p1 *base @C . @A /p1' | |
1181 | $ hg log -G |
|
1181 | $ hg log -G | |
1182 | o changeset: 4:4bf67499b70a |
|
1182 | o changeset: 4:4bf67499b70a | |
1183 | |\ branch: A |
|
1183 | |\ branch: A | |
1184 | | | tag: tip |
|
1184 | | | tag: tip | |
1185 | | | parent: 3:4a546028fa8f |
|
1185 | | | parent: 3:4a546028fa8f | |
1186 | | | parent: 1:0bc7d348d965 |
|
1186 | | | parent: 1:0bc7d348d965 | |
1187 | | | user: debugbuilddag |
|
1187 | | | user: debugbuilddag | |
1188 | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
1188 | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
1189 | | | summary: r4 |
|
1189 | | | summary: r4 | |
1190 | | | |
|
1190 | | | | |
1191 | | o changeset: 3:4a546028fa8f |
|
1191 | | o changeset: 3:4a546028fa8f | |
1192 | | | branch: C |
|
1192 | | | branch: C | |
1193 | | | user: debugbuilddag |
|
1193 | | | user: debugbuilddag | |
1194 | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
1194 | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
1195 | | | summary: r3 |
|
1195 | | | summary: r3 | |
1196 | | | |
|
1196 | | | | |
1197 | | o changeset: 2:a3b807b3ff0b |
|
1197 | | o changeset: 2:a3b807b3ff0b | |
1198 | | | branch: A |
|
1198 | | | branch: A | |
1199 | | | parent: 0:2ab8003a1750 |
|
1199 | | | parent: 0:2ab8003a1750 | |
1200 | | | user: debugbuilddag |
|
1200 | | | user: debugbuilddag | |
1201 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
1201 | | | date: Thu Jan 01 00:00:02 1970 +0000 | |
1202 | | | summary: r2 |
|
1202 | | | summary: r2 | |
1203 | | | |
|
1203 | | | | |
1204 | o | changeset: 1:0bc7d348d965 |
|
1204 | o | changeset: 1:0bc7d348d965 | |
1205 | |/ branch: B |
|
1205 | |/ branch: B | |
1206 | | tag: p1 |
|
1206 | | tag: p1 | |
1207 | | user: debugbuilddag |
|
1207 | | user: debugbuilddag | |
1208 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1208 | | date: Thu Jan 01 00:00:01 1970 +0000 | |
1209 | | summary: r1 |
|
1209 | | summary: r1 | |
1210 | | |
|
1210 | | | |
1211 | o changeset: 0:2ab8003a1750 |
|
1211 | o changeset: 0:2ab8003a1750 | |
1212 | branch: A |
|
1212 | branch: A | |
1213 | tag: base |
|
1213 | tag: base | |
1214 | user: debugbuilddag |
|
1214 | user: debugbuilddag | |
1215 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1215 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1216 | summary: r0 |
|
1216 | summary: r0 | |
1217 |
|
1217 | |||
1218 | $ hg branches |
|
1218 | $ hg branches | |
1219 | A 4:4bf67499b70a |
|
1219 | A 4:4bf67499b70a | |
1220 | C 3:4a546028fa8f (inactive) |
|
1220 | C 3:4a546028fa8f (inactive) | |
1221 | B 1:0bc7d348d965 (inactive) |
|
1221 | B 1:0bc7d348d965 (inactive) | |
1222 | $ hg clone -r 1 -r 3 . ../branchmap-testing4-clone |
|
1222 | $ hg clone -r 1 -r 3 . ../branchmap-testing4-clone | |
1223 | adding changesets |
|
1223 | adding changesets | |
1224 | adding manifests |
|
1224 | adding manifests | |
1225 | adding file changes |
|
1225 | adding file changes | |
1226 | added 4 changesets with 0 changes to 0 files (+1 heads) |
|
1226 | added 4 changesets with 0 changes to 0 files (+1 heads) | |
1227 | new changesets 2ab8003a1750:4a546028fa8f |
|
1227 | new changesets 2ab8003a1750:4a546028fa8f | |
1228 | updating to branch B |
|
1228 | updating to branch B | |
1229 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1229 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1230 | $ cd ../branchmap-testing4-clone |
|
1230 | $ cd ../branchmap-testing4-clone | |
1231 | $ hg pull ../branchmap-testing4 |
|
1231 | $ hg pull ../branchmap-testing4 | |
1232 | pulling from ../branchmap-testing4 |
|
1232 | pulling from ../branchmap-testing4 | |
1233 | searching for changes |
|
1233 | searching for changes | |
1234 | adding changesets |
|
1234 | adding changesets | |
1235 | adding manifests |
|
1235 | adding manifests | |
1236 | adding file changes |
|
1236 | adding file changes | |
1237 | added 1 changesets with 0 changes to 0 files (-1 heads) |
|
1237 | added 1 changesets with 0 changes to 0 files (-1 heads) | |
1238 | new changesets 4bf67499b70a |
|
1238 | new changesets 4bf67499b70a | |
1239 | (run 'hg update' to get a working copy) |
|
1239 | (run 'hg update' to get a working copy) | |
1240 | $ hg branches |
|
1240 | $ hg branches | |
1241 | A 4:4bf67499b70a |
|
1241 | A 4:4bf67499b70a | |
1242 | C 3:4a546028fa8f (inactive) |
|
1242 | C 3:4a546028fa8f (inactive) | |
1243 | B 1:0bc7d348d965 (inactive) |
|
1243 | B 1:0bc7d348d965 (inactive) | |
1244 | $ cd .. |
|
1244 | $ cd .. | |
1245 |
|
1245 | |||
1246 | Check that the cache are not written too early |
|
1246 | Check that the cache are not written too early | |
1247 | ---------------------------------------------- |
|
1247 | ---------------------------------------------- | |
1248 |
|
1248 | |||
1249 | $ hg log -R branchmap-testing1 -G |
|
1249 | $ hg log -R branchmap-testing1 -G | |
1250 | o changeset: 3:71ca9a6d524e |
|
1250 | o changeset: 3:71ca9a6d524e | |
1251 | |\ branch: A |
|
1251 | |\ branch: A | |
1252 | | | tag: tip |
|
1252 | | | tag: tip | |
1253 | | | parent: 2:a3b807b3ff0b |
|
1253 | | | parent: 2:a3b807b3ff0b | |
1254 | | | parent: 1:99ba08759bc7 |
|
1254 | | | parent: 1:99ba08759bc7 | |
1255 | | | user: debugbuilddag |
|
1255 | | | user: debugbuilddag | |
1256 | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
1256 | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
1257 | | | summary: r3 |
|
1257 | | | summary: r3 | |
1258 | | | |
|
1258 | | | | |
1259 | | o changeset: 2:a3b807b3ff0b |
|
1259 | | o changeset: 2:a3b807b3ff0b | |
1260 | | | branch: A |
|
1260 | | | branch: A | |
1261 | | | parent: 0:2ab8003a1750 |
|
1261 | | | parent: 0:2ab8003a1750 | |
1262 | | | user: debugbuilddag |
|
1262 | | | user: debugbuilddag | |
1263 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
1263 | | | date: Thu Jan 01 00:00:02 1970 +0000 | |
1264 | | | summary: r2 |
|
1264 | | | summary: r2 | |
1265 | | | |
|
1265 | | | | |
1266 | o | changeset: 1:99ba08759bc7 |
|
1266 | o | changeset: 1:99ba08759bc7 | |
1267 | |/ branch: A |
|
1267 | |/ branch: A | |
1268 | | tag: p1 |
|
1268 | | tag: p1 | |
1269 | | user: debugbuilddag |
|
1269 | | user: debugbuilddag | |
1270 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1270 | | date: Thu Jan 01 00:00:01 1970 +0000 | |
1271 | | summary: r1 |
|
1271 | | summary: r1 | |
1272 | | |
|
1272 | | | |
1273 | o changeset: 0:2ab8003a1750 |
|
1273 | o changeset: 0:2ab8003a1750 | |
1274 | branch: A |
|
1274 | branch: A | |
1275 | tag: base |
|
1275 | tag: base | |
1276 | user: debugbuilddag |
|
1276 | user: debugbuilddag | |
1277 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1277 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1278 | summary: r0 |
|
1278 | summary: r0 | |
1279 |
|
1279 | |||
1280 | $ hg bundle -R branchmap-testing1 --base 1 bundle.hg --rev 'head()' |
|
1280 | $ hg bundle -R branchmap-testing1 --base 1 bundle.hg --rev 'head()' | |
1281 | 2 changesets found |
|
1281 | 2 changesets found | |
1282 |
|
1282 | |||
1283 | Unbundling revision should warm the served cache |
|
1283 | Unbundling revision should warm the served cache | |
1284 |
|
1284 | |||
1285 | $ hg clone branchmap-testing1 --rev 1 branchmap-update-01 |
|
1285 | $ hg clone branchmap-testing1 --rev 1 branchmap-update-01 | |
1286 | adding changesets |
|
1286 | adding changesets | |
1287 | adding manifests |
|
1287 | adding manifests | |
1288 | adding file changes |
|
1288 | adding file changes | |
1289 | added 2 changesets with 0 changes to 0 files |
|
1289 | added 2 changesets with 0 changes to 0 files | |
1290 | new changesets 2ab8003a1750:99ba08759bc7 |
|
1290 | new changesets 2ab8003a1750:99ba08759bc7 | |
1291 | updating to branch A |
|
1291 | updating to branch A | |
1292 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1292 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1293 | $ cat branchmap-update-01/.hg/cache/branch2-served |
|
1293 | $ cat branchmap-update-01/.hg/cache/branch2-served | |
1294 | 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
|
1294 | 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 | |
1295 | 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
|
1295 | 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A | |
1296 | $ hg -R branchmap-update-01 unbundle bundle.hg |
|
1296 | $ hg -R branchmap-update-01 unbundle bundle.hg | |
1297 | adding changesets |
|
1297 | adding changesets | |
1298 | adding manifests |
|
1298 | adding manifests | |
1299 | adding file changes |
|
1299 | adding file changes | |
1300 | added 2 changesets with 0 changes to 0 files |
|
1300 | added 2 changesets with 0 changes to 0 files | |
1301 | new changesets a3b807b3ff0b:71ca9a6d524e (2 drafts) |
|
1301 | new changesets a3b807b3ff0b:71ca9a6d524e (2 drafts) | |
1302 | (run 'hg update' to get a working copy) |
|
1302 | (run 'hg update' to get a working copy) | |
1303 | $ cat branchmap-update-01/.hg/cache/branch2-served |
|
1303 | $ cat branchmap-update-01/.hg/cache/branch2-served | |
1304 | 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 3 |
|
1304 | 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 3 | |
1305 | 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 o A |
|
1305 | 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 o A | |
1306 |
|
1306 | |||
1307 | aborted Unbundle should not update the on disk cache |
|
1307 | aborted Unbundle should not update the on disk cache | |
1308 |
|
1308 | |||
1309 | $ cat >> simplehook.py << EOF |
|
1309 | $ cat >> simplehook.py << EOF | |
1310 | > import sys |
|
1310 | > import sys | |
1311 | > from mercurial import node |
|
1311 | > from mercurial import node | |
1312 | > from mercurial import branchmap |
|
1312 | > from mercurial import branchmap | |
1313 | > def hook(ui, repo, *args, **kwargs): |
|
1313 | > def hook(ui, repo, *args, **kwargs): | |
1314 | > s = repo.filtered(b"served") |
|
1314 | > s = repo.filtered(b"served") | |
1315 | > s.branchmap() |
|
1315 | > s.branchmap() | |
1316 | > return 1 |
|
1316 | > return 1 | |
1317 | > EOF |
|
1317 | > EOF | |
1318 | $ hg clone branchmap-testing1 --rev 1 branchmap-update-02 |
|
1318 | $ hg clone branchmap-testing1 --rev 1 branchmap-update-02 | |
1319 | adding changesets |
|
1319 | adding changesets | |
1320 | adding manifests |
|
1320 | adding manifests | |
1321 | adding file changes |
|
1321 | adding file changes | |
1322 | added 2 changesets with 0 changes to 0 files |
|
1322 | added 2 changesets with 0 changes to 0 files | |
1323 | new changesets 2ab8003a1750:99ba08759bc7 |
|
1323 | new changesets 2ab8003a1750:99ba08759bc7 | |
1324 | updating to branch A |
|
1324 | updating to branch A | |
1325 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1325 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1326 |
|
1326 | |||
1327 | $ cat branchmap-update-02/.hg/cache/branch2-served |
|
1327 | $ cat branchmap-update-02/.hg/cache/branch2-served | |
1328 | 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
|
1328 | 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 | |
1329 | 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
|
1329 | 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A | |
1330 | $ hg -R branchmap-update-02 unbundle bundle.hg --config "hooks.pretxnclose=python:$TESTTMP/simplehook.py:hook" |
|
1330 | $ hg -R branchmap-update-02 unbundle bundle.hg --config "hooks.pretxnclose=python:$TESTTMP/simplehook.py:hook" | |
1331 | adding changesets |
|
1331 | adding changesets | |
1332 | adding manifests |
|
1332 | adding manifests | |
1333 | adding file changes |
|
1333 | adding file changes | |
1334 | transaction abort! |
|
1334 | transaction abort! | |
1335 | rollback completed |
|
1335 | rollback completed | |
1336 | abort: pretxnclose hook failed |
|
1336 | abort: pretxnclose hook failed | |
1337 | [40] |
|
1337 | [40] | |
1338 | $ cat branchmap-update-02/.hg/cache/branch2-served |
|
1338 | $ cat branchmap-update-02/.hg/cache/branch2-served | |
1339 |
99ba08759bc7f6fdbe5304e83d0387f35c082479 1 |
|
1339 | 99ba08759bc7f6fdbe5304e83d0387f35c082479 1 | |
1340 |
99ba08759bc7f6fdbe5304e83d0387f35c082479 o A |
|
1340 | 99ba08759bc7f6fdbe5304e83d0387f35c082479 o A | |
1341 | 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 3 (known-bad-output !) |
|
|||
1342 | 71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 o A (known-bad-output !) |
|
General Comments 0
You need to be logged in to leave comments.
Login now