Show More
@@ -1,3689 +1,3689 b'' | |||
|
1 | 1 | # localrepo.py - read/write repository class for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | 10 | import errno |
|
11 | 11 | import functools |
|
12 | 12 | import os |
|
13 | 13 | import random |
|
14 | 14 | import sys |
|
15 | 15 | import time |
|
16 | 16 | import weakref |
|
17 | 17 | |
|
18 | 18 | from .i18n import _ |
|
19 | 19 | from .node import ( |
|
20 | 20 | bin, |
|
21 | 21 | hex, |
|
22 | 22 | nullid, |
|
23 | 23 | nullrev, |
|
24 | 24 | short, |
|
25 | 25 | ) |
|
26 | 26 | from .pycompat import ( |
|
27 | 27 | delattr, |
|
28 | 28 | getattr, |
|
29 | 29 | ) |
|
30 | 30 | from . import ( |
|
31 | 31 | bookmarks, |
|
32 | 32 | branchmap, |
|
33 | 33 | bundle2, |
|
34 | 34 | bundlecaches, |
|
35 | 35 | changegroup, |
|
36 | 36 | color, |
|
37 | 37 | commit, |
|
38 | 38 | context, |
|
39 | 39 | dirstate, |
|
40 | 40 | dirstateguard, |
|
41 | 41 | discovery, |
|
42 | 42 | encoding, |
|
43 | 43 | error, |
|
44 | 44 | exchange, |
|
45 | 45 | extensions, |
|
46 | 46 | filelog, |
|
47 | 47 | hook, |
|
48 | 48 | lock as lockmod, |
|
49 | 49 | match as matchmod, |
|
50 | 50 | mergestate as mergestatemod, |
|
51 | 51 | mergeutil, |
|
52 | 52 | namespaces, |
|
53 | 53 | narrowspec, |
|
54 | 54 | obsolete, |
|
55 | 55 | pathutil, |
|
56 | 56 | phases, |
|
57 | 57 | pushkey, |
|
58 | 58 | pycompat, |
|
59 | 59 | rcutil, |
|
60 | 60 | repoview, |
|
61 | 61 | requirements as requirementsmod, |
|
62 | 62 | revlog, |
|
63 | 63 | revset, |
|
64 | 64 | revsetlang, |
|
65 | 65 | scmutil, |
|
66 | 66 | sparse, |
|
67 | 67 | store as storemod, |
|
68 | 68 | subrepoutil, |
|
69 | 69 | tags as tagsmod, |
|
70 | 70 | transaction, |
|
71 | 71 | txnutil, |
|
72 | 72 | util, |
|
73 | 73 | vfs as vfsmod, |
|
74 | 74 | ) |
|
75 | 75 | |
|
76 | 76 | from .interfaces import ( |
|
77 | 77 | repository, |
|
78 | 78 | util as interfaceutil, |
|
79 | 79 | ) |
|
80 | 80 | |
|
81 | 81 | from .utils import ( |
|
82 | 82 | hashutil, |
|
83 | 83 | procutil, |
|
84 | 84 | stringutil, |
|
85 | 85 | ) |
|
86 | 86 | |
|
87 | 87 | from .revlogutils import constants as revlogconst |
|
88 | 88 | |
|
89 | 89 | release = lockmod.release |
|
90 | 90 | urlerr = util.urlerr |
|
91 | 91 | urlreq = util.urlreq |
|
92 | 92 | |
|
93 | 93 | # set of (path, vfs-location) tuples. vfs-location is: |
|
94 | 94 | # - 'plain for vfs relative paths |
|
95 | 95 | # - '' for svfs relative paths |
|
96 | 96 | _cachedfiles = set() |
|
97 | 97 | |
|
98 | 98 | |
|
99 | 99 | class _basefilecache(scmutil.filecache): |
|
100 | 100 | """All filecache usage on repo are done for logic that should be unfiltered""" |
|
101 | 101 | |
|
102 | 102 | def __get__(self, repo, type=None): |
|
103 | 103 | if repo is None: |
|
104 | 104 | return self |
|
105 | 105 | # proxy to unfiltered __dict__ since filtered repo has no entry |
|
106 | 106 | unfi = repo.unfiltered() |
|
107 | 107 | try: |
|
108 | 108 | return unfi.__dict__[self.sname] |
|
109 | 109 | except KeyError: |
|
110 | 110 | pass |
|
111 | 111 | return super(_basefilecache, self).__get__(unfi, type) |
|
112 | 112 | |
|
113 | 113 | def set(self, repo, value): |
|
114 | 114 | return super(_basefilecache, self).set(repo.unfiltered(), value) |
|
115 | 115 | |
|
116 | 116 | |
|
117 | 117 | class repofilecache(_basefilecache): |
|
118 | 118 | """filecache for files in .hg but outside of .hg/store""" |
|
119 | 119 | |
|
120 | 120 | def __init__(self, *paths): |
|
121 | 121 | super(repofilecache, self).__init__(*paths) |
|
122 | 122 | for path in paths: |
|
123 | 123 | _cachedfiles.add((path, b'plain')) |
|
124 | 124 | |
|
125 | 125 | def join(self, obj, fname): |
|
126 | 126 | return obj.vfs.join(fname) |
|
127 | 127 | |
|
128 | 128 | |
|
129 | 129 | class storecache(_basefilecache): |
|
130 | 130 | """filecache for files in the store""" |
|
131 | 131 | |
|
132 | 132 | def __init__(self, *paths): |
|
133 | 133 | super(storecache, self).__init__(*paths) |
|
134 | 134 | for path in paths: |
|
135 | 135 | _cachedfiles.add((path, b'')) |
|
136 | 136 | |
|
137 | 137 | def join(self, obj, fname): |
|
138 | 138 | return obj.sjoin(fname) |
|
139 | 139 | |
|
140 | 140 | |
|
141 | 141 | class mixedrepostorecache(_basefilecache): |
|
142 | 142 | """filecache for a mix files in .hg/store and outside""" |
|
143 | 143 | |
|
144 | 144 | def __init__(self, *pathsandlocations): |
|
145 | 145 | # scmutil.filecache only uses the path for passing back into our |
|
146 | 146 | # join(), so we can safely pass a list of paths and locations |
|
147 | 147 | super(mixedrepostorecache, self).__init__(*pathsandlocations) |
|
148 | 148 | _cachedfiles.update(pathsandlocations) |
|
149 | 149 | |
|
150 | 150 | def join(self, obj, fnameandlocation): |
|
151 | 151 | fname, location = fnameandlocation |
|
152 | 152 | if location == b'plain': |
|
153 | 153 | return obj.vfs.join(fname) |
|
154 | 154 | else: |
|
155 | 155 | if location != b'': |
|
156 | 156 | raise error.ProgrammingError( |
|
157 | 157 | b'unexpected location: %s' % location |
|
158 | 158 | ) |
|
159 | 159 | return obj.sjoin(fname) |
|
160 | 160 | |
|
161 | 161 | |
|
162 | 162 | def isfilecached(repo, name): |
|
163 | 163 | """check if a repo has already cached "name" filecache-ed property |
|
164 | 164 | |
|
165 | 165 | This returns (cachedobj-or-None, iscached) tuple. |
|
166 | 166 | """ |
|
167 | 167 | cacheentry = repo.unfiltered()._filecache.get(name, None) |
|
168 | 168 | if not cacheentry: |
|
169 | 169 | return None, False |
|
170 | 170 | return cacheentry.obj, True |
|
171 | 171 | |
|
172 | 172 | |
|
173 | 173 | class unfilteredpropertycache(util.propertycache): |
|
174 | 174 | """propertycache that apply to unfiltered repo only""" |
|
175 | 175 | |
|
176 | 176 | def __get__(self, repo, type=None): |
|
177 | 177 | unfi = repo.unfiltered() |
|
178 | 178 | if unfi is repo: |
|
179 | 179 | return super(unfilteredpropertycache, self).__get__(unfi) |
|
180 | 180 | return getattr(unfi, self.name) |
|
181 | 181 | |
|
182 | 182 | |
|
183 | 183 | class filteredpropertycache(util.propertycache): |
|
184 | 184 | """propertycache that must take filtering in account""" |
|
185 | 185 | |
|
186 | 186 | def cachevalue(self, obj, value): |
|
187 | 187 | object.__setattr__(obj, self.name, value) |
|
188 | 188 | |
|
189 | 189 | |
|
190 | 190 | def hasunfilteredcache(repo, name): |
|
191 | 191 | """check if a repo has an unfilteredpropertycache value for <name>""" |
|
192 | 192 | return name in vars(repo.unfiltered()) |
|
193 | 193 | |
|
194 | 194 | |
|
195 | 195 | def unfilteredmethod(orig): |
|
196 | 196 | """decorate method that always need to be run on unfiltered version""" |
|
197 | 197 | |
|
198 | 198 | @functools.wraps(orig) |
|
199 | 199 | def wrapper(repo, *args, **kwargs): |
|
200 | 200 | return orig(repo.unfiltered(), *args, **kwargs) |
|
201 | 201 | |
|
202 | 202 | return wrapper |
|
203 | 203 | |
|
204 | 204 | |
|
205 | 205 | moderncaps = { |
|
206 | 206 | b'lookup', |
|
207 | 207 | b'branchmap', |
|
208 | 208 | b'pushkey', |
|
209 | 209 | b'known', |
|
210 | 210 | b'getbundle', |
|
211 | 211 | b'unbundle', |
|
212 | 212 | } |
|
213 | 213 | legacycaps = moderncaps.union({b'changegroupsubset'}) |
|
214 | 214 | |
|
215 | 215 | |
|
216 | 216 | @interfaceutil.implementer(repository.ipeercommandexecutor) |
|
217 | 217 | class localcommandexecutor(object): |
|
218 | 218 | def __init__(self, peer): |
|
219 | 219 | self._peer = peer |
|
220 | 220 | self._sent = False |
|
221 | 221 | self._closed = False |
|
222 | 222 | |
|
223 | 223 | def __enter__(self): |
|
224 | 224 | return self |
|
225 | 225 | |
|
226 | 226 | def __exit__(self, exctype, excvalue, exctb): |
|
227 | 227 | self.close() |
|
228 | 228 | |
|
229 | 229 | def callcommand(self, command, args): |
|
230 | 230 | if self._sent: |
|
231 | 231 | raise error.ProgrammingError( |
|
232 | 232 | b'callcommand() cannot be used after sendcommands()' |
|
233 | 233 | ) |
|
234 | 234 | |
|
235 | 235 | if self._closed: |
|
236 | 236 | raise error.ProgrammingError( |
|
237 | 237 | b'callcommand() cannot be used after close()' |
|
238 | 238 | ) |
|
239 | 239 | |
|
240 | 240 | # We don't need to support anything fancy. Just call the named |
|
241 | 241 | # method on the peer and return a resolved future. |
|
242 | 242 | fn = getattr(self._peer, pycompat.sysstr(command)) |
|
243 | 243 | |
|
244 | 244 | f = pycompat.futures.Future() |
|
245 | 245 | |
|
246 | 246 | try: |
|
247 | 247 | result = fn(**pycompat.strkwargs(args)) |
|
248 | 248 | except Exception: |
|
249 | 249 | pycompat.future_set_exception_info(f, sys.exc_info()[1:]) |
|
250 | 250 | else: |
|
251 | 251 | f.set_result(result) |
|
252 | 252 | |
|
253 | 253 | return f |
|
254 | 254 | |
|
255 | 255 | def sendcommands(self): |
|
256 | 256 | self._sent = True |
|
257 | 257 | |
|
258 | 258 | def close(self): |
|
259 | 259 | self._closed = True |
|
260 | 260 | |
|
261 | 261 | |
|
262 | 262 | @interfaceutil.implementer(repository.ipeercommands) |
|
263 | 263 | class localpeer(repository.peer): |
|
264 | 264 | '''peer for a local repo; reflects only the most recent API''' |
|
265 | 265 | |
|
266 | 266 | def __init__(self, repo, caps=None): |
|
267 | 267 | super(localpeer, self).__init__() |
|
268 | 268 | |
|
269 | 269 | if caps is None: |
|
270 | 270 | caps = moderncaps.copy() |
|
271 | 271 | self._repo = repo.filtered(b'served') |
|
272 | 272 | self.ui = repo.ui |
|
273 | 273 | self._caps = repo._restrictcapabilities(caps) |
|
274 | 274 | |
|
275 | 275 | # Begin of _basepeer interface. |
|
276 | 276 | |
|
277 | 277 | def url(self): |
|
278 | 278 | return self._repo.url() |
|
279 | 279 | |
|
280 | 280 | def local(self): |
|
281 | 281 | return self._repo |
|
282 | 282 | |
|
283 | 283 | def peer(self): |
|
284 | 284 | return self |
|
285 | 285 | |
|
286 | 286 | def canpush(self): |
|
287 | 287 | return True |
|
288 | 288 | |
|
289 | 289 | def close(self): |
|
290 | 290 | self._repo.close() |
|
291 | 291 | |
|
292 | 292 | # End of _basepeer interface. |
|
293 | 293 | |
|
294 | 294 | # Begin of _basewirecommands interface. |
|
295 | 295 | |
|
296 | 296 | def branchmap(self): |
|
297 | 297 | return self._repo.branchmap() |
|
298 | 298 | |
|
299 | 299 | def capabilities(self): |
|
300 | 300 | return self._caps |
|
301 | 301 | |
|
302 | 302 | def clonebundles(self): |
|
303 | 303 | return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE) |
|
304 | 304 | |
|
305 | 305 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
306 | 306 | """Used to test argument passing over the wire""" |
|
307 | 307 | return b"%s %s %s %s %s" % ( |
|
308 | 308 | one, |
|
309 | 309 | two, |
|
310 | 310 | pycompat.bytestr(three), |
|
311 | 311 | pycompat.bytestr(four), |
|
312 | 312 | pycompat.bytestr(five), |
|
313 | 313 | ) |
|
314 | 314 | |
|
315 | 315 | def getbundle( |
|
316 | 316 | self, source, heads=None, common=None, bundlecaps=None, **kwargs |
|
317 | 317 | ): |
|
318 | 318 | chunks = exchange.getbundlechunks( |
|
319 | 319 | self._repo, |
|
320 | 320 | source, |
|
321 | 321 | heads=heads, |
|
322 | 322 | common=common, |
|
323 | 323 | bundlecaps=bundlecaps, |
|
324 | 324 | **kwargs |
|
325 | 325 | )[1] |
|
326 | 326 | cb = util.chunkbuffer(chunks) |
|
327 | 327 | |
|
328 | 328 | if exchange.bundle2requested(bundlecaps): |
|
329 | 329 | # When requesting a bundle2, getbundle returns a stream to make the |
|
330 | 330 | # wire level function happier. We need to build a proper object |
|
331 | 331 | # from it in local peer. |
|
332 | 332 | return bundle2.getunbundler(self.ui, cb) |
|
333 | 333 | else: |
|
334 | 334 | return changegroup.getunbundler(b'01', cb, None) |
|
335 | 335 | |
|
336 | 336 | def heads(self): |
|
337 | 337 | return self._repo.heads() |
|
338 | 338 | |
|
339 | 339 | def known(self, nodes): |
|
340 | 340 | return self._repo.known(nodes) |
|
341 | 341 | |
|
342 | 342 | def listkeys(self, namespace): |
|
343 | 343 | return self._repo.listkeys(namespace) |
|
344 | 344 | |
|
345 | 345 | def lookup(self, key): |
|
346 | 346 | return self._repo.lookup(key) |
|
347 | 347 | |
|
348 | 348 | def pushkey(self, namespace, key, old, new): |
|
349 | 349 | return self._repo.pushkey(namespace, key, old, new) |
|
350 | 350 | |
|
351 | 351 | def stream_out(self): |
|
352 | 352 | raise error.Abort(_(b'cannot perform stream clone against local peer')) |
|
353 | 353 | |
|
354 | 354 | def unbundle(self, bundle, heads, url): |
|
355 | 355 | """apply a bundle on a repo |
|
356 | 356 | |
|
357 | 357 | This function handles the repo locking itself.""" |
|
358 | 358 | try: |
|
359 | 359 | try: |
|
360 | 360 | bundle = exchange.readbundle(self.ui, bundle, None) |
|
361 | 361 | ret = exchange.unbundle(self._repo, bundle, heads, b'push', url) |
|
362 | 362 | if util.safehasattr(ret, b'getchunks'): |
|
363 | 363 | # This is a bundle20 object, turn it into an unbundler. |
|
364 | 364 | # This little dance should be dropped eventually when the |
|
365 | 365 | # API is finally improved. |
|
366 | 366 | stream = util.chunkbuffer(ret.getchunks()) |
|
367 | 367 | ret = bundle2.getunbundler(self.ui, stream) |
|
368 | 368 | return ret |
|
369 | 369 | except Exception as exc: |
|
370 | 370 | # If the exception contains output salvaged from a bundle2 |
|
371 | 371 | # reply, we need to make sure it is printed before continuing |
|
372 | 372 | # to fail. So we build a bundle2 with such output and consume |
|
373 | 373 | # it directly. |
|
374 | 374 | # |
|
375 | 375 | # This is not very elegant but allows a "simple" solution for |
|
376 | 376 | # issue4594 |
|
377 | 377 | output = getattr(exc, '_bundle2salvagedoutput', ()) |
|
378 | 378 | if output: |
|
379 | 379 | bundler = bundle2.bundle20(self._repo.ui) |
|
380 | 380 | for out in output: |
|
381 | 381 | bundler.addpart(out) |
|
382 | 382 | stream = util.chunkbuffer(bundler.getchunks()) |
|
383 | 383 | b = bundle2.getunbundler(self.ui, stream) |
|
384 | 384 | bundle2.processbundle(self._repo, b) |
|
385 | 385 | raise |
|
386 | 386 | except error.PushRaced as exc: |
|
387 | 387 | raise error.ResponseError( |
|
388 | 388 | _(b'push failed:'), stringutil.forcebytestr(exc) |
|
389 | 389 | ) |
|
390 | 390 | |
|
391 | 391 | # End of _basewirecommands interface. |
|
392 | 392 | |
|
393 | 393 | # Begin of peer interface. |
|
394 | 394 | |
|
395 | 395 | def commandexecutor(self): |
|
396 | 396 | return localcommandexecutor(self) |
|
397 | 397 | |
|
398 | 398 | # End of peer interface. |
|
399 | 399 | |
|
400 | 400 | |
|
401 | 401 | @interfaceutil.implementer(repository.ipeerlegacycommands) |
|
402 | 402 | class locallegacypeer(localpeer): |
|
403 | 403 | """peer extension which implements legacy methods too; used for tests with |
|
404 | 404 | restricted capabilities""" |
|
405 | 405 | |
|
406 | 406 | def __init__(self, repo): |
|
407 | 407 | super(locallegacypeer, self).__init__(repo, caps=legacycaps) |
|
408 | 408 | |
|
409 | 409 | # Begin of baselegacywirecommands interface. |
|
410 | 410 | |
|
411 | 411 | def between(self, pairs): |
|
412 | 412 | return self._repo.between(pairs) |
|
413 | 413 | |
|
414 | 414 | def branches(self, nodes): |
|
415 | 415 | return self._repo.branches(nodes) |
|
416 | 416 | |
|
417 | 417 | def changegroup(self, nodes, source): |
|
418 | 418 | outgoing = discovery.outgoing( |
|
419 | 419 | self._repo, missingroots=nodes, ancestorsof=self._repo.heads() |
|
420 | 420 | ) |
|
421 | 421 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
422 | 422 | |
|
423 | 423 | def changegroupsubset(self, bases, heads, source): |
|
424 | 424 | outgoing = discovery.outgoing( |
|
425 | 425 | self._repo, missingroots=bases, ancestorsof=heads |
|
426 | 426 | ) |
|
427 | 427 | return changegroup.makechangegroup(self._repo, outgoing, b'01', source) |
|
428 | 428 | |
|
429 | 429 | # End of baselegacywirecommands interface. |
|
430 | 430 | |
|
431 | 431 | |
|
432 | 432 | # Functions receiving (ui, features) that extensions can register to impact |
|
433 | 433 | # the ability to load repositories with custom requirements. Only |
|
434 | 434 | # functions defined in loaded extensions are called. |
|
435 | 435 | # |
|
436 | 436 | # The function receives a set of requirement strings that the repository |
|
437 | 437 | # is capable of opening. Functions will typically add elements to the |
|
438 | 438 | # set to reflect that the extension knows how to handle that requirements. |
|
439 | 439 | featuresetupfuncs = set() |
|
440 | 440 | |
|
441 | 441 | |
|
442 | 442 | def _getsharedvfs(hgvfs, requirements): |
|
443 | 443 | """returns the vfs object pointing to root of shared source |
|
444 | 444 | repo for a shared repository |
|
445 | 445 | |
|
446 | 446 | hgvfs is vfs pointing at .hg/ of current repo (shared one) |
|
447 | 447 | requirements is a set of requirements of current repo (shared one) |
|
448 | 448 | """ |
|
449 | 449 | # The ``shared`` or ``relshared`` requirements indicate the |
|
450 | 450 | # store lives in the path contained in the ``.hg/sharedpath`` file. |
|
451 | 451 | # This is an absolute path for ``shared`` and relative to |
|
452 | 452 | # ``.hg/`` for ``relshared``. |
|
453 | 453 | sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n') |
|
454 | 454 | if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements: |
|
455 | 455 | sharedpath = hgvfs.join(sharedpath) |
|
456 | 456 | |
|
457 | 457 | sharedvfs = vfsmod.vfs(sharedpath, realpath=True) |
|
458 | 458 | |
|
459 | 459 | if not sharedvfs.exists(): |
|
460 | 460 | raise error.RepoError( |
|
461 | 461 | _(b'.hg/sharedpath points to nonexistent directory %s') |
|
462 | 462 | % sharedvfs.base |
|
463 | 463 | ) |
|
464 | 464 | return sharedvfs |
|
465 | 465 | |
|
466 | 466 | |
|
467 | 467 | def _readrequires(vfs, allowmissing): |
|
468 | 468 | """reads the require file present at root of this vfs |
|
469 | 469 | and return a set of requirements |
|
470 | 470 | |
|
471 | 471 | If allowmissing is True, we suppress ENOENT if raised""" |
|
472 | 472 | # requires file contains a newline-delimited list of |
|
473 | 473 | # features/capabilities the opener (us) must have in order to use |
|
474 | 474 | # the repository. This file was introduced in Mercurial 0.9.2, |
|
475 | 475 | # which means very old repositories may not have one. We assume |
|
476 | 476 | # a missing file translates to no requirements. |
|
477 | 477 | try: |
|
478 | 478 | requirements = set(vfs.read(b'requires').splitlines()) |
|
479 | 479 | except IOError as e: |
|
480 | 480 | if not (allowmissing and e.errno == errno.ENOENT): |
|
481 | 481 | raise |
|
482 | 482 | requirements = set() |
|
483 | 483 | return requirements |
|
484 | 484 | |
|
485 | 485 | |
|
486 | 486 | def makelocalrepository(baseui, path, intents=None): |
|
487 | 487 | """Create a local repository object. |
|
488 | 488 | |
|
489 | 489 | Given arguments needed to construct a local repository, this function |
|
490 | 490 | performs various early repository loading functionality (such as |
|
491 | 491 | reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that |
|
492 | 492 | the repository can be opened, derives a type suitable for representing |
|
493 | 493 | that repository, and returns an instance of it. |
|
494 | 494 | |
|
495 | 495 | The returned object conforms to the ``repository.completelocalrepository`` |
|
496 | 496 | interface. |
|
497 | 497 | |
|
498 | 498 | The repository type is derived by calling a series of factory functions |
|
499 | 499 | for each aspect/interface of the final repository. These are defined by |
|
500 | 500 | ``REPO_INTERFACES``. |
|
501 | 501 | |
|
502 | 502 | Each factory function is called to produce a type implementing a specific |
|
503 | 503 | interface. The cumulative list of returned types will be combined into a |
|
504 | 504 | new type and that type will be instantiated to represent the local |
|
505 | 505 | repository. |
|
506 | 506 | |
|
507 | 507 | The factory functions each receive various state that may be consulted |
|
508 | 508 | as part of deriving a type. |
|
509 | 509 | |
|
510 | 510 | Extensions should wrap these factory functions to customize repository type |
|
511 | 511 | creation. Note that an extension's wrapped function may be called even if |
|
512 | 512 | that extension is not loaded for the repo being constructed. Extensions |
|
513 | 513 | should check if their ``__name__`` appears in the |
|
514 | 514 | ``extensionmodulenames`` set passed to the factory function and no-op if |
|
515 | 515 | not. |
|
516 | 516 | """ |
|
517 | 517 | ui = baseui.copy() |
|
518 | 518 | # Prevent copying repo configuration. |
|
519 | 519 | ui.copy = baseui.copy |
|
520 | 520 | |
|
521 | 521 | # Working directory VFS rooted at repository root. |
|
522 | 522 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
523 | 523 | |
|
524 | 524 | # Main VFS for .hg/ directory. |
|
525 | 525 | hgpath = wdirvfs.join(b'.hg') |
|
526 | 526 | hgvfs = vfsmod.vfs(hgpath, cacheaudited=True) |
|
527 | 527 | # Whether this repository is shared one or not |
|
528 | 528 | shared = False |
|
529 | 529 | # If this repository is shared, vfs pointing to shared repo |
|
530 | 530 | sharedvfs = None |
|
531 | 531 | |
|
532 | 532 | # The .hg/ path should exist and should be a directory. All other |
|
533 | 533 | # cases are errors. |
|
534 | 534 | if not hgvfs.isdir(): |
|
535 | 535 | try: |
|
536 | 536 | hgvfs.stat() |
|
537 | 537 | except OSError as e: |
|
538 | 538 | if e.errno != errno.ENOENT: |
|
539 | 539 | raise |
|
540 | 540 | except ValueError as e: |
|
541 | 541 | # Can be raised on Python 3.8 when path is invalid. |
|
542 | 542 | raise error.Abort( |
|
543 | 543 | _(b'invalid path %s: %s') % (path, pycompat.bytestr(e)) |
|
544 | 544 | ) |
|
545 | 545 | |
|
546 | 546 | raise error.RepoError(_(b'repository %s not found') % path) |
|
547 | 547 | |
|
548 | 548 | requirements = _readrequires(hgvfs, True) |
|
549 | 549 | shared = ( |
|
550 | 550 | requirementsmod.SHARED_REQUIREMENT in requirements |
|
551 | 551 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements |
|
552 | 552 | ) |
|
553 | 553 | storevfs = None |
|
554 | 554 | if shared: |
|
555 | 555 | # This is a shared repo |
|
556 | 556 | sharedvfs = _getsharedvfs(hgvfs, requirements) |
|
557 | 557 | storevfs = vfsmod.vfs(sharedvfs.join(b'store')) |
|
558 | 558 | else: |
|
559 | 559 | storevfs = vfsmod.vfs(hgvfs.join(b'store')) |
|
560 | 560 | |
|
561 | 561 | # if .hg/requires contains the sharesafe requirement, it means |
|
562 | 562 | # there exists a `.hg/store/requires` too and we should read it |
|
563 | 563 | # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement |
|
564 | 564 | # is present. We never write SHARESAFE_REQUIREMENT for a repo if store |
|
565 | 565 | # is not present, refer checkrequirementscompat() for that |
|
566 | 566 | # |
|
567 | 567 | # However, if SHARESAFE_REQUIREMENT is not present, it means that the |
|
568 | 568 | # repository was shared the old way. We check the share source .hg/requires |
|
569 | 569 | # for SHARESAFE_REQUIREMENT to detect whether the current repository needs |
|
570 | 570 | # to be reshared |
|
571 | 571 | hint = _("see `hg help config.format.use-share-safe` for more information") |
|
572 | 572 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: |
|
573 | 573 | |
|
574 | 574 | if ( |
|
575 | 575 | shared |
|
576 | 576 | and requirementsmod.SHARESAFE_REQUIREMENT |
|
577 | 577 | not in _readrequires(sharedvfs, True) |
|
578 | 578 | ): |
|
579 | 579 | mismatch_warn = ui.configbool( |
|
580 | 580 | b'share', b'safe-mismatch.source-not-safe.warn' |
|
581 | 581 | ) |
|
582 | 582 | mismatch_config = ui.config( |
|
583 | 583 | b'share', b'safe-mismatch.source-not-safe' |
|
584 | 584 | ) |
|
585 | 585 | if mismatch_config in ( |
|
586 | 586 | b'downgrade-allow', |
|
587 | 587 | b'allow', |
|
588 | 588 | b'downgrade-abort', |
|
589 | 589 | ): |
|
590 | 590 | # prevent cyclic import localrepo -> upgrade -> localrepo |
|
591 | 591 | from . import upgrade |
|
592 | 592 | |
|
593 | 593 | upgrade.downgrade_share_to_non_safe( |
|
594 | 594 | ui, |
|
595 | 595 | hgvfs, |
|
596 | 596 | sharedvfs, |
|
597 | 597 | requirements, |
|
598 | 598 | mismatch_config, |
|
599 | 599 | mismatch_warn, |
|
600 | 600 | ) |
|
601 | 601 | elif mismatch_config == b'abort': |
|
602 | 602 | raise error.Abort( |
|
603 | 603 | _(b"share source does not support share-safe requirement"), |
|
604 | 604 | hint=hint, |
|
605 | 605 | ) |
|
606 | 606 | else: |
|
607 | 607 | raise error.Abort( |
|
608 | 608 | _( |
|
609 | 609 | b"share-safe mismatch with source.\nUnrecognized" |
|
610 | 610 | b" value '%s' of `share.safe-mismatch.source-not-safe`" |
|
611 | 611 | b" set." |
|
612 | 612 | ) |
|
613 | 613 | % mismatch_config, |
|
614 | 614 | hint=hint, |
|
615 | 615 | ) |
|
616 | 616 | else: |
|
617 | 617 | requirements |= _readrequires(storevfs, False) |
|
618 | 618 | elif shared: |
|
619 | 619 | sourcerequires = _readrequires(sharedvfs, False) |
|
620 | 620 | if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: |
|
621 | 621 | mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe') |
|
622 | 622 | mismatch_warn = ui.configbool( |
|
623 | 623 | b'share', b'safe-mismatch.source-safe.warn' |
|
624 | 624 | ) |
|
625 | 625 | if mismatch_config in ( |
|
626 | 626 | b'upgrade-allow', |
|
627 | 627 | b'allow', |
|
628 | 628 | b'upgrade-abort', |
|
629 | 629 | ): |
|
630 | 630 | # prevent cyclic import localrepo -> upgrade -> localrepo |
|
631 | 631 | from . import upgrade |
|
632 | 632 | |
|
633 | 633 | upgrade.upgrade_share_to_safe( |
|
634 | 634 | ui, |
|
635 | 635 | hgvfs, |
|
636 | 636 | storevfs, |
|
637 | 637 | requirements, |
|
638 | 638 | mismatch_config, |
|
639 | 639 | mismatch_warn, |
|
640 | 640 | ) |
|
641 | 641 | elif mismatch_config == b'abort': |
|
642 | 642 | raise error.Abort( |
|
643 | 643 | _( |
|
644 | 644 | b'version mismatch: source uses share-safe' |
|
645 | 645 | b' functionality while the current share does not' |
|
646 | 646 | ), |
|
647 | 647 | hint=hint, |
|
648 | 648 | ) |
|
649 | 649 | else: |
|
650 | 650 | raise error.Abort( |
|
651 | 651 | _( |
|
652 | 652 | b"share-safe mismatch with source.\nUnrecognized" |
|
653 | 653 | b" value '%s' of `share.safe-mismatch.source-safe` set." |
|
654 | 654 | ) |
|
655 | 655 | % mismatch_config, |
|
656 | 656 | hint=hint, |
|
657 | 657 | ) |
|
658 | 658 | |
|
659 | 659 | # The .hg/hgrc file may load extensions or contain config options |
|
660 | 660 | # that influence repository construction. Attempt to load it and |
|
661 | 661 | # process any new extensions that it may have pulled in. |
|
662 | 662 | if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs): |
|
663 | 663 | afterhgrcload(ui, wdirvfs, hgvfs, requirements) |
|
664 | 664 | extensions.loadall(ui) |
|
665 | 665 | extensions.populateui(ui) |
|
666 | 666 | |
|
667 | 667 | # Set of module names of extensions loaded for this repository. |
|
668 | 668 | extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)} |
|
669 | 669 | |
|
670 | 670 | supportedrequirements = gathersupportedrequirements(ui) |
|
671 | 671 | |
|
672 | 672 | # We first validate the requirements are known. |
|
673 | 673 | ensurerequirementsrecognized(requirements, supportedrequirements) |
|
674 | 674 | |
|
675 | 675 | # Then we validate that the known set is reasonable to use together. |
|
676 | 676 | ensurerequirementscompatible(ui, requirements) |
|
677 | 677 | |
|
678 | 678 | # TODO there are unhandled edge cases related to opening repositories with |
|
679 | 679 | # shared storage. If storage is shared, we should also test for requirements |
|
680 | 680 | # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in |
|
681 | 681 | # that repo, as that repo may load extensions needed to open it. This is a |
|
682 | 682 | # bit complicated because we don't want the other hgrc to overwrite settings |
|
683 | 683 | # in this hgrc. |
|
684 | 684 | # |
|
685 | 685 | # This bug is somewhat mitigated by the fact that we copy the .hg/requires |
|
686 | 686 | # file when sharing repos. But if a requirement is added after the share is |
|
687 | 687 | # performed, thereby introducing a new requirement for the opener, we may |
|
688 | 688 | # will not see that and could encounter a run-time error interacting with |
|
689 | 689 | # that shared store since it has an unknown-to-us requirement. |
|
690 | 690 | |
|
691 | 691 | # At this point, we know we should be capable of opening the repository. |
|
692 | 692 | # Now get on with doing that. |
|
693 | 693 | |
|
694 | 694 | features = set() |
|
695 | 695 | |
|
696 | 696 | # The "store" part of the repository holds versioned data. How it is |
|
697 | 697 | # accessed is determined by various requirements. If `shared` or |
|
698 | 698 | # `relshared` requirements are present, this indicates current repository |
|
699 | 699 | # is a share and store exists in path mentioned in `.hg/sharedpath` |
|
700 | 700 | if shared: |
|
701 | 701 | storebasepath = sharedvfs.base |
|
702 | 702 | cachepath = sharedvfs.join(b'cache') |
|
703 | 703 | features.add(repository.REPO_FEATURE_SHARED_STORAGE) |
|
704 | 704 | else: |
|
705 | 705 | storebasepath = hgvfs.base |
|
706 | 706 | cachepath = hgvfs.join(b'cache') |
|
707 | 707 | wcachepath = hgvfs.join(b'wcache') |
|
708 | 708 | |
|
709 | 709 | # The store has changed over time and the exact layout is dictated by |
|
710 | 710 | # requirements. The store interface abstracts differences across all |
|
711 | 711 | # of them. |
|
712 | 712 | store = makestore( |
|
713 | 713 | requirements, |
|
714 | 714 | storebasepath, |
|
715 | 715 | lambda base: vfsmod.vfs(base, cacheaudited=True), |
|
716 | 716 | ) |
|
717 | 717 | hgvfs.createmode = store.createmode |
|
718 | 718 | |
|
719 | 719 | storevfs = store.vfs |
|
720 | 720 | storevfs.options = resolvestorevfsoptions(ui, requirements, features) |
|
721 | 721 | |
|
722 | 722 | # The cache vfs is used to manage cache files. |
|
723 | 723 | cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) |
|
724 | 724 | cachevfs.createmode = store.createmode |
|
725 | 725 | # The cache vfs is used to manage cache files related to the working copy |
|
726 | 726 | wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) |
|
727 | 727 | wcachevfs.createmode = store.createmode |
|
728 | 728 | |
|
729 | 729 | # Now resolve the type for the repository object. We do this by repeatedly |
|
730 | 730 | # calling a factory function to produces types for specific aspects of the |
|
731 | 731 | # repo's operation. The aggregate returned types are used as base classes |
|
732 | 732 | # for a dynamically-derived type, which will represent our new repository. |
|
733 | 733 | |
|
734 | 734 | bases = [] |
|
735 | 735 | extrastate = {} |
|
736 | 736 | |
|
737 | 737 | for iface, fn in REPO_INTERFACES: |
|
738 | 738 | # We pass all potentially useful state to give extensions tons of |
|
739 | 739 | # flexibility. |
|
740 | 740 | typ = fn()( |
|
741 | 741 | ui=ui, |
|
742 | 742 | intents=intents, |
|
743 | 743 | requirements=requirements, |
|
744 | 744 | features=features, |
|
745 | 745 | wdirvfs=wdirvfs, |
|
746 | 746 | hgvfs=hgvfs, |
|
747 | 747 | store=store, |
|
748 | 748 | storevfs=storevfs, |
|
749 | 749 | storeoptions=storevfs.options, |
|
750 | 750 | cachevfs=cachevfs, |
|
751 | 751 | wcachevfs=wcachevfs, |
|
752 | 752 | extensionmodulenames=extensionmodulenames, |
|
753 | 753 | extrastate=extrastate, |
|
754 | 754 | baseclasses=bases, |
|
755 | 755 | ) |
|
756 | 756 | |
|
757 | 757 | if not isinstance(typ, type): |
|
758 | 758 | raise error.ProgrammingError( |
|
759 | 759 | b'unable to construct type for %s' % iface |
|
760 | 760 | ) |
|
761 | 761 | |
|
762 | 762 | bases.append(typ) |
|
763 | 763 | |
|
764 | 764 | # type() allows you to use characters in type names that wouldn't be |
|
765 | 765 | # recognized as Python symbols in source code. We abuse that to add |
|
766 | 766 | # rich information about our constructed repo. |
|
767 | 767 | name = pycompat.sysstr( |
|
768 | 768 | b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements))) |
|
769 | 769 | ) |
|
770 | 770 | |
|
771 | 771 | cls = type(name, tuple(bases), {}) |
|
772 | 772 | |
|
773 | 773 | return cls( |
|
774 | 774 | baseui=baseui, |
|
775 | 775 | ui=ui, |
|
776 | 776 | origroot=path, |
|
777 | 777 | wdirvfs=wdirvfs, |
|
778 | 778 | hgvfs=hgvfs, |
|
779 | 779 | requirements=requirements, |
|
780 | 780 | supportedrequirements=supportedrequirements, |
|
781 | 781 | sharedpath=storebasepath, |
|
782 | 782 | store=store, |
|
783 | 783 | cachevfs=cachevfs, |
|
784 | 784 | wcachevfs=wcachevfs, |
|
785 | 785 | features=features, |
|
786 | 786 | intents=intents, |
|
787 | 787 | ) |
|
788 | 788 | |
|
789 | 789 | |
|
790 | 790 | def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None): |
|
791 | 791 | """Load hgrc files/content into a ui instance. |
|
792 | 792 | |
|
793 | 793 | This is called during repository opening to load any additional |
|
794 | 794 | config files or settings relevant to the current repository. |
|
795 | 795 | |
|
796 | 796 | Returns a bool indicating whether any additional configs were loaded. |
|
797 | 797 | |
|
798 | 798 | Extensions should monkeypatch this function to modify how per-repo |
|
799 | 799 | configs are loaded. For example, an extension may wish to pull in |
|
800 | 800 | configs from alternate files or sources. |
|
801 | 801 | |
|
802 | 802 | sharedvfs is vfs object pointing to source repo if the current one is a |
|
803 | 803 | shared one |
|
804 | 804 | """ |
|
805 | 805 | if not rcutil.use_repo_hgrc(): |
|
806 | 806 | return False |
|
807 | 807 | |
|
808 | 808 | ret = False |
|
809 | 809 | # first load config from shared source if we has to |
|
810 | 810 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs: |
|
811 | 811 | try: |
|
812 | 812 | ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base) |
|
813 | 813 | ret = True |
|
814 | 814 | except IOError: |
|
815 | 815 | pass |
|
816 | 816 | |
|
817 | 817 | try: |
|
818 | 818 | ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) |
|
819 | 819 | ret = True |
|
820 | 820 | except IOError: |
|
821 | 821 | pass |
|
822 | 822 | |
|
823 | 823 | try: |
|
824 | 824 | ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base) |
|
825 | 825 | ret = True |
|
826 | 826 | except IOError: |
|
827 | 827 | pass |
|
828 | 828 | |
|
829 | 829 | return ret |
|
830 | 830 | |
|
831 | 831 | |
|
832 | 832 | def afterhgrcload(ui, wdirvfs, hgvfs, requirements): |
|
833 | 833 | """Perform additional actions after .hg/hgrc is loaded. |
|
834 | 834 | |
|
835 | 835 | This function is called during repository loading immediately after |
|
836 | 836 | the .hg/hgrc file is loaded and before per-repo extensions are loaded. |
|
837 | 837 | |
|
838 | 838 | The function can be used to validate configs, automatically add |
|
839 | 839 | options (including extensions) based on requirements, etc. |
|
840 | 840 | """ |
|
841 | 841 | |
|
842 | 842 | # Map of requirements to list of extensions to load automatically when |
|
843 | 843 | # requirement is present. |
|
844 | 844 | autoextensions = { |
|
845 | 845 | b'git': [b'git'], |
|
846 | 846 | b'largefiles': [b'largefiles'], |
|
847 | 847 | b'lfs': [b'lfs'], |
|
848 | 848 | } |
|
849 | 849 | |
|
850 | 850 | for requirement, names in sorted(autoextensions.items()): |
|
851 | 851 | if requirement not in requirements: |
|
852 | 852 | continue |
|
853 | 853 | |
|
854 | 854 | for name in names: |
|
855 | 855 | if not ui.hasconfig(b'extensions', name): |
|
856 | 856 | ui.setconfig(b'extensions', name, b'', source=b'autoload') |
|
857 | 857 | |
|
858 | 858 | |
|
859 | 859 | def gathersupportedrequirements(ui): |
|
860 | 860 | """Determine the complete set of recognized requirements.""" |
|
861 | 861 | # Start with all requirements supported by this file. |
|
862 | 862 | supported = set(localrepository._basesupported) |
|
863 | 863 | |
|
864 | 864 | # Execute ``featuresetupfuncs`` entries if they belong to an extension |
|
865 | 865 | # relevant to this ui instance. |
|
866 | 866 | modules = {m.__name__ for n, m in extensions.extensions(ui)} |
|
867 | 867 | |
|
868 | 868 | for fn in featuresetupfuncs: |
|
869 | 869 | if fn.__module__ in modules: |
|
870 | 870 | fn(ui, supported) |
|
871 | 871 | |
|
872 | 872 | # Add derived requirements from registered compression engines. |
|
873 | 873 | for name in util.compengines: |
|
874 | 874 | engine = util.compengines[name] |
|
875 | 875 | if engine.available() and engine.revlogheader(): |
|
876 | 876 | supported.add(b'exp-compression-%s' % name) |
|
877 | 877 | if engine.name() == b'zstd': |
|
878 | 878 | supported.add(b'revlog-compression-zstd') |
|
879 | 879 | |
|
880 | 880 | return supported |
|
881 | 881 | |
|
882 | 882 | |
|
883 | 883 | def ensurerequirementsrecognized(requirements, supported): |
|
884 | 884 | """Validate that a set of local requirements is recognized. |
|
885 | 885 | |
|
886 | 886 | Receives a set of requirements. Raises an ``error.RepoError`` if there |
|
887 | 887 | exists any requirement in that set that currently loaded code doesn't |
|
888 | 888 | recognize. |
|
889 | 889 | |
|
890 | 890 | Returns a set of supported requirements. |
|
891 | 891 | """ |
|
892 | 892 | missing = set() |
|
893 | 893 | |
|
894 | 894 | for requirement in requirements: |
|
895 | 895 | if requirement in supported: |
|
896 | 896 | continue |
|
897 | 897 | |
|
898 | 898 | if not requirement or not requirement[0:1].isalnum(): |
|
899 | 899 | raise error.RequirementError(_(b'.hg/requires file is corrupt')) |
|
900 | 900 | |
|
901 | 901 | missing.add(requirement) |
|
902 | 902 | |
|
903 | 903 | if missing: |
|
904 | 904 | raise error.RequirementError( |
|
905 | 905 | _(b'repository requires features unknown to this Mercurial: %s') |
|
906 | 906 | % b' '.join(sorted(missing)), |
|
907 | 907 | hint=_( |
|
908 | 908 | b'see https://mercurial-scm.org/wiki/MissingRequirement ' |
|
909 | 909 | b'for more information' |
|
910 | 910 | ), |
|
911 | 911 | ) |
|
912 | 912 | |
|
913 | 913 | |
|
914 | 914 | def ensurerequirementscompatible(ui, requirements): |
|
915 | 915 | """Validates that a set of recognized requirements is mutually compatible. |
|
916 | 916 | |
|
917 | 917 | Some requirements may not be compatible with others or require |
|
918 | 918 | config options that aren't enabled. This function is called during |
|
919 | 919 | repository opening to ensure that the set of requirements needed |
|
920 | 920 | to open a repository is sane and compatible with config options. |
|
921 | 921 | |
|
922 | 922 | Extensions can monkeypatch this function to perform additional |
|
923 | 923 | checking. |
|
924 | 924 | |
|
925 | 925 | ``error.RepoError`` should be raised on failure. |
|
926 | 926 | """ |
|
927 | 927 | if ( |
|
928 | 928 | requirementsmod.SPARSE_REQUIREMENT in requirements |
|
929 | 929 | and not sparse.enabled |
|
930 | 930 | ): |
|
931 | 931 | raise error.RepoError( |
|
932 | 932 | _( |
|
933 | 933 | b'repository is using sparse feature but ' |
|
934 | 934 | b'sparse is not enabled; enable the ' |
|
935 | 935 | b'"sparse" extensions to access' |
|
936 | 936 | ) |
|
937 | 937 | ) |
|
938 | 938 | |
|
939 | 939 | |
|
940 | 940 | def makestore(requirements, path, vfstype): |
|
941 | 941 | """Construct a storage object for a repository.""" |
|
942 | 942 | if b'store' in requirements: |
|
943 | 943 | if b'fncache' in requirements: |
|
944 | 944 | return storemod.fncachestore( |
|
945 | 945 | path, vfstype, b'dotencode' in requirements |
|
946 | 946 | ) |
|
947 | 947 | |
|
948 | 948 | return storemod.encodedstore(path, vfstype) |
|
949 | 949 | |
|
950 | 950 | return storemod.basicstore(path, vfstype) |
|
951 | 951 | |
|
952 | 952 | |
|
953 | 953 | def resolvestorevfsoptions(ui, requirements, features): |
|
954 | 954 | """Resolve the options to pass to the store vfs opener. |
|
955 | 955 | |
|
956 | 956 | The returned dict is used to influence behavior of the storage layer. |
|
957 | 957 | """ |
|
958 | 958 | options = {} |
|
959 | 959 | |
|
960 | 960 | if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements: |
|
961 | 961 | options[b'treemanifest'] = True |
|
962 | 962 | |
|
963 | 963 | # experimental config: format.manifestcachesize |
|
964 | 964 | manifestcachesize = ui.configint(b'format', b'manifestcachesize') |
|
965 | 965 | if manifestcachesize is not None: |
|
966 | 966 | options[b'manifestcachesize'] = manifestcachesize |
|
967 | 967 | |
|
968 | 968 | # In the absence of another requirement superseding a revlog-related |
|
969 | 969 | # requirement, we have to assume the repo is using revlog version 0. |
|
970 | 970 | # This revlog format is super old and we don't bother trying to parse |
|
971 | 971 | # opener options for it because those options wouldn't do anything |
|
972 | 972 | # meaningful on such old repos. |
|
973 | 973 | if ( |
|
974 | 974 | b'revlogv1' in requirements |
|
975 | 975 | or requirementsmod.REVLOGV2_REQUIREMENT in requirements |
|
976 | 976 | ): |
|
977 | 977 | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) |
|
978 | 978 | else: # explicitly mark repo as using revlogv0 |
|
979 | 979 | options[b'revlogv0'] = True |
|
980 | 980 | |
|
981 | 981 | if requirementsmod.COPIESSDC_REQUIREMENT in requirements: |
|
982 | 982 | options[b'copies-storage'] = b'changeset-sidedata' |
|
983 | 983 | else: |
|
984 | 984 | writecopiesto = ui.config(b'experimental', b'copies.write-to') |
|
985 | 985 | copiesextramode = (b'changeset-only', b'compatibility') |
|
986 | 986 | if writecopiesto in copiesextramode: |
|
987 | 987 | options[b'copies-storage'] = b'extra' |
|
988 | 988 | |
|
989 | 989 | return options |
|
990 | 990 | |
|
991 | 991 | |
|
992 | 992 | def resolverevlogstorevfsoptions(ui, requirements, features): |
|
993 | 993 | """Resolve opener options specific to revlogs.""" |
|
994 | 994 | |
|
995 | 995 | options = {} |
|
996 | 996 | options[b'flagprocessors'] = {} |
|
997 | 997 | |
|
998 | 998 | if b'revlogv1' in requirements: |
|
999 | 999 | options[b'revlogv1'] = True |
|
1000 | 1000 | if requirementsmod.REVLOGV2_REQUIREMENT in requirements: |
|
1001 | 1001 | options[b'revlogv2'] = True |
|
1002 | 1002 | |
|
1003 | 1003 | if b'generaldelta' in requirements: |
|
1004 | 1004 | options[b'generaldelta'] = True |
|
1005 | 1005 | |
|
1006 | 1006 | # experimental config: format.chunkcachesize |
|
1007 | 1007 | chunkcachesize = ui.configint(b'format', b'chunkcachesize') |
|
1008 | 1008 | if chunkcachesize is not None: |
|
1009 | 1009 | options[b'chunkcachesize'] = chunkcachesize |
|
1010 | 1010 | |
|
1011 | 1011 | deltabothparents = ui.configbool( |
|
1012 | 1012 | b'storage', b'revlog.optimize-delta-parent-choice' |
|
1013 | 1013 | ) |
|
1014 | 1014 | options[b'deltabothparents'] = deltabothparents |
|
1015 | 1015 | |
|
1016 | 1016 | lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta') |
|
1017 | 1017 | lazydeltabase = False |
|
1018 | 1018 | if lazydelta: |
|
1019 | 1019 | lazydeltabase = ui.configbool( |
|
1020 | 1020 | b'storage', b'revlog.reuse-external-delta-parent' |
|
1021 | 1021 | ) |
|
1022 | 1022 | if lazydeltabase is None: |
|
1023 | 1023 | lazydeltabase = not scmutil.gddeltaconfig(ui) |
|
1024 | 1024 | options[b'lazydelta'] = lazydelta |
|
1025 | 1025 | options[b'lazydeltabase'] = lazydeltabase |
|
1026 | 1026 | |
|
1027 | 1027 | chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan') |
|
1028 | 1028 | if 0 <= chainspan: |
|
1029 | 1029 | options[b'maxdeltachainspan'] = chainspan |
|
1030 | 1030 | |
|
1031 | 1031 | mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold') |
|
1032 | 1032 | if mmapindexthreshold is not None: |
|
1033 | 1033 | options[b'mmapindexthreshold'] = mmapindexthreshold |
|
1034 | 1034 | |
|
1035 | 1035 | withsparseread = ui.configbool(b'experimental', b'sparse-read') |
|
1036 | 1036 | srdensitythres = float( |
|
1037 | 1037 | ui.config(b'experimental', b'sparse-read.density-threshold') |
|
1038 | 1038 | ) |
|
1039 | 1039 | srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size') |
|
1040 | 1040 | options[b'with-sparse-read'] = withsparseread |
|
1041 | 1041 | options[b'sparse-read-density-threshold'] = srdensitythres |
|
1042 | 1042 | options[b'sparse-read-min-gap-size'] = srmingapsize |
|
1043 | 1043 | |
|
1044 | 1044 | sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements |
|
1045 | 1045 | options[b'sparse-revlog'] = sparserevlog |
|
1046 | 1046 | if sparserevlog: |
|
1047 | 1047 | options[b'generaldelta'] = True |
|
1048 | 1048 | |
|
1049 | 1049 | sidedata = requirementsmod.SIDEDATA_REQUIREMENT in requirements |
|
1050 | 1050 | options[b'side-data'] = sidedata |
|
1051 | 1051 | |
|
1052 | 1052 | maxchainlen = None |
|
1053 | 1053 | if sparserevlog: |
|
1054 | 1054 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH |
|
1055 | 1055 | # experimental config: format.maxchainlen |
|
1056 | 1056 | maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) |
|
1057 | 1057 | if maxchainlen is not None: |
|
1058 | 1058 | options[b'maxchainlen'] = maxchainlen |
|
1059 | 1059 | |
|
1060 | 1060 | for r in requirements: |
|
1061 | 1061 | # we allow multiple compression engine requirement to co-exist because |
|
1062 | 1062 | # strickly speaking, revlog seems to support mixed compression style. |
|
1063 | 1063 | # |
|
1064 | 1064 | # The compression used for new entries will be "the last one" |
|
1065 | 1065 | prefix = r.startswith |
|
1066 | 1066 | if prefix(b'revlog-compression-') or prefix(b'exp-compression-'): |
|
1067 | 1067 | options[b'compengine'] = r.split(b'-', 2)[2] |
|
1068 | 1068 | |
|
1069 | 1069 | options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level') |
|
1070 | 1070 | if options[b'zlib.level'] is not None: |
|
1071 | 1071 | if not (0 <= options[b'zlib.level'] <= 9): |
|
1072 | 1072 | msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d') |
|
1073 | 1073 | raise error.Abort(msg % options[b'zlib.level']) |
|
1074 | 1074 | options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level') |
|
1075 | 1075 | if options[b'zstd.level'] is not None: |
|
1076 | 1076 | if not (0 <= options[b'zstd.level'] <= 22): |
|
1077 | 1077 | msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') |
|
1078 | 1078 | raise error.Abort(msg % options[b'zstd.level']) |
|
1079 | 1079 | |
|
1080 | 1080 | if requirementsmod.NARROW_REQUIREMENT in requirements: |
|
1081 | 1081 | options[b'enableellipsis'] = True |
|
1082 | 1082 | |
|
1083 | 1083 | if ui.configbool(b'experimental', b'rust.index'): |
|
1084 | 1084 | options[b'rust.index'] = True |
|
1085 | 1085 | if requirementsmod.NODEMAP_REQUIREMENT in requirements: |
|
1086 | 1086 | slow_path = ui.config( |
|
1087 | 1087 | b'storage', b'revlog.persistent-nodemap.slow-path' |
|
1088 | 1088 | ) |
|
1089 | 1089 | if slow_path not in (b'allow', b'warn', b'abort'): |
|
1090 | 1090 | default = ui.config_default( |
|
1091 | 1091 | b'storage', b'revlog.persistent-nodemap.slow-path' |
|
1092 | 1092 | ) |
|
1093 | 1093 | msg = _( |
|
1094 | 1094 | b'unknown value for config ' |
|
1095 | 1095 | b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n' |
|
1096 | 1096 | ) |
|
1097 | 1097 | ui.warn(msg % slow_path) |
|
1098 | 1098 | if not ui.quiet: |
|
1099 | 1099 | ui.warn(_(b'falling back to default value: %s\n') % default) |
|
1100 | 1100 | slow_path = default |
|
1101 | 1101 | |
|
1102 | 1102 | msg = _( |
|
1103 | 1103 | b"accessing `persistent-nodemap` repository without associated " |
|
1104 | 1104 | b"fast implementation." |
|
1105 | 1105 | ) |
|
1106 | 1106 | hint = _( |
|
1107 | 1107 | b"check `hg help config.format.use-persistent-nodemap` " |
|
1108 | 1108 | b"for details" |
|
1109 | 1109 | ) |
|
1110 | 1110 | if not revlog.HAS_FAST_PERSISTENT_NODEMAP: |
|
1111 | 1111 | if slow_path == b'warn': |
|
1112 | 1112 | msg = b"warning: " + msg + b'\n' |
|
1113 | 1113 | ui.warn(msg) |
|
1114 | 1114 | if not ui.quiet: |
|
1115 | 1115 | hint = b'(' + hint + b')\n' |
|
1116 | 1116 | ui.warn(hint) |
|
1117 | 1117 | if slow_path == b'abort': |
|
1118 | 1118 | raise error.Abort(msg, hint=hint) |
|
1119 | 1119 | options[b'persistent-nodemap'] = True |
|
1120 | 1120 | if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): |
|
1121 | 1121 | options[b'persistent-nodemap.mmap'] = True |
|
1122 | 1122 | if ui.configbool(b'devel', b'persistent-nodemap'): |
|
1123 | 1123 | options[b'devel-force-nodemap'] = True |
|
1124 | 1124 | |
|
1125 | 1125 | return options |
|
1126 | 1126 | |
|
1127 | 1127 | |
|
1128 | 1128 | def makemain(**kwargs): |
|
1129 | 1129 | """Produce a type conforming to ``ilocalrepositorymain``.""" |
|
1130 | 1130 | return localrepository |
|
1131 | 1131 | |
|
1132 | 1132 | |
|
1133 | 1133 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
1134 | 1134 | class revlogfilestorage(object): |
|
1135 | 1135 | """File storage when using revlogs.""" |
|
1136 | 1136 | |
|
1137 | 1137 | def file(self, path): |
|
1138 |
if path |
|
|
1138 | if path.startswith(b'/'): | |
|
1139 | 1139 | path = path[1:] |
|
1140 | 1140 | |
|
1141 | 1141 | return filelog.filelog(self.svfs, path) |
|
1142 | 1142 | |
|
1143 | 1143 | |
|
1144 | 1144 | @interfaceutil.implementer(repository.ilocalrepositoryfilestorage) |
|
1145 | 1145 | class revlognarrowfilestorage(object): |
|
1146 | 1146 | """File storage when using revlogs and narrow files.""" |
|
1147 | 1147 | |
|
1148 | 1148 | def file(self, path): |
|
1149 |
if path |
|
|
1149 | if path.startswith(b'/'): | |
|
1150 | 1150 | path = path[1:] |
|
1151 | 1151 | |
|
1152 | 1152 | return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch) |
|
1153 | 1153 | |
|
1154 | 1154 | |
|
1155 | 1155 | def makefilestorage(requirements, features, **kwargs): |
|
1156 | 1156 | """Produce a type conforming to ``ilocalrepositoryfilestorage``.""" |
|
1157 | 1157 | features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE) |
|
1158 | 1158 | features.add(repository.REPO_FEATURE_STREAM_CLONE) |
|
1159 | 1159 | |
|
1160 | 1160 | if requirementsmod.NARROW_REQUIREMENT in requirements: |
|
1161 | 1161 | return revlognarrowfilestorage |
|
1162 | 1162 | else: |
|
1163 | 1163 | return revlogfilestorage |
|
1164 | 1164 | |
|
1165 | 1165 | |
|
1166 | 1166 | # List of repository interfaces and factory functions for them. Each |
|
1167 | 1167 | # will be called in order during ``makelocalrepository()`` to iteratively |
|
1168 | 1168 | # derive the final type for a local repository instance. We capture the |
|
1169 | 1169 | # function as a lambda so we don't hold a reference and the module-level |
|
1170 | 1170 | # functions can be wrapped. |
|
1171 | 1171 | REPO_INTERFACES = [ |
|
1172 | 1172 | (repository.ilocalrepositorymain, lambda: makemain), |
|
1173 | 1173 | (repository.ilocalrepositoryfilestorage, lambda: makefilestorage), |
|
1174 | 1174 | ] |
|
1175 | 1175 | |
|
1176 | 1176 | |
|
1177 | 1177 | @interfaceutil.implementer(repository.ilocalrepositorymain) |
|
1178 | 1178 | class localrepository(object): |
|
1179 | 1179 | """Main class for representing local repositories. |
|
1180 | 1180 | |
|
1181 | 1181 | All local repositories are instances of this class. |
|
1182 | 1182 | |
|
1183 | 1183 | Constructed on its own, instances of this class are not usable as |
|
1184 | 1184 | repository objects. To obtain a usable repository object, call |
|
1185 | 1185 | ``hg.repository()``, ``localrepo.instance()``, or |
|
1186 | 1186 | ``localrepo.makelocalrepository()``. The latter is the lowest-level. |
|
1187 | 1187 | ``instance()`` adds support for creating new repositories. |
|
1188 | 1188 | ``hg.repository()`` adds more extension integration, including calling |
|
1189 | 1189 | ``reposetup()``. Generally speaking, ``hg.repository()`` should be |
|
1190 | 1190 | used. |
|
1191 | 1191 | """ |
|
1192 | 1192 | |
|
1193 | 1193 | # obsolete experimental requirements: |
|
1194 | 1194 | # - manifestv2: An experimental new manifest format that allowed |
|
1195 | 1195 | # for stem compression of long paths. Experiment ended up not |
|
1196 | 1196 | # being successful (repository sizes went up due to worse delta |
|
1197 | 1197 | # chains), and the code was deleted in 4.6. |
|
1198 | 1198 | supportedformats = { |
|
1199 | 1199 | b'revlogv1', |
|
1200 | 1200 | b'generaldelta', |
|
1201 | 1201 | requirementsmod.TREEMANIFEST_REQUIREMENT, |
|
1202 | 1202 | requirementsmod.COPIESSDC_REQUIREMENT, |
|
1203 | 1203 | requirementsmod.REVLOGV2_REQUIREMENT, |
|
1204 | 1204 | requirementsmod.SIDEDATA_REQUIREMENT, |
|
1205 | 1205 | requirementsmod.SPARSEREVLOG_REQUIREMENT, |
|
1206 | 1206 | requirementsmod.NODEMAP_REQUIREMENT, |
|
1207 | 1207 | bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, |
|
1208 | 1208 | requirementsmod.SHARESAFE_REQUIREMENT, |
|
1209 | 1209 | } |
|
1210 | 1210 | _basesupported = supportedformats | { |
|
1211 | 1211 | b'store', |
|
1212 | 1212 | b'fncache', |
|
1213 | 1213 | requirementsmod.SHARED_REQUIREMENT, |
|
1214 | 1214 | requirementsmod.RELATIVE_SHARED_REQUIREMENT, |
|
1215 | 1215 | b'dotencode', |
|
1216 | 1216 | requirementsmod.SPARSE_REQUIREMENT, |
|
1217 | 1217 | requirementsmod.INTERNAL_PHASE_REQUIREMENT, |
|
1218 | 1218 | } |
|
1219 | 1219 | |
|
1220 | 1220 | # list of prefix for file which can be written without 'wlock' |
|
1221 | 1221 | # Extensions should extend this list when needed |
|
1222 | 1222 | _wlockfreeprefix = { |
|
1223 | 1223 | # We migh consider requiring 'wlock' for the next |
|
1224 | 1224 | # two, but pretty much all the existing code assume |
|
1225 | 1225 | # wlock is not needed so we keep them excluded for |
|
1226 | 1226 | # now. |
|
1227 | 1227 | b'hgrc', |
|
1228 | 1228 | b'requires', |
|
1229 | 1229 | # XXX cache is a complicatged business someone |
|
1230 | 1230 | # should investigate this in depth at some point |
|
1231 | 1231 | b'cache/', |
|
1232 | 1232 | # XXX shouldn't be dirstate covered by the wlock? |
|
1233 | 1233 | b'dirstate', |
|
1234 | 1234 | # XXX bisect was still a bit too messy at the time |
|
1235 | 1235 | # this changeset was introduced. Someone should fix |
|
1236 | 1236 | # the remainig bit and drop this line |
|
1237 | 1237 | b'bisect.state', |
|
1238 | 1238 | } |
|
1239 | 1239 | |
|
1240 | 1240 | def __init__( |
|
1241 | 1241 | self, |
|
1242 | 1242 | baseui, |
|
1243 | 1243 | ui, |
|
1244 | 1244 | origroot, |
|
1245 | 1245 | wdirvfs, |
|
1246 | 1246 | hgvfs, |
|
1247 | 1247 | requirements, |
|
1248 | 1248 | supportedrequirements, |
|
1249 | 1249 | sharedpath, |
|
1250 | 1250 | store, |
|
1251 | 1251 | cachevfs, |
|
1252 | 1252 | wcachevfs, |
|
1253 | 1253 | features, |
|
1254 | 1254 | intents=None, |
|
1255 | 1255 | ): |
|
1256 | 1256 | """Create a new local repository instance. |
|
1257 | 1257 | |
|
1258 | 1258 | Most callers should use ``hg.repository()``, ``localrepo.instance()``, |
|
1259 | 1259 | or ``localrepo.makelocalrepository()`` for obtaining a new repository |
|
1260 | 1260 | object. |
|
1261 | 1261 | |
|
1262 | 1262 | Arguments: |
|
1263 | 1263 | |
|
1264 | 1264 | baseui |
|
1265 | 1265 | ``ui.ui`` instance that ``ui`` argument was based off of. |
|
1266 | 1266 | |
|
1267 | 1267 | ui |
|
1268 | 1268 | ``ui.ui`` instance for use by the repository. |
|
1269 | 1269 | |
|
1270 | 1270 | origroot |
|
1271 | 1271 | ``bytes`` path to working directory root of this repository. |
|
1272 | 1272 | |
|
1273 | 1273 | wdirvfs |
|
1274 | 1274 | ``vfs.vfs`` rooted at the working directory. |
|
1275 | 1275 | |
|
1276 | 1276 | hgvfs |
|
1277 | 1277 | ``vfs.vfs`` rooted at .hg/ |
|
1278 | 1278 | |
|
1279 | 1279 | requirements |
|
1280 | 1280 | ``set`` of bytestrings representing repository opening requirements. |
|
1281 | 1281 | |
|
1282 | 1282 | supportedrequirements |
|
1283 | 1283 | ``set`` of bytestrings representing repository requirements that we |
|
1284 | 1284 | know how to open. May be a supetset of ``requirements``. |
|
1285 | 1285 | |
|
1286 | 1286 | sharedpath |
|
1287 | 1287 | ``bytes`` Defining path to storage base directory. Points to a |
|
1288 | 1288 | ``.hg/`` directory somewhere. |
|
1289 | 1289 | |
|
1290 | 1290 | store |
|
1291 | 1291 | ``store.basicstore`` (or derived) instance providing access to |
|
1292 | 1292 | versioned storage. |
|
1293 | 1293 | |
|
1294 | 1294 | cachevfs |
|
1295 | 1295 | ``vfs.vfs`` used for cache files. |
|
1296 | 1296 | |
|
1297 | 1297 | wcachevfs |
|
1298 | 1298 | ``vfs.vfs`` used for cache files related to the working copy. |
|
1299 | 1299 | |
|
1300 | 1300 | features |
|
1301 | 1301 | ``set`` of bytestrings defining features/capabilities of this |
|
1302 | 1302 | instance. |
|
1303 | 1303 | |
|
1304 | 1304 | intents |
|
1305 | 1305 | ``set`` of system strings indicating what this repo will be used |
|
1306 | 1306 | for. |
|
1307 | 1307 | """ |
|
1308 | 1308 | self.baseui = baseui |
|
1309 | 1309 | self.ui = ui |
|
1310 | 1310 | self.origroot = origroot |
|
1311 | 1311 | # vfs rooted at working directory. |
|
1312 | 1312 | self.wvfs = wdirvfs |
|
1313 | 1313 | self.root = wdirvfs.base |
|
1314 | 1314 | # vfs rooted at .hg/. Used to access most non-store paths. |
|
1315 | 1315 | self.vfs = hgvfs |
|
1316 | 1316 | self.path = hgvfs.base |
|
1317 | 1317 | self.requirements = requirements |
|
1318 | 1318 | self.supported = supportedrequirements |
|
1319 | 1319 | self.sharedpath = sharedpath |
|
1320 | 1320 | self.store = store |
|
1321 | 1321 | self.cachevfs = cachevfs |
|
1322 | 1322 | self.wcachevfs = wcachevfs |
|
1323 | 1323 | self.features = features |
|
1324 | 1324 | |
|
1325 | 1325 | self.filtername = None |
|
1326 | 1326 | |
|
1327 | 1327 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1328 | 1328 | b'devel', b'check-locks' |
|
1329 | 1329 | ): |
|
1330 | 1330 | self.vfs.audit = self._getvfsward(self.vfs.audit) |
|
1331 | 1331 | # A list of callback to shape the phase if no data were found. |
|
1332 | 1332 | # Callback are in the form: func(repo, roots) --> processed root. |
|
1333 | 1333 | # This list it to be filled by extension during repo setup |
|
1334 | 1334 | self._phasedefaults = [] |
|
1335 | 1335 | |
|
1336 | 1336 | color.setup(self.ui) |
|
1337 | 1337 | |
|
1338 | 1338 | self.spath = self.store.path |
|
1339 | 1339 | self.svfs = self.store.vfs |
|
1340 | 1340 | self.sjoin = self.store.join |
|
1341 | 1341 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
1342 | 1342 | b'devel', b'check-locks' |
|
1343 | 1343 | ): |
|
1344 | 1344 | if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs |
|
1345 | 1345 | self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) |
|
1346 | 1346 | else: # standard vfs |
|
1347 | 1347 | self.svfs.audit = self._getsvfsward(self.svfs.audit) |
|
1348 | 1348 | |
|
1349 | 1349 | self._dirstatevalidatewarned = False |
|
1350 | 1350 | |
|
1351 | 1351 | self._branchcaches = branchmap.BranchMapCache() |
|
1352 | 1352 | self._revbranchcache = None |
|
1353 | 1353 | self._filterpats = {} |
|
1354 | 1354 | self._datafilters = {} |
|
1355 | 1355 | self._transref = self._lockref = self._wlockref = None |
|
1356 | 1356 | |
|
1357 | 1357 | # A cache for various files under .hg/ that tracks file changes, |
|
1358 | 1358 | # (used by the filecache decorator) |
|
1359 | 1359 | # |
|
1360 | 1360 | # Maps a property name to its util.filecacheentry |
|
1361 | 1361 | self._filecache = {} |
|
1362 | 1362 | |
|
1363 | 1363 | # hold sets of revision to be filtered |
|
1364 | 1364 | # should be cleared when something might have changed the filter value: |
|
1365 | 1365 | # - new changesets, |
|
1366 | 1366 | # - phase change, |
|
1367 | 1367 | # - new obsolescence marker, |
|
1368 | 1368 | # - working directory parent change, |
|
1369 | 1369 | # - bookmark changes |
|
1370 | 1370 | self.filteredrevcache = {} |
|
1371 | 1371 | |
|
1372 | 1372 | # post-dirstate-status hooks |
|
1373 | 1373 | self._postdsstatus = [] |
|
1374 | 1374 | |
|
1375 | 1375 | # generic mapping between names and nodes |
|
1376 | 1376 | self.names = namespaces.namespaces() |
|
1377 | 1377 | |
|
1378 | 1378 | # Key to signature value. |
|
1379 | 1379 | self._sparsesignaturecache = {} |
|
1380 | 1380 | # Signature to cached matcher instance. |
|
1381 | 1381 | self._sparsematchercache = {} |
|
1382 | 1382 | |
|
1383 | 1383 | self._extrafilterid = repoview.extrafilter(ui) |
|
1384 | 1384 | |
|
1385 | 1385 | self.filecopiesmode = None |
|
1386 | 1386 | if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements: |
|
1387 | 1387 | self.filecopiesmode = b'changeset-sidedata' |
|
1388 | 1388 | |
|
1389 | 1389 | def _getvfsward(self, origfunc): |
|
1390 | 1390 | """build a ward for self.vfs""" |
|
1391 | 1391 | rref = weakref.ref(self) |
|
1392 | 1392 | |
|
1393 | 1393 | def checkvfs(path, mode=None): |
|
1394 | 1394 | ret = origfunc(path, mode=mode) |
|
1395 | 1395 | repo = rref() |
|
1396 | 1396 | if ( |
|
1397 | 1397 | repo is None |
|
1398 | 1398 | or not util.safehasattr(repo, b'_wlockref') |
|
1399 | 1399 | or not util.safehasattr(repo, b'_lockref') |
|
1400 | 1400 | ): |
|
1401 | 1401 | return |
|
1402 | 1402 | if mode in (None, b'r', b'rb'): |
|
1403 | 1403 | return |
|
1404 | 1404 | if path.startswith(repo.path): |
|
1405 | 1405 | # truncate name relative to the repository (.hg) |
|
1406 | 1406 | path = path[len(repo.path) + 1 :] |
|
1407 | 1407 | if path.startswith(b'cache/'): |
|
1408 | 1408 | msg = b'accessing cache with vfs instead of cachevfs: "%s"' |
|
1409 | 1409 | repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs") |
|
1410 | 1410 | # path prefixes covered by 'lock' |
|
1411 | 1411 | vfs_path_prefixes = ( |
|
1412 | 1412 | b'journal.', |
|
1413 | 1413 | b'undo.', |
|
1414 | 1414 | b'strip-backup/', |
|
1415 | 1415 | b'cache/', |
|
1416 | 1416 | ) |
|
1417 | 1417 | if any(path.startswith(prefix) for prefix in vfs_path_prefixes): |
|
1418 | 1418 | if repo._currentlock(repo._lockref) is None: |
|
1419 | 1419 | repo.ui.develwarn( |
|
1420 | 1420 | b'write with no lock: "%s"' % path, |
|
1421 | 1421 | stacklevel=3, |
|
1422 | 1422 | config=b'check-locks', |
|
1423 | 1423 | ) |
|
1424 | 1424 | elif repo._currentlock(repo._wlockref) is None: |
|
1425 | 1425 | # rest of vfs files are covered by 'wlock' |
|
1426 | 1426 | # |
|
1427 | 1427 | # exclude special files |
|
1428 | 1428 | for prefix in self._wlockfreeprefix: |
|
1429 | 1429 | if path.startswith(prefix): |
|
1430 | 1430 | return |
|
1431 | 1431 | repo.ui.develwarn( |
|
1432 | 1432 | b'write with no wlock: "%s"' % path, |
|
1433 | 1433 | stacklevel=3, |
|
1434 | 1434 | config=b'check-locks', |
|
1435 | 1435 | ) |
|
1436 | 1436 | return ret |
|
1437 | 1437 | |
|
1438 | 1438 | return checkvfs |
|
1439 | 1439 | |
|
1440 | 1440 | def _getsvfsward(self, origfunc): |
|
1441 | 1441 | """build a ward for self.svfs""" |
|
1442 | 1442 | rref = weakref.ref(self) |
|
1443 | 1443 | |
|
1444 | 1444 | def checksvfs(path, mode=None): |
|
1445 | 1445 | ret = origfunc(path, mode=mode) |
|
1446 | 1446 | repo = rref() |
|
1447 | 1447 | if repo is None or not util.safehasattr(repo, b'_lockref'): |
|
1448 | 1448 | return |
|
1449 | 1449 | if mode in (None, b'r', b'rb'): |
|
1450 | 1450 | return |
|
1451 | 1451 | if path.startswith(repo.sharedpath): |
|
1452 | 1452 | # truncate name relative to the repository (.hg) |
|
1453 | 1453 | path = path[len(repo.sharedpath) + 1 :] |
|
1454 | 1454 | if repo._currentlock(repo._lockref) is None: |
|
1455 | 1455 | repo.ui.develwarn( |
|
1456 | 1456 | b'write with no lock: "%s"' % path, stacklevel=4 |
|
1457 | 1457 | ) |
|
1458 | 1458 | return ret |
|
1459 | 1459 | |
|
1460 | 1460 | return checksvfs |
|
1461 | 1461 | |
|
1462 | 1462 | def close(self): |
|
1463 | 1463 | self._writecaches() |
|
1464 | 1464 | |
|
1465 | 1465 | def _writecaches(self): |
|
1466 | 1466 | if self._revbranchcache: |
|
1467 | 1467 | self._revbranchcache.write() |
|
1468 | 1468 | |
|
1469 | 1469 | def _restrictcapabilities(self, caps): |
|
1470 | 1470 | if self.ui.configbool(b'experimental', b'bundle2-advertise'): |
|
1471 | 1471 | caps = set(caps) |
|
1472 | 1472 | capsblob = bundle2.encodecaps( |
|
1473 | 1473 | bundle2.getrepocaps(self, role=b'client') |
|
1474 | 1474 | ) |
|
1475 | 1475 | caps.add(b'bundle2=' + urlreq.quote(capsblob)) |
|
1476 | 1476 | return caps |
|
1477 | 1477 | |
|
1478 | 1478 | # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: |
|
1479 | 1479 | # self -> auditor -> self._checknested -> self |
|
1480 | 1480 | |
|
1481 | 1481 | @property |
|
1482 | 1482 | def auditor(self): |
|
1483 | 1483 | # This is only used by context.workingctx.match in order to |
|
1484 | 1484 | # detect files in subrepos. |
|
1485 | 1485 | return pathutil.pathauditor(self.root, callback=self._checknested) |
|
1486 | 1486 | |
|
1487 | 1487 | @property |
|
1488 | 1488 | def nofsauditor(self): |
|
1489 | 1489 | # This is only used by context.basectx.match in order to detect |
|
1490 | 1490 | # files in subrepos. |
|
1491 | 1491 | return pathutil.pathauditor( |
|
1492 | 1492 | self.root, callback=self._checknested, realfs=False, cached=True |
|
1493 | 1493 | ) |
|
1494 | 1494 | |
|
1495 | 1495 | def _checknested(self, path): |
|
1496 | 1496 | """Determine if path is a legal nested repository.""" |
|
1497 | 1497 | if not path.startswith(self.root): |
|
1498 | 1498 | return False |
|
1499 | 1499 | subpath = path[len(self.root) + 1 :] |
|
1500 | 1500 | normsubpath = util.pconvert(subpath) |
|
1501 | 1501 | |
|
1502 | 1502 | # XXX: Checking against the current working copy is wrong in |
|
1503 | 1503 | # the sense that it can reject things like |
|
1504 | 1504 | # |
|
1505 | 1505 | # $ hg cat -r 10 sub/x.txt |
|
1506 | 1506 | # |
|
1507 | 1507 | # if sub/ is no longer a subrepository in the working copy |
|
1508 | 1508 | # parent revision. |
|
1509 | 1509 | # |
|
1510 | 1510 | # However, it can of course also allow things that would have |
|
1511 | 1511 | # been rejected before, such as the above cat command if sub/ |
|
1512 | 1512 | # is a subrepository now, but was a normal directory before. |
|
1513 | 1513 | # The old path auditor would have rejected by mistake since it |
|
1514 | 1514 | # panics when it sees sub/.hg/. |
|
1515 | 1515 | # |
|
1516 | 1516 | # All in all, checking against the working copy seems sensible |
|
1517 | 1517 | # since we want to prevent access to nested repositories on |
|
1518 | 1518 | # the filesystem *now*. |
|
1519 | 1519 | ctx = self[None] |
|
1520 | 1520 | parts = util.splitpath(subpath) |
|
1521 | 1521 | while parts: |
|
1522 | 1522 | prefix = b'/'.join(parts) |
|
1523 | 1523 | if prefix in ctx.substate: |
|
1524 | 1524 | if prefix == normsubpath: |
|
1525 | 1525 | return True |
|
1526 | 1526 | else: |
|
1527 | 1527 | sub = ctx.sub(prefix) |
|
1528 | 1528 | return sub.checknested(subpath[len(prefix) + 1 :]) |
|
1529 | 1529 | else: |
|
1530 | 1530 | parts.pop() |
|
1531 | 1531 | return False |
|
1532 | 1532 | |
|
1533 | 1533 | def peer(self): |
|
1534 | 1534 | return localpeer(self) # not cached to avoid reference cycle |
|
1535 | 1535 | |
|
1536 | 1536 | def unfiltered(self): |
|
1537 | 1537 | """Return unfiltered version of the repository |
|
1538 | 1538 | |
|
1539 | 1539 | Intended to be overwritten by filtered repo.""" |
|
1540 | 1540 | return self |
|
1541 | 1541 | |
|
1542 | 1542 | def filtered(self, name, visibilityexceptions=None): |
|
1543 | 1543 | """Return a filtered version of a repository |
|
1544 | 1544 | |
|
1545 | 1545 | The `name` parameter is the identifier of the requested view. This |
|
1546 | 1546 | will return a repoview object set "exactly" to the specified view. |
|
1547 | 1547 | |
|
1548 | 1548 | This function does not apply recursive filtering to a repository. For |
|
1549 | 1549 | example calling `repo.filtered("served")` will return a repoview using |
|
1550 | 1550 | the "served" view, regardless of the initial view used by `repo`. |
|
1551 | 1551 | |
|
1552 | 1552 | In other word, there is always only one level of `repoview` "filtering". |
|
1553 | 1553 | """ |
|
1554 | 1554 | if self._extrafilterid is not None and b'%' not in name: |
|
1555 | 1555 | name = name + b'%' + self._extrafilterid |
|
1556 | 1556 | |
|
1557 | 1557 | cls = repoview.newtype(self.unfiltered().__class__) |
|
1558 | 1558 | return cls(self, name, visibilityexceptions) |
|
1559 | 1559 | |
|
1560 | 1560 | @mixedrepostorecache( |
|
1561 | 1561 | (b'bookmarks', b'plain'), |
|
1562 | 1562 | (b'bookmarks.current', b'plain'), |
|
1563 | 1563 | (b'bookmarks', b''), |
|
1564 | 1564 | (b'00changelog.i', b''), |
|
1565 | 1565 | ) |
|
1566 | 1566 | def _bookmarks(self): |
|
1567 | 1567 | # Since the multiple files involved in the transaction cannot be |
|
1568 | 1568 | # written atomically (with current repository format), there is a race |
|
1569 | 1569 | # condition here. |
|
1570 | 1570 | # |
|
1571 | 1571 | # 1) changelog content A is read |
|
1572 | 1572 | # 2) outside transaction update changelog to content B |
|
1573 | 1573 | # 3) outside transaction update bookmark file referring to content B |
|
1574 | 1574 | # 4) bookmarks file content is read and filtered against changelog-A |
|
1575 | 1575 | # |
|
1576 | 1576 | # When this happens, bookmarks against nodes missing from A are dropped. |
|
1577 | 1577 | # |
|
1578 | 1578 | # Having this happening during read is not great, but it become worse |
|
1579 | 1579 | # when this happen during write because the bookmarks to the "unknown" |
|
1580 | 1580 | # nodes will be dropped for good. However, writes happen within locks. |
|
1581 | 1581 | # This locking makes it possible to have a race free consistent read. |
|
1582 | 1582 | # For this purpose data read from disc before locking are |
|
1583 | 1583 | # "invalidated" right after the locks are taken. This invalidations are |
|
1584 | 1584 | # "light", the `filecache` mechanism keep the data in memory and will |
|
1585 | 1585 | # reuse them if the underlying files did not changed. Not parsing the |
|
1586 | 1586 | # same data multiple times helps performances. |
|
1587 | 1587 | # |
|
1588 | 1588 | # Unfortunately in the case describe above, the files tracked by the |
|
1589 | 1589 | # bookmarks file cache might not have changed, but the in-memory |
|
1590 | 1590 | # content is still "wrong" because we used an older changelog content |
|
1591 | 1591 | # to process the on-disk data. So after locking, the changelog would be |
|
1592 | 1592 | # refreshed but `_bookmarks` would be preserved. |
|
1593 | 1593 | # Adding `00changelog.i` to the list of tracked file is not |
|
1594 | 1594 | # enough, because at the time we build the content for `_bookmarks` in |
|
1595 | 1595 | # (4), the changelog file has already diverged from the content used |
|
1596 | 1596 | # for loading `changelog` in (1) |
|
1597 | 1597 | # |
|
1598 | 1598 | # To prevent the issue, we force the changelog to be explicitly |
|
1599 | 1599 | # reloaded while computing `_bookmarks`. The data race can still happen |
|
1600 | 1600 | # without the lock (with a narrower window), but it would no longer go |
|
1601 | 1601 | # undetected during the lock time refresh. |
|
1602 | 1602 | # |
|
1603 | 1603 | # The new schedule is as follow |
|
1604 | 1604 | # |
|
1605 | 1605 | # 1) filecache logic detect that `_bookmarks` needs to be computed |
|
1606 | 1606 | # 2) cachestat for `bookmarks` and `changelog` are captured (for book) |
|
1607 | 1607 | # 3) We force `changelog` filecache to be tested |
|
1608 | 1608 | # 4) cachestat for `changelog` are captured (for changelog) |
|
1609 | 1609 | # 5) `_bookmarks` is computed and cached |
|
1610 | 1610 | # |
|
1611 | 1611 | # The step in (3) ensure we have a changelog at least as recent as the |
|
1612 | 1612 | # cache stat computed in (1). As a result at locking time: |
|
1613 | 1613 | # * if the changelog did not changed since (1) -> we can reuse the data |
|
1614 | 1614 | # * otherwise -> the bookmarks get refreshed. |
|
1615 | 1615 | self._refreshchangelog() |
|
1616 | 1616 | return bookmarks.bmstore(self) |
|
1617 | 1617 | |
|
1618 | 1618 | def _refreshchangelog(self): |
|
1619 | 1619 | """make sure the in memory changelog match the on-disk one""" |
|
1620 | 1620 | if 'changelog' in vars(self) and self.currenttransaction() is None: |
|
1621 | 1621 | del self.changelog |
|
1622 | 1622 | |
|
1623 | 1623 | @property |
|
1624 | 1624 | def _activebookmark(self): |
|
1625 | 1625 | return self._bookmarks.active |
|
1626 | 1626 | |
|
1627 | 1627 | # _phasesets depend on changelog. what we need is to call |
|
1628 | 1628 | # _phasecache.invalidate() if '00changelog.i' was changed, but it |
|
1629 | 1629 | # can't be easily expressed in filecache mechanism. |
|
1630 | 1630 | @storecache(b'phaseroots', b'00changelog.i') |
|
1631 | 1631 | def _phasecache(self): |
|
1632 | 1632 | return phases.phasecache(self, self._phasedefaults) |
|
1633 | 1633 | |
|
1634 | 1634 | @storecache(b'obsstore') |
|
1635 | 1635 | def obsstore(self): |
|
1636 | 1636 | return obsolete.makestore(self.ui, self) |
|
1637 | 1637 | |
|
1638 | 1638 | @storecache(b'00changelog.i') |
|
1639 | 1639 | def changelog(self): |
|
1640 | 1640 | # load dirstate before changelog to avoid race see issue6303 |
|
1641 | 1641 | self.dirstate.prefetch_parents() |
|
1642 | 1642 | return self.store.changelog(txnutil.mayhavepending(self.root)) |
|
1643 | 1643 | |
|
1644 | 1644 | @storecache(b'00manifest.i') |
|
1645 | 1645 | def manifestlog(self): |
|
1646 | 1646 | return self.store.manifestlog(self, self._storenarrowmatch) |
|
1647 | 1647 | |
|
1648 | 1648 | @repofilecache(b'dirstate') |
|
1649 | 1649 | def dirstate(self): |
|
1650 | 1650 | return self._makedirstate() |
|
1651 | 1651 | |
|
1652 | 1652 | def _makedirstate(self): |
|
1653 | 1653 | """Extension point for wrapping the dirstate per-repo.""" |
|
1654 | 1654 | sparsematchfn = lambda: sparse.matcher(self) |
|
1655 | 1655 | |
|
1656 | 1656 | return dirstate.dirstate( |
|
1657 | 1657 | self.vfs, self.ui, self.root, self._dirstatevalidate, sparsematchfn |
|
1658 | 1658 | ) |
|
1659 | 1659 | |
|
1660 | 1660 | def _dirstatevalidate(self, node): |
|
1661 | 1661 | try: |
|
1662 | 1662 | self.changelog.rev(node) |
|
1663 | 1663 | return node |
|
1664 | 1664 | except error.LookupError: |
|
1665 | 1665 | if not self._dirstatevalidatewarned: |
|
1666 | 1666 | self._dirstatevalidatewarned = True |
|
1667 | 1667 | self.ui.warn( |
|
1668 | 1668 | _(b"warning: ignoring unknown working parent %s!\n") |
|
1669 | 1669 | % short(node) |
|
1670 | 1670 | ) |
|
1671 | 1671 | return nullid |
|
1672 | 1672 | |
|
1673 | 1673 | @storecache(narrowspec.FILENAME) |
|
1674 | 1674 | def narrowpats(self): |
|
1675 | 1675 | """matcher patterns for this repository's narrowspec |
|
1676 | 1676 | |
|
1677 | 1677 | A tuple of (includes, excludes). |
|
1678 | 1678 | """ |
|
1679 | 1679 | return narrowspec.load(self) |
|
1680 | 1680 | |
|
1681 | 1681 | @storecache(narrowspec.FILENAME) |
|
1682 | 1682 | def _storenarrowmatch(self): |
|
1683 | 1683 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: |
|
1684 | 1684 | return matchmod.always() |
|
1685 | 1685 | include, exclude = self.narrowpats |
|
1686 | 1686 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1687 | 1687 | |
|
1688 | 1688 | @storecache(narrowspec.FILENAME) |
|
1689 | 1689 | def _narrowmatch(self): |
|
1690 | 1690 | if requirementsmod.NARROW_REQUIREMENT not in self.requirements: |
|
1691 | 1691 | return matchmod.always() |
|
1692 | 1692 | narrowspec.checkworkingcopynarrowspec(self) |
|
1693 | 1693 | include, exclude = self.narrowpats |
|
1694 | 1694 | return narrowspec.match(self.root, include=include, exclude=exclude) |
|
1695 | 1695 | |
|
1696 | 1696 | def narrowmatch(self, match=None, includeexact=False): |
|
1697 | 1697 | """matcher corresponding the the repo's narrowspec |
|
1698 | 1698 | |
|
1699 | 1699 | If `match` is given, then that will be intersected with the narrow |
|
1700 | 1700 | matcher. |
|
1701 | 1701 | |
|
1702 | 1702 | If `includeexact` is True, then any exact matches from `match` will |
|
1703 | 1703 | be included even if they're outside the narrowspec. |
|
1704 | 1704 | """ |
|
1705 | 1705 | if match: |
|
1706 | 1706 | if includeexact and not self._narrowmatch.always(): |
|
1707 | 1707 | # do not exclude explicitly-specified paths so that they can |
|
1708 | 1708 | # be warned later on |
|
1709 | 1709 | em = matchmod.exact(match.files()) |
|
1710 | 1710 | nm = matchmod.unionmatcher([self._narrowmatch, em]) |
|
1711 | 1711 | return matchmod.intersectmatchers(match, nm) |
|
1712 | 1712 | return matchmod.intersectmatchers(match, self._narrowmatch) |
|
1713 | 1713 | return self._narrowmatch |
|
1714 | 1714 | |
|
1715 | 1715 | def setnarrowpats(self, newincludes, newexcludes): |
|
1716 | 1716 | narrowspec.save(self, newincludes, newexcludes) |
|
1717 | 1717 | self.invalidate(clearfilecache=True) |
|
1718 | 1718 | |
|
1719 | 1719 | @unfilteredpropertycache |
|
1720 | 1720 | def _quick_access_changeid_null(self): |
|
1721 | 1721 | return { |
|
1722 | 1722 | b'null': (nullrev, nullid), |
|
1723 | 1723 | nullrev: (nullrev, nullid), |
|
1724 | 1724 | nullid: (nullrev, nullid), |
|
1725 | 1725 | } |
|
1726 | 1726 | |
|
1727 | 1727 | @unfilteredpropertycache |
|
1728 | 1728 | def _quick_access_changeid_wc(self): |
|
1729 | 1729 | # also fast path access to the working copy parents |
|
1730 | 1730 | # however, only do it for filter that ensure wc is visible. |
|
1731 | 1731 | quick = self._quick_access_changeid_null.copy() |
|
1732 | 1732 | cl = self.unfiltered().changelog |
|
1733 | 1733 | for node in self.dirstate.parents(): |
|
1734 | 1734 | if node == nullid: |
|
1735 | 1735 | continue |
|
1736 | 1736 | rev = cl.index.get_rev(node) |
|
1737 | 1737 | if rev is None: |
|
1738 | 1738 | # unknown working copy parent case: |
|
1739 | 1739 | # |
|
1740 | 1740 | # skip the fast path and let higher code deal with it |
|
1741 | 1741 | continue |
|
1742 | 1742 | pair = (rev, node) |
|
1743 | 1743 | quick[rev] = pair |
|
1744 | 1744 | quick[node] = pair |
|
1745 | 1745 | # also add the parents of the parents |
|
1746 | 1746 | for r in cl.parentrevs(rev): |
|
1747 | 1747 | if r == nullrev: |
|
1748 | 1748 | continue |
|
1749 | 1749 | n = cl.node(r) |
|
1750 | 1750 | pair = (r, n) |
|
1751 | 1751 | quick[r] = pair |
|
1752 | 1752 | quick[n] = pair |
|
1753 | 1753 | p1node = self.dirstate.p1() |
|
1754 | 1754 | if p1node != nullid: |
|
1755 | 1755 | quick[b'.'] = quick[p1node] |
|
1756 | 1756 | return quick |
|
1757 | 1757 | |
|
1758 | 1758 | @unfilteredmethod |
|
1759 | 1759 | def _quick_access_changeid_invalidate(self): |
|
1760 | 1760 | if '_quick_access_changeid_wc' in vars(self): |
|
1761 | 1761 | del self.__dict__['_quick_access_changeid_wc'] |
|
1762 | 1762 | |
|
1763 | 1763 | @property |
|
1764 | 1764 | def _quick_access_changeid(self): |
|
1765 | 1765 | """an helper dictionnary for __getitem__ calls |
|
1766 | 1766 | |
|
1767 | 1767 | This contains a list of symbol we can recognise right away without |
|
1768 | 1768 | further processing. |
|
1769 | 1769 | """ |
|
1770 | 1770 | if self.filtername in repoview.filter_has_wc: |
|
1771 | 1771 | return self._quick_access_changeid_wc |
|
1772 | 1772 | return self._quick_access_changeid_null |
|
1773 | 1773 | |
|
1774 | 1774 | def __getitem__(self, changeid): |
|
1775 | 1775 | # dealing with special cases |
|
1776 | 1776 | if changeid is None: |
|
1777 | 1777 | return context.workingctx(self) |
|
1778 | 1778 | if isinstance(changeid, context.basectx): |
|
1779 | 1779 | return changeid |
|
1780 | 1780 | |
|
1781 | 1781 | # dealing with multiple revisions |
|
1782 | 1782 | if isinstance(changeid, slice): |
|
1783 | 1783 | # wdirrev isn't contiguous so the slice shouldn't include it |
|
1784 | 1784 | return [ |
|
1785 | 1785 | self[i] |
|
1786 | 1786 | for i in pycompat.xrange(*changeid.indices(len(self))) |
|
1787 | 1787 | if i not in self.changelog.filteredrevs |
|
1788 | 1788 | ] |
|
1789 | 1789 | |
|
1790 | 1790 | # dealing with some special values |
|
1791 | 1791 | quick_access = self._quick_access_changeid.get(changeid) |
|
1792 | 1792 | if quick_access is not None: |
|
1793 | 1793 | rev, node = quick_access |
|
1794 | 1794 | return context.changectx(self, rev, node, maybe_filtered=False) |
|
1795 | 1795 | if changeid == b'tip': |
|
1796 | 1796 | node = self.changelog.tip() |
|
1797 | 1797 | rev = self.changelog.rev(node) |
|
1798 | 1798 | return context.changectx(self, rev, node) |
|
1799 | 1799 | |
|
1800 | 1800 | # dealing with arbitrary values |
|
1801 | 1801 | try: |
|
1802 | 1802 | if isinstance(changeid, int): |
|
1803 | 1803 | node = self.changelog.node(changeid) |
|
1804 | 1804 | rev = changeid |
|
1805 | 1805 | elif changeid == b'.': |
|
1806 | 1806 | # this is a hack to delay/avoid loading obsmarkers |
|
1807 | 1807 | # when we know that '.' won't be hidden |
|
1808 | 1808 | node = self.dirstate.p1() |
|
1809 | 1809 | rev = self.unfiltered().changelog.rev(node) |
|
1810 | 1810 | elif len(changeid) == 20: |
|
1811 | 1811 | try: |
|
1812 | 1812 | node = changeid |
|
1813 | 1813 | rev = self.changelog.rev(changeid) |
|
1814 | 1814 | except error.FilteredLookupError: |
|
1815 | 1815 | changeid = hex(changeid) # for the error message |
|
1816 | 1816 | raise |
|
1817 | 1817 | except LookupError: |
|
1818 | 1818 | # check if it might have come from damaged dirstate |
|
1819 | 1819 | # |
|
1820 | 1820 | # XXX we could avoid the unfiltered if we had a recognizable |
|
1821 | 1821 | # exception for filtered changeset access |
|
1822 | 1822 | if ( |
|
1823 | 1823 | self.local() |
|
1824 | 1824 | and changeid in self.unfiltered().dirstate.parents() |
|
1825 | 1825 | ): |
|
1826 | 1826 | msg = _(b"working directory has unknown parent '%s'!") |
|
1827 | 1827 | raise error.Abort(msg % short(changeid)) |
|
1828 | 1828 | changeid = hex(changeid) # for the error message |
|
1829 | 1829 | raise |
|
1830 | 1830 | |
|
1831 | 1831 | elif len(changeid) == 40: |
|
1832 | 1832 | node = bin(changeid) |
|
1833 | 1833 | rev = self.changelog.rev(node) |
|
1834 | 1834 | else: |
|
1835 | 1835 | raise error.ProgrammingError( |
|
1836 | 1836 | b"unsupported changeid '%s' of type %s" |
|
1837 | 1837 | % (changeid, pycompat.bytestr(type(changeid))) |
|
1838 | 1838 | ) |
|
1839 | 1839 | |
|
1840 | 1840 | return context.changectx(self, rev, node) |
|
1841 | 1841 | |
|
1842 | 1842 | except (error.FilteredIndexError, error.FilteredLookupError): |
|
1843 | 1843 | raise error.FilteredRepoLookupError( |
|
1844 | 1844 | _(b"filtered revision '%s'") % pycompat.bytestr(changeid) |
|
1845 | 1845 | ) |
|
1846 | 1846 | except (IndexError, LookupError): |
|
1847 | 1847 | raise error.RepoLookupError( |
|
1848 | 1848 | _(b"unknown revision '%s'") % pycompat.bytestr(changeid) |
|
1849 | 1849 | ) |
|
1850 | 1850 | except error.WdirUnsupported: |
|
1851 | 1851 | return context.workingctx(self) |
|
1852 | 1852 | |
|
1853 | 1853 | def __contains__(self, changeid): |
|
1854 | 1854 | """True if the given changeid exists""" |
|
1855 | 1855 | try: |
|
1856 | 1856 | self[changeid] |
|
1857 | 1857 | return True |
|
1858 | 1858 | except error.RepoLookupError: |
|
1859 | 1859 | return False |
|
1860 | 1860 | |
|
1861 | 1861 | def __nonzero__(self): |
|
1862 | 1862 | return True |
|
1863 | 1863 | |
|
1864 | 1864 | __bool__ = __nonzero__ |
|
1865 | 1865 | |
|
1866 | 1866 | def __len__(self): |
|
1867 | 1867 | # no need to pay the cost of repoview.changelog |
|
1868 | 1868 | unfi = self.unfiltered() |
|
1869 | 1869 | return len(unfi.changelog) |
|
1870 | 1870 | |
|
1871 | 1871 | def __iter__(self): |
|
1872 | 1872 | return iter(self.changelog) |
|
1873 | 1873 | |
|
1874 | 1874 | def revs(self, expr, *args): |
|
1875 | 1875 | """Find revisions matching a revset. |
|
1876 | 1876 | |
|
1877 | 1877 | The revset is specified as a string ``expr`` that may contain |
|
1878 | 1878 | %-formatting to escape certain types. See ``revsetlang.formatspec``. |
|
1879 | 1879 | |
|
1880 | 1880 | Revset aliases from the configuration are not expanded. To expand |
|
1881 | 1881 | user aliases, consider calling ``scmutil.revrange()`` or |
|
1882 | 1882 | ``repo.anyrevs([expr], user=True)``. |
|
1883 | 1883 | |
|
1884 | 1884 | Returns a smartset.abstractsmartset, which is a list-like interface |
|
1885 | 1885 | that contains integer revisions. |
|
1886 | 1886 | """ |
|
1887 | 1887 | tree = revsetlang.spectree(expr, *args) |
|
1888 | 1888 | return revset.makematcher(tree)(self) |
|
1889 | 1889 | |
|
1890 | 1890 | def set(self, expr, *args): |
|
1891 | 1891 | """Find revisions matching a revset and emit changectx instances. |
|
1892 | 1892 | |
|
1893 | 1893 | This is a convenience wrapper around ``revs()`` that iterates the |
|
1894 | 1894 | result and is a generator of changectx instances. |
|
1895 | 1895 | |
|
1896 | 1896 | Revset aliases from the configuration are not expanded. To expand |
|
1897 | 1897 | user aliases, consider calling ``scmutil.revrange()``. |
|
1898 | 1898 | """ |
|
1899 | 1899 | for r in self.revs(expr, *args): |
|
1900 | 1900 | yield self[r] |
|
1901 | 1901 | |
|
1902 | 1902 | def anyrevs(self, specs, user=False, localalias=None): |
|
1903 | 1903 | """Find revisions matching one of the given revsets. |
|
1904 | 1904 | |
|
1905 | 1905 | Revset aliases from the configuration are not expanded by default. To |
|
1906 | 1906 | expand user aliases, specify ``user=True``. To provide some local |
|
1907 | 1907 | definitions overriding user aliases, set ``localalias`` to |
|
1908 | 1908 | ``{name: definitionstring}``. |
|
1909 | 1909 | """ |
|
1910 | 1910 | if specs == [b'null']: |
|
1911 | 1911 | return revset.baseset([nullrev]) |
|
1912 | 1912 | if specs == [b'.']: |
|
1913 | 1913 | quick_data = self._quick_access_changeid.get(b'.') |
|
1914 | 1914 | if quick_data is not None: |
|
1915 | 1915 | return revset.baseset([quick_data[0]]) |
|
1916 | 1916 | if user: |
|
1917 | 1917 | m = revset.matchany( |
|
1918 | 1918 | self.ui, |
|
1919 | 1919 | specs, |
|
1920 | 1920 | lookup=revset.lookupfn(self), |
|
1921 | 1921 | localalias=localalias, |
|
1922 | 1922 | ) |
|
1923 | 1923 | else: |
|
1924 | 1924 | m = revset.matchany(None, specs, localalias=localalias) |
|
1925 | 1925 | return m(self) |
|
1926 | 1926 | |
|
1927 | 1927 | def url(self): |
|
1928 | 1928 | return b'file:' + self.root |
|
1929 | 1929 | |
|
1930 | 1930 | def hook(self, name, throw=False, **args): |
|
1931 | 1931 | """Call a hook, passing this repo instance. |
|
1932 | 1932 | |
|
1933 | 1933 | This a convenience method to aid invoking hooks. Extensions likely |
|
1934 | 1934 | won't call this unless they have registered a custom hook or are |
|
1935 | 1935 | replacing code that is expected to call a hook. |
|
1936 | 1936 | """ |
|
1937 | 1937 | return hook.hook(self.ui, self, name, throw, **args) |
|
1938 | 1938 | |
|
1939 | 1939 | @filteredpropertycache |
|
1940 | 1940 | def _tagscache(self): |
|
1941 | 1941 | """Returns a tagscache object that contains various tags related |
|
1942 | 1942 | caches.""" |
|
1943 | 1943 | |
|
1944 | 1944 | # This simplifies its cache management by having one decorated |
|
1945 | 1945 | # function (this one) and the rest simply fetch things from it. |
|
1946 | 1946 | class tagscache(object): |
|
1947 | 1947 | def __init__(self): |
|
1948 | 1948 | # These two define the set of tags for this repository. tags |
|
1949 | 1949 | # maps tag name to node; tagtypes maps tag name to 'global' or |
|
1950 | 1950 | # 'local'. (Global tags are defined by .hgtags across all |
|
1951 | 1951 | # heads, and local tags are defined in .hg/localtags.) |
|
1952 | 1952 | # They constitute the in-memory cache of tags. |
|
1953 | 1953 | self.tags = self.tagtypes = None |
|
1954 | 1954 | |
|
1955 | 1955 | self.nodetagscache = self.tagslist = None |
|
1956 | 1956 | |
|
1957 | 1957 | cache = tagscache() |
|
1958 | 1958 | cache.tags, cache.tagtypes = self._findtags() |
|
1959 | 1959 | |
|
1960 | 1960 | return cache |
|
1961 | 1961 | |
|
1962 | 1962 | def tags(self): |
|
1963 | 1963 | '''return a mapping of tag to node''' |
|
1964 | 1964 | t = {} |
|
1965 | 1965 | if self.changelog.filteredrevs: |
|
1966 | 1966 | tags, tt = self._findtags() |
|
1967 | 1967 | else: |
|
1968 | 1968 | tags = self._tagscache.tags |
|
1969 | 1969 | rev = self.changelog.rev |
|
1970 | 1970 | for k, v in pycompat.iteritems(tags): |
|
1971 | 1971 | try: |
|
1972 | 1972 | # ignore tags to unknown nodes |
|
1973 | 1973 | rev(v) |
|
1974 | 1974 | t[k] = v |
|
1975 | 1975 | except (error.LookupError, ValueError): |
|
1976 | 1976 | pass |
|
1977 | 1977 | return t |
|
1978 | 1978 | |
|
1979 | 1979 | def _findtags(self): |
|
1980 | 1980 | """Do the hard work of finding tags. Return a pair of dicts |
|
1981 | 1981 | (tags, tagtypes) where tags maps tag name to node, and tagtypes |
|
1982 | 1982 | maps tag name to a string like \'global\' or \'local\'. |
|
1983 | 1983 | Subclasses or extensions are free to add their own tags, but |
|
1984 | 1984 | should be aware that the returned dicts will be retained for the |
|
1985 | 1985 | duration of the localrepo object.""" |
|
1986 | 1986 | |
|
1987 | 1987 | # XXX what tagtype should subclasses/extensions use? Currently |
|
1988 | 1988 | # mq and bookmarks add tags, but do not set the tagtype at all. |
|
1989 | 1989 | # Should each extension invent its own tag type? Should there |
|
1990 | 1990 | # be one tagtype for all such "virtual" tags? Or is the status |
|
1991 | 1991 | # quo fine? |
|
1992 | 1992 | |
|
1993 | 1993 | # map tag name to (node, hist) |
|
1994 | 1994 | alltags = tagsmod.findglobaltags(self.ui, self) |
|
1995 | 1995 | # map tag name to tag type |
|
1996 | 1996 | tagtypes = {tag: b'global' for tag in alltags} |
|
1997 | 1997 | |
|
1998 | 1998 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) |
|
1999 | 1999 | |
|
2000 | 2000 | # Build the return dicts. Have to re-encode tag names because |
|
2001 | 2001 | # the tags module always uses UTF-8 (in order not to lose info |
|
2002 | 2002 | # writing to the cache), but the rest of Mercurial wants them in |
|
2003 | 2003 | # local encoding. |
|
2004 | 2004 | tags = {} |
|
2005 | 2005 | for (name, (node, hist)) in pycompat.iteritems(alltags): |
|
2006 | 2006 | if node != nullid: |
|
2007 | 2007 | tags[encoding.tolocal(name)] = node |
|
2008 | 2008 | tags[b'tip'] = self.changelog.tip() |
|
2009 | 2009 | tagtypes = { |
|
2010 | 2010 | encoding.tolocal(name): value |
|
2011 | 2011 | for (name, value) in pycompat.iteritems(tagtypes) |
|
2012 | 2012 | } |
|
2013 | 2013 | return (tags, tagtypes) |
|
2014 | 2014 | |
|
2015 | 2015 | def tagtype(self, tagname): |
|
2016 | 2016 | """ |
|
2017 | 2017 | return the type of the given tag. result can be: |
|
2018 | 2018 | |
|
2019 | 2019 | 'local' : a local tag |
|
2020 | 2020 | 'global' : a global tag |
|
2021 | 2021 | None : tag does not exist |
|
2022 | 2022 | """ |
|
2023 | 2023 | |
|
2024 | 2024 | return self._tagscache.tagtypes.get(tagname) |
|
2025 | 2025 | |
|
2026 | 2026 | def tagslist(self): |
|
2027 | 2027 | '''return a list of tags ordered by revision''' |
|
2028 | 2028 | if not self._tagscache.tagslist: |
|
2029 | 2029 | l = [] |
|
2030 | 2030 | for t, n in pycompat.iteritems(self.tags()): |
|
2031 | 2031 | l.append((self.changelog.rev(n), t, n)) |
|
2032 | 2032 | self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)] |
|
2033 | 2033 | |
|
2034 | 2034 | return self._tagscache.tagslist |
|
2035 | 2035 | |
|
2036 | 2036 | def nodetags(self, node): |
|
2037 | 2037 | '''return the tags associated with a node''' |
|
2038 | 2038 | if not self._tagscache.nodetagscache: |
|
2039 | 2039 | nodetagscache = {} |
|
2040 | 2040 | for t, n in pycompat.iteritems(self._tagscache.tags): |
|
2041 | 2041 | nodetagscache.setdefault(n, []).append(t) |
|
2042 | 2042 | for tags in pycompat.itervalues(nodetagscache): |
|
2043 | 2043 | tags.sort() |
|
2044 | 2044 | self._tagscache.nodetagscache = nodetagscache |
|
2045 | 2045 | return self._tagscache.nodetagscache.get(node, []) |
|
2046 | 2046 | |
|
2047 | 2047 | def nodebookmarks(self, node): |
|
2048 | 2048 | """return the list of bookmarks pointing to the specified node""" |
|
2049 | 2049 | return self._bookmarks.names(node) |
|
2050 | 2050 | |
|
2051 | 2051 | def branchmap(self): |
|
2052 | 2052 | """returns a dictionary {branch: [branchheads]} with branchheads |
|
2053 | 2053 | ordered by increasing revision number""" |
|
2054 | 2054 | return self._branchcaches[self] |
|
2055 | 2055 | |
|
2056 | 2056 | @unfilteredmethod |
|
2057 | 2057 | def revbranchcache(self): |
|
2058 | 2058 | if not self._revbranchcache: |
|
2059 | 2059 | self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) |
|
2060 | 2060 | return self._revbranchcache |
|
2061 | 2061 | |
|
2062 | 2062 | def branchtip(self, branch, ignoremissing=False): |
|
2063 | 2063 | """return the tip node for a given branch |
|
2064 | 2064 | |
|
2065 | 2065 | If ignoremissing is True, then this method will not raise an error. |
|
2066 | 2066 | This is helpful for callers that only expect None for a missing branch |
|
2067 | 2067 | (e.g. namespace). |
|
2068 | 2068 | |
|
2069 | 2069 | """ |
|
2070 | 2070 | try: |
|
2071 | 2071 | return self.branchmap().branchtip(branch) |
|
2072 | 2072 | except KeyError: |
|
2073 | 2073 | if not ignoremissing: |
|
2074 | 2074 | raise error.RepoLookupError(_(b"unknown branch '%s'") % branch) |
|
2075 | 2075 | else: |
|
2076 | 2076 | pass |
|
2077 | 2077 | |
|
2078 | 2078 | def lookup(self, key): |
|
2079 | 2079 | node = scmutil.revsymbol(self, key).node() |
|
2080 | 2080 | if node is None: |
|
2081 | 2081 | raise error.RepoLookupError(_(b"unknown revision '%s'") % key) |
|
2082 | 2082 | return node |
|
2083 | 2083 | |
|
2084 | 2084 | def lookupbranch(self, key): |
|
2085 | 2085 | if self.branchmap().hasbranch(key): |
|
2086 | 2086 | return key |
|
2087 | 2087 | |
|
2088 | 2088 | return scmutil.revsymbol(self, key).branch() |
|
2089 | 2089 | |
|
2090 | 2090 | def known(self, nodes): |
|
2091 | 2091 | cl = self.changelog |
|
2092 | 2092 | get_rev = cl.index.get_rev |
|
2093 | 2093 | filtered = cl.filteredrevs |
|
2094 | 2094 | result = [] |
|
2095 | 2095 | for n in nodes: |
|
2096 | 2096 | r = get_rev(n) |
|
2097 | 2097 | resp = not (r is None or r in filtered) |
|
2098 | 2098 | result.append(resp) |
|
2099 | 2099 | return result |
|
2100 | 2100 | |
|
2101 | 2101 | def local(self): |
|
2102 | 2102 | return self |
|
2103 | 2103 | |
|
2104 | 2104 | def publishing(self): |
|
2105 | 2105 | # it's safe (and desirable) to trust the publish flag unconditionally |
|
2106 | 2106 | # so that we don't finalize changes shared between users via ssh or nfs |
|
2107 | 2107 | return self.ui.configbool(b'phases', b'publish', untrusted=True) |
|
2108 | 2108 | |
|
2109 | 2109 | def cancopy(self): |
|
2110 | 2110 | # so statichttprepo's override of local() works |
|
2111 | 2111 | if not self.local(): |
|
2112 | 2112 | return False |
|
2113 | 2113 | if not self.publishing(): |
|
2114 | 2114 | return True |
|
2115 | 2115 | # if publishing we can't copy if there is filtered content |
|
2116 | 2116 | return not self.filtered(b'visible').changelog.filteredrevs |
|
2117 | 2117 | |
|
2118 | 2118 | def shared(self): |
|
2119 | 2119 | '''the type of shared repository (None if not shared)''' |
|
2120 | 2120 | if self.sharedpath != self.path: |
|
2121 | 2121 | return b'store' |
|
2122 | 2122 | return None |
|
2123 | 2123 | |
|
2124 | 2124 | def wjoin(self, f, *insidef): |
|
2125 | 2125 | return self.vfs.reljoin(self.root, f, *insidef) |
|
2126 | 2126 | |
|
2127 | 2127 | def setparents(self, p1, p2=nullid): |
|
2128 | 2128 | self[None].setparents(p1, p2) |
|
2129 | 2129 | self._quick_access_changeid_invalidate() |
|
2130 | 2130 | |
|
2131 | 2131 | def filectx(self, path, changeid=None, fileid=None, changectx=None): |
|
2132 | 2132 | """changeid must be a changeset revision, if specified. |
|
2133 | 2133 | fileid can be a file revision or node.""" |
|
2134 | 2134 | return context.filectx( |
|
2135 | 2135 | self, path, changeid, fileid, changectx=changectx |
|
2136 | 2136 | ) |
|
2137 | 2137 | |
|
2138 | 2138 | def getcwd(self): |
|
2139 | 2139 | return self.dirstate.getcwd() |
|
2140 | 2140 | |
|
2141 | 2141 | def pathto(self, f, cwd=None): |
|
2142 | 2142 | return self.dirstate.pathto(f, cwd) |
|
2143 | 2143 | |
|
2144 | 2144 | def _loadfilter(self, filter): |
|
2145 | 2145 | if filter not in self._filterpats: |
|
2146 | 2146 | l = [] |
|
2147 | 2147 | for pat, cmd in self.ui.configitems(filter): |
|
2148 | 2148 | if cmd == b'!': |
|
2149 | 2149 | continue |
|
2150 | 2150 | mf = matchmod.match(self.root, b'', [pat]) |
|
2151 | 2151 | fn = None |
|
2152 | 2152 | params = cmd |
|
2153 | 2153 | for name, filterfn in pycompat.iteritems(self._datafilters): |
|
2154 | 2154 | if cmd.startswith(name): |
|
2155 | 2155 | fn = filterfn |
|
2156 | 2156 | params = cmd[len(name) :].lstrip() |
|
2157 | 2157 | break |
|
2158 | 2158 | if not fn: |
|
2159 | 2159 | fn = lambda s, c, **kwargs: procutil.filter(s, c) |
|
2160 | 2160 | fn.__name__ = 'commandfilter' |
|
2161 | 2161 | # Wrap old filters not supporting keyword arguments |
|
2162 | 2162 | if not pycompat.getargspec(fn)[2]: |
|
2163 | 2163 | oldfn = fn |
|
2164 | 2164 | fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c) |
|
2165 | 2165 | fn.__name__ = 'compat-' + oldfn.__name__ |
|
2166 | 2166 | l.append((mf, fn, params)) |
|
2167 | 2167 | self._filterpats[filter] = l |
|
2168 | 2168 | return self._filterpats[filter] |
|
2169 | 2169 | |
|
2170 | 2170 | def _filter(self, filterpats, filename, data): |
|
2171 | 2171 | for mf, fn, cmd in filterpats: |
|
2172 | 2172 | if mf(filename): |
|
2173 | 2173 | self.ui.debug( |
|
2174 | 2174 | b"filtering %s through %s\n" |
|
2175 | 2175 | % (filename, cmd or pycompat.sysbytes(fn.__name__)) |
|
2176 | 2176 | ) |
|
2177 | 2177 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) |
|
2178 | 2178 | break |
|
2179 | 2179 | |
|
2180 | 2180 | return data |
|
2181 | 2181 | |
|
2182 | 2182 | @unfilteredpropertycache |
|
2183 | 2183 | def _encodefilterpats(self): |
|
2184 | 2184 | return self._loadfilter(b'encode') |
|
2185 | 2185 | |
|
2186 | 2186 | @unfilteredpropertycache |
|
2187 | 2187 | def _decodefilterpats(self): |
|
2188 | 2188 | return self._loadfilter(b'decode') |
|
2189 | 2189 | |
|
2190 | 2190 | def adddatafilter(self, name, filter): |
|
2191 | 2191 | self._datafilters[name] = filter |
|
2192 | 2192 | |
|
2193 | 2193 | def wread(self, filename): |
|
2194 | 2194 | if self.wvfs.islink(filename): |
|
2195 | 2195 | data = self.wvfs.readlink(filename) |
|
2196 | 2196 | else: |
|
2197 | 2197 | data = self.wvfs.read(filename) |
|
2198 | 2198 | return self._filter(self._encodefilterpats, filename, data) |
|
2199 | 2199 | |
|
2200 | 2200 | def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs): |
|
2201 | 2201 | """write ``data`` into ``filename`` in the working directory |
|
2202 | 2202 | |
|
2203 | 2203 | This returns length of written (maybe decoded) data. |
|
2204 | 2204 | """ |
|
2205 | 2205 | data = self._filter(self._decodefilterpats, filename, data) |
|
2206 | 2206 | if b'l' in flags: |
|
2207 | 2207 | self.wvfs.symlink(data, filename) |
|
2208 | 2208 | else: |
|
2209 | 2209 | self.wvfs.write( |
|
2210 | 2210 | filename, data, backgroundclose=backgroundclose, **kwargs |
|
2211 | 2211 | ) |
|
2212 | 2212 | if b'x' in flags: |
|
2213 | 2213 | self.wvfs.setflags(filename, False, True) |
|
2214 | 2214 | else: |
|
2215 | 2215 | self.wvfs.setflags(filename, False, False) |
|
2216 | 2216 | return len(data) |
|
2217 | 2217 | |
|
2218 | 2218 | def wwritedata(self, filename, data): |
|
2219 | 2219 | return self._filter(self._decodefilterpats, filename, data) |
|
2220 | 2220 | |
|
2221 | 2221 | def currenttransaction(self): |
|
2222 | 2222 | """return the current transaction or None if non exists""" |
|
2223 | 2223 | if self._transref: |
|
2224 | 2224 | tr = self._transref() |
|
2225 | 2225 | else: |
|
2226 | 2226 | tr = None |
|
2227 | 2227 | |
|
2228 | 2228 | if tr and tr.running(): |
|
2229 | 2229 | return tr |
|
2230 | 2230 | return None |
|
2231 | 2231 | |
|
2232 | 2232 | def transaction(self, desc, report=None): |
|
2233 | 2233 | if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool( |
|
2234 | 2234 | b'devel', b'check-locks' |
|
2235 | 2235 | ): |
|
2236 | 2236 | if self._currentlock(self._lockref) is None: |
|
2237 | 2237 | raise error.ProgrammingError(b'transaction requires locking') |
|
2238 | 2238 | tr = self.currenttransaction() |
|
2239 | 2239 | if tr is not None: |
|
2240 | 2240 | return tr.nest(name=desc) |
|
2241 | 2241 | |
|
2242 | 2242 | # abort here if the journal already exists |
|
2243 | 2243 | if self.svfs.exists(b"journal"): |
|
2244 | 2244 | raise error.RepoError( |
|
2245 | 2245 | _(b"abandoned transaction found"), |
|
2246 | 2246 | hint=_(b"run 'hg recover' to clean up transaction"), |
|
2247 | 2247 | ) |
|
2248 | 2248 | |
|
2249 | 2249 | idbase = b"%.40f#%f" % (random.random(), time.time()) |
|
2250 | 2250 | ha = hex(hashutil.sha1(idbase).digest()) |
|
2251 | 2251 | txnid = b'TXN:' + ha |
|
2252 | 2252 | self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid) |
|
2253 | 2253 | |
|
2254 | 2254 | self._writejournal(desc) |
|
2255 | 2255 | renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
|
2256 | 2256 | if report: |
|
2257 | 2257 | rp = report |
|
2258 | 2258 | else: |
|
2259 | 2259 | rp = self.ui.warn |
|
2260 | 2260 | vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/ |
|
2261 | 2261 | # we must avoid cyclic reference between repo and transaction. |
|
2262 | 2262 | reporef = weakref.ref(self) |
|
2263 | 2263 | # Code to track tag movement |
|
2264 | 2264 | # |
|
2265 | 2265 | # Since tags are all handled as file content, it is actually quite hard |
|
2266 | 2266 | # to track these movement from a code perspective. So we fallback to a |
|
2267 | 2267 | # tracking at the repository level. One could envision to track changes |
|
2268 | 2268 | # to the '.hgtags' file through changegroup apply but that fails to |
|
2269 | 2269 | # cope with case where transaction expose new heads without changegroup |
|
2270 | 2270 | # being involved (eg: phase movement). |
|
2271 | 2271 | # |
|
2272 | 2272 | # For now, We gate the feature behind a flag since this likely comes |
|
2273 | 2273 | # with performance impacts. The current code run more often than needed |
|
2274 | 2274 | # and do not use caches as much as it could. The current focus is on |
|
2275 | 2275 | # the behavior of the feature so we disable it by default. The flag |
|
2276 | 2276 | # will be removed when we are happy with the performance impact. |
|
2277 | 2277 | # |
|
2278 | 2278 | # Once this feature is no longer experimental move the following |
|
2279 | 2279 | # documentation to the appropriate help section: |
|
2280 | 2280 | # |
|
2281 | 2281 | # The ``HG_TAG_MOVED`` variable will be set if the transaction touched |
|
2282 | 2282 | # tags (new or changed or deleted tags). In addition the details of |
|
2283 | 2283 | # these changes are made available in a file at: |
|
2284 | 2284 | # ``REPOROOT/.hg/changes/tags.changes``. |
|
2285 | 2285 | # Make sure you check for HG_TAG_MOVED before reading that file as it |
|
2286 | 2286 | # might exist from a previous transaction even if no tag were touched |
|
2287 | 2287 | # in this one. Changes are recorded in a line base format:: |
|
2288 | 2288 | # |
|
2289 | 2289 | # <action> <hex-node> <tag-name>\n |
|
2290 | 2290 | # |
|
2291 | 2291 | # Actions are defined as follow: |
|
2292 | 2292 | # "-R": tag is removed, |
|
2293 | 2293 | # "+A": tag is added, |
|
2294 | 2294 | # "-M": tag is moved (old value), |
|
2295 | 2295 | # "+M": tag is moved (new value), |
|
2296 | 2296 | tracktags = lambda x: None |
|
2297 | 2297 | # experimental config: experimental.hook-track-tags |
|
2298 | 2298 | shouldtracktags = self.ui.configbool( |
|
2299 | 2299 | b'experimental', b'hook-track-tags' |
|
2300 | 2300 | ) |
|
2301 | 2301 | if desc != b'strip' and shouldtracktags: |
|
2302 | 2302 | oldheads = self.changelog.headrevs() |
|
2303 | 2303 | |
|
2304 | 2304 | def tracktags(tr2): |
|
2305 | 2305 | repo = reporef() |
|
2306 | 2306 | oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads) |
|
2307 | 2307 | newheads = repo.changelog.headrevs() |
|
2308 | 2308 | newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads) |
|
2309 | 2309 | # notes: we compare lists here. |
|
2310 | 2310 | # As we do it only once buiding set would not be cheaper |
|
2311 | 2311 | changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes) |
|
2312 | 2312 | if changes: |
|
2313 | 2313 | tr2.hookargs[b'tag_moved'] = b'1' |
|
2314 | 2314 | with repo.vfs( |
|
2315 | 2315 | b'changes/tags.changes', b'w', atomictemp=True |
|
2316 | 2316 | ) as changesfile: |
|
2317 | 2317 | # note: we do not register the file to the transaction |
|
2318 | 2318 | # because we needs it to still exist on the transaction |
|
2319 | 2319 | # is close (for txnclose hooks) |
|
2320 | 2320 | tagsmod.writediff(changesfile, changes) |
|
2321 | 2321 | |
|
2322 | 2322 | def validate(tr2): |
|
2323 | 2323 | """will run pre-closing hooks""" |
|
2324 | 2324 | # XXX the transaction API is a bit lacking here so we take a hacky |
|
2325 | 2325 | # path for now |
|
2326 | 2326 | # |
|
2327 | 2327 | # We cannot add this as a "pending" hooks since the 'tr.hookargs' |
|
2328 | 2328 | # dict is copied before these run. In addition we needs the data |
|
2329 | 2329 | # available to in memory hooks too. |
|
2330 | 2330 | # |
|
2331 | 2331 | # Moreover, we also need to make sure this runs before txnclose |
|
2332 | 2332 | # hooks and there is no "pending" mechanism that would execute |
|
2333 | 2333 | # logic only if hooks are about to run. |
|
2334 | 2334 | # |
|
2335 | 2335 | # Fixing this limitation of the transaction is also needed to track |
|
2336 | 2336 | # other families of changes (bookmarks, phases, obsolescence). |
|
2337 | 2337 | # |
|
2338 | 2338 | # This will have to be fixed before we remove the experimental |
|
2339 | 2339 | # gating. |
|
2340 | 2340 | tracktags(tr2) |
|
2341 | 2341 | repo = reporef() |
|
2342 | 2342 | |
|
2343 | 2343 | singleheadopt = (b'experimental', b'single-head-per-branch') |
|
2344 | 2344 | singlehead = repo.ui.configbool(*singleheadopt) |
|
2345 | 2345 | if singlehead: |
|
2346 | 2346 | singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1] |
|
2347 | 2347 | accountclosed = singleheadsub.get( |
|
2348 | 2348 | b"account-closed-heads", False |
|
2349 | 2349 | ) |
|
2350 | 2350 | if singleheadsub.get(b"public-changes-only", False): |
|
2351 | 2351 | filtername = b"immutable" |
|
2352 | 2352 | else: |
|
2353 | 2353 | filtername = b"visible" |
|
2354 | 2354 | scmutil.enforcesinglehead( |
|
2355 | 2355 | repo, tr2, desc, accountclosed, filtername |
|
2356 | 2356 | ) |
|
2357 | 2357 | if hook.hashook(repo.ui, b'pretxnclose-bookmark'): |
|
2358 | 2358 | for name, (old, new) in sorted( |
|
2359 | 2359 | tr.changes[b'bookmarks'].items() |
|
2360 | 2360 | ): |
|
2361 | 2361 | args = tr.hookargs.copy() |
|
2362 | 2362 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2363 | 2363 | repo.hook( |
|
2364 | 2364 | b'pretxnclose-bookmark', |
|
2365 | 2365 | throw=True, |
|
2366 | 2366 | **pycompat.strkwargs(args) |
|
2367 | 2367 | ) |
|
2368 | 2368 | if hook.hashook(repo.ui, b'pretxnclose-phase'): |
|
2369 | 2369 | cl = repo.unfiltered().changelog |
|
2370 | 2370 | for revs, (old, new) in tr.changes[b'phases']: |
|
2371 | 2371 | for rev in revs: |
|
2372 | 2372 | args = tr.hookargs.copy() |
|
2373 | 2373 | node = hex(cl.node(rev)) |
|
2374 | 2374 | args.update(phases.preparehookargs(node, old, new)) |
|
2375 | 2375 | repo.hook( |
|
2376 | 2376 | b'pretxnclose-phase', |
|
2377 | 2377 | throw=True, |
|
2378 | 2378 | **pycompat.strkwargs(args) |
|
2379 | 2379 | ) |
|
2380 | 2380 | |
|
2381 | 2381 | repo.hook( |
|
2382 | 2382 | b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs) |
|
2383 | 2383 | ) |
|
2384 | 2384 | |
|
2385 | 2385 | def releasefn(tr, success): |
|
2386 | 2386 | repo = reporef() |
|
2387 | 2387 | if repo is None: |
|
2388 | 2388 | # If the repo has been GC'd (and this release function is being |
|
2389 | 2389 | # called from transaction.__del__), there's not much we can do, |
|
2390 | 2390 | # so just leave the unfinished transaction there and let the |
|
2391 | 2391 | # user run `hg recover`. |
|
2392 | 2392 | return |
|
2393 | 2393 | if success: |
|
2394 | 2394 | # this should be explicitly invoked here, because |
|
2395 | 2395 | # in-memory changes aren't written out at closing |
|
2396 | 2396 | # transaction, if tr.addfilegenerator (via |
|
2397 | 2397 | # dirstate.write or so) isn't invoked while |
|
2398 | 2398 | # transaction running |
|
2399 | 2399 | repo.dirstate.write(None) |
|
2400 | 2400 | else: |
|
2401 | 2401 | # discard all changes (including ones already written |
|
2402 | 2402 | # out) in this transaction |
|
2403 | 2403 | narrowspec.restorebackup(self, b'journal.narrowspec') |
|
2404 | 2404 | narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate') |
|
2405 | 2405 | repo.dirstate.restorebackup(None, b'journal.dirstate') |
|
2406 | 2406 | |
|
2407 | 2407 | repo.invalidate(clearfilecache=True) |
|
2408 | 2408 | |
|
2409 | 2409 | tr = transaction.transaction( |
|
2410 | 2410 | rp, |
|
2411 | 2411 | self.svfs, |
|
2412 | 2412 | vfsmap, |
|
2413 | 2413 | b"journal", |
|
2414 | 2414 | b"undo", |
|
2415 | 2415 | aftertrans(renames), |
|
2416 | 2416 | self.store.createmode, |
|
2417 | 2417 | validator=validate, |
|
2418 | 2418 | releasefn=releasefn, |
|
2419 | 2419 | checkambigfiles=_cachedfiles, |
|
2420 | 2420 | name=desc, |
|
2421 | 2421 | ) |
|
2422 | 2422 | tr.changes[b'origrepolen'] = len(self) |
|
2423 | 2423 | tr.changes[b'obsmarkers'] = set() |
|
2424 | 2424 | tr.changes[b'phases'] = [] |
|
2425 | 2425 | tr.changes[b'bookmarks'] = {} |
|
2426 | 2426 | |
|
2427 | 2427 | tr.hookargs[b'txnid'] = txnid |
|
2428 | 2428 | tr.hookargs[b'txnname'] = desc |
|
2429 | 2429 | tr.hookargs[b'changes'] = tr.changes |
|
2430 | 2430 | # note: writing the fncache only during finalize mean that the file is |
|
2431 | 2431 | # outdated when running hooks. As fncache is used for streaming clone, |
|
2432 | 2432 | # this is not expected to break anything that happen during the hooks. |
|
2433 | 2433 | tr.addfinalize(b'flush-fncache', self.store.write) |
|
2434 | 2434 | |
|
2435 | 2435 | def txnclosehook(tr2): |
|
2436 | 2436 | """To be run if transaction is successful, will schedule a hook run""" |
|
2437 | 2437 | # Don't reference tr2 in hook() so we don't hold a reference. |
|
2438 | 2438 | # This reduces memory consumption when there are multiple |
|
2439 | 2439 | # transactions per lock. This can likely go away if issue5045 |
|
2440 | 2440 | # fixes the function accumulation. |
|
2441 | 2441 | hookargs = tr2.hookargs |
|
2442 | 2442 | |
|
2443 | 2443 | def hookfunc(unused_success): |
|
2444 | 2444 | repo = reporef() |
|
2445 | 2445 | if hook.hashook(repo.ui, b'txnclose-bookmark'): |
|
2446 | 2446 | bmchanges = sorted(tr.changes[b'bookmarks'].items()) |
|
2447 | 2447 | for name, (old, new) in bmchanges: |
|
2448 | 2448 | args = tr.hookargs.copy() |
|
2449 | 2449 | args.update(bookmarks.preparehookargs(name, old, new)) |
|
2450 | 2450 | repo.hook( |
|
2451 | 2451 | b'txnclose-bookmark', |
|
2452 | 2452 | throw=False, |
|
2453 | 2453 | **pycompat.strkwargs(args) |
|
2454 | 2454 | ) |
|
2455 | 2455 | |
|
2456 | 2456 | if hook.hashook(repo.ui, b'txnclose-phase'): |
|
2457 | 2457 | cl = repo.unfiltered().changelog |
|
2458 | 2458 | phasemv = sorted( |
|
2459 | 2459 | tr.changes[b'phases'], key=lambda r: r[0][0] |
|
2460 | 2460 | ) |
|
2461 | 2461 | for revs, (old, new) in phasemv: |
|
2462 | 2462 | for rev in revs: |
|
2463 | 2463 | args = tr.hookargs.copy() |
|
2464 | 2464 | node = hex(cl.node(rev)) |
|
2465 | 2465 | args.update(phases.preparehookargs(node, old, new)) |
|
2466 | 2466 | repo.hook( |
|
2467 | 2467 | b'txnclose-phase', |
|
2468 | 2468 | throw=False, |
|
2469 | 2469 | **pycompat.strkwargs(args) |
|
2470 | 2470 | ) |
|
2471 | 2471 | |
|
2472 | 2472 | repo.hook( |
|
2473 | 2473 | b'txnclose', throw=False, **pycompat.strkwargs(hookargs) |
|
2474 | 2474 | ) |
|
2475 | 2475 | |
|
2476 | 2476 | reporef()._afterlock(hookfunc) |
|
2477 | 2477 | |
|
2478 | 2478 | tr.addfinalize(b'txnclose-hook', txnclosehook) |
|
2479 | 2479 | # Include a leading "-" to make it happen before the transaction summary |
|
2480 | 2480 | # reports registered via scmutil.registersummarycallback() whose names |
|
2481 | 2481 | # are 00-txnreport etc. That way, the caches will be warm when the |
|
2482 | 2482 | # callbacks run. |
|
2483 | 2483 | tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr)) |
|
2484 | 2484 | |
|
2485 | 2485 | def txnaborthook(tr2): |
|
2486 | 2486 | """To be run if transaction is aborted""" |
|
2487 | 2487 | reporef().hook( |
|
2488 | 2488 | b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs) |
|
2489 | 2489 | ) |
|
2490 | 2490 | |
|
2491 | 2491 | tr.addabort(b'txnabort-hook', txnaborthook) |
|
2492 | 2492 | # avoid eager cache invalidation. in-memory data should be identical |
|
2493 | 2493 | # to stored data if transaction has no error. |
|
2494 | 2494 | tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats) |
|
2495 | 2495 | self._transref = weakref.ref(tr) |
|
2496 | 2496 | scmutil.registersummarycallback(self, tr, desc) |
|
2497 | 2497 | return tr |
|
2498 | 2498 | |
|
2499 | 2499 | def _journalfiles(self): |
|
2500 | 2500 | return ( |
|
2501 | 2501 | (self.svfs, b'journal'), |
|
2502 | 2502 | (self.svfs, b'journal.narrowspec'), |
|
2503 | 2503 | (self.vfs, b'journal.narrowspec.dirstate'), |
|
2504 | 2504 | (self.vfs, b'journal.dirstate'), |
|
2505 | 2505 | (self.vfs, b'journal.branch'), |
|
2506 | 2506 | (self.vfs, b'journal.desc'), |
|
2507 | 2507 | (bookmarks.bookmarksvfs(self), b'journal.bookmarks'), |
|
2508 | 2508 | (self.svfs, b'journal.phaseroots'), |
|
2509 | 2509 | ) |
|
2510 | 2510 | |
|
2511 | 2511 | def undofiles(self): |
|
2512 | 2512 | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] |
|
2513 | 2513 | |
|
2514 | 2514 | @unfilteredmethod |
|
2515 | 2515 | def _writejournal(self, desc): |
|
2516 | 2516 | self.dirstate.savebackup(None, b'journal.dirstate') |
|
2517 | 2517 | narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate') |
|
2518 | 2518 | narrowspec.savebackup(self, b'journal.narrowspec') |
|
2519 | 2519 | self.vfs.write( |
|
2520 | 2520 | b"journal.branch", encoding.fromlocal(self.dirstate.branch()) |
|
2521 | 2521 | ) |
|
2522 | 2522 | self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc)) |
|
2523 | 2523 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2524 | 2524 | bookmarksvfs.write( |
|
2525 | 2525 | b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks") |
|
2526 | 2526 | ) |
|
2527 | 2527 | self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots")) |
|
2528 | 2528 | |
|
2529 | 2529 | def recover(self): |
|
2530 | 2530 | with self.lock(): |
|
2531 | 2531 | if self.svfs.exists(b"journal"): |
|
2532 | 2532 | self.ui.status(_(b"rolling back interrupted transaction\n")) |
|
2533 | 2533 | vfsmap = { |
|
2534 | 2534 | b'': self.svfs, |
|
2535 | 2535 | b'plain': self.vfs, |
|
2536 | 2536 | } |
|
2537 | 2537 | transaction.rollback( |
|
2538 | 2538 | self.svfs, |
|
2539 | 2539 | vfsmap, |
|
2540 | 2540 | b"journal", |
|
2541 | 2541 | self.ui.warn, |
|
2542 | 2542 | checkambigfiles=_cachedfiles, |
|
2543 | 2543 | ) |
|
2544 | 2544 | self.invalidate() |
|
2545 | 2545 | return True |
|
2546 | 2546 | else: |
|
2547 | 2547 | self.ui.warn(_(b"no interrupted transaction available\n")) |
|
2548 | 2548 | return False |
|
2549 | 2549 | |
|
2550 | 2550 | def rollback(self, dryrun=False, force=False): |
|
2551 | 2551 | wlock = lock = dsguard = None |
|
2552 | 2552 | try: |
|
2553 | 2553 | wlock = self.wlock() |
|
2554 | 2554 | lock = self.lock() |
|
2555 | 2555 | if self.svfs.exists(b"undo"): |
|
2556 | 2556 | dsguard = dirstateguard.dirstateguard(self, b'rollback') |
|
2557 | 2557 | |
|
2558 | 2558 | return self._rollback(dryrun, force, dsguard) |
|
2559 | 2559 | else: |
|
2560 | 2560 | self.ui.warn(_(b"no rollback information available\n")) |
|
2561 | 2561 | return 1 |
|
2562 | 2562 | finally: |
|
2563 | 2563 | release(dsguard, lock, wlock) |
|
2564 | 2564 | |
|
2565 | 2565 | @unfilteredmethod # Until we get smarter cache management |
|
2566 | 2566 | def _rollback(self, dryrun, force, dsguard): |
|
2567 | 2567 | ui = self.ui |
|
2568 | 2568 | try: |
|
2569 | 2569 | args = self.vfs.read(b'undo.desc').splitlines() |
|
2570 | 2570 | (oldlen, desc, detail) = (int(args[0]), args[1], None) |
|
2571 | 2571 | if len(args) >= 3: |
|
2572 | 2572 | detail = args[2] |
|
2573 | 2573 | oldtip = oldlen - 1 |
|
2574 | 2574 | |
|
2575 | 2575 | if detail and ui.verbose: |
|
2576 | 2576 | msg = _( |
|
2577 | 2577 | b'repository tip rolled back to revision %d' |
|
2578 | 2578 | b' (undo %s: %s)\n' |
|
2579 | 2579 | ) % (oldtip, desc, detail) |
|
2580 | 2580 | else: |
|
2581 | 2581 | msg = _( |
|
2582 | 2582 | b'repository tip rolled back to revision %d (undo %s)\n' |
|
2583 | 2583 | ) % (oldtip, desc) |
|
2584 | 2584 | except IOError: |
|
2585 | 2585 | msg = _(b'rolling back unknown transaction\n') |
|
2586 | 2586 | desc = None |
|
2587 | 2587 | |
|
2588 | 2588 | if not force and self[b'.'] != self[b'tip'] and desc == b'commit': |
|
2589 | 2589 | raise error.Abort( |
|
2590 | 2590 | _( |
|
2591 | 2591 | b'rollback of last commit while not checked out ' |
|
2592 | 2592 | b'may lose data' |
|
2593 | 2593 | ), |
|
2594 | 2594 | hint=_(b'use -f to force'), |
|
2595 | 2595 | ) |
|
2596 | 2596 | |
|
2597 | 2597 | ui.status(msg) |
|
2598 | 2598 | if dryrun: |
|
2599 | 2599 | return 0 |
|
2600 | 2600 | |
|
2601 | 2601 | parents = self.dirstate.parents() |
|
2602 | 2602 | self.destroying() |
|
2603 | 2603 | vfsmap = {b'plain': self.vfs, b'': self.svfs} |
|
2604 | 2604 | transaction.rollback( |
|
2605 | 2605 | self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles |
|
2606 | 2606 | ) |
|
2607 | 2607 | bookmarksvfs = bookmarks.bookmarksvfs(self) |
|
2608 | 2608 | if bookmarksvfs.exists(b'undo.bookmarks'): |
|
2609 | 2609 | bookmarksvfs.rename( |
|
2610 | 2610 | b'undo.bookmarks', b'bookmarks', checkambig=True |
|
2611 | 2611 | ) |
|
2612 | 2612 | if self.svfs.exists(b'undo.phaseroots'): |
|
2613 | 2613 | self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) |
|
2614 | 2614 | self.invalidate() |
|
2615 | 2615 | |
|
2616 | 2616 | has_node = self.changelog.index.has_node |
|
2617 | 2617 | parentgone = any(not has_node(p) for p in parents) |
|
2618 | 2618 | if parentgone: |
|
2619 | 2619 | # prevent dirstateguard from overwriting already restored one |
|
2620 | 2620 | dsguard.close() |
|
2621 | 2621 | |
|
2622 | 2622 | narrowspec.restorebackup(self, b'undo.narrowspec') |
|
2623 | 2623 | narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate') |
|
2624 | 2624 | self.dirstate.restorebackup(None, b'undo.dirstate') |
|
2625 | 2625 | try: |
|
2626 | 2626 | branch = self.vfs.read(b'undo.branch') |
|
2627 | 2627 | self.dirstate.setbranch(encoding.tolocal(branch)) |
|
2628 | 2628 | except IOError: |
|
2629 | 2629 | ui.warn( |
|
2630 | 2630 | _( |
|
2631 | 2631 | b'named branch could not be reset: ' |
|
2632 | 2632 | b'current branch is still \'%s\'\n' |
|
2633 | 2633 | ) |
|
2634 | 2634 | % self.dirstate.branch() |
|
2635 | 2635 | ) |
|
2636 | 2636 | |
|
2637 | 2637 | parents = tuple([p.rev() for p in self[None].parents()]) |
|
2638 | 2638 | if len(parents) > 1: |
|
2639 | 2639 | ui.status( |
|
2640 | 2640 | _( |
|
2641 | 2641 | b'working directory now based on ' |
|
2642 | 2642 | b'revisions %d and %d\n' |
|
2643 | 2643 | ) |
|
2644 | 2644 | % parents |
|
2645 | 2645 | ) |
|
2646 | 2646 | else: |
|
2647 | 2647 | ui.status( |
|
2648 | 2648 | _(b'working directory now based on revision %d\n') % parents |
|
2649 | 2649 | ) |
|
2650 | 2650 | mergestatemod.mergestate.clean(self) |
|
2651 | 2651 | |
|
2652 | 2652 | # TODO: if we know which new heads may result from this rollback, pass |
|
2653 | 2653 | # them to destroy(), which will prevent the branchhead cache from being |
|
2654 | 2654 | # invalidated. |
|
2655 | 2655 | self.destroyed() |
|
2656 | 2656 | return 0 |
|
2657 | 2657 | |
|
2658 | 2658 | def _buildcacheupdater(self, newtransaction): |
|
2659 | 2659 | """called during transaction to build the callback updating cache |
|
2660 | 2660 | |
|
2661 | 2661 | Lives on the repository to help extension who might want to augment |
|
2662 | 2662 | this logic. For this purpose, the created transaction is passed to the |
|
2663 | 2663 | method. |
|
2664 | 2664 | """ |
|
2665 | 2665 | # we must avoid cyclic reference between repo and transaction. |
|
2666 | 2666 | reporef = weakref.ref(self) |
|
2667 | 2667 | |
|
2668 | 2668 | def updater(tr): |
|
2669 | 2669 | repo = reporef() |
|
2670 | 2670 | repo.updatecaches(tr) |
|
2671 | 2671 | |
|
2672 | 2672 | return updater |
|
2673 | 2673 | |
|
2674 | 2674 | @unfilteredmethod |
|
2675 | 2675 | def updatecaches(self, tr=None, full=False): |
|
2676 | 2676 | """warm appropriate caches |
|
2677 | 2677 | |
|
2678 | 2678 | If this function is called after a transaction closed. The transaction |
|
2679 | 2679 | will be available in the 'tr' argument. This can be used to selectively |
|
2680 | 2680 | update caches relevant to the changes in that transaction. |
|
2681 | 2681 | |
|
2682 | 2682 | If 'full' is set, make sure all caches the function knows about have |
|
2683 | 2683 | up-to-date data. Even the ones usually loaded more lazily. |
|
2684 | 2684 | """ |
|
2685 | 2685 | if tr is not None and tr.hookargs.get(b'source') == b'strip': |
|
2686 | 2686 | # During strip, many caches are invalid but |
|
2687 | 2687 | # later call to `destroyed` will refresh them. |
|
2688 | 2688 | return |
|
2689 | 2689 | |
|
2690 | 2690 | if tr is None or tr.changes[b'origrepolen'] < len(self): |
|
2691 | 2691 | # accessing the 'served' branchmap should refresh all the others, |
|
2692 | 2692 | self.ui.debug(b'updating the branch cache\n') |
|
2693 | 2693 | self.filtered(b'served').branchmap() |
|
2694 | 2694 | self.filtered(b'served.hidden').branchmap() |
|
2695 | 2695 | |
|
2696 | 2696 | if full: |
|
2697 | 2697 | unfi = self.unfiltered() |
|
2698 | 2698 | |
|
2699 | 2699 | self.changelog.update_caches(transaction=tr) |
|
2700 | 2700 | self.manifestlog.update_caches(transaction=tr) |
|
2701 | 2701 | |
|
2702 | 2702 | rbc = unfi.revbranchcache() |
|
2703 | 2703 | for r in unfi.changelog: |
|
2704 | 2704 | rbc.branchinfo(r) |
|
2705 | 2705 | rbc.write() |
|
2706 | 2706 | |
|
2707 | 2707 | # ensure the working copy parents are in the manifestfulltextcache |
|
2708 | 2708 | for ctx in self[b'.'].parents(): |
|
2709 | 2709 | ctx.manifest() # accessing the manifest is enough |
|
2710 | 2710 | |
|
2711 | 2711 | # accessing fnode cache warms the cache |
|
2712 | 2712 | tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs()) |
|
2713 | 2713 | # accessing tags warm the cache |
|
2714 | 2714 | self.tags() |
|
2715 | 2715 | self.filtered(b'served').tags() |
|
2716 | 2716 | |
|
2717 | 2717 | # The `full` arg is documented as updating even the lazily-loaded |
|
2718 | 2718 | # caches immediately, so we're forcing a write to cause these caches |
|
2719 | 2719 | # to be warmed up even if they haven't explicitly been requested |
|
2720 | 2720 | # yet (if they've never been used by hg, they won't ever have been |
|
2721 | 2721 | # written, even if they're a subset of another kind of cache that |
|
2722 | 2722 | # *has* been used). |
|
2723 | 2723 | for filt in repoview.filtertable.keys(): |
|
2724 | 2724 | filtered = self.filtered(filt) |
|
2725 | 2725 | filtered.branchmap().write(filtered) |
|
2726 | 2726 | |
|
2727 | 2727 | def invalidatecaches(self): |
|
2728 | 2728 | |
|
2729 | 2729 | if '_tagscache' in vars(self): |
|
2730 | 2730 | # can't use delattr on proxy |
|
2731 | 2731 | del self.__dict__['_tagscache'] |
|
2732 | 2732 | |
|
2733 | 2733 | self._branchcaches.clear() |
|
2734 | 2734 | self.invalidatevolatilesets() |
|
2735 | 2735 | self._sparsesignaturecache.clear() |
|
2736 | 2736 | |
|
2737 | 2737 | def invalidatevolatilesets(self): |
|
2738 | 2738 | self.filteredrevcache.clear() |
|
2739 | 2739 | obsolete.clearobscaches(self) |
|
2740 | 2740 | self._quick_access_changeid_invalidate() |
|
2741 | 2741 | |
|
2742 | 2742 | def invalidatedirstate(self): |
|
2743 | 2743 | """Invalidates the dirstate, causing the next call to dirstate |
|
2744 | 2744 | to check if it was modified since the last time it was read, |
|
2745 | 2745 | rereading it if it has. |
|
2746 | 2746 | |
|
2747 | 2747 | This is different to dirstate.invalidate() that it doesn't always |
|
2748 | 2748 | rereads the dirstate. Use dirstate.invalidate() if you want to |
|
2749 | 2749 | explicitly read the dirstate again (i.e. restoring it to a previous |
|
2750 | 2750 | known good state).""" |
|
2751 | 2751 | if hasunfilteredcache(self, 'dirstate'): |
|
2752 | 2752 | for k in self.dirstate._filecache: |
|
2753 | 2753 | try: |
|
2754 | 2754 | delattr(self.dirstate, k) |
|
2755 | 2755 | except AttributeError: |
|
2756 | 2756 | pass |
|
2757 | 2757 | delattr(self.unfiltered(), 'dirstate') |
|
2758 | 2758 | |
|
2759 | 2759 | def invalidate(self, clearfilecache=False): |
|
2760 | 2760 | """Invalidates both store and non-store parts other than dirstate |
|
2761 | 2761 | |
|
2762 | 2762 | If a transaction is running, invalidation of store is omitted, |
|
2763 | 2763 | because discarding in-memory changes might cause inconsistency |
|
2764 | 2764 | (e.g. incomplete fncache causes unintentional failure, but |
|
2765 | 2765 | redundant one doesn't). |
|
2766 | 2766 | """ |
|
2767 | 2767 | unfiltered = self.unfiltered() # all file caches are stored unfiltered |
|
2768 | 2768 | for k in list(self._filecache.keys()): |
|
2769 | 2769 | # dirstate is invalidated separately in invalidatedirstate() |
|
2770 | 2770 | if k == b'dirstate': |
|
2771 | 2771 | continue |
|
2772 | 2772 | if ( |
|
2773 | 2773 | k == b'changelog' |
|
2774 | 2774 | and self.currenttransaction() |
|
2775 | 2775 | and self.changelog._delayed |
|
2776 | 2776 | ): |
|
2777 | 2777 | # The changelog object may store unwritten revisions. We don't |
|
2778 | 2778 | # want to lose them. |
|
2779 | 2779 | # TODO: Solve the problem instead of working around it. |
|
2780 | 2780 | continue |
|
2781 | 2781 | |
|
2782 | 2782 | if clearfilecache: |
|
2783 | 2783 | del self._filecache[k] |
|
2784 | 2784 | try: |
|
2785 | 2785 | delattr(unfiltered, k) |
|
2786 | 2786 | except AttributeError: |
|
2787 | 2787 | pass |
|
2788 | 2788 | self.invalidatecaches() |
|
2789 | 2789 | if not self.currenttransaction(): |
|
2790 | 2790 | # TODO: Changing contents of store outside transaction |
|
2791 | 2791 | # causes inconsistency. We should make in-memory store |
|
2792 | 2792 | # changes detectable, and abort if changed. |
|
2793 | 2793 | self.store.invalidatecaches() |
|
2794 | 2794 | |
|
2795 | 2795 | def invalidateall(self): |
|
2796 | 2796 | """Fully invalidates both store and non-store parts, causing the |
|
2797 | 2797 | subsequent operation to reread any outside changes.""" |
|
2798 | 2798 | # extension should hook this to invalidate its caches |
|
2799 | 2799 | self.invalidate() |
|
2800 | 2800 | self.invalidatedirstate() |
|
2801 | 2801 | |
|
2802 | 2802 | @unfilteredmethod |
|
2803 | 2803 | def _refreshfilecachestats(self, tr): |
|
2804 | 2804 | """Reload stats of cached files so that they are flagged as valid""" |
|
2805 | 2805 | for k, ce in self._filecache.items(): |
|
2806 | 2806 | k = pycompat.sysstr(k) |
|
2807 | 2807 | if k == 'dirstate' or k not in self.__dict__: |
|
2808 | 2808 | continue |
|
2809 | 2809 | ce.refresh() |
|
2810 | 2810 | |
|
2811 | 2811 | def _lock( |
|
2812 | 2812 | self, |
|
2813 | 2813 | vfs, |
|
2814 | 2814 | lockname, |
|
2815 | 2815 | wait, |
|
2816 | 2816 | releasefn, |
|
2817 | 2817 | acquirefn, |
|
2818 | 2818 | desc, |
|
2819 | 2819 | ): |
|
2820 | 2820 | timeout = 0 |
|
2821 | 2821 | warntimeout = 0 |
|
2822 | 2822 | if wait: |
|
2823 | 2823 | timeout = self.ui.configint(b"ui", b"timeout") |
|
2824 | 2824 | warntimeout = self.ui.configint(b"ui", b"timeout.warn") |
|
2825 | 2825 | # internal config: ui.signal-safe-lock |
|
2826 | 2826 | signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock') |
|
2827 | 2827 | |
|
2828 | 2828 | l = lockmod.trylock( |
|
2829 | 2829 | self.ui, |
|
2830 | 2830 | vfs, |
|
2831 | 2831 | lockname, |
|
2832 | 2832 | timeout, |
|
2833 | 2833 | warntimeout, |
|
2834 | 2834 | releasefn=releasefn, |
|
2835 | 2835 | acquirefn=acquirefn, |
|
2836 | 2836 | desc=desc, |
|
2837 | 2837 | signalsafe=signalsafe, |
|
2838 | 2838 | ) |
|
2839 | 2839 | return l |
|
2840 | 2840 | |
|
2841 | 2841 | def _afterlock(self, callback): |
|
2842 | 2842 | """add a callback to be run when the repository is fully unlocked |
|
2843 | 2843 | |
|
2844 | 2844 | The callback will be executed when the outermost lock is released |
|
2845 | 2845 | (with wlock being higher level than 'lock').""" |
|
2846 | 2846 | for ref in (self._wlockref, self._lockref): |
|
2847 | 2847 | l = ref and ref() |
|
2848 | 2848 | if l and l.held: |
|
2849 | 2849 | l.postrelease.append(callback) |
|
2850 | 2850 | break |
|
2851 | 2851 | else: # no lock have been found. |
|
2852 | 2852 | callback(True) |
|
2853 | 2853 | |
|
2854 | 2854 | def lock(self, wait=True): |
|
2855 | 2855 | """Lock the repository store (.hg/store) and return a weak reference |
|
2856 | 2856 | to the lock. Use this before modifying the store (e.g. committing or |
|
2857 | 2857 | stripping). If you are opening a transaction, get a lock as well.) |
|
2858 | 2858 | |
|
2859 | 2859 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
2860 | 2860 | 'wlock' first to avoid a dead-lock hazard.""" |
|
2861 | 2861 | l = self._currentlock(self._lockref) |
|
2862 | 2862 | if l is not None: |
|
2863 | 2863 | l.lock() |
|
2864 | 2864 | return l |
|
2865 | 2865 | |
|
2866 | 2866 | l = self._lock( |
|
2867 | 2867 | vfs=self.svfs, |
|
2868 | 2868 | lockname=b"lock", |
|
2869 | 2869 | wait=wait, |
|
2870 | 2870 | releasefn=None, |
|
2871 | 2871 | acquirefn=self.invalidate, |
|
2872 | 2872 | desc=_(b'repository %s') % self.origroot, |
|
2873 | 2873 | ) |
|
2874 | 2874 | self._lockref = weakref.ref(l) |
|
2875 | 2875 | return l |
|
2876 | 2876 | |
|
2877 | 2877 | def wlock(self, wait=True): |
|
2878 | 2878 | """Lock the non-store parts of the repository (everything under |
|
2879 | 2879 | .hg except .hg/store) and return a weak reference to the lock. |
|
2880 | 2880 | |
|
2881 | 2881 | Use this before modifying files in .hg. |
|
2882 | 2882 | |
|
2883 | 2883 | If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
|
2884 | 2884 | 'wlock' first to avoid a dead-lock hazard.""" |
|
2885 | 2885 | l = self._wlockref and self._wlockref() |
|
2886 | 2886 | if l is not None and l.held: |
|
2887 | 2887 | l.lock() |
|
2888 | 2888 | return l |
|
2889 | 2889 | |
|
2890 | 2890 | # We do not need to check for non-waiting lock acquisition. Such |
|
2891 | 2891 | # acquisition would not cause dead-lock as they would just fail. |
|
2892 | 2892 | if wait and ( |
|
2893 | 2893 | self.ui.configbool(b'devel', b'all-warnings') |
|
2894 | 2894 | or self.ui.configbool(b'devel', b'check-locks') |
|
2895 | 2895 | ): |
|
2896 | 2896 | if self._currentlock(self._lockref) is not None: |
|
2897 | 2897 | self.ui.develwarn(b'"wlock" acquired after "lock"') |
|
2898 | 2898 | |
|
2899 | 2899 | def unlock(): |
|
2900 | 2900 | if self.dirstate.pendingparentchange(): |
|
2901 | 2901 | self.dirstate.invalidate() |
|
2902 | 2902 | else: |
|
2903 | 2903 | self.dirstate.write(None) |
|
2904 | 2904 | |
|
2905 | 2905 | self._filecache[b'dirstate'].refresh() |
|
2906 | 2906 | |
|
2907 | 2907 | l = self._lock( |
|
2908 | 2908 | self.vfs, |
|
2909 | 2909 | b"wlock", |
|
2910 | 2910 | wait, |
|
2911 | 2911 | unlock, |
|
2912 | 2912 | self.invalidatedirstate, |
|
2913 | 2913 | _(b'working directory of %s') % self.origroot, |
|
2914 | 2914 | ) |
|
2915 | 2915 | self._wlockref = weakref.ref(l) |
|
2916 | 2916 | return l |
|
2917 | 2917 | |
|
2918 | 2918 | def _currentlock(self, lockref): |
|
2919 | 2919 | """Returns the lock if it's held, or None if it's not.""" |
|
2920 | 2920 | if lockref is None: |
|
2921 | 2921 | return None |
|
2922 | 2922 | l = lockref() |
|
2923 | 2923 | if l is None or not l.held: |
|
2924 | 2924 | return None |
|
2925 | 2925 | return l |
|
2926 | 2926 | |
|
2927 | 2927 | def currentwlock(self): |
|
2928 | 2928 | """Returns the wlock if it's held, or None if it's not.""" |
|
2929 | 2929 | return self._currentlock(self._wlockref) |
|
2930 | 2930 | |
|
2931 | 2931 | def checkcommitpatterns(self, wctx, match, status, fail): |
|
2932 | 2932 | """check for commit arguments that aren't committable""" |
|
2933 | 2933 | if match.isexact() or match.prefix(): |
|
2934 | 2934 | matched = set(status.modified + status.added + status.removed) |
|
2935 | 2935 | |
|
2936 | 2936 | for f in match.files(): |
|
2937 | 2937 | f = self.dirstate.normalize(f) |
|
2938 | 2938 | if f == b'.' or f in matched or f in wctx.substate: |
|
2939 | 2939 | continue |
|
2940 | 2940 | if f in status.deleted: |
|
2941 | 2941 | fail(f, _(b'file not found!')) |
|
2942 | 2942 | # Is it a directory that exists or used to exist? |
|
2943 | 2943 | if self.wvfs.isdir(f) or wctx.p1().hasdir(f): |
|
2944 | 2944 | d = f + b'/' |
|
2945 | 2945 | for mf in matched: |
|
2946 | 2946 | if mf.startswith(d): |
|
2947 | 2947 | break |
|
2948 | 2948 | else: |
|
2949 | 2949 | fail(f, _(b"no match under directory!")) |
|
2950 | 2950 | elif f not in self.dirstate: |
|
2951 | 2951 | fail(f, _(b"file not tracked!")) |
|
2952 | 2952 | |
|
2953 | 2953 | @unfilteredmethod |
|
2954 | 2954 | def commit( |
|
2955 | 2955 | self, |
|
2956 | 2956 | text=b"", |
|
2957 | 2957 | user=None, |
|
2958 | 2958 | date=None, |
|
2959 | 2959 | match=None, |
|
2960 | 2960 | force=False, |
|
2961 | 2961 | editor=None, |
|
2962 | 2962 | extra=None, |
|
2963 | 2963 | ): |
|
2964 | 2964 | """Add a new revision to current repository. |
|
2965 | 2965 | |
|
2966 | 2966 | Revision information is gathered from the working directory, |
|
2967 | 2967 | match can be used to filter the committed files. If editor is |
|
2968 | 2968 | supplied, it is called to get a commit message. |
|
2969 | 2969 | """ |
|
2970 | 2970 | if extra is None: |
|
2971 | 2971 | extra = {} |
|
2972 | 2972 | |
|
2973 | 2973 | def fail(f, msg): |
|
2974 | 2974 | raise error.InputError(b'%s: %s' % (f, msg)) |
|
2975 | 2975 | |
|
2976 | 2976 | if not match: |
|
2977 | 2977 | match = matchmod.always() |
|
2978 | 2978 | |
|
2979 | 2979 | if not force: |
|
2980 | 2980 | match.bad = fail |
|
2981 | 2981 | |
|
2982 | 2982 | # lock() for recent changelog (see issue4368) |
|
2983 | 2983 | with self.wlock(), self.lock(): |
|
2984 | 2984 | wctx = self[None] |
|
2985 | 2985 | merge = len(wctx.parents()) > 1 |
|
2986 | 2986 | |
|
2987 | 2987 | if not force and merge and not match.always(): |
|
2988 | 2988 | raise error.Abort( |
|
2989 | 2989 | _( |
|
2990 | 2990 | b'cannot partially commit a merge ' |
|
2991 | 2991 | b'(do not specify files or patterns)' |
|
2992 | 2992 | ) |
|
2993 | 2993 | ) |
|
2994 | 2994 | |
|
2995 | 2995 | status = self.status(match=match, clean=force) |
|
2996 | 2996 | if force: |
|
2997 | 2997 | status.modified.extend( |
|
2998 | 2998 | status.clean |
|
2999 | 2999 | ) # mq may commit clean files |
|
3000 | 3000 | |
|
3001 | 3001 | # check subrepos |
|
3002 | 3002 | subs, commitsubs, newstate = subrepoutil.precommit( |
|
3003 | 3003 | self.ui, wctx, status, match, force=force |
|
3004 | 3004 | ) |
|
3005 | 3005 | |
|
3006 | 3006 | # make sure all explicit patterns are matched |
|
3007 | 3007 | if not force: |
|
3008 | 3008 | self.checkcommitpatterns(wctx, match, status, fail) |
|
3009 | 3009 | |
|
3010 | 3010 | cctx = context.workingcommitctx( |
|
3011 | 3011 | self, status, text, user, date, extra |
|
3012 | 3012 | ) |
|
3013 | 3013 | |
|
3014 | 3014 | ms = mergestatemod.mergestate.read(self) |
|
3015 | 3015 | mergeutil.checkunresolved(ms) |
|
3016 | 3016 | |
|
3017 | 3017 | # internal config: ui.allowemptycommit |
|
3018 | 3018 | if cctx.isempty() and not self.ui.configbool( |
|
3019 | 3019 | b'ui', b'allowemptycommit' |
|
3020 | 3020 | ): |
|
3021 | 3021 | self.ui.debug(b'nothing to commit, clearing merge state\n') |
|
3022 | 3022 | ms.reset() |
|
3023 | 3023 | return None |
|
3024 | 3024 | |
|
3025 | 3025 | if merge and cctx.deleted(): |
|
3026 | 3026 | raise error.Abort(_(b"cannot commit merge with missing files")) |
|
3027 | 3027 | |
|
3028 | 3028 | if editor: |
|
3029 | 3029 | cctx._text = editor(self, cctx, subs) |
|
3030 | 3030 | edited = text != cctx._text |
|
3031 | 3031 | |
|
3032 | 3032 | # Save commit message in case this transaction gets rolled back |
|
3033 | 3033 | # (e.g. by a pretxncommit hook). Leave the content alone on |
|
3034 | 3034 | # the assumption that the user will use the same editor again. |
|
3035 | 3035 | msgfn = self.savecommitmessage(cctx._text) |
|
3036 | 3036 | |
|
3037 | 3037 | # commit subs and write new state |
|
3038 | 3038 | if subs: |
|
3039 | 3039 | uipathfn = scmutil.getuipathfn(self) |
|
3040 | 3040 | for s in sorted(commitsubs): |
|
3041 | 3041 | sub = wctx.sub(s) |
|
3042 | 3042 | self.ui.status( |
|
3043 | 3043 | _(b'committing subrepository %s\n') |
|
3044 | 3044 | % uipathfn(subrepoutil.subrelpath(sub)) |
|
3045 | 3045 | ) |
|
3046 | 3046 | sr = sub.commit(cctx._text, user, date) |
|
3047 | 3047 | newstate[s] = (newstate[s][0], sr) |
|
3048 | 3048 | subrepoutil.writestate(self, newstate) |
|
3049 | 3049 | |
|
3050 | 3050 | p1, p2 = self.dirstate.parents() |
|
3051 | 3051 | hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or b'') |
|
3052 | 3052 | try: |
|
3053 | 3053 | self.hook( |
|
3054 | 3054 | b"precommit", throw=True, parent1=hookp1, parent2=hookp2 |
|
3055 | 3055 | ) |
|
3056 | 3056 | with self.transaction(b'commit'): |
|
3057 | 3057 | ret = self.commitctx(cctx, True) |
|
3058 | 3058 | # update bookmarks, dirstate and mergestate |
|
3059 | 3059 | bookmarks.update(self, [p1, p2], ret) |
|
3060 | 3060 | cctx.markcommitted(ret) |
|
3061 | 3061 | ms.reset() |
|
3062 | 3062 | except: # re-raises |
|
3063 | 3063 | if edited: |
|
3064 | 3064 | self.ui.write( |
|
3065 | 3065 | _(b'note: commit message saved in %s\n') % msgfn |
|
3066 | 3066 | ) |
|
3067 | 3067 | self.ui.write( |
|
3068 | 3068 | _( |
|
3069 | 3069 | b"note: use 'hg commit --logfile " |
|
3070 | 3070 | b".hg/last-message.txt --edit' to reuse it\n" |
|
3071 | 3071 | ) |
|
3072 | 3072 | ) |
|
3073 | 3073 | raise |
|
3074 | 3074 | |
|
3075 | 3075 | def commithook(unused_success): |
|
3076 | 3076 | # hack for command that use a temporary commit (eg: histedit) |
|
3077 | 3077 | # temporary commit got stripped before hook release |
|
3078 | 3078 | if self.changelog.hasnode(ret): |
|
3079 | 3079 | self.hook( |
|
3080 | 3080 | b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2 |
|
3081 | 3081 | ) |
|
3082 | 3082 | |
|
3083 | 3083 | self._afterlock(commithook) |
|
3084 | 3084 | return ret |
|
3085 | 3085 | |
|
3086 | 3086 | @unfilteredmethod |
|
3087 | 3087 | def commitctx(self, ctx, error=False, origctx=None): |
|
3088 | 3088 | return commit.commitctx(self, ctx, error=error, origctx=origctx) |
|
3089 | 3089 | |
|
3090 | 3090 | @unfilteredmethod |
|
3091 | 3091 | def destroying(self): |
|
3092 | 3092 | """Inform the repository that nodes are about to be destroyed. |
|
3093 | 3093 | Intended for use by strip and rollback, so there's a common |
|
3094 | 3094 | place for anything that has to be done before destroying history. |
|
3095 | 3095 | |
|
3096 | 3096 | This is mostly useful for saving state that is in memory and waiting |
|
3097 | 3097 | to be flushed when the current lock is released. Because a call to |
|
3098 | 3098 | destroyed is imminent, the repo will be invalidated causing those |
|
3099 | 3099 | changes to stay in memory (waiting for the next unlock), or vanish |
|
3100 | 3100 | completely. |
|
3101 | 3101 | """ |
|
3102 | 3102 | # When using the same lock to commit and strip, the phasecache is left |
|
3103 | 3103 | # dirty after committing. Then when we strip, the repo is invalidated, |
|
3104 | 3104 | # causing those changes to disappear. |
|
3105 | 3105 | if '_phasecache' in vars(self): |
|
3106 | 3106 | self._phasecache.write() |
|
3107 | 3107 | |
|
3108 | 3108 | @unfilteredmethod |
|
3109 | 3109 | def destroyed(self): |
|
3110 | 3110 | """Inform the repository that nodes have been destroyed. |
|
3111 | 3111 | Intended for use by strip and rollback, so there's a common |
|
3112 | 3112 | place for anything that has to be done after destroying history. |
|
3113 | 3113 | """ |
|
3114 | 3114 | # When one tries to: |
|
3115 | 3115 | # 1) destroy nodes thus calling this method (e.g. strip) |
|
3116 | 3116 | # 2) use phasecache somewhere (e.g. commit) |
|
3117 | 3117 | # |
|
3118 | 3118 | # then 2) will fail because the phasecache contains nodes that were |
|
3119 | 3119 | # removed. We can either remove phasecache from the filecache, |
|
3120 | 3120 | # causing it to reload next time it is accessed, or simply filter |
|
3121 | 3121 | # the removed nodes now and write the updated cache. |
|
3122 | 3122 | self._phasecache.filterunknown(self) |
|
3123 | 3123 | self._phasecache.write() |
|
3124 | 3124 | |
|
3125 | 3125 | # refresh all repository caches |
|
3126 | 3126 | self.updatecaches() |
|
3127 | 3127 | |
|
3128 | 3128 | # Ensure the persistent tag cache is updated. Doing it now |
|
3129 | 3129 | # means that the tag cache only has to worry about destroyed |
|
3130 | 3130 | # heads immediately after a strip/rollback. That in turn |
|
3131 | 3131 | # guarantees that "cachetip == currenttip" (comparing both rev |
|
3132 | 3132 | # and node) always means no nodes have been added or destroyed. |
|
3133 | 3133 | |
|
3134 | 3134 | # XXX this is suboptimal when qrefresh'ing: we strip the current |
|
3135 | 3135 | # head, refresh the tag cache, then immediately add a new head. |
|
3136 | 3136 | # But I think doing it this way is necessary for the "instant |
|
3137 | 3137 | # tag cache retrieval" case to work. |
|
3138 | 3138 | self.invalidate() |
|
3139 | 3139 | |
|
3140 | 3140 | def status( |
|
3141 | 3141 | self, |
|
3142 | 3142 | node1=b'.', |
|
3143 | 3143 | node2=None, |
|
3144 | 3144 | match=None, |
|
3145 | 3145 | ignored=False, |
|
3146 | 3146 | clean=False, |
|
3147 | 3147 | unknown=False, |
|
3148 | 3148 | listsubrepos=False, |
|
3149 | 3149 | ): |
|
3150 | 3150 | '''a convenience method that calls node1.status(node2)''' |
|
3151 | 3151 | return self[node1].status( |
|
3152 | 3152 | node2, match, ignored, clean, unknown, listsubrepos |
|
3153 | 3153 | ) |
|
3154 | 3154 | |
|
3155 | 3155 | def addpostdsstatus(self, ps): |
|
3156 | 3156 | """Add a callback to run within the wlock, at the point at which status |
|
3157 | 3157 | fixups happen. |
|
3158 | 3158 | |
|
3159 | 3159 | On status completion, callback(wctx, status) will be called with the |
|
3160 | 3160 | wlock held, unless the dirstate has changed from underneath or the wlock |
|
3161 | 3161 | couldn't be grabbed. |
|
3162 | 3162 | |
|
3163 | 3163 | Callbacks should not capture and use a cached copy of the dirstate -- |
|
3164 | 3164 | it might change in the meanwhile. Instead, they should access the |
|
3165 | 3165 | dirstate via wctx.repo().dirstate. |
|
3166 | 3166 | |
|
3167 | 3167 | This list is emptied out after each status run -- extensions should |
|
3168 | 3168 | make sure it adds to this list each time dirstate.status is called. |
|
3169 | 3169 | Extensions should also make sure they don't call this for statuses |
|
3170 | 3170 | that don't involve the dirstate. |
|
3171 | 3171 | """ |
|
3172 | 3172 | |
|
3173 | 3173 | # The list is located here for uniqueness reasons -- it is actually |
|
3174 | 3174 | # managed by the workingctx, but that isn't unique per-repo. |
|
3175 | 3175 | self._postdsstatus.append(ps) |
|
3176 | 3176 | |
|
3177 | 3177 | def postdsstatus(self): |
|
3178 | 3178 | """Used by workingctx to get the list of post-dirstate-status hooks.""" |
|
3179 | 3179 | return self._postdsstatus |
|
3180 | 3180 | |
|
3181 | 3181 | def clearpostdsstatus(self): |
|
3182 | 3182 | """Used by workingctx to clear post-dirstate-status hooks.""" |
|
3183 | 3183 | del self._postdsstatus[:] |
|
3184 | 3184 | |
|
3185 | 3185 | def heads(self, start=None): |
|
3186 | 3186 | if start is None: |
|
3187 | 3187 | cl = self.changelog |
|
3188 | 3188 | headrevs = reversed(cl.headrevs()) |
|
3189 | 3189 | return [cl.node(rev) for rev in headrevs] |
|
3190 | 3190 | |
|
3191 | 3191 | heads = self.changelog.heads(start) |
|
3192 | 3192 | # sort the output in rev descending order |
|
3193 | 3193 | return sorted(heads, key=self.changelog.rev, reverse=True) |
|
3194 | 3194 | |
|
3195 | 3195 | def branchheads(self, branch=None, start=None, closed=False): |
|
3196 | 3196 | """return a (possibly filtered) list of heads for the given branch |
|
3197 | 3197 | |
|
3198 | 3198 | Heads are returned in topological order, from newest to oldest. |
|
3199 | 3199 | If branch is None, use the dirstate branch. |
|
3200 | 3200 | If start is not None, return only heads reachable from start. |
|
3201 | 3201 | If closed is True, return heads that are marked as closed as well. |
|
3202 | 3202 | """ |
|
3203 | 3203 | if branch is None: |
|
3204 | 3204 | branch = self[None].branch() |
|
3205 | 3205 | branches = self.branchmap() |
|
3206 | 3206 | if not branches.hasbranch(branch): |
|
3207 | 3207 | return [] |
|
3208 | 3208 | # the cache returns heads ordered lowest to highest |
|
3209 | 3209 | bheads = list(reversed(branches.branchheads(branch, closed=closed))) |
|
3210 | 3210 | if start is not None: |
|
3211 | 3211 | # filter out the heads that cannot be reached from startrev |
|
3212 | 3212 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) |
|
3213 | 3213 | bheads = [h for h in bheads if h in fbheads] |
|
3214 | 3214 | return bheads |
|
3215 | 3215 | |
|
3216 | 3216 | def branches(self, nodes): |
|
3217 | 3217 | if not nodes: |
|
3218 | 3218 | nodes = [self.changelog.tip()] |
|
3219 | 3219 | b = [] |
|
3220 | 3220 | for n in nodes: |
|
3221 | 3221 | t = n |
|
3222 | 3222 | while True: |
|
3223 | 3223 | p = self.changelog.parents(n) |
|
3224 | 3224 | if p[1] != nullid or p[0] == nullid: |
|
3225 | 3225 | b.append((t, n, p[0], p[1])) |
|
3226 | 3226 | break |
|
3227 | 3227 | n = p[0] |
|
3228 | 3228 | return b |
|
3229 | 3229 | |
|
3230 | 3230 | def between(self, pairs): |
|
3231 | 3231 | r = [] |
|
3232 | 3232 | |
|
3233 | 3233 | for top, bottom in pairs: |
|
3234 | 3234 | n, l, i = top, [], 0 |
|
3235 | 3235 | f = 1 |
|
3236 | 3236 | |
|
3237 | 3237 | while n != bottom and n != nullid: |
|
3238 | 3238 | p = self.changelog.parents(n)[0] |
|
3239 | 3239 | if i == f: |
|
3240 | 3240 | l.append(n) |
|
3241 | 3241 | f = f * 2 |
|
3242 | 3242 | n = p |
|
3243 | 3243 | i += 1 |
|
3244 | 3244 | |
|
3245 | 3245 | r.append(l) |
|
3246 | 3246 | |
|
3247 | 3247 | return r |
|
3248 | 3248 | |
|
3249 | 3249 | def checkpush(self, pushop): |
|
3250 | 3250 | """Extensions can override this function if additional checks have |
|
3251 | 3251 | to be performed before pushing, or call it if they override push |
|
3252 | 3252 | command. |
|
3253 | 3253 | """ |
|
3254 | 3254 | |
|
3255 | 3255 | @unfilteredpropertycache |
|
3256 | 3256 | def prepushoutgoinghooks(self): |
|
3257 | 3257 | """Return util.hooks consists of a pushop with repo, remote, outgoing |
|
3258 | 3258 | methods, which are called before pushing changesets. |
|
3259 | 3259 | """ |
|
3260 | 3260 | return util.hooks() |
|
3261 | 3261 | |
|
3262 | 3262 | def pushkey(self, namespace, key, old, new): |
|
3263 | 3263 | try: |
|
3264 | 3264 | tr = self.currenttransaction() |
|
3265 | 3265 | hookargs = {} |
|
3266 | 3266 | if tr is not None: |
|
3267 | 3267 | hookargs.update(tr.hookargs) |
|
3268 | 3268 | hookargs = pycompat.strkwargs(hookargs) |
|
3269 | 3269 | hookargs['namespace'] = namespace |
|
3270 | 3270 | hookargs['key'] = key |
|
3271 | 3271 | hookargs['old'] = old |
|
3272 | 3272 | hookargs['new'] = new |
|
3273 | 3273 | self.hook(b'prepushkey', throw=True, **hookargs) |
|
3274 | 3274 | except error.HookAbort as exc: |
|
3275 | 3275 | self.ui.write_err(_(b"pushkey-abort: %s\n") % exc) |
|
3276 | 3276 | if exc.hint: |
|
3277 | 3277 | self.ui.write_err(_(b"(%s)\n") % exc.hint) |
|
3278 | 3278 | return False |
|
3279 | 3279 | self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key)) |
|
3280 | 3280 | ret = pushkey.push(self, namespace, key, old, new) |
|
3281 | 3281 | |
|
3282 | 3282 | def runhook(unused_success): |
|
3283 | 3283 | self.hook( |
|
3284 | 3284 | b'pushkey', |
|
3285 | 3285 | namespace=namespace, |
|
3286 | 3286 | key=key, |
|
3287 | 3287 | old=old, |
|
3288 | 3288 | new=new, |
|
3289 | 3289 | ret=ret, |
|
3290 | 3290 | ) |
|
3291 | 3291 | |
|
3292 | 3292 | self._afterlock(runhook) |
|
3293 | 3293 | return ret |
|
3294 | 3294 | |
|
3295 | 3295 | def listkeys(self, namespace): |
|
3296 | 3296 | self.hook(b'prelistkeys', throw=True, namespace=namespace) |
|
3297 | 3297 | self.ui.debug(b'listing keys for "%s"\n' % namespace) |
|
3298 | 3298 | values = pushkey.list(self, namespace) |
|
3299 | 3299 | self.hook(b'listkeys', namespace=namespace, values=values) |
|
3300 | 3300 | return values |
|
3301 | 3301 | |
|
3302 | 3302 | def debugwireargs(self, one, two, three=None, four=None, five=None): |
|
3303 | 3303 | '''used to test argument passing over the wire''' |
|
3304 | 3304 | return b"%s %s %s %s %s" % ( |
|
3305 | 3305 | one, |
|
3306 | 3306 | two, |
|
3307 | 3307 | pycompat.bytestr(three), |
|
3308 | 3308 | pycompat.bytestr(four), |
|
3309 | 3309 | pycompat.bytestr(five), |
|
3310 | 3310 | ) |
|
3311 | 3311 | |
|
3312 | 3312 | def savecommitmessage(self, text): |
|
3313 | 3313 | fp = self.vfs(b'last-message.txt', b'wb') |
|
3314 | 3314 | try: |
|
3315 | 3315 | fp.write(text) |
|
3316 | 3316 | finally: |
|
3317 | 3317 | fp.close() |
|
3318 | 3318 | return self.pathto(fp.name[len(self.root) + 1 :]) |
|
3319 | 3319 | |
|
3320 | 3320 | |
|
3321 | 3321 | # used to avoid circular references so destructors work |
|
3322 | 3322 | def aftertrans(files): |
|
3323 | 3323 | renamefiles = [tuple(t) for t in files] |
|
3324 | 3324 | |
|
3325 | 3325 | def a(): |
|
3326 | 3326 | for vfs, src, dest in renamefiles: |
|
3327 | 3327 | # if src and dest refer to a same file, vfs.rename is a no-op, |
|
3328 | 3328 | # leaving both src and dest on disk. delete dest to make sure |
|
3329 | 3329 | # the rename couldn't be such a no-op. |
|
3330 | 3330 | vfs.tryunlink(dest) |
|
3331 | 3331 | try: |
|
3332 | 3332 | vfs.rename(src, dest) |
|
3333 | 3333 | except OSError: # journal file does not yet exist |
|
3334 | 3334 | pass |
|
3335 | 3335 | |
|
3336 | 3336 | return a |
|
3337 | 3337 | |
|
3338 | 3338 | |
|
3339 | 3339 | def undoname(fn): |
|
3340 | 3340 | base, name = os.path.split(fn) |
|
3341 | 3341 | assert name.startswith(b'journal') |
|
3342 | 3342 | return os.path.join(base, name.replace(b'journal', b'undo', 1)) |
|
3343 | 3343 | |
|
3344 | 3344 | |
|
3345 | 3345 | def instance(ui, path, create, intents=None, createopts=None): |
|
3346 | 3346 | localpath = util.urllocalpath(path) |
|
3347 | 3347 | if create: |
|
3348 | 3348 | createrepository(ui, localpath, createopts=createopts) |
|
3349 | 3349 | |
|
3350 | 3350 | return makelocalrepository(ui, localpath, intents=intents) |
|
3351 | 3351 | |
|
3352 | 3352 | |
|
3353 | 3353 | def islocal(path): |
|
3354 | 3354 | return True |
|
3355 | 3355 | |
|
3356 | 3356 | |
|
3357 | 3357 | def defaultcreateopts(ui, createopts=None): |
|
3358 | 3358 | """Populate the default creation options for a repository. |
|
3359 | 3359 | |
|
3360 | 3360 | A dictionary of explicitly requested creation options can be passed |
|
3361 | 3361 | in. Missing keys will be populated. |
|
3362 | 3362 | """ |
|
3363 | 3363 | createopts = dict(createopts or {}) |
|
3364 | 3364 | |
|
3365 | 3365 | if b'backend' not in createopts: |
|
3366 | 3366 | # experimental config: storage.new-repo-backend |
|
3367 | 3367 | createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend') |
|
3368 | 3368 | |
|
3369 | 3369 | return createopts |
|
3370 | 3370 | |
|
3371 | 3371 | |
|
3372 | 3372 | def newreporequirements(ui, createopts): |
|
3373 | 3373 | """Determine the set of requirements for a new local repository. |
|
3374 | 3374 | |
|
3375 | 3375 | Extensions can wrap this function to specify custom requirements for |
|
3376 | 3376 | new repositories. |
|
3377 | 3377 | """ |
|
3378 | 3378 | # If the repo is being created from a shared repository, we copy |
|
3379 | 3379 | # its requirements. |
|
3380 | 3380 | if b'sharedrepo' in createopts: |
|
3381 | 3381 | requirements = set(createopts[b'sharedrepo'].requirements) |
|
3382 | 3382 | if createopts.get(b'sharedrelative'): |
|
3383 | 3383 | requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT) |
|
3384 | 3384 | else: |
|
3385 | 3385 | requirements.add(requirementsmod.SHARED_REQUIREMENT) |
|
3386 | 3386 | |
|
3387 | 3387 | return requirements |
|
3388 | 3388 | |
|
3389 | 3389 | if b'backend' not in createopts: |
|
3390 | 3390 | raise error.ProgrammingError( |
|
3391 | 3391 | b'backend key not present in createopts; ' |
|
3392 | 3392 | b'was defaultcreateopts() called?' |
|
3393 | 3393 | ) |
|
3394 | 3394 | |
|
3395 | 3395 | if createopts[b'backend'] != b'revlogv1': |
|
3396 | 3396 | raise error.Abort( |
|
3397 | 3397 | _( |
|
3398 | 3398 | b'unable to determine repository requirements for ' |
|
3399 | 3399 | b'storage backend: %s' |
|
3400 | 3400 | ) |
|
3401 | 3401 | % createopts[b'backend'] |
|
3402 | 3402 | ) |
|
3403 | 3403 | |
|
3404 | 3404 | requirements = {b'revlogv1'} |
|
3405 | 3405 | if ui.configbool(b'format', b'usestore'): |
|
3406 | 3406 | requirements.add(b'store') |
|
3407 | 3407 | if ui.configbool(b'format', b'usefncache'): |
|
3408 | 3408 | requirements.add(b'fncache') |
|
3409 | 3409 | if ui.configbool(b'format', b'dotencode'): |
|
3410 | 3410 | requirements.add(b'dotencode') |
|
3411 | 3411 | |
|
3412 | 3412 | compengines = ui.configlist(b'format', b'revlog-compression') |
|
3413 | 3413 | for compengine in compengines: |
|
3414 | 3414 | if compengine in util.compengines: |
|
3415 | 3415 | break |
|
3416 | 3416 | else: |
|
3417 | 3417 | raise error.Abort( |
|
3418 | 3418 | _( |
|
3419 | 3419 | b'compression engines %s defined by ' |
|
3420 | 3420 | b'format.revlog-compression not available' |
|
3421 | 3421 | ) |
|
3422 | 3422 | % b', '.join(b'"%s"' % e for e in compengines), |
|
3423 | 3423 | hint=_( |
|
3424 | 3424 | b'run "hg debuginstall" to list available ' |
|
3425 | 3425 | b'compression engines' |
|
3426 | 3426 | ), |
|
3427 | 3427 | ) |
|
3428 | 3428 | |
|
3429 | 3429 | # zlib is the historical default and doesn't need an explicit requirement. |
|
3430 | 3430 | if compengine == b'zstd': |
|
3431 | 3431 | requirements.add(b'revlog-compression-zstd') |
|
3432 | 3432 | elif compengine != b'zlib': |
|
3433 | 3433 | requirements.add(b'exp-compression-%s' % compengine) |
|
3434 | 3434 | |
|
3435 | 3435 | if scmutil.gdinitconfig(ui): |
|
3436 | 3436 | requirements.add(b'generaldelta') |
|
3437 | 3437 | if ui.configbool(b'format', b'sparse-revlog'): |
|
3438 | 3438 | requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) |
|
3439 | 3439 | |
|
3440 | 3440 | # experimental config: format.exp-use-side-data |
|
3441 | 3441 | if ui.configbool(b'format', b'exp-use-side-data'): |
|
3442 | 3442 | requirements.add(requirementsmod.SIDEDATA_REQUIREMENT) |
|
3443 | 3443 | # experimental config: format.exp-use-copies-side-data-changeset |
|
3444 | 3444 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): |
|
3445 | 3445 | requirements.add(requirementsmod.SIDEDATA_REQUIREMENT) |
|
3446 | 3446 | requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) |
|
3447 | 3447 | if ui.configbool(b'experimental', b'treemanifest'): |
|
3448 | 3448 | requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) |
|
3449 | 3449 | |
|
3450 | 3450 | revlogv2 = ui.config(b'experimental', b'revlogv2') |
|
3451 | 3451 | if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': |
|
3452 | 3452 | requirements.remove(b'revlogv1') |
|
3453 | 3453 | # generaldelta is implied by revlogv2. |
|
3454 | 3454 | requirements.discard(b'generaldelta') |
|
3455 | 3455 | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) |
|
3456 | 3456 | # experimental config: format.internal-phase |
|
3457 | 3457 | if ui.configbool(b'format', b'internal-phase'): |
|
3458 | 3458 | requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) |
|
3459 | 3459 | |
|
3460 | 3460 | if createopts.get(b'narrowfiles'): |
|
3461 | 3461 | requirements.add(requirementsmod.NARROW_REQUIREMENT) |
|
3462 | 3462 | |
|
3463 | 3463 | if createopts.get(b'lfs'): |
|
3464 | 3464 | requirements.add(b'lfs') |
|
3465 | 3465 | |
|
3466 | 3466 | if ui.configbool(b'format', b'bookmarks-in-store'): |
|
3467 | 3467 | requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) |
|
3468 | 3468 | |
|
3469 | 3469 | if ui.configbool(b'format', b'use-persistent-nodemap'): |
|
3470 | 3470 | requirements.add(requirementsmod.NODEMAP_REQUIREMENT) |
|
3471 | 3471 | |
|
3472 | 3472 | # if share-safe is enabled, let's create the new repository with the new |
|
3473 | 3473 | # requirement |
|
3474 | 3474 | if ui.configbool(b'format', b'use-share-safe'): |
|
3475 | 3475 | requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) |
|
3476 | 3476 | |
|
3477 | 3477 | return requirements |
|
3478 | 3478 | |
|
3479 | 3479 | |
|
3480 | 3480 | def checkrequirementscompat(ui, requirements): |
|
3481 | 3481 | """Checks compatibility of repository requirements enabled and disabled. |
|
3482 | 3482 | |
|
3483 | 3483 | Returns a set of requirements which needs to be dropped because dependend |
|
3484 | 3484 | requirements are not enabled. Also warns users about it""" |
|
3485 | 3485 | |
|
3486 | 3486 | dropped = set() |
|
3487 | 3487 | |
|
3488 | 3488 | if b'store' not in requirements: |
|
3489 | 3489 | if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements: |
|
3490 | 3490 | ui.warn( |
|
3491 | 3491 | _( |
|
3492 | 3492 | b'ignoring enabled \'format.bookmarks-in-store\' config ' |
|
3493 | 3493 | b'beacuse it is incompatible with disabled ' |
|
3494 | 3494 | b'\'format.usestore\' config\n' |
|
3495 | 3495 | ) |
|
3496 | 3496 | ) |
|
3497 | 3497 | dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) |
|
3498 | 3498 | |
|
3499 | 3499 | if ( |
|
3500 | 3500 | requirementsmod.SHARED_REQUIREMENT in requirements |
|
3501 | 3501 | or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements |
|
3502 | 3502 | ): |
|
3503 | 3503 | raise error.Abort( |
|
3504 | 3504 | _( |
|
3505 | 3505 | b"cannot create shared repository as source was created" |
|
3506 | 3506 | b" with 'format.usestore' config disabled" |
|
3507 | 3507 | ) |
|
3508 | 3508 | ) |
|
3509 | 3509 | |
|
3510 | 3510 | if requirementsmod.SHARESAFE_REQUIREMENT in requirements: |
|
3511 | 3511 | ui.warn( |
|
3512 | 3512 | _( |
|
3513 | 3513 | b"ignoring enabled 'format.use-share-safe' config because " |
|
3514 | 3514 | b"it is incompatible with disabled 'format.usestore'" |
|
3515 | 3515 | b" config\n" |
|
3516 | 3516 | ) |
|
3517 | 3517 | ) |
|
3518 | 3518 | dropped.add(requirementsmod.SHARESAFE_REQUIREMENT) |
|
3519 | 3519 | |
|
3520 | 3520 | return dropped |
|
3521 | 3521 | |
|
3522 | 3522 | |
|
3523 | 3523 | def filterknowncreateopts(ui, createopts): |
|
3524 | 3524 | """Filters a dict of repo creation options against options that are known. |
|
3525 | 3525 | |
|
3526 | 3526 | Receives a dict of repo creation options and returns a dict of those |
|
3527 | 3527 | options that we don't know how to handle. |
|
3528 | 3528 | |
|
3529 | 3529 | This function is called as part of repository creation. If the |
|
3530 | 3530 | returned dict contains any items, repository creation will not |
|
3531 | 3531 | be allowed, as it means there was a request to create a repository |
|
3532 | 3532 | with options not recognized by loaded code. |
|
3533 | 3533 | |
|
3534 | 3534 | Extensions can wrap this function to filter out creation options |
|
3535 | 3535 | they know how to handle. |
|
3536 | 3536 | """ |
|
3537 | 3537 | known = { |
|
3538 | 3538 | b'backend', |
|
3539 | 3539 | b'lfs', |
|
3540 | 3540 | b'narrowfiles', |
|
3541 | 3541 | b'sharedrepo', |
|
3542 | 3542 | b'sharedrelative', |
|
3543 | 3543 | b'shareditems', |
|
3544 | 3544 | b'shallowfilestore', |
|
3545 | 3545 | } |
|
3546 | 3546 | |
|
3547 | 3547 | return {k: v for k, v in createopts.items() if k not in known} |
|
3548 | 3548 | |
|
3549 | 3549 | |
|
3550 | 3550 | def createrepository(ui, path, createopts=None): |
|
3551 | 3551 | """Create a new repository in a vfs. |
|
3552 | 3552 | |
|
3553 | 3553 | ``path`` path to the new repo's working directory. |
|
3554 | 3554 | ``createopts`` options for the new repository. |
|
3555 | 3555 | |
|
3556 | 3556 | The following keys for ``createopts`` are recognized: |
|
3557 | 3557 | |
|
3558 | 3558 | backend |
|
3559 | 3559 | The storage backend to use. |
|
3560 | 3560 | lfs |
|
3561 | 3561 | Repository will be created with ``lfs`` requirement. The lfs extension |
|
3562 | 3562 | will automatically be loaded when the repository is accessed. |
|
3563 | 3563 | narrowfiles |
|
3564 | 3564 | Set up repository to support narrow file storage. |
|
3565 | 3565 | sharedrepo |
|
3566 | 3566 | Repository object from which storage should be shared. |
|
3567 | 3567 | sharedrelative |
|
3568 | 3568 | Boolean indicating if the path to the shared repo should be |
|
3569 | 3569 | stored as relative. By default, the pointer to the "parent" repo |
|
3570 | 3570 | is stored as an absolute path. |
|
3571 | 3571 | shareditems |
|
3572 | 3572 | Set of items to share to the new repository (in addition to storage). |
|
3573 | 3573 | shallowfilestore |
|
3574 | 3574 | Indicates that storage for files should be shallow (not all ancestor |
|
3575 | 3575 | revisions are known). |
|
3576 | 3576 | """ |
|
3577 | 3577 | createopts = defaultcreateopts(ui, createopts=createopts) |
|
3578 | 3578 | |
|
3579 | 3579 | unknownopts = filterknowncreateopts(ui, createopts) |
|
3580 | 3580 | |
|
3581 | 3581 | if not isinstance(unknownopts, dict): |
|
3582 | 3582 | raise error.ProgrammingError( |
|
3583 | 3583 | b'filterknowncreateopts() did not return a dict' |
|
3584 | 3584 | ) |
|
3585 | 3585 | |
|
3586 | 3586 | if unknownopts: |
|
3587 | 3587 | raise error.Abort( |
|
3588 | 3588 | _( |
|
3589 | 3589 | b'unable to create repository because of unknown ' |
|
3590 | 3590 | b'creation option: %s' |
|
3591 | 3591 | ) |
|
3592 | 3592 | % b', '.join(sorted(unknownopts)), |
|
3593 | 3593 | hint=_(b'is a required extension not loaded?'), |
|
3594 | 3594 | ) |
|
3595 | 3595 | |
|
3596 | 3596 | requirements = newreporequirements(ui, createopts=createopts) |
|
3597 | 3597 | requirements -= checkrequirementscompat(ui, requirements) |
|
3598 | 3598 | |
|
3599 | 3599 | wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True) |
|
3600 | 3600 | |
|
3601 | 3601 | hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg')) |
|
3602 | 3602 | if hgvfs.exists(): |
|
3603 | 3603 | raise error.RepoError(_(b'repository %s already exists') % path) |
|
3604 | 3604 | |
|
3605 | 3605 | if b'sharedrepo' in createopts: |
|
3606 | 3606 | sharedpath = createopts[b'sharedrepo'].sharedpath |
|
3607 | 3607 | |
|
3608 | 3608 | if createopts.get(b'sharedrelative'): |
|
3609 | 3609 | try: |
|
3610 | 3610 | sharedpath = os.path.relpath(sharedpath, hgvfs.base) |
|
3611 | 3611 | except (IOError, ValueError) as e: |
|
3612 | 3612 | # ValueError is raised on Windows if the drive letters differ |
|
3613 | 3613 | # on each path. |
|
3614 | 3614 | raise error.Abort( |
|
3615 | 3615 | _(b'cannot calculate relative path'), |
|
3616 | 3616 | hint=stringutil.forcebytestr(e), |
|
3617 | 3617 | ) |
|
3618 | 3618 | |
|
3619 | 3619 | if not wdirvfs.exists(): |
|
3620 | 3620 | wdirvfs.makedirs() |
|
3621 | 3621 | |
|
3622 | 3622 | hgvfs.makedir(notindexed=True) |
|
3623 | 3623 | if b'sharedrepo' not in createopts: |
|
3624 | 3624 | hgvfs.mkdir(b'cache') |
|
3625 | 3625 | hgvfs.mkdir(b'wcache') |
|
3626 | 3626 | |
|
3627 | 3627 | if b'store' in requirements and b'sharedrepo' not in createopts: |
|
3628 | 3628 | hgvfs.mkdir(b'store') |
|
3629 | 3629 | |
|
3630 | 3630 | # We create an invalid changelog outside the store so very old |
|
3631 | 3631 | # Mercurial versions (which didn't know about the requirements |
|
3632 | 3632 | # file) encounter an error on reading the changelog. This |
|
3633 | 3633 | # effectively locks out old clients and prevents them from |
|
3634 | 3634 | # mucking with a repo in an unknown format. |
|
3635 | 3635 | # |
|
3636 | 3636 | # The revlog header has version 2, which won't be recognized by |
|
3637 | 3637 | # such old clients. |
|
3638 | 3638 | hgvfs.append( |
|
3639 | 3639 | b'00changelog.i', |
|
3640 | 3640 | b'\0\0\0\2 dummy changelog to prevent using the old repo ' |
|
3641 | 3641 | b'layout', |
|
3642 | 3642 | ) |
|
3643 | 3643 | |
|
3644 | 3644 | # Filter the requirements into working copy and store ones |
|
3645 | 3645 | wcreq, storereq = scmutil.filterrequirements(requirements) |
|
3646 | 3646 | # write working copy ones |
|
3647 | 3647 | scmutil.writerequires(hgvfs, wcreq) |
|
3648 | 3648 | # If there are store requirements and the current repository |
|
3649 | 3649 | # is not a shared one, write stored requirements |
|
3650 | 3650 | # For new shared repository, we don't need to write the store |
|
3651 | 3651 | # requirements as they are already present in store requires |
|
3652 | 3652 | if storereq and b'sharedrepo' not in createopts: |
|
3653 | 3653 | storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True) |
|
3654 | 3654 | scmutil.writerequires(storevfs, storereq) |
|
3655 | 3655 | |
|
3656 | 3656 | # Write out file telling readers where to find the shared store. |
|
3657 | 3657 | if b'sharedrepo' in createopts: |
|
3658 | 3658 | hgvfs.write(b'sharedpath', sharedpath) |
|
3659 | 3659 | |
|
3660 | 3660 | if createopts.get(b'shareditems'): |
|
3661 | 3661 | shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n' |
|
3662 | 3662 | hgvfs.write(b'shared', shared) |
|
3663 | 3663 | |
|
3664 | 3664 | |
|
3665 | 3665 | def poisonrepository(repo): |
|
3666 | 3666 | """Poison a repository instance so it can no longer be used.""" |
|
3667 | 3667 | # Perform any cleanup on the instance. |
|
3668 | 3668 | repo.close() |
|
3669 | 3669 | |
|
3670 | 3670 | # Our strategy is to replace the type of the object with one that |
|
3671 | 3671 | # has all attribute lookups result in error. |
|
3672 | 3672 | # |
|
3673 | 3673 | # But we have to allow the close() method because some constructors |
|
3674 | 3674 | # of repos call close() on repo references. |
|
3675 | 3675 | class poisonedrepository(object): |
|
3676 | 3676 | def __getattribute__(self, item): |
|
3677 | 3677 | if item == 'close': |
|
3678 | 3678 | return object.__getattribute__(self, item) |
|
3679 | 3679 | |
|
3680 | 3680 | raise error.ProgrammingError( |
|
3681 | 3681 | b'repo instances should not be used after unshare' |
|
3682 | 3682 | ) |
|
3683 | 3683 | |
|
3684 | 3684 | def close(self): |
|
3685 | 3685 | pass |
|
3686 | 3686 | |
|
3687 | 3687 | # We may have a repoview, which intercepts __setattr__. So be sure |
|
3688 | 3688 | # we operate at the lowest level possible. |
|
3689 | 3689 | object.__setattr__(repo, '__class__', poisonedrepository) |
@@ -1,1219 +1,1219 b'' | |||
|
1 | 1 | # logcmdutil.py - utility for log-like commands |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | 10 | import itertools |
|
11 | 11 | import os |
|
12 | 12 | import posixpath |
|
13 | 13 | |
|
14 | 14 | from .i18n import _ |
|
15 | 15 | from .node import ( |
|
16 | 16 | nullid, |
|
17 | 17 | wdirid, |
|
18 | 18 | wdirrev, |
|
19 | 19 | ) |
|
20 | 20 | |
|
21 | 21 | from .thirdparty import attr |
|
22 | 22 | |
|
23 | 23 | from . import ( |
|
24 | 24 | dagop, |
|
25 | 25 | error, |
|
26 | 26 | formatter, |
|
27 | 27 | graphmod, |
|
28 | 28 | match as matchmod, |
|
29 | 29 | mdiff, |
|
30 | 30 | patch, |
|
31 | 31 | pathutil, |
|
32 | 32 | pycompat, |
|
33 | 33 | revset, |
|
34 | 34 | revsetlang, |
|
35 | 35 | scmutil, |
|
36 | 36 | smartset, |
|
37 | 37 | templatekw, |
|
38 | 38 | templater, |
|
39 | 39 | util, |
|
40 | 40 | ) |
|
41 | 41 | from .utils import ( |
|
42 | 42 | dateutil, |
|
43 | 43 | stringutil, |
|
44 | 44 | ) |
|
45 | 45 | |
|
46 | 46 | |
|
47 | 47 | if pycompat.TYPE_CHECKING: |
|
48 | 48 | from typing import ( |
|
49 | 49 | Any, |
|
50 | 50 | Callable, |
|
51 | 51 | Dict, |
|
52 | 52 | List, |
|
53 | 53 | Optional, |
|
54 | 54 | Tuple, |
|
55 | 55 | ) |
|
56 | 56 | |
|
57 | 57 | for t in (Any, Callable, Dict, List, Optional, Tuple): |
|
58 | 58 | assert t |
|
59 | 59 | |
|
60 | 60 | |
|
61 | 61 | def getlimit(opts): |
|
62 | 62 | """get the log limit according to option -l/--limit""" |
|
63 | 63 | limit = opts.get(b'limit') |
|
64 | 64 | if limit: |
|
65 | 65 | try: |
|
66 | 66 | limit = int(limit) |
|
67 | 67 | except ValueError: |
|
68 | 68 | raise error.Abort(_(b'limit must be a positive integer')) |
|
69 | 69 | if limit <= 0: |
|
70 | 70 | raise error.Abort(_(b'limit must be positive')) |
|
71 | 71 | else: |
|
72 | 72 | limit = None |
|
73 | 73 | return limit |
|
74 | 74 | |
|
75 | 75 | |
|
76 | 76 | def diffordiffstat( |
|
77 | 77 | ui, |
|
78 | 78 | repo, |
|
79 | 79 | diffopts, |
|
80 | 80 | ctx1, |
|
81 | 81 | ctx2, |
|
82 | 82 | match, |
|
83 | 83 | changes=None, |
|
84 | 84 | stat=False, |
|
85 | 85 | fp=None, |
|
86 | 86 | graphwidth=0, |
|
87 | 87 | prefix=b'', |
|
88 | 88 | root=b'', |
|
89 | 89 | listsubrepos=False, |
|
90 | 90 | hunksfilterfn=None, |
|
91 | 91 | ): |
|
92 | 92 | '''show diff or diffstat.''' |
|
93 | 93 | if root: |
|
94 | 94 | relroot = pathutil.canonpath(repo.root, repo.getcwd(), root) |
|
95 | 95 | else: |
|
96 | 96 | relroot = b'' |
|
97 | 97 | copysourcematch = None |
|
98 | 98 | |
|
99 | 99 | def compose(f, g): |
|
100 | 100 | return lambda x: f(g(x)) |
|
101 | 101 | |
|
102 | 102 | def pathfn(f): |
|
103 | 103 | return posixpath.join(prefix, f) |
|
104 | 104 | |
|
105 | 105 | if relroot != b'': |
|
106 | 106 | # XXX relative roots currently don't work if the root is within a |
|
107 | 107 | # subrepo |
|
108 | 108 | uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) |
|
109 | 109 | uirelroot = uipathfn(pathfn(relroot)) |
|
110 | 110 | relroot += b'/' |
|
111 | 111 | for matchroot in match.files(): |
|
112 | 112 | if not matchroot.startswith(relroot): |
|
113 | 113 | ui.warn( |
|
114 | 114 | _(b'warning: %s not inside relative root %s\n') |
|
115 | 115 | % (uipathfn(pathfn(matchroot)), uirelroot) |
|
116 | 116 | ) |
|
117 | 117 | |
|
118 | 118 | relrootmatch = scmutil.match(ctx2, pats=[relroot], default=b'path') |
|
119 | 119 | match = matchmod.intersectmatchers(match, relrootmatch) |
|
120 | 120 | copysourcematch = relrootmatch |
|
121 | 121 | |
|
122 | 122 | checkroot = repo.ui.configbool( |
|
123 | 123 | b'devel', b'all-warnings' |
|
124 | 124 | ) or repo.ui.configbool(b'devel', b'check-relroot') |
|
125 | 125 | |
|
126 | 126 | def relrootpathfn(f): |
|
127 | 127 | if checkroot and not f.startswith(relroot): |
|
128 | 128 | raise AssertionError( |
|
129 | 129 | b"file %s doesn't start with relroot %s" % (f, relroot) |
|
130 | 130 | ) |
|
131 | 131 | return f[len(relroot) :] |
|
132 | 132 | |
|
133 | 133 | pathfn = compose(relrootpathfn, pathfn) |
|
134 | 134 | |
|
135 | 135 | if stat: |
|
136 | 136 | diffopts = diffopts.copy(context=0, noprefix=False) |
|
137 | 137 | width = 80 |
|
138 | 138 | if not ui.plain(): |
|
139 | 139 | width = ui.termwidth() - graphwidth |
|
140 | 140 | # If an explicit --root was given, don't respect ui.relative-paths |
|
141 | 141 | if not relroot: |
|
142 | 142 | pathfn = compose(scmutil.getuipathfn(repo), pathfn) |
|
143 | 143 | |
|
144 | 144 | chunks = ctx2.diff( |
|
145 | 145 | ctx1, |
|
146 | 146 | match, |
|
147 | 147 | changes, |
|
148 | 148 | opts=diffopts, |
|
149 | 149 | pathfn=pathfn, |
|
150 | 150 | copysourcematch=copysourcematch, |
|
151 | 151 | hunksfilterfn=hunksfilterfn, |
|
152 | 152 | ) |
|
153 | 153 | |
|
154 | 154 | if fp is not None or ui.canwritewithoutlabels(): |
|
155 | 155 | out = fp or ui |
|
156 | 156 | if stat: |
|
157 | 157 | chunks = [patch.diffstat(util.iterlines(chunks), width=width)] |
|
158 | 158 | for chunk in util.filechunkiter(util.chunkbuffer(chunks)): |
|
159 | 159 | out.write(chunk) |
|
160 | 160 | else: |
|
161 | 161 | if stat: |
|
162 | 162 | chunks = patch.diffstatui(util.iterlines(chunks), width=width) |
|
163 | 163 | else: |
|
164 | 164 | chunks = patch.difflabel( |
|
165 | 165 | lambda chunks, **kwargs: chunks, chunks, opts=diffopts |
|
166 | 166 | ) |
|
167 | 167 | if ui.canbatchlabeledwrites(): |
|
168 | 168 | |
|
169 | 169 | def gen(): |
|
170 | 170 | for chunk, label in chunks: |
|
171 | 171 | yield ui.label(chunk, label=label) |
|
172 | 172 | |
|
173 | 173 | for chunk in util.filechunkiter(util.chunkbuffer(gen())): |
|
174 | 174 | ui.write(chunk) |
|
175 | 175 | else: |
|
176 | 176 | for chunk, label in chunks: |
|
177 | 177 | ui.write(chunk, label=label) |
|
178 | 178 | |
|
179 | 179 | node2 = ctx2.node() |
|
180 | 180 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
|
181 | 181 | tempnode2 = node2 |
|
182 | 182 | try: |
|
183 | 183 | if node2 is not None: |
|
184 | 184 | tempnode2 = ctx2.substate[subpath][1] |
|
185 | 185 | except KeyError: |
|
186 | 186 | # A subrepo that existed in node1 was deleted between node1 and |
|
187 | 187 | # node2 (inclusive). Thus, ctx2's substate won't contain that |
|
188 | 188 | # subpath. The best we can do is to ignore it. |
|
189 | 189 | tempnode2 = None |
|
190 | 190 | submatch = matchmod.subdirmatcher(subpath, match) |
|
191 | 191 | subprefix = repo.wvfs.reljoin(prefix, subpath) |
|
192 | 192 | if listsubrepos or match.exact(subpath) or any(submatch.files()): |
|
193 | 193 | sub.diff( |
|
194 | 194 | ui, |
|
195 | 195 | diffopts, |
|
196 | 196 | tempnode2, |
|
197 | 197 | submatch, |
|
198 | 198 | changes=changes, |
|
199 | 199 | stat=stat, |
|
200 | 200 | fp=fp, |
|
201 | 201 | prefix=subprefix, |
|
202 | 202 | ) |
|
203 | 203 | |
|
204 | 204 | |
|
205 | 205 | class changesetdiffer(object): |
|
206 | 206 | """Generate diff of changeset with pre-configured filtering functions""" |
|
207 | 207 | |
|
208 | 208 | def _makefilematcher(self, ctx): |
|
209 | 209 | return scmutil.matchall(ctx.repo()) |
|
210 | 210 | |
|
211 | 211 | def _makehunksfilter(self, ctx): |
|
212 | 212 | return None |
|
213 | 213 | |
|
214 | 214 | def showdiff(self, ui, ctx, diffopts, graphwidth=0, stat=False): |
|
215 | 215 | diffordiffstat( |
|
216 | 216 | ui, |
|
217 | 217 | ctx.repo(), |
|
218 | 218 | diffopts, |
|
219 | 219 | ctx.p1(), |
|
220 | 220 | ctx, |
|
221 | 221 | match=self._makefilematcher(ctx), |
|
222 | 222 | stat=stat, |
|
223 | 223 | graphwidth=graphwidth, |
|
224 | 224 | hunksfilterfn=self._makehunksfilter(ctx), |
|
225 | 225 | ) |
|
226 | 226 | |
|
227 | 227 | |
|
228 | 228 | def changesetlabels(ctx): |
|
229 | 229 | labels = [b'log.changeset', b'changeset.%s' % ctx.phasestr()] |
|
230 | 230 | if ctx.obsolete(): |
|
231 | 231 | labels.append(b'changeset.obsolete') |
|
232 | 232 | if ctx.isunstable(): |
|
233 | 233 | labels.append(b'changeset.unstable') |
|
234 | 234 | for instability in ctx.instabilities(): |
|
235 | 235 | labels.append(b'instability.%s' % instability) |
|
236 | 236 | return b' '.join(labels) |
|
237 | 237 | |
|
238 | 238 | |
|
239 | 239 | class changesetprinter(object): |
|
240 | 240 | '''show changeset information when templating not requested.''' |
|
241 | 241 | |
|
242 | 242 | def __init__(self, ui, repo, differ=None, diffopts=None, buffered=False): |
|
243 | 243 | self.ui = ui |
|
244 | 244 | self.repo = repo |
|
245 | 245 | self.buffered = buffered |
|
246 | 246 | self._differ = differ or changesetdiffer() |
|
247 | 247 | self._diffopts = patch.diffallopts(ui, diffopts) |
|
248 | 248 | self._includestat = diffopts and diffopts.get(b'stat') |
|
249 | 249 | self._includediff = diffopts and diffopts.get(b'patch') |
|
250 | 250 | self.header = {} |
|
251 | 251 | self.hunk = {} |
|
252 | 252 | self.lastheader = None |
|
253 | 253 | self.footer = None |
|
254 | 254 | self._columns = templatekw.getlogcolumns() |
|
255 | 255 | |
|
256 | 256 | def flush(self, ctx): |
|
257 | 257 | rev = ctx.rev() |
|
258 | 258 | if rev in self.header: |
|
259 | 259 | h = self.header[rev] |
|
260 | 260 | if h != self.lastheader: |
|
261 | 261 | self.lastheader = h |
|
262 | 262 | self.ui.write(h) |
|
263 | 263 | del self.header[rev] |
|
264 | 264 | if rev in self.hunk: |
|
265 | 265 | self.ui.write(self.hunk[rev]) |
|
266 | 266 | del self.hunk[rev] |
|
267 | 267 | |
|
268 | 268 | def close(self): |
|
269 | 269 | if self.footer: |
|
270 | 270 | self.ui.write(self.footer) |
|
271 | 271 | |
|
272 | 272 | def show(self, ctx, copies=None, **props): |
|
273 | 273 | props = pycompat.byteskwargs(props) |
|
274 | 274 | if self.buffered: |
|
275 | 275 | self.ui.pushbuffer(labeled=True) |
|
276 | 276 | self._show(ctx, copies, props) |
|
277 | 277 | self.hunk[ctx.rev()] = self.ui.popbuffer() |
|
278 | 278 | else: |
|
279 | 279 | self._show(ctx, copies, props) |
|
280 | 280 | |
|
281 | 281 | def _show(self, ctx, copies, props): |
|
282 | 282 | '''show a single changeset or file revision''' |
|
283 | 283 | changenode = ctx.node() |
|
284 | 284 | graphwidth = props.get(b'graphwidth', 0) |
|
285 | 285 | |
|
286 | 286 | if self.ui.quiet: |
|
287 | 287 | self.ui.write( |
|
288 | 288 | b"%s\n" % scmutil.formatchangeid(ctx), label=b'log.node' |
|
289 | 289 | ) |
|
290 | 290 | return |
|
291 | 291 | |
|
292 | 292 | columns = self._columns |
|
293 | 293 | self.ui.write( |
|
294 | 294 | columns[b'changeset'] % scmutil.formatchangeid(ctx), |
|
295 | 295 | label=changesetlabels(ctx), |
|
296 | 296 | ) |
|
297 | 297 | |
|
298 | 298 | # branches are shown first before any other names due to backwards |
|
299 | 299 | # compatibility |
|
300 | 300 | branch = ctx.branch() |
|
301 | 301 | # don't show the default branch name |
|
302 | 302 | if branch != b'default': |
|
303 | 303 | self.ui.write(columns[b'branch'] % branch, label=b'log.branch') |
|
304 | 304 | |
|
305 | 305 | for nsname, ns in pycompat.iteritems(self.repo.names): |
|
306 | 306 | # branches has special logic already handled above, so here we just |
|
307 | 307 | # skip it |
|
308 | 308 | if nsname == b'branches': |
|
309 | 309 | continue |
|
310 | 310 | # we will use the templatename as the color name since those two |
|
311 | 311 | # should be the same |
|
312 | 312 | for name in ns.names(self.repo, changenode): |
|
313 | 313 | self.ui.write(ns.logfmt % name, label=b'log.%s' % ns.colorname) |
|
314 | 314 | if self.ui.debugflag: |
|
315 | 315 | self.ui.write( |
|
316 | 316 | columns[b'phase'] % ctx.phasestr(), label=b'log.phase' |
|
317 | 317 | ) |
|
318 | 318 | for pctx in scmutil.meaningfulparents(self.repo, ctx): |
|
319 | 319 | label = b'log.parent changeset.%s' % pctx.phasestr() |
|
320 | 320 | self.ui.write( |
|
321 | 321 | columns[b'parent'] % scmutil.formatchangeid(pctx), label=label |
|
322 | 322 | ) |
|
323 | 323 | |
|
324 | 324 | if self.ui.debugflag: |
|
325 | 325 | mnode = ctx.manifestnode() |
|
326 | 326 | if mnode is None: |
|
327 | 327 | mnode = wdirid |
|
328 | 328 | mrev = wdirrev |
|
329 | 329 | else: |
|
330 | 330 | mrev = self.repo.manifestlog.rev(mnode) |
|
331 | 331 | self.ui.write( |
|
332 | 332 | columns[b'manifest'] |
|
333 | 333 | % scmutil.formatrevnode(self.ui, mrev, mnode), |
|
334 | 334 | label=b'ui.debug log.manifest', |
|
335 | 335 | ) |
|
336 | 336 | self.ui.write(columns[b'user'] % ctx.user(), label=b'log.user') |
|
337 | 337 | self.ui.write( |
|
338 | 338 | columns[b'date'] % dateutil.datestr(ctx.date()), label=b'log.date' |
|
339 | 339 | ) |
|
340 | 340 | |
|
341 | 341 | if ctx.isunstable(): |
|
342 | 342 | instabilities = ctx.instabilities() |
|
343 | 343 | self.ui.write( |
|
344 | 344 | columns[b'instability'] % b', '.join(instabilities), |
|
345 | 345 | label=b'log.instability', |
|
346 | 346 | ) |
|
347 | 347 | |
|
348 | 348 | elif ctx.obsolete(): |
|
349 | 349 | self._showobsfate(ctx) |
|
350 | 350 | |
|
351 | 351 | self._exthook(ctx) |
|
352 | 352 | |
|
353 | 353 | if self.ui.debugflag: |
|
354 | 354 | files = ctx.p1().status(ctx) |
|
355 | 355 | for key, value in zip( |
|
356 | 356 | [b'files', b'files+', b'files-'], |
|
357 | 357 | [files.modified, files.added, files.removed], |
|
358 | 358 | ): |
|
359 | 359 | if value: |
|
360 | 360 | self.ui.write( |
|
361 | 361 | columns[key] % b" ".join(value), |
|
362 | 362 | label=b'ui.debug log.files', |
|
363 | 363 | ) |
|
364 | 364 | elif ctx.files() and self.ui.verbose: |
|
365 | 365 | self.ui.write( |
|
366 | 366 | columns[b'files'] % b" ".join(ctx.files()), |
|
367 | 367 | label=b'ui.note log.files', |
|
368 | 368 | ) |
|
369 | 369 | if copies and self.ui.verbose: |
|
370 | 370 | copies = [b'%s (%s)' % c for c in copies] |
|
371 | 371 | self.ui.write( |
|
372 | 372 | columns[b'copies'] % b' '.join(copies), |
|
373 | 373 | label=b'ui.note log.copies', |
|
374 | 374 | ) |
|
375 | 375 | |
|
376 | 376 | extra = ctx.extra() |
|
377 | 377 | if extra and self.ui.debugflag: |
|
378 | 378 | for key, value in sorted(extra.items()): |
|
379 | 379 | self.ui.write( |
|
380 | 380 | columns[b'extra'] % (key, stringutil.escapestr(value)), |
|
381 | 381 | label=b'ui.debug log.extra', |
|
382 | 382 | ) |
|
383 | 383 | |
|
384 | 384 | description = ctx.description().strip() |
|
385 | 385 | if description: |
|
386 | 386 | if self.ui.verbose: |
|
387 | 387 | self.ui.write( |
|
388 | 388 | _(b"description:\n"), label=b'ui.note log.description' |
|
389 | 389 | ) |
|
390 | 390 | self.ui.write(description, label=b'ui.note log.description') |
|
391 | 391 | self.ui.write(b"\n\n") |
|
392 | 392 | else: |
|
393 | 393 | self.ui.write( |
|
394 | 394 | columns[b'summary'] % description.splitlines()[0], |
|
395 | 395 | label=b'log.summary', |
|
396 | 396 | ) |
|
397 | 397 | self.ui.write(b"\n") |
|
398 | 398 | |
|
399 | 399 | self._showpatch(ctx, graphwidth) |
|
400 | 400 | |
|
401 | 401 | def _showobsfate(self, ctx): |
|
402 | 402 | # TODO: do not depend on templater |
|
403 | 403 | tres = formatter.templateresources(self.repo.ui, self.repo) |
|
404 | 404 | t = formatter.maketemplater( |
|
405 | 405 | self.repo.ui, |
|
406 | 406 | b'{join(obsfate, "\n")}', |
|
407 | 407 | defaults=templatekw.keywords, |
|
408 | 408 | resources=tres, |
|
409 | 409 | ) |
|
410 | 410 | obsfate = t.renderdefault({b'ctx': ctx}).splitlines() |
|
411 | 411 | |
|
412 | 412 | if obsfate: |
|
413 | 413 | for obsfateline in obsfate: |
|
414 | 414 | self.ui.write( |
|
415 | 415 | self._columns[b'obsolete'] % obsfateline, |
|
416 | 416 | label=b'log.obsfate', |
|
417 | 417 | ) |
|
418 | 418 | |
|
419 | 419 | def _exthook(self, ctx): |
|
420 | 420 | """empty method used by extension as a hook point""" |
|
421 | 421 | |
|
422 | 422 | def _showpatch(self, ctx, graphwidth=0): |
|
423 | 423 | if self._includestat: |
|
424 | 424 | self._differ.showdiff( |
|
425 | 425 | self.ui, ctx, self._diffopts, graphwidth, stat=True |
|
426 | 426 | ) |
|
427 | 427 | if self._includestat and self._includediff: |
|
428 | 428 | self.ui.write(b"\n") |
|
429 | 429 | if self._includediff: |
|
430 | 430 | self._differ.showdiff( |
|
431 | 431 | self.ui, ctx, self._diffopts, graphwidth, stat=False |
|
432 | 432 | ) |
|
433 | 433 | if self._includestat or self._includediff: |
|
434 | 434 | self.ui.write(b"\n") |
|
435 | 435 | |
|
436 | 436 | |
|
437 | 437 | class changesetformatter(changesetprinter): |
|
438 | 438 | """Format changeset information by generic formatter""" |
|
439 | 439 | |
|
440 | 440 | def __init__( |
|
441 | 441 | self, ui, repo, fm, differ=None, diffopts=None, buffered=False |
|
442 | 442 | ): |
|
443 | 443 | changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered) |
|
444 | 444 | self._diffopts = patch.difffeatureopts(ui, diffopts, git=True) |
|
445 | 445 | self._fm = fm |
|
446 | 446 | |
|
447 | 447 | def close(self): |
|
448 | 448 | self._fm.end() |
|
449 | 449 | |
|
450 | 450 | def _show(self, ctx, copies, props): |
|
451 | 451 | '''show a single changeset or file revision''' |
|
452 | 452 | fm = self._fm |
|
453 | 453 | fm.startitem() |
|
454 | 454 | fm.context(ctx=ctx) |
|
455 | 455 | fm.data(rev=scmutil.intrev(ctx), node=fm.hexfunc(scmutil.binnode(ctx))) |
|
456 | 456 | |
|
457 | 457 | datahint = fm.datahint() |
|
458 | 458 | if self.ui.quiet and not datahint: |
|
459 | 459 | return |
|
460 | 460 | |
|
461 | 461 | fm.data( |
|
462 | 462 | branch=ctx.branch(), |
|
463 | 463 | phase=ctx.phasestr(), |
|
464 | 464 | user=ctx.user(), |
|
465 | 465 | date=fm.formatdate(ctx.date()), |
|
466 | 466 | desc=ctx.description(), |
|
467 | 467 | bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'), |
|
468 | 468 | tags=fm.formatlist(ctx.tags(), name=b'tag'), |
|
469 | 469 | parents=fm.formatlist( |
|
470 | 470 | [fm.hexfunc(c.node()) for c in ctx.parents()], name=b'node' |
|
471 | 471 | ), |
|
472 | 472 | ) |
|
473 | 473 | |
|
474 | 474 | if self.ui.debugflag or b'manifest' in datahint: |
|
475 | 475 | fm.data(manifest=fm.hexfunc(ctx.manifestnode() or wdirid)) |
|
476 | 476 | if self.ui.debugflag or b'extra' in datahint: |
|
477 | 477 | fm.data(extra=fm.formatdict(ctx.extra())) |
|
478 | 478 | |
|
479 | 479 | if ( |
|
480 | 480 | self.ui.debugflag |
|
481 | 481 | or b'modified' in datahint |
|
482 | 482 | or b'added' in datahint |
|
483 | 483 | or b'removed' in datahint |
|
484 | 484 | ): |
|
485 | 485 | files = ctx.p1().status(ctx) |
|
486 | 486 | fm.data( |
|
487 | 487 | modified=fm.formatlist(files.modified, name=b'file'), |
|
488 | 488 | added=fm.formatlist(files.added, name=b'file'), |
|
489 | 489 | removed=fm.formatlist(files.removed, name=b'file'), |
|
490 | 490 | ) |
|
491 | 491 | |
|
492 | 492 | verbose = not self.ui.debugflag and self.ui.verbose |
|
493 | 493 | if verbose or b'files' in datahint: |
|
494 | 494 | fm.data(files=fm.formatlist(ctx.files(), name=b'file')) |
|
495 | 495 | if verbose and copies or b'copies' in datahint: |
|
496 | 496 | fm.data( |
|
497 | 497 | copies=fm.formatdict(copies or {}, key=b'name', value=b'source') |
|
498 | 498 | ) |
|
499 | 499 | |
|
500 | 500 | if self._includestat or b'diffstat' in datahint: |
|
501 | 501 | self.ui.pushbuffer() |
|
502 | 502 | self._differ.showdiff(self.ui, ctx, self._diffopts, stat=True) |
|
503 | 503 | fm.data(diffstat=self.ui.popbuffer()) |
|
504 | 504 | if self._includediff or b'diff' in datahint: |
|
505 | 505 | self.ui.pushbuffer() |
|
506 | 506 | self._differ.showdiff(self.ui, ctx, self._diffopts, stat=False) |
|
507 | 507 | fm.data(diff=self.ui.popbuffer()) |
|
508 | 508 | |
|
509 | 509 | |
|
510 | 510 | class changesettemplater(changesetprinter): |
|
511 | 511 | """format changeset information. |
|
512 | 512 | |
|
513 | 513 | Note: there are a variety of convenience functions to build a |
|
514 | 514 | changesettemplater for common cases. See functions such as: |
|
515 | 515 | maketemplater, changesetdisplayer, buildcommittemplate, or other |
|
516 | 516 | functions that use changesest_templater. |
|
517 | 517 | """ |
|
518 | 518 | |
|
519 | 519 | # Arguments before "buffered" used to be positional. Consider not |
|
520 | 520 | # adding/removing arguments before "buffered" to not break callers. |
|
521 | 521 | def __init__( |
|
522 | 522 | self, ui, repo, tmplspec, differ=None, diffopts=None, buffered=False |
|
523 | 523 | ): |
|
524 | 524 | changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered) |
|
525 | 525 | # tres is shared with _graphnodeformatter() |
|
526 | 526 | self._tresources = tres = formatter.templateresources(ui, repo) |
|
527 | 527 | self.t = formatter.loadtemplater( |
|
528 | 528 | ui, |
|
529 | 529 | tmplspec, |
|
530 | 530 | defaults=templatekw.keywords, |
|
531 | 531 | resources=tres, |
|
532 | 532 | cache=templatekw.defaulttempl, |
|
533 | 533 | ) |
|
534 | 534 | self._counter = itertools.count() |
|
535 | 535 | |
|
536 | 536 | self._tref = tmplspec.ref |
|
537 | 537 | self._parts = { |
|
538 | 538 | b'header': b'', |
|
539 | 539 | b'footer': b'', |
|
540 | 540 | tmplspec.ref: tmplspec.ref, |
|
541 | 541 | b'docheader': b'', |
|
542 | 542 | b'docfooter': b'', |
|
543 | 543 | b'separator': b'', |
|
544 | 544 | } |
|
545 | 545 | if tmplspec.mapfile: |
|
546 | 546 | # find correct templates for current mode, for backward |
|
547 | 547 | # compatibility with 'log -v/-q/--debug' using a mapfile |
|
548 | 548 | tmplmodes = [ |
|
549 | 549 | (True, b''), |
|
550 | 550 | (self.ui.verbose, b'_verbose'), |
|
551 | 551 | (self.ui.quiet, b'_quiet'), |
|
552 | 552 | (self.ui.debugflag, b'_debug'), |
|
553 | 553 | ] |
|
554 | 554 | for mode, postfix in tmplmodes: |
|
555 | 555 | for t in self._parts: |
|
556 | 556 | cur = t + postfix |
|
557 | 557 | if mode and cur in self.t: |
|
558 | 558 | self._parts[t] = cur |
|
559 | 559 | else: |
|
560 | 560 | partnames = [p for p in self._parts.keys() if p != tmplspec.ref] |
|
561 | 561 | m = formatter.templatepartsmap(tmplspec, self.t, partnames) |
|
562 | 562 | self._parts.update(m) |
|
563 | 563 | |
|
564 | 564 | if self._parts[b'docheader']: |
|
565 | 565 | self.ui.write(self.t.render(self._parts[b'docheader'], {})) |
|
566 | 566 | |
|
567 | 567 | def close(self): |
|
568 | 568 | if self._parts[b'docfooter']: |
|
569 | 569 | if not self.footer: |
|
570 | 570 | self.footer = b"" |
|
571 | 571 | self.footer += self.t.render(self._parts[b'docfooter'], {}) |
|
572 | 572 | return super(changesettemplater, self).close() |
|
573 | 573 | |
|
574 | 574 | def _show(self, ctx, copies, props): |
|
575 | 575 | '''show a single changeset or file revision''' |
|
576 | 576 | props = props.copy() |
|
577 | 577 | props[b'ctx'] = ctx |
|
578 | 578 | props[b'index'] = index = next(self._counter) |
|
579 | 579 | props[b'revcache'] = {b'copies': copies} |
|
580 | 580 | graphwidth = props.get(b'graphwidth', 0) |
|
581 | 581 | |
|
582 | 582 | # write separator, which wouldn't work well with the header part below |
|
583 | 583 | # since there's inherently a conflict between header (across items) and |
|
584 | 584 | # separator (per item) |
|
585 | 585 | if self._parts[b'separator'] and index > 0: |
|
586 | 586 | self.ui.write(self.t.render(self._parts[b'separator'], {})) |
|
587 | 587 | |
|
588 | 588 | # write header |
|
589 | 589 | if self._parts[b'header']: |
|
590 | 590 | h = self.t.render(self._parts[b'header'], props) |
|
591 | 591 | if self.buffered: |
|
592 | 592 | self.header[ctx.rev()] = h |
|
593 | 593 | else: |
|
594 | 594 | if self.lastheader != h: |
|
595 | 595 | self.lastheader = h |
|
596 | 596 | self.ui.write(h) |
|
597 | 597 | |
|
598 | 598 | # write changeset metadata, then patch if requested |
|
599 | 599 | key = self._parts[self._tref] |
|
600 | 600 | self.ui.write(self.t.render(key, props)) |
|
601 | 601 | self._exthook(ctx) |
|
602 | 602 | self._showpatch(ctx, graphwidth) |
|
603 | 603 | |
|
604 | 604 | if self._parts[b'footer']: |
|
605 | 605 | if not self.footer: |
|
606 | 606 | self.footer = self.t.render(self._parts[b'footer'], props) |
|
607 | 607 | |
|
608 | 608 | |
|
609 | 609 | def templatespec(tmpl, mapfile): |
|
610 | 610 | assert not (tmpl and mapfile) |
|
611 | 611 | if mapfile: |
|
612 | 612 | return formatter.mapfile_templatespec(b'changeset', mapfile) |
|
613 | 613 | else: |
|
614 | 614 | return formatter.literal_templatespec(tmpl) |
|
615 | 615 | |
|
616 | 616 | |
|
617 | 617 | def _lookuptemplate(ui, tmpl, style): |
|
618 | 618 | """Find the template matching the given template spec or style |
|
619 | 619 | |
|
620 | 620 | See formatter.lookuptemplate() for details. |
|
621 | 621 | """ |
|
622 | 622 | |
|
623 | 623 | # ui settings |
|
624 | 624 | if not tmpl and not style: # template are stronger than style |
|
625 | 625 | tmpl = ui.config(b'command-templates', b'log') |
|
626 | 626 | if tmpl: |
|
627 | 627 | return formatter.literal_templatespec(templater.unquotestring(tmpl)) |
|
628 | 628 | else: |
|
629 | 629 | style = util.expandpath(ui.config(b'ui', b'style')) |
|
630 | 630 | |
|
631 | 631 | if not tmpl and style: |
|
632 | 632 | mapfile = style |
|
633 | 633 | fp = None |
|
634 | 634 | if not os.path.split(mapfile)[0]: |
|
635 | 635 | (mapname, fp) = templater.try_open_template( |
|
636 | 636 | b'map-cmdline.' + mapfile |
|
637 | 637 | ) or templater.try_open_template(mapfile) |
|
638 | 638 | if mapname: |
|
639 | 639 | mapfile = mapname |
|
640 | 640 | return formatter.mapfile_templatespec(b'changeset', mapfile, fp) |
|
641 | 641 | |
|
642 | 642 | return formatter.lookuptemplate(ui, b'changeset', tmpl) |
|
643 | 643 | |
|
644 | 644 | |
|
645 | 645 | def maketemplater(ui, repo, tmpl, buffered=False): |
|
646 | 646 | """Create a changesettemplater from a literal template 'tmpl' |
|
647 | 647 | byte-string.""" |
|
648 | 648 | spec = formatter.literal_templatespec(tmpl) |
|
649 | 649 | return changesettemplater(ui, repo, spec, buffered=buffered) |
|
650 | 650 | |
|
651 | 651 | |
|
652 | 652 | def changesetdisplayer(ui, repo, opts, differ=None, buffered=False): |
|
653 | 653 | """show one changeset using template or regular display. |
|
654 | 654 | |
|
655 | 655 | Display format will be the first non-empty hit of: |
|
656 | 656 | 1. option 'template' |
|
657 | 657 | 2. option 'style' |
|
658 | 658 | 3. [command-templates] setting 'log' |
|
659 | 659 | 4. [ui] setting 'style' |
|
660 | 660 | If all of these values are either the unset or the empty string, |
|
661 | 661 | regular display via changesetprinter() is done. |
|
662 | 662 | """ |
|
663 | 663 | postargs = (differ, opts, buffered) |
|
664 | 664 | spec = _lookuptemplate(ui, opts.get(b'template'), opts.get(b'style')) |
|
665 | 665 | |
|
666 | 666 | # machine-readable formats have slightly different keyword set than |
|
667 | 667 | # plain templates, which are handled by changesetformatter. |
|
668 | 668 | # note that {b'pickle', b'debug'} can also be added to the list if needed. |
|
669 | 669 | if spec.ref in {b'cbor', b'json'}: |
|
670 | 670 | fm = ui.formatter(b'log', opts) |
|
671 | 671 | return changesetformatter(ui, repo, fm, *postargs) |
|
672 | 672 | |
|
673 | 673 | if not spec.ref and not spec.tmpl and not spec.mapfile: |
|
674 | 674 | return changesetprinter(ui, repo, *postargs) |
|
675 | 675 | |
|
676 | 676 | return changesettemplater(ui, repo, spec, *postargs) |
|
677 | 677 | |
|
678 | 678 | |
|
679 | 679 | @attr.s |
|
680 | 680 | class walkopts(object): |
|
681 | 681 | """Options to configure a set of revisions and file matcher factory |
|
682 | 682 | to scan revision/file history |
|
683 | 683 | """ |
|
684 | 684 | |
|
685 | 685 | # raw command-line parameters, which a matcher will be built from |
|
686 | 686 | pats = attr.ib() # type: List[bytes] |
|
687 | 687 | opts = attr.ib() # type: Dict[bytes, Any] |
|
688 | 688 | |
|
689 | 689 | # a list of revset expressions to be traversed; if follow, it specifies |
|
690 | 690 | # the start revisions |
|
691 | 691 | revspec = attr.ib() # type: List[bytes] |
|
692 | 692 | |
|
693 | 693 | # miscellaneous queries to filter revisions (see "hg help log" for details) |
|
694 | 694 | bookmarks = attr.ib(default=attr.Factory(list)) # type: List[bytes] |
|
695 | 695 | branches = attr.ib(default=attr.Factory(list)) # type: List[bytes] |
|
696 | 696 | date = attr.ib(default=None) # type: Optional[bytes] |
|
697 | 697 | keywords = attr.ib(default=attr.Factory(list)) # type: List[bytes] |
|
698 | 698 | no_merges = attr.ib(default=False) # type: bool |
|
699 | 699 | only_merges = attr.ib(default=False) # type: bool |
|
700 | 700 | prune_ancestors = attr.ib(default=attr.Factory(list)) # type: List[bytes] |
|
701 | 701 | users = attr.ib(default=attr.Factory(list)) # type: List[bytes] |
|
702 | 702 | |
|
703 | 703 | # miscellaneous matcher arguments |
|
704 | 704 | include_pats = attr.ib(default=attr.Factory(list)) # type: List[bytes] |
|
705 | 705 | exclude_pats = attr.ib(default=attr.Factory(list)) # type: List[bytes] |
|
706 | 706 | |
|
707 | 707 | # 0: no follow, 1: follow first, 2: follow both parents |
|
708 | 708 | follow = attr.ib(default=0) # type: int |
|
709 | 709 | |
|
710 | 710 | # do not attempt filelog-based traversal, which may be fast but cannot |
|
711 | 711 | # include revisions where files were removed |
|
712 | 712 | force_changelog_traversal = attr.ib(default=False) # type: bool |
|
713 | 713 | |
|
714 | 714 | # filter revisions by file patterns, which should be disabled only if |
|
715 | 715 | # you want to include revisions where files were unmodified |
|
716 | 716 | filter_revisions_by_pats = attr.ib(default=True) # type: bool |
|
717 | 717 | |
|
718 | 718 | # sort revisions prior to traversal: 'desc', 'topo', or None |
|
719 | 719 | sort_revisions = attr.ib(default=None) # type: Optional[bytes] |
|
720 | 720 | |
|
721 | 721 | # limit number of changes displayed; None means unlimited |
|
722 | 722 | limit = attr.ib(default=None) # type: Optional[int] |
|
723 | 723 | |
|
724 | 724 | |
|
725 | 725 | def parseopts(ui, pats, opts): |
|
726 | 726 | # type: (Any, List[bytes], Dict[bytes, Any]) -> walkopts |
|
727 | 727 | """Parse log command options into walkopts |
|
728 | 728 | |
|
729 | 729 | The returned walkopts will be passed in to getrevs() or makewalker(). |
|
730 | 730 | """ |
|
731 | 731 | if opts.get(b'follow_first'): |
|
732 | 732 | follow = 1 |
|
733 | 733 | elif opts.get(b'follow'): |
|
734 | 734 | follow = 2 |
|
735 | 735 | else: |
|
736 | 736 | follow = 0 |
|
737 | 737 | |
|
738 | 738 | if opts.get(b'graph'): |
|
739 | 739 | if ui.configbool(b'experimental', b'log.topo'): |
|
740 | 740 | sort_revisions = b'topo' |
|
741 | 741 | else: |
|
742 | 742 | sort_revisions = b'desc' |
|
743 | 743 | else: |
|
744 | 744 | sort_revisions = None |
|
745 | 745 | |
|
746 | 746 | return walkopts( |
|
747 | 747 | pats=pats, |
|
748 | 748 | opts=opts, |
|
749 | 749 | revspec=opts.get(b'rev', []), |
|
750 | 750 | bookmarks=opts.get(b'bookmark', []), |
|
751 | 751 | # branch and only_branch are really aliases and must be handled at |
|
752 | 752 | # the same time |
|
753 | 753 | branches=opts.get(b'branch', []) + opts.get(b'only_branch', []), |
|
754 | 754 | date=opts.get(b'date'), |
|
755 | 755 | keywords=opts.get(b'keyword', []), |
|
756 | 756 | no_merges=bool(opts.get(b'no_merges')), |
|
757 | 757 | only_merges=bool(opts.get(b'only_merges')), |
|
758 | 758 | prune_ancestors=opts.get(b'prune', []), |
|
759 | 759 | users=opts.get(b'user', []), |
|
760 | 760 | include_pats=opts.get(b'include', []), |
|
761 | 761 | exclude_pats=opts.get(b'exclude', []), |
|
762 | 762 | follow=follow, |
|
763 | 763 | force_changelog_traversal=bool(opts.get(b'removed')), |
|
764 | 764 | sort_revisions=sort_revisions, |
|
765 | 765 | limit=getlimit(opts), |
|
766 | 766 | ) |
|
767 | 767 | |
|
768 | 768 | |
|
769 | 769 | def _makematcher(repo, revs, wopts): |
|
770 | 770 | """Build matcher and expanded patterns from log options |
|
771 | 771 | |
|
772 | 772 | If --follow, revs are the revisions to follow from. |
|
773 | 773 | |
|
774 | 774 | Returns (match, pats, slowpath) where |
|
775 | 775 | - match: a matcher built from the given pats and -I/-X opts |
|
776 | 776 | - pats: patterns used (globs are expanded on Windows) |
|
777 | 777 | - slowpath: True if patterns aren't as simple as scanning filelogs |
|
778 | 778 | """ |
|
779 | 779 | # pats/include/exclude are passed to match.match() directly in |
|
780 | 780 | # _matchfiles() revset, but a log-like command should build its matcher |
|
781 | 781 | # with scmutil.match(). The difference is input pats are globbed on |
|
782 | 782 | # platforms without shell expansion (windows). |
|
783 | 783 | wctx = repo[None] |
|
784 | 784 | match, pats = scmutil.matchandpats(wctx, wopts.pats, wopts.opts) |
|
785 | 785 | slowpath = match.anypats() or ( |
|
786 | 786 | not match.always() and wopts.force_changelog_traversal |
|
787 | 787 | ) |
|
788 | 788 | if not slowpath: |
|
789 | 789 | if wopts.follow and wopts.revspec: |
|
790 | 790 | # There may be the case that a path doesn't exist in some (but |
|
791 | 791 | # not all) of the specified start revisions, but let's consider |
|
792 | 792 | # the path is valid. Missing files will be warned by the matcher. |
|
793 | 793 | startctxs = [repo[r] for r in revs] |
|
794 | 794 | for f in match.files(): |
|
795 | 795 | found = False |
|
796 | 796 | for c in startctxs: |
|
797 | 797 | if f in c: |
|
798 | 798 | found = True |
|
799 | 799 | elif c.hasdir(f): |
|
800 | 800 | # If a directory exists in any of the start revisions, |
|
801 | 801 | # take the slow path. |
|
802 | 802 | found = slowpath = True |
|
803 | 803 | if not found: |
|
804 | 804 | raise error.Abort( |
|
805 | 805 | _( |
|
806 | 806 | b'cannot follow file not in any of the specified ' |
|
807 | 807 | b'revisions: "%s"' |
|
808 | 808 | ) |
|
809 | 809 | % f |
|
810 | 810 | ) |
|
811 | 811 | elif wopts.follow: |
|
812 | 812 | for f in match.files(): |
|
813 | 813 | if f not in wctx: |
|
814 | 814 | # If the file exists, it may be a directory, so let it |
|
815 | 815 | # take the slow path. |
|
816 | 816 | if os.path.exists(repo.wjoin(f)): |
|
817 | 817 | slowpath = True |
|
818 | 818 | continue |
|
819 | 819 | else: |
|
820 | 820 | raise error.Abort( |
|
821 | 821 | _( |
|
822 | 822 | b'cannot follow file not in parent ' |
|
823 | 823 | b'revision: "%s"' |
|
824 | 824 | ) |
|
825 | 825 | % f |
|
826 | 826 | ) |
|
827 | 827 | filelog = repo.file(f) |
|
828 | 828 | if not filelog: |
|
829 | 829 | # A file exists in wdir but not in history, which means |
|
830 | 830 | # the file isn't committed yet. |
|
831 | 831 | raise error.Abort( |
|
832 | 832 | _(b'cannot follow nonexistent file: "%s"') % f |
|
833 | 833 | ) |
|
834 | 834 | else: |
|
835 | 835 | for f in match.files(): |
|
836 | 836 | filelog = repo.file(f) |
|
837 | 837 | if not filelog: |
|
838 | 838 | # A zero count may be a directory or deleted file, so |
|
839 | 839 | # try to find matching entries on the slow path. |
|
840 | 840 | slowpath = True |
|
841 | 841 | |
|
842 | 842 | # We decided to fall back to the slowpath because at least one |
|
843 | 843 | # of the paths was not a file. Check to see if at least one of them |
|
844 | 844 | # existed in history - in that case, we'll continue down the |
|
845 | 845 | # slowpath; otherwise, we can turn off the slowpath |
|
846 | 846 | if slowpath: |
|
847 | 847 | for path in match.files(): |
|
848 |
if path |
|
|
848 | if not path or path in repo.store: | |
|
849 | 849 | break |
|
850 | 850 | else: |
|
851 | 851 | slowpath = False |
|
852 | 852 | |
|
853 | 853 | return match, pats, slowpath |
|
854 | 854 | |
|
855 | 855 | |
|
856 | 856 | def _fileancestors(repo, revs, match, followfirst): |
|
857 | 857 | fctxs = [] |
|
858 | 858 | for r in revs: |
|
859 | 859 | ctx = repo[r] |
|
860 | 860 | fctxs.extend(ctx[f].introfilectx() for f in ctx.walk(match)) |
|
861 | 861 | |
|
862 | 862 | # When displaying a revision with --patch --follow FILE, we have |
|
863 | 863 | # to know which file of the revision must be diffed. With |
|
864 | 864 | # --follow, we want the names of the ancestors of FILE in the |
|
865 | 865 | # revision, stored in "fcache". "fcache" is populated as a side effect |
|
866 | 866 | # of the graph traversal. |
|
867 | 867 | fcache = {} |
|
868 | 868 | |
|
869 | 869 | def filematcher(ctx): |
|
870 | 870 | return scmutil.matchfiles(repo, fcache.get(scmutil.intrev(ctx), [])) |
|
871 | 871 | |
|
872 | 872 | def revgen(): |
|
873 | 873 | for rev, cs in dagop.filectxancestors(fctxs, followfirst=followfirst): |
|
874 | 874 | fcache[rev] = [c.path() for c in cs] |
|
875 | 875 | yield rev |
|
876 | 876 | |
|
877 | 877 | return smartset.generatorset(revgen(), iterasc=False), filematcher |
|
878 | 878 | |
|
879 | 879 | |
|
880 | 880 | def _makenofollowfilematcher(repo, pats, opts): |
|
881 | 881 | '''hook for extensions to override the filematcher for non-follow cases''' |
|
882 | 882 | return None |
|
883 | 883 | |
|
884 | 884 | |
|
885 | 885 | _opt2logrevset = { |
|
886 | 886 | b'no_merges': (b'not merge()', None), |
|
887 | 887 | b'only_merges': (b'merge()', None), |
|
888 | 888 | b'_matchfiles': (None, b'_matchfiles(%ps)'), |
|
889 | 889 | b'date': (b'date(%s)', None), |
|
890 | 890 | b'branch': (b'branch(%s)', b'%lr'), |
|
891 | 891 | b'_patslog': (b'filelog(%s)', b'%lr'), |
|
892 | 892 | b'keyword': (b'keyword(%s)', b'%lr'), |
|
893 | 893 | b'prune': (b'ancestors(%s)', b'not %lr'), |
|
894 | 894 | b'user': (b'user(%s)', b'%lr'), |
|
895 | 895 | } |
|
896 | 896 | |
|
897 | 897 | |
|
898 | 898 | def _makerevset(repo, wopts, slowpath): |
|
899 | 899 | """Return a revset string built from log options and file patterns""" |
|
900 | 900 | opts = { |
|
901 | 901 | b'branch': [b'literal:' + repo.lookupbranch(b) for b in wopts.branches], |
|
902 | 902 | b'date': wopts.date, |
|
903 | 903 | b'keyword': wopts.keywords, |
|
904 | 904 | b'no_merges': wopts.no_merges, |
|
905 | 905 | b'only_merges': wopts.only_merges, |
|
906 | 906 | b'prune': wopts.prune_ancestors, |
|
907 | 907 | b'user': [b'literal:' + v for v in wopts.users], |
|
908 | 908 | } |
|
909 | 909 | |
|
910 | 910 | if wopts.filter_revisions_by_pats and slowpath: |
|
911 | 911 | # pats/include/exclude cannot be represented as separate |
|
912 | 912 | # revset expressions as their filtering logic applies at file |
|
913 | 913 | # level. For instance "-I a -X b" matches a revision touching |
|
914 | 914 | # "a" and "b" while "file(a) and not file(b)" does |
|
915 | 915 | # not. Besides, filesets are evaluated against the working |
|
916 | 916 | # directory. |
|
917 | 917 | matchargs = [b'r:', b'd:relpath'] |
|
918 | 918 | for p in wopts.pats: |
|
919 | 919 | matchargs.append(b'p:' + p) |
|
920 | 920 | for p in wopts.include_pats: |
|
921 | 921 | matchargs.append(b'i:' + p) |
|
922 | 922 | for p in wopts.exclude_pats: |
|
923 | 923 | matchargs.append(b'x:' + p) |
|
924 | 924 | opts[b'_matchfiles'] = matchargs |
|
925 | 925 | elif wopts.filter_revisions_by_pats and not wopts.follow: |
|
926 | 926 | opts[b'_patslog'] = list(wopts.pats) |
|
927 | 927 | |
|
928 | 928 | expr = [] |
|
929 | 929 | for op, val in sorted(pycompat.iteritems(opts)): |
|
930 | 930 | if not val: |
|
931 | 931 | continue |
|
932 | 932 | revop, listop = _opt2logrevset[op] |
|
933 | 933 | if revop and b'%' not in revop: |
|
934 | 934 | expr.append(revop) |
|
935 | 935 | elif not listop: |
|
936 | 936 | expr.append(revsetlang.formatspec(revop, val)) |
|
937 | 937 | else: |
|
938 | 938 | if revop: |
|
939 | 939 | val = [revsetlang.formatspec(revop, v) for v in val] |
|
940 | 940 | expr.append(revsetlang.formatspec(listop, val)) |
|
941 | 941 | |
|
942 | 942 | if wopts.bookmarks: |
|
943 | 943 | expr.append( |
|
944 | 944 | revsetlang.formatspec( |
|
945 | 945 | b'%lr', |
|
946 | 946 | [scmutil.format_bookmark_revspec(v) for v in wopts.bookmarks], |
|
947 | 947 | ) |
|
948 | 948 | ) |
|
949 | 949 | |
|
950 | 950 | if expr: |
|
951 | 951 | expr = b'(' + b' and '.join(expr) + b')' |
|
952 | 952 | else: |
|
953 | 953 | expr = None |
|
954 | 954 | return expr |
|
955 | 955 | |
|
956 | 956 | |
|
957 | 957 | def _initialrevs(repo, wopts): |
|
958 | 958 | """Return the initial set of revisions to be filtered or followed""" |
|
959 | 959 | if wopts.revspec: |
|
960 | 960 | revs = scmutil.revrange(repo, wopts.revspec) |
|
961 | 961 | elif wopts.follow and repo.dirstate.p1() == nullid: |
|
962 | 962 | revs = smartset.baseset() |
|
963 | 963 | elif wopts.follow: |
|
964 | 964 | revs = repo.revs(b'.') |
|
965 | 965 | else: |
|
966 | 966 | revs = smartset.spanset(repo) |
|
967 | 967 | revs.reverse() |
|
968 | 968 | return revs |
|
969 | 969 | |
|
970 | 970 | |
|
971 | 971 | def makewalker(repo, wopts): |
|
972 | 972 | # type: (Any, walkopts) -> Tuple[smartset.abstractsmartset, Optional[Callable[[Any], matchmod.basematcher]]] |
|
973 | 973 | """Build (revs, makefilematcher) to scan revision/file history |
|
974 | 974 | |
|
975 | 975 | - revs is the smartset to be traversed. |
|
976 | 976 | - makefilematcher is a function to map ctx to a matcher for that revision |
|
977 | 977 | """ |
|
978 | 978 | revs = _initialrevs(repo, wopts) |
|
979 | 979 | if not revs: |
|
980 | 980 | return smartset.baseset(), None |
|
981 | 981 | # TODO: might want to merge slowpath with wopts.force_changelog_traversal |
|
982 | 982 | match, pats, slowpath = _makematcher(repo, revs, wopts) |
|
983 | 983 | wopts = attr.evolve(wopts, pats=pats) |
|
984 | 984 | |
|
985 | 985 | filematcher = None |
|
986 | 986 | if wopts.follow: |
|
987 | 987 | if slowpath or match.always(): |
|
988 | 988 | revs = dagop.revancestors(repo, revs, followfirst=wopts.follow == 1) |
|
989 | 989 | else: |
|
990 | 990 | assert not wopts.force_changelog_traversal |
|
991 | 991 | revs, filematcher = _fileancestors( |
|
992 | 992 | repo, revs, match, followfirst=wopts.follow == 1 |
|
993 | 993 | ) |
|
994 | 994 | revs.reverse() |
|
995 | 995 | if filematcher is None: |
|
996 | 996 | filematcher = _makenofollowfilematcher(repo, wopts.pats, wopts.opts) |
|
997 | 997 | if filematcher is None: |
|
998 | 998 | |
|
999 | 999 | def filematcher(ctx): |
|
1000 | 1000 | return match |
|
1001 | 1001 | |
|
1002 | 1002 | expr = _makerevset(repo, wopts, slowpath) |
|
1003 | 1003 | if wopts.sort_revisions: |
|
1004 | 1004 | assert wopts.sort_revisions in {b'topo', b'desc'} |
|
1005 | 1005 | if wopts.sort_revisions == b'topo': |
|
1006 | 1006 | if not revs.istopo(): |
|
1007 | 1007 | revs = dagop.toposort(revs, repo.changelog.parentrevs) |
|
1008 | 1008 | # TODO: try to iterate the set lazily |
|
1009 | 1009 | revs = revset.baseset(list(revs), istopo=True) |
|
1010 | 1010 | elif not (revs.isdescending() or revs.istopo()): |
|
1011 | 1011 | # User-specified revs might be unsorted |
|
1012 | 1012 | revs.sort(reverse=True) |
|
1013 | 1013 | if expr: |
|
1014 | 1014 | matcher = revset.match(None, expr) |
|
1015 | 1015 | revs = matcher(repo, revs) |
|
1016 | 1016 | if wopts.limit is not None: |
|
1017 | 1017 | revs = revs.slice(0, wopts.limit) |
|
1018 | 1018 | |
|
1019 | 1019 | return revs, filematcher |
|
1020 | 1020 | |
|
1021 | 1021 | |
|
1022 | 1022 | def getrevs(repo, wopts): |
|
1023 | 1023 | # type: (Any, walkopts) -> Tuple[smartset.abstractsmartset, Optional[changesetdiffer]] |
|
1024 | 1024 | """Return (revs, differ) where revs is a smartset |
|
1025 | 1025 | |
|
1026 | 1026 | differ is a changesetdiffer with pre-configured file matcher. |
|
1027 | 1027 | """ |
|
1028 | 1028 | revs, filematcher = makewalker(repo, wopts) |
|
1029 | 1029 | if not revs: |
|
1030 | 1030 | return revs, None |
|
1031 | 1031 | differ = changesetdiffer() |
|
1032 | 1032 | differ._makefilematcher = filematcher |
|
1033 | 1033 | return revs, differ |
|
1034 | 1034 | |
|
1035 | 1035 | |
|
1036 | 1036 | def _parselinerangeopt(repo, opts): |
|
1037 | 1037 | """Parse --line-range log option and return a list of tuples (filename, |
|
1038 | 1038 | (fromline, toline)). |
|
1039 | 1039 | """ |
|
1040 | 1040 | linerangebyfname = [] |
|
1041 | 1041 | for pat in opts.get(b'line_range', []): |
|
1042 | 1042 | try: |
|
1043 | 1043 | pat, linerange = pat.rsplit(b',', 1) |
|
1044 | 1044 | except ValueError: |
|
1045 | 1045 | raise error.Abort(_(b'malformatted line-range pattern %s') % pat) |
|
1046 | 1046 | try: |
|
1047 | 1047 | fromline, toline = map(int, linerange.split(b':')) |
|
1048 | 1048 | except ValueError: |
|
1049 | 1049 | raise error.Abort(_(b"invalid line range for %s") % pat) |
|
1050 | 1050 | msg = _(b"line range pattern '%s' must match exactly one file") % pat |
|
1051 | 1051 | fname = scmutil.parsefollowlinespattern(repo, None, pat, msg) |
|
1052 | 1052 | linerangebyfname.append( |
|
1053 | 1053 | (fname, util.processlinerange(fromline, toline)) |
|
1054 | 1054 | ) |
|
1055 | 1055 | return linerangebyfname |
|
1056 | 1056 | |
|
1057 | 1057 | |
|
1058 | 1058 | def getlinerangerevs(repo, userrevs, opts): |
|
1059 | 1059 | """Return (revs, differ). |
|
1060 | 1060 | |
|
1061 | 1061 | "revs" are revisions obtained by processing "line-range" log options and |
|
1062 | 1062 | walking block ancestors of each specified file/line-range. |
|
1063 | 1063 | |
|
1064 | 1064 | "differ" is a changesetdiffer with pre-configured file matcher and hunks |
|
1065 | 1065 | filter. |
|
1066 | 1066 | """ |
|
1067 | 1067 | wctx = repo[None] |
|
1068 | 1068 | |
|
1069 | 1069 | # Two-levels map of "rev -> file ctx -> [line range]". |
|
1070 | 1070 | linerangesbyrev = {} |
|
1071 | 1071 | for fname, (fromline, toline) in _parselinerangeopt(repo, opts): |
|
1072 | 1072 | if fname not in wctx: |
|
1073 | 1073 | raise error.Abort( |
|
1074 | 1074 | _(b'cannot follow file not in parent revision: "%s"') % fname |
|
1075 | 1075 | ) |
|
1076 | 1076 | fctx = wctx.filectx(fname) |
|
1077 | 1077 | for fctx, linerange in dagop.blockancestors(fctx, fromline, toline): |
|
1078 | 1078 | rev = fctx.introrev() |
|
1079 | 1079 | if rev is None: |
|
1080 | 1080 | rev = wdirrev |
|
1081 | 1081 | if rev not in userrevs: |
|
1082 | 1082 | continue |
|
1083 | 1083 | linerangesbyrev.setdefault(rev, {}).setdefault( |
|
1084 | 1084 | fctx.path(), [] |
|
1085 | 1085 | ).append(linerange) |
|
1086 | 1086 | |
|
1087 | 1087 | def nofilterhunksfn(fctx, hunks): |
|
1088 | 1088 | return hunks |
|
1089 | 1089 | |
|
1090 | 1090 | def hunksfilter(ctx): |
|
1091 | 1091 | fctxlineranges = linerangesbyrev.get(scmutil.intrev(ctx)) |
|
1092 | 1092 | if fctxlineranges is None: |
|
1093 | 1093 | return nofilterhunksfn |
|
1094 | 1094 | |
|
1095 | 1095 | def filterfn(fctx, hunks): |
|
1096 | 1096 | lineranges = fctxlineranges.get(fctx.path()) |
|
1097 | 1097 | if lineranges is not None: |
|
1098 | 1098 | for hr, lines in hunks: |
|
1099 | 1099 | if hr is None: # binary |
|
1100 | 1100 | yield hr, lines |
|
1101 | 1101 | continue |
|
1102 | 1102 | if any(mdiff.hunkinrange(hr[2:], lr) for lr in lineranges): |
|
1103 | 1103 | yield hr, lines |
|
1104 | 1104 | else: |
|
1105 | 1105 | for hunk in hunks: |
|
1106 | 1106 | yield hunk |
|
1107 | 1107 | |
|
1108 | 1108 | return filterfn |
|
1109 | 1109 | |
|
1110 | 1110 | def filematcher(ctx): |
|
1111 | 1111 | files = list(linerangesbyrev.get(scmutil.intrev(ctx), [])) |
|
1112 | 1112 | return scmutil.matchfiles(repo, files) |
|
1113 | 1113 | |
|
1114 | 1114 | revs = sorted(linerangesbyrev, reverse=True) |
|
1115 | 1115 | |
|
1116 | 1116 | differ = changesetdiffer() |
|
1117 | 1117 | differ._makefilematcher = filematcher |
|
1118 | 1118 | differ._makehunksfilter = hunksfilter |
|
1119 | 1119 | return smartset.baseset(revs), differ |
|
1120 | 1120 | |
|
1121 | 1121 | |
|
1122 | 1122 | def _graphnodeformatter(ui, displayer): |
|
1123 | 1123 | spec = ui.config(b'command-templates', b'graphnode') |
|
1124 | 1124 | if not spec: |
|
1125 | 1125 | return templatekw.getgraphnode # fast path for "{graphnode}" |
|
1126 | 1126 | |
|
1127 | 1127 | spec = templater.unquotestring(spec) |
|
1128 | 1128 | if isinstance(displayer, changesettemplater): |
|
1129 | 1129 | # reuse cache of slow templates |
|
1130 | 1130 | tres = displayer._tresources |
|
1131 | 1131 | else: |
|
1132 | 1132 | tres = formatter.templateresources(ui) |
|
1133 | 1133 | templ = formatter.maketemplater( |
|
1134 | 1134 | ui, spec, defaults=templatekw.keywords, resources=tres |
|
1135 | 1135 | ) |
|
1136 | 1136 | |
|
1137 | 1137 | def formatnode(repo, ctx, cache): |
|
1138 | 1138 | props = {b'ctx': ctx, b'repo': repo} |
|
1139 | 1139 | return templ.renderdefault(props) |
|
1140 | 1140 | |
|
1141 | 1141 | return formatnode |
|
1142 | 1142 | |
|
1143 | 1143 | |
|
1144 | 1144 | def displaygraph(ui, repo, dag, displayer, edgefn, getcopies=None, props=None): |
|
1145 | 1145 | props = props or {} |
|
1146 | 1146 | formatnode = _graphnodeformatter(ui, displayer) |
|
1147 | 1147 | state = graphmod.asciistate() |
|
1148 | 1148 | styles = state.styles |
|
1149 | 1149 | |
|
1150 | 1150 | # only set graph styling if HGPLAIN is not set. |
|
1151 | 1151 | if ui.plain(b'graph'): |
|
1152 | 1152 | # set all edge styles to |, the default pre-3.8 behaviour |
|
1153 | 1153 | styles.update(dict.fromkeys(styles, b'|')) |
|
1154 | 1154 | else: |
|
1155 | 1155 | edgetypes = { |
|
1156 | 1156 | b'parent': graphmod.PARENT, |
|
1157 | 1157 | b'grandparent': graphmod.GRANDPARENT, |
|
1158 | 1158 | b'missing': graphmod.MISSINGPARENT, |
|
1159 | 1159 | } |
|
1160 | 1160 | for name, key in edgetypes.items(): |
|
1161 | 1161 | # experimental config: experimental.graphstyle.* |
|
1162 | 1162 | styles[key] = ui.config( |
|
1163 | 1163 | b'experimental', b'graphstyle.%s' % name, styles[key] |
|
1164 | 1164 | ) |
|
1165 | 1165 | if not styles[key]: |
|
1166 | 1166 | styles[key] = None |
|
1167 | 1167 | |
|
1168 | 1168 | # experimental config: experimental.graphshorten |
|
1169 | 1169 | state.graphshorten = ui.configbool(b'experimental', b'graphshorten') |
|
1170 | 1170 | |
|
1171 | 1171 | formatnode_cache = {} |
|
1172 | 1172 | for rev, type, ctx, parents in dag: |
|
1173 | 1173 | char = formatnode(repo, ctx, formatnode_cache) |
|
1174 | 1174 | copies = getcopies(ctx) if getcopies else None |
|
1175 | 1175 | edges = edgefn(type, char, state, rev, parents) |
|
1176 | 1176 | firstedge = next(edges) |
|
1177 | 1177 | width = firstedge[2] |
|
1178 | 1178 | displayer.show( |
|
1179 | 1179 | ctx, copies=copies, graphwidth=width, **pycompat.strkwargs(props) |
|
1180 | 1180 | ) |
|
1181 | 1181 | lines = displayer.hunk.pop(rev).split(b'\n') |
|
1182 | 1182 | if not lines[-1]: |
|
1183 | 1183 | del lines[-1] |
|
1184 | 1184 | displayer.flush(ctx) |
|
1185 | 1185 | for type, char, width, coldata in itertools.chain([firstedge], edges): |
|
1186 | 1186 | graphmod.ascii(ui, state, type, char, lines, coldata) |
|
1187 | 1187 | lines = [] |
|
1188 | 1188 | displayer.close() |
|
1189 | 1189 | |
|
1190 | 1190 | |
|
1191 | 1191 | def displaygraphrevs(ui, repo, revs, displayer, getrenamed): |
|
1192 | 1192 | revdag = graphmod.dagwalker(repo, revs) |
|
1193 | 1193 | displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed) |
|
1194 | 1194 | |
|
1195 | 1195 | |
|
1196 | 1196 | def displayrevs(ui, repo, revs, displayer, getcopies): |
|
1197 | 1197 | for rev in revs: |
|
1198 | 1198 | ctx = repo[rev] |
|
1199 | 1199 | copies = getcopies(ctx) if getcopies else None |
|
1200 | 1200 | displayer.show(ctx, copies=copies) |
|
1201 | 1201 | displayer.flush(ctx) |
|
1202 | 1202 | displayer.close() |
|
1203 | 1203 | |
|
1204 | 1204 | |
|
1205 | 1205 | def checkunsupportedgraphflags(pats, opts): |
|
1206 | 1206 | for op in [b"newest_first"]: |
|
1207 | 1207 | if op in opts and opts[op]: |
|
1208 | 1208 | raise error.Abort( |
|
1209 | 1209 | _(b"-G/--graph option is incompatible with --%s") |
|
1210 | 1210 | % op.replace(b"_", b"-") |
|
1211 | 1211 | ) |
|
1212 | 1212 | |
|
1213 | 1213 | |
|
1214 | 1214 | def graphrevs(repo, nodes, opts): |
|
1215 | 1215 | limit = getlimit(opts) |
|
1216 | 1216 | nodes.reverse() |
|
1217 | 1217 | if limit is not None: |
|
1218 | 1218 | nodes = nodes[:limit] |
|
1219 | 1219 | return graphmod.nodes(repo, nodes) |
@@ -1,2917 +1,2952 b'' | |||
|
1 | 1 | Log on empty repository: checking consistency |
|
2 | 2 | |
|
3 | 3 | $ hg init empty |
|
4 | 4 | $ cd empty |
|
5 | 5 | $ hg log |
|
6 | 6 | $ hg log -r 1 |
|
7 | 7 | abort: unknown revision '1' |
|
8 | 8 | [255] |
|
9 | 9 | $ hg log -r -1:0 |
|
10 | 10 | abort: unknown revision '-1' |
|
11 | 11 | [255] |
|
12 | 12 | $ hg log -r 'branch(name)' |
|
13 | 13 | abort: unknown revision 'name' |
|
14 | 14 | [255] |
|
15 | 15 | $ hg log -r null -q |
|
16 | 16 | -1:000000000000 |
|
17 | 17 | |
|
18 | 18 | $ cd .. |
|
19 | 19 | |
|
20 | 20 | The g is crafted to have 2 filelog topological heads in a linear |
|
21 | 21 | changeset graph |
|
22 | 22 | |
|
23 | 23 | $ hg init a |
|
24 | 24 | $ cd a |
|
25 | 25 | $ echo a > a |
|
26 | 26 | $ echo f > f |
|
27 | 27 | $ hg ci -Ama -d '1 0' |
|
28 | 28 | adding a |
|
29 | 29 | adding f |
|
30 | 30 | |
|
31 | 31 | $ hg cp a b |
|
32 | 32 | $ hg cp f g |
|
33 | 33 | $ hg ci -mb -d '2 0' |
|
34 | 34 | |
|
35 | 35 | $ mkdir dir |
|
36 | 36 | $ hg mv b dir |
|
37 | 37 | $ echo g >> g |
|
38 | 38 | $ echo f >> f |
|
39 | 39 | $ hg ci -mc -d '3 0' |
|
40 | 40 | |
|
41 | 41 | $ hg mv a b |
|
42 | 42 | $ hg cp -f f g |
|
43 | 43 | $ echo a > d |
|
44 | 44 | $ hg add d |
|
45 | 45 | $ hg ci -md -d '4 0' |
|
46 | 46 | |
|
47 | 47 | $ hg mv dir/b e |
|
48 | 48 | $ hg ci -me -d '5 0' |
|
49 | 49 | |
|
50 | 50 | Make sure largefiles doesn't interfere with logging a regular file |
|
51 | 51 | $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles= |
|
52 | 52 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
|
53 | 53 | updated patterns: .hglf/a, a |
|
54 | 54 | 0: a |
|
55 | 55 | $ hg log a |
|
56 | 56 | changeset: 0:9161b9aeaf16 |
|
57 | 57 | user: test |
|
58 | 58 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
59 | 59 | summary: a |
|
60 | 60 | |
|
61 | 61 | $ hg log glob:a* |
|
62 | 62 | changeset: 3:2ca5ba701980 |
|
63 | 63 | user: test |
|
64 | 64 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
65 | 65 | summary: d |
|
66 | 66 | |
|
67 | 67 | changeset: 0:9161b9aeaf16 |
|
68 | 68 | user: test |
|
69 | 69 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
70 | 70 | summary: a |
|
71 | 71 | |
|
72 | 72 | $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles= |
|
73 | 73 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
|
74 | 74 | updated patterns: glob:.hglf/a*, glob:a* |
|
75 | 75 | 3: d |
|
76 | 76 | 0: a |
|
77 | 77 | |
|
78 | 78 | log on directory |
|
79 | 79 | |
|
80 | 80 | $ hg log dir |
|
81 | 81 | changeset: 4:7e4639b4691b |
|
82 | 82 | tag: tip |
|
83 | 83 | user: test |
|
84 | 84 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
85 | 85 | summary: e |
|
86 | 86 | |
|
87 | 87 | changeset: 2:f8954cd4dc1f |
|
88 | 88 | user: test |
|
89 | 89 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
90 | 90 | summary: c |
|
91 | 91 | |
|
92 | 92 | $ hg log somethingthatdoesntexist dir |
|
93 | 93 | changeset: 4:7e4639b4691b |
|
94 | 94 | tag: tip |
|
95 | 95 | user: test |
|
96 | 96 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
97 | 97 | summary: e |
|
98 | 98 | |
|
99 | 99 | changeset: 2:f8954cd4dc1f |
|
100 | 100 | user: test |
|
101 | 101 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
102 | 102 | summary: c |
|
103 | 103 | |
|
104 | 104 | |
|
105 | log empty path (or repo root) of slow path shouldn't crash (issue6478) | |
|
106 | ||
|
107 | $ hg log -ql1 '' inexistent | |
|
108 | 4:7e4639b4691b | |
|
109 | $ hg log -ql1 . inexistent | |
|
110 | 4:7e4639b4691b | |
|
111 | $ hg log -ql1 "`pwd`" inexistent | |
|
112 | 4:7e4639b4691b | |
|
113 | ||
|
114 | $ hg log -ql1 '' e | |
|
115 | 4:7e4639b4691b | |
|
116 | $ hg log -ql1 . e | |
|
117 | 4:7e4639b4691b | |
|
118 | $ hg log -ql1 "`pwd`" e | |
|
119 | 4:7e4639b4691b | |
|
120 | ||
|
121 | log -f empty path (or repo root) shouldn't crash | |
|
122 | ||
|
123 | $ hg log -qfl1 '' inexistent | |
|
124 | abort: cannot follow file not in parent revision: "inexistent" | |
|
125 | [255] | |
|
126 | $ hg log -qfl1 . inexistent | |
|
127 | abort: cannot follow file not in parent revision: "inexistent" | |
|
128 | [255] | |
|
129 | $ hg log -qfl1 "`pwd`" inexistent | |
|
130 | abort: cannot follow file not in parent revision: "inexistent" | |
|
131 | [255] | |
|
132 | ||
|
133 | $ hg log -qfl1 '' e | |
|
134 | 4:7e4639b4691b | |
|
135 | $ hg log -qfl1 . e | |
|
136 | 4:7e4639b4691b | |
|
137 | $ hg log -qfl1 "`pwd`" e | |
|
138 | 4:7e4639b4691b | |
|
139 | ||
|
105 | 140 | -X, with explicit path |
|
106 | 141 | |
|
107 | 142 | $ hg log a -X a |
|
108 | 143 | |
|
109 | 144 | -f, non-existent directory |
|
110 | 145 | |
|
111 | 146 | $ hg log -f dir |
|
112 | 147 | abort: cannot follow file not in parent revision: "dir" |
|
113 | 148 | [255] |
|
114 | 149 | |
|
115 | 150 | -f, directory |
|
116 | 151 | |
|
117 | 152 | $ hg up -q 3 |
|
118 | 153 | $ hg log -f dir |
|
119 | 154 | changeset: 2:f8954cd4dc1f |
|
120 | 155 | user: test |
|
121 | 156 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
122 | 157 | summary: c |
|
123 | 158 | |
|
124 | 159 | -f, directory with --patch |
|
125 | 160 | |
|
126 | 161 | $ hg log -f dir -p |
|
127 | 162 | changeset: 2:f8954cd4dc1f |
|
128 | 163 | user: test |
|
129 | 164 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
130 | 165 | summary: c |
|
131 | 166 | |
|
132 | 167 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
133 | 168 | --- /dev/null* (glob) |
|
134 | 169 | +++ b/dir/b* (glob) |
|
135 | 170 | @@ -0,0 +1,1 @@ |
|
136 | 171 | +a |
|
137 | 172 | |
|
138 | 173 | |
|
139 | 174 | -f, pattern |
|
140 | 175 | |
|
141 | 176 | $ hg log -f -I 'dir**' -p |
|
142 | 177 | changeset: 2:f8954cd4dc1f |
|
143 | 178 | user: test |
|
144 | 179 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
145 | 180 | summary: c |
|
146 | 181 | |
|
147 | 182 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
148 | 183 | --- /dev/null* (glob) |
|
149 | 184 | +++ b/dir/b* (glob) |
|
150 | 185 | @@ -0,0 +1,1 @@ |
|
151 | 186 | +a |
|
152 | 187 | |
|
153 | 188 | $ hg up -q 4 |
|
154 | 189 | |
|
155 | 190 | -f, a wrong style |
|
156 | 191 | |
|
157 | 192 | $ hg log -f -l1 --style something |
|
158 | 193 | abort: style 'something' not found |
|
159 | 194 | (available styles: bisect, changelog, compact, default, phases, show, status, xml) |
|
160 | 195 | [255] |
|
161 | 196 | |
|
162 | 197 | -f, phases style |
|
163 | 198 | |
|
164 | 199 | |
|
165 | 200 | $ hg log -f -l1 --style phases |
|
166 | 201 | changeset: 4:7e4639b4691b |
|
167 | 202 | tag: tip |
|
168 | 203 | phase: draft |
|
169 | 204 | user: test |
|
170 | 205 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
171 | 206 | summary: e |
|
172 | 207 | |
|
173 | 208 | |
|
174 | 209 | $ hg log -f -l1 --style phases -q |
|
175 | 210 | 4:7e4639b4691b |
|
176 | 211 | |
|
177 | 212 | -f, but no args |
|
178 | 213 | |
|
179 | 214 | $ hg log -f |
|
180 | 215 | changeset: 4:7e4639b4691b |
|
181 | 216 | tag: tip |
|
182 | 217 | user: test |
|
183 | 218 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
184 | 219 | summary: e |
|
185 | 220 | |
|
186 | 221 | changeset: 3:2ca5ba701980 |
|
187 | 222 | user: test |
|
188 | 223 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
189 | 224 | summary: d |
|
190 | 225 | |
|
191 | 226 | changeset: 2:f8954cd4dc1f |
|
192 | 227 | user: test |
|
193 | 228 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
194 | 229 | summary: c |
|
195 | 230 | |
|
196 | 231 | changeset: 1:d89b0a12d229 |
|
197 | 232 | user: test |
|
198 | 233 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
199 | 234 | summary: b |
|
200 | 235 | |
|
201 | 236 | changeset: 0:9161b9aeaf16 |
|
202 | 237 | user: test |
|
203 | 238 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
204 | 239 | summary: a |
|
205 | 240 | |
|
206 | 241 | |
|
207 | 242 | one rename |
|
208 | 243 | |
|
209 | 244 | $ hg up -q 2 |
|
210 | 245 | $ hg log -vf a |
|
211 | 246 | changeset: 0:9161b9aeaf16 |
|
212 | 247 | user: test |
|
213 | 248 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
214 | 249 | files: a f |
|
215 | 250 | description: |
|
216 | 251 | a |
|
217 | 252 | |
|
218 | 253 | |
|
219 | 254 | |
|
220 | 255 | many renames |
|
221 | 256 | |
|
222 | 257 | $ hg up -q tip |
|
223 | 258 | $ hg log -vf e |
|
224 | 259 | changeset: 4:7e4639b4691b |
|
225 | 260 | tag: tip |
|
226 | 261 | user: test |
|
227 | 262 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
228 | 263 | files: dir/b e |
|
229 | 264 | description: |
|
230 | 265 | e |
|
231 | 266 | |
|
232 | 267 | |
|
233 | 268 | changeset: 2:f8954cd4dc1f |
|
234 | 269 | user: test |
|
235 | 270 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
236 | 271 | files: b dir/b f g |
|
237 | 272 | description: |
|
238 | 273 | c |
|
239 | 274 | |
|
240 | 275 | |
|
241 | 276 | changeset: 1:d89b0a12d229 |
|
242 | 277 | user: test |
|
243 | 278 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
244 | 279 | files: b g |
|
245 | 280 | description: |
|
246 | 281 | b |
|
247 | 282 | |
|
248 | 283 | |
|
249 | 284 | changeset: 0:9161b9aeaf16 |
|
250 | 285 | user: test |
|
251 | 286 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
252 | 287 | files: a f |
|
253 | 288 | description: |
|
254 | 289 | a |
|
255 | 290 | |
|
256 | 291 | |
|
257 | 292 | |
|
258 | 293 | |
|
259 | 294 | log -pf dir/b |
|
260 | 295 | |
|
261 | 296 | $ hg up -q 3 |
|
262 | 297 | $ hg log -pf dir/b |
|
263 | 298 | changeset: 2:f8954cd4dc1f |
|
264 | 299 | user: test |
|
265 | 300 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
266 | 301 | summary: c |
|
267 | 302 | |
|
268 | 303 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
269 | 304 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
270 | 305 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
271 | 306 | @@ -0,0 +1,1 @@ |
|
272 | 307 | +a |
|
273 | 308 | |
|
274 | 309 | changeset: 1:d89b0a12d229 |
|
275 | 310 | user: test |
|
276 | 311 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
277 | 312 | summary: b |
|
278 | 313 | |
|
279 | 314 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
280 | 315 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
281 | 316 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
282 | 317 | @@ -0,0 +1,1 @@ |
|
283 | 318 | +a |
|
284 | 319 | |
|
285 | 320 | changeset: 0:9161b9aeaf16 |
|
286 | 321 | user: test |
|
287 | 322 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
288 | 323 | summary: a |
|
289 | 324 | |
|
290 | 325 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
291 | 326 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
292 | 327 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
293 | 328 | @@ -0,0 +1,1 @@ |
|
294 | 329 | +a |
|
295 | 330 | |
|
296 | 331 | |
|
297 | 332 | log -pf b inside dir |
|
298 | 333 | |
|
299 | 334 | $ hg --cwd=dir log -pf b |
|
300 | 335 | changeset: 2:f8954cd4dc1f |
|
301 | 336 | user: test |
|
302 | 337 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
303 | 338 | summary: c |
|
304 | 339 | |
|
305 | 340 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
306 | 341 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
307 | 342 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
308 | 343 | @@ -0,0 +1,1 @@ |
|
309 | 344 | +a |
|
310 | 345 | |
|
311 | 346 | changeset: 1:d89b0a12d229 |
|
312 | 347 | user: test |
|
313 | 348 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
314 | 349 | summary: b |
|
315 | 350 | |
|
316 | 351 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
317 | 352 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
318 | 353 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
319 | 354 | @@ -0,0 +1,1 @@ |
|
320 | 355 | +a |
|
321 | 356 | |
|
322 | 357 | changeset: 0:9161b9aeaf16 |
|
323 | 358 | user: test |
|
324 | 359 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
325 | 360 | summary: a |
|
326 | 361 | |
|
327 | 362 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
328 | 363 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
329 | 364 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
330 | 365 | @@ -0,0 +1,1 @@ |
|
331 | 366 | +a |
|
332 | 367 | |
|
333 | 368 | |
|
334 | 369 | log -pf, but no args |
|
335 | 370 | |
|
336 | 371 | $ hg log -pf |
|
337 | 372 | changeset: 3:2ca5ba701980 |
|
338 | 373 | user: test |
|
339 | 374 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
340 | 375 | summary: d |
|
341 | 376 | |
|
342 | 377 | diff -r f8954cd4dc1f -r 2ca5ba701980 a |
|
343 | 378 | --- a/a Thu Jan 01 00:00:03 1970 +0000 |
|
344 | 379 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
345 | 380 | @@ -1,1 +0,0 @@ |
|
346 | 381 | -a |
|
347 | 382 | diff -r f8954cd4dc1f -r 2ca5ba701980 b |
|
348 | 383 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
349 | 384 | +++ b/b Thu Jan 01 00:00:04 1970 +0000 |
|
350 | 385 | @@ -0,0 +1,1 @@ |
|
351 | 386 | +a |
|
352 | 387 | diff -r f8954cd4dc1f -r 2ca5ba701980 d |
|
353 | 388 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
354 | 389 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
355 | 390 | @@ -0,0 +1,1 @@ |
|
356 | 391 | +a |
|
357 | 392 | diff -r f8954cd4dc1f -r 2ca5ba701980 g |
|
358 | 393 | --- a/g Thu Jan 01 00:00:03 1970 +0000 |
|
359 | 394 | +++ b/g Thu Jan 01 00:00:04 1970 +0000 |
|
360 | 395 | @@ -1,2 +1,2 @@ |
|
361 | 396 | f |
|
362 | 397 | -g |
|
363 | 398 | +f |
|
364 | 399 | |
|
365 | 400 | changeset: 2:f8954cd4dc1f |
|
366 | 401 | user: test |
|
367 | 402 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
368 | 403 | summary: c |
|
369 | 404 | |
|
370 | 405 | diff -r d89b0a12d229 -r f8954cd4dc1f b |
|
371 | 406 | --- a/b Thu Jan 01 00:00:02 1970 +0000 |
|
372 | 407 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
373 | 408 | @@ -1,1 +0,0 @@ |
|
374 | 409 | -a |
|
375 | 410 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
376 | 411 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
377 | 412 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
378 | 413 | @@ -0,0 +1,1 @@ |
|
379 | 414 | +a |
|
380 | 415 | diff -r d89b0a12d229 -r f8954cd4dc1f f |
|
381 | 416 | --- a/f Thu Jan 01 00:00:02 1970 +0000 |
|
382 | 417 | +++ b/f Thu Jan 01 00:00:03 1970 +0000 |
|
383 | 418 | @@ -1,1 +1,2 @@ |
|
384 | 419 | f |
|
385 | 420 | +f |
|
386 | 421 | diff -r d89b0a12d229 -r f8954cd4dc1f g |
|
387 | 422 | --- a/g Thu Jan 01 00:00:02 1970 +0000 |
|
388 | 423 | +++ b/g Thu Jan 01 00:00:03 1970 +0000 |
|
389 | 424 | @@ -1,1 +1,2 @@ |
|
390 | 425 | f |
|
391 | 426 | +g |
|
392 | 427 | |
|
393 | 428 | changeset: 1:d89b0a12d229 |
|
394 | 429 | user: test |
|
395 | 430 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
396 | 431 | summary: b |
|
397 | 432 | |
|
398 | 433 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
399 | 434 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
400 | 435 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
401 | 436 | @@ -0,0 +1,1 @@ |
|
402 | 437 | +a |
|
403 | 438 | diff -r 9161b9aeaf16 -r d89b0a12d229 g |
|
404 | 439 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
405 | 440 | +++ b/g Thu Jan 01 00:00:02 1970 +0000 |
|
406 | 441 | @@ -0,0 +1,1 @@ |
|
407 | 442 | +f |
|
408 | 443 | |
|
409 | 444 | changeset: 0:9161b9aeaf16 |
|
410 | 445 | user: test |
|
411 | 446 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
412 | 447 | summary: a |
|
413 | 448 | |
|
414 | 449 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
415 | 450 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
416 | 451 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
417 | 452 | @@ -0,0 +1,1 @@ |
|
418 | 453 | +a |
|
419 | 454 | diff -r 000000000000 -r 9161b9aeaf16 f |
|
420 | 455 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
421 | 456 | +++ b/f Thu Jan 01 00:00:01 1970 +0000 |
|
422 | 457 | @@ -0,0 +1,1 @@ |
|
423 | 458 | +f |
|
424 | 459 | |
|
425 | 460 | |
|
426 | 461 | log -vf dir/b |
|
427 | 462 | |
|
428 | 463 | $ hg log -vf dir/b |
|
429 | 464 | changeset: 2:f8954cd4dc1f |
|
430 | 465 | user: test |
|
431 | 466 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
432 | 467 | files: b dir/b f g |
|
433 | 468 | description: |
|
434 | 469 | c |
|
435 | 470 | |
|
436 | 471 | |
|
437 | 472 | changeset: 1:d89b0a12d229 |
|
438 | 473 | user: test |
|
439 | 474 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
440 | 475 | files: b g |
|
441 | 476 | description: |
|
442 | 477 | b |
|
443 | 478 | |
|
444 | 479 | |
|
445 | 480 | changeset: 0:9161b9aeaf16 |
|
446 | 481 | user: test |
|
447 | 482 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
448 | 483 | files: a f |
|
449 | 484 | description: |
|
450 | 485 | a |
|
451 | 486 | |
|
452 | 487 | |
|
453 | 488 | Respects ui.logtemplate and command-templates.log configs (the latter takes |
|
454 | 489 | precedence) |
|
455 | 490 | |
|
456 | 491 | $ hg log -r 0 --config ui.logtemplate="foo {rev}\n" |
|
457 | 492 | foo 0 |
|
458 | 493 | $ hg log -r 0 --config command-templates.log="bar {rev}\n" |
|
459 | 494 | bar 0 |
|
460 | 495 | $ hg log -r 0 --config ui.logtemplate="foo {rev}\n" \ |
|
461 | 496 | > --config command-templates.log="bar {rev}\n" |
|
462 | 497 | bar 0 |
|
463 | 498 | |
|
464 | 499 | |
|
465 | 500 | -f and multiple filelog heads |
|
466 | 501 | |
|
467 | 502 | $ hg up -q 2 |
|
468 | 503 | $ hg log -f g --template '{rev}\n' |
|
469 | 504 | 2 |
|
470 | 505 | 1 |
|
471 | 506 | 0 |
|
472 | 507 | $ hg up -q tip |
|
473 | 508 | $ hg log -f g --template '{rev}\n' |
|
474 | 509 | 3 |
|
475 | 510 | 2 |
|
476 | 511 | 0 |
|
477 | 512 | |
|
478 | 513 | follow files from the specified revisions (issue4959) |
|
479 | 514 | |
|
480 | 515 | $ hg log -G -T '{rev} {files},{file_copies % " {source}->{name}"}\n' |
|
481 | 516 | @ 4 dir/b e, dir/b->e |
|
482 | 517 | | |
|
483 | 518 | o 3 a b d g, a->b f->g |
|
484 | 519 | | |
|
485 | 520 | o 2 b dir/b f g, b->dir/b |
|
486 | 521 | | |
|
487 | 522 | o 1 b g, a->b f->g |
|
488 | 523 | | |
|
489 | 524 | o 0 a f, |
|
490 | 525 | |
|
491 | 526 | |
|
492 | 527 | $ hg log -T '{rev}\n' -fr 4 e |
|
493 | 528 | 4 |
|
494 | 529 | 2 |
|
495 | 530 | 1 |
|
496 | 531 | 0 |
|
497 | 532 | $ hg log -T '{rev}\n' -fr 2 g |
|
498 | 533 | 2 |
|
499 | 534 | 1 |
|
500 | 535 | 0 |
|
501 | 536 | $ hg log -T '{rev}\n' -fr '2+3' g |
|
502 | 537 | 3 |
|
503 | 538 | 2 |
|
504 | 539 | 1 |
|
505 | 540 | 0 |
|
506 | 541 | |
|
507 | 542 | follow files from the specified revisions with glob patterns (issue5053) |
|
508 | 543 | (BROKEN: should follow copies from e@4) |
|
509 | 544 | |
|
510 | 545 | $ hg log -T '{rev}\n' -fr4 e -X '[abcdfg]' |
|
511 | 546 | 4 |
|
512 | 547 | 2 (false !) |
|
513 | 548 | 1 (false !) |
|
514 | 549 | 0 (false !) |
|
515 | 550 | |
|
516 | 551 | follow files from the specified revisions with missing patterns |
|
517 | 552 | |
|
518 | 553 | $ hg log -T '{rev}\n' -fr4 e x |
|
519 | 554 | abort: cannot follow file not in any of the specified revisions: "x" |
|
520 | 555 | [255] |
|
521 | 556 | |
|
522 | 557 | follow files from the specified revisions with directory patterns |
|
523 | 558 | (BROKEN: should follow copies from dir/b@2) |
|
524 | 559 | |
|
525 | 560 | $ hg log -T '{rev}\n' -fr2 dir/b dir |
|
526 | 561 | 2 |
|
527 | 562 | 1 (false !) |
|
528 | 563 | 0 (false !) |
|
529 | 564 | |
|
530 | 565 | follow files from multiple revisions, but the pattern is missing in |
|
531 | 566 | one of the specified revisions |
|
532 | 567 | |
|
533 | 568 | $ hg log -T '{rev}\n' -fr'2+4' dir/b e |
|
534 | 569 | e: no such file in rev f8954cd4dc1f |
|
535 | 570 | dir/b: no such file in rev 7e4639b4691b |
|
536 | 571 | 4 |
|
537 | 572 | 2 |
|
538 | 573 | 1 |
|
539 | 574 | 0 |
|
540 | 575 | |
|
541 | 576 | follow files from multiple revisions, and the pattern matches a file in |
|
542 | 577 | one revision but matches a directory in another: |
|
543 | 578 | (BROKEN: should follow copies from dir/b@2 and dir/b/g@5) |
|
544 | 579 | (BROKEN: the revision 4 should not be included since dir/b/g@5 is unchanged) |
|
545 | 580 | |
|
546 | 581 | $ mkdir -p dir/b |
|
547 | 582 | $ hg mv g dir/b |
|
548 | 583 | $ hg ci -m 'make dir/b a directory' |
|
549 | 584 | |
|
550 | 585 | $ hg log -T '{rev}\n' -fr'2+5' dir/b |
|
551 | 586 | 5 |
|
552 | 587 | 4 |
|
553 | 588 | 3 (false !) |
|
554 | 589 | 2 |
|
555 | 590 | 1 (false !) |
|
556 | 591 | 0 (false !) |
|
557 | 592 | |
|
558 | 593 | $ hg --config extensions.strip= strip -r. --no-backup |
|
559 | 594 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
560 | 595 | |
|
561 | 596 | follow files from the specified revisions across copies with -p/--patch |
|
562 | 597 | |
|
563 | 598 | $ hg log -T '== rev: {rev},{file_copies % " {source}->{name}"} ==\n' -fpr 4 e g |
|
564 | 599 | == rev: 4, dir/b->e == |
|
565 | 600 | diff -r 2ca5ba701980 -r 7e4639b4691b e |
|
566 | 601 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
567 | 602 | +++ b/e Thu Jan 01 00:00:05 1970 +0000 |
|
568 | 603 | @@ -0,0 +1,1 @@ |
|
569 | 604 | +a |
|
570 | 605 | |
|
571 | 606 | == rev: 3, a->b f->g == |
|
572 | 607 | diff -r f8954cd4dc1f -r 2ca5ba701980 g |
|
573 | 608 | --- a/g Thu Jan 01 00:00:03 1970 +0000 |
|
574 | 609 | +++ b/g Thu Jan 01 00:00:04 1970 +0000 |
|
575 | 610 | @@ -1,2 +1,2 @@ |
|
576 | 611 | f |
|
577 | 612 | -g |
|
578 | 613 | +f |
|
579 | 614 | |
|
580 | 615 | == rev: 2, b->dir/b == |
|
581 | 616 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
582 | 617 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
583 | 618 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
584 | 619 | @@ -0,0 +1,1 @@ |
|
585 | 620 | +a |
|
586 | 621 | diff -r d89b0a12d229 -r f8954cd4dc1f f |
|
587 | 622 | --- a/f Thu Jan 01 00:00:02 1970 +0000 |
|
588 | 623 | +++ b/f Thu Jan 01 00:00:03 1970 +0000 |
|
589 | 624 | @@ -1,1 +1,2 @@ |
|
590 | 625 | f |
|
591 | 626 | +f |
|
592 | 627 | |
|
593 | 628 | == rev: 1, a->b f->g == |
|
594 | 629 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
595 | 630 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
596 | 631 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
597 | 632 | @@ -0,0 +1,1 @@ |
|
598 | 633 | +a |
|
599 | 634 | |
|
600 | 635 | == rev: 0, == |
|
601 | 636 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
602 | 637 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
603 | 638 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
604 | 639 | @@ -0,0 +1,1 @@ |
|
605 | 640 | +a |
|
606 | 641 | diff -r 000000000000 -r 9161b9aeaf16 f |
|
607 | 642 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
608 | 643 | +++ b/f Thu Jan 01 00:00:01 1970 +0000 |
|
609 | 644 | @@ -0,0 +1,1 @@ |
|
610 | 645 | +f |
|
611 | 646 | |
|
612 | 647 | |
|
613 | 648 | log copies with --copies |
|
614 | 649 | |
|
615 | 650 | $ hg log -vC --template '{rev} {file_copies}\n' |
|
616 | 651 | 4 e (dir/b) |
|
617 | 652 | 3 b (a)g (f) |
|
618 | 653 | 2 dir/b (b) |
|
619 | 654 | 1 b (a)g (f) |
|
620 | 655 | 0 |
|
621 | 656 | |
|
622 | 657 | log copies switch without --copies, with old filecopy template |
|
623 | 658 | |
|
624 | 659 | $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' |
|
625 | 660 | 4 |
|
626 | 661 | 3 |
|
627 | 662 | 2 |
|
628 | 663 | 1 |
|
629 | 664 | 0 |
|
630 | 665 | |
|
631 | 666 | log copies switch with --copies |
|
632 | 667 | |
|
633 | 668 | $ hg log -vC --template '{rev} {file_copies_switch}\n' |
|
634 | 669 | 4 e (dir/b) |
|
635 | 670 | 3 b (a)g (f) |
|
636 | 671 | 2 dir/b (b) |
|
637 | 672 | 1 b (a)g (f) |
|
638 | 673 | 0 |
|
639 | 674 | |
|
640 | 675 | |
|
641 | 676 | log copies with hardcoded style and with --style=default |
|
642 | 677 | |
|
643 | 678 | $ hg log -vC -r4 |
|
644 | 679 | changeset: 4:7e4639b4691b |
|
645 | 680 | tag: tip |
|
646 | 681 | user: test |
|
647 | 682 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
648 | 683 | files: dir/b e |
|
649 | 684 | copies: e (dir/b) |
|
650 | 685 | description: |
|
651 | 686 | e |
|
652 | 687 | |
|
653 | 688 | |
|
654 | 689 | $ hg log -vC -r4 --style=default |
|
655 | 690 | changeset: 4:7e4639b4691b |
|
656 | 691 | tag: tip |
|
657 | 692 | user: test |
|
658 | 693 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
659 | 694 | files: dir/b e |
|
660 | 695 | copies: e (dir/b) |
|
661 | 696 | description: |
|
662 | 697 | e |
|
663 | 698 | |
|
664 | 699 | |
|
665 | 700 | $ hg log -vC -r4 -Tjson |
|
666 | 701 | [ |
|
667 | 702 | { |
|
668 | 703 | "bookmarks": [], |
|
669 | 704 | "branch": "default", |
|
670 | 705 | "copies": {"e": "dir/b"}, |
|
671 | 706 | "date": [5, 0], |
|
672 | 707 | "desc": "e", |
|
673 | 708 | "files": ["dir/b", "e"], |
|
674 | 709 | "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3", |
|
675 | 710 | "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"], |
|
676 | 711 | "phase": "draft", |
|
677 | 712 | "rev": 4, |
|
678 | 713 | "tags": ["tip"], |
|
679 | 714 | "user": "test" |
|
680 | 715 | } |
|
681 | 716 | ] |
|
682 | 717 | |
|
683 | 718 | log copies, non-linear manifest |
|
684 | 719 | |
|
685 | 720 | $ hg up -C 3 |
|
686 | 721 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
687 | 722 | $ hg mv dir/b e |
|
688 | 723 | $ echo foo > foo |
|
689 | 724 | $ hg ci -Ame2 -d '6 0' |
|
690 | 725 | adding foo |
|
691 | 726 | created new head |
|
692 | 727 | $ hg log -v --template '{rev} {file_copies}\n' -r 5 |
|
693 | 728 | 5 e (dir/b) |
|
694 | 729 | |
|
695 | 730 | |
|
696 | 731 | log copies, execute bit set |
|
697 | 732 | |
|
698 | 733 | #if execbit |
|
699 | 734 | $ chmod +x e |
|
700 | 735 | $ hg ci -me3 -d '7 0' |
|
701 | 736 | $ hg log -v --template '{rev} {file_copies}\n' -r 6 |
|
702 | 737 | 6 |
|
703 | 738 | #endif |
|
704 | 739 | |
|
705 | 740 | log copies, empty set |
|
706 | 741 | |
|
707 | 742 | $ hg log --copies -r '0 and not 0' |
|
708 | 743 | |
|
709 | 744 | log -p d |
|
710 | 745 | |
|
711 | 746 | $ hg log -pv d |
|
712 | 747 | changeset: 3:2ca5ba701980 |
|
713 | 748 | user: test |
|
714 | 749 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
715 | 750 | files: a b d g |
|
716 | 751 | description: |
|
717 | 752 | d |
|
718 | 753 | |
|
719 | 754 | |
|
720 | 755 | diff -r f8954cd4dc1f -r 2ca5ba701980 d |
|
721 | 756 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
722 | 757 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
723 | 758 | @@ -0,0 +1,1 @@ |
|
724 | 759 | +a |
|
725 | 760 | |
|
726 | 761 | |
|
727 | 762 | |
|
728 | 763 | log --removed file |
|
729 | 764 | |
|
730 | 765 | $ hg log --removed -v a |
|
731 | 766 | changeset: 3:2ca5ba701980 |
|
732 | 767 | user: test |
|
733 | 768 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
734 | 769 | files: a b d g |
|
735 | 770 | description: |
|
736 | 771 | d |
|
737 | 772 | |
|
738 | 773 | |
|
739 | 774 | changeset: 0:9161b9aeaf16 |
|
740 | 775 | user: test |
|
741 | 776 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
742 | 777 | files: a f |
|
743 | 778 | description: |
|
744 | 779 | a |
|
745 | 780 | |
|
746 | 781 | |
|
747 | 782 | |
|
748 | 783 | log --removed revrange file |
|
749 | 784 | |
|
750 | 785 | $ hg log --removed -v -r0:2 a |
|
751 | 786 | changeset: 0:9161b9aeaf16 |
|
752 | 787 | user: test |
|
753 | 788 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
754 | 789 | files: a f |
|
755 | 790 | description: |
|
756 | 791 | a |
|
757 | 792 | |
|
758 | 793 | |
|
759 | 794 | $ cd .. |
|
760 | 795 | |
|
761 | 796 | log --follow tests |
|
762 | 797 | |
|
763 | 798 | $ hg init follow |
|
764 | 799 | $ cd follow |
|
765 | 800 | |
|
766 | 801 | $ echo base > base |
|
767 | 802 | $ hg ci -Ambase -d '1 0' |
|
768 | 803 | adding base |
|
769 | 804 | |
|
770 | 805 | $ echo r1 >> base |
|
771 | 806 | $ hg ci -Amr1 -d '1 0' |
|
772 | 807 | $ echo r2 >> base |
|
773 | 808 | $ hg ci -Amr2 -d '1 0' |
|
774 | 809 | |
|
775 | 810 | $ hg up -C 1 |
|
776 | 811 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
777 | 812 | $ echo b1 > b1 |
|
778 | 813 | |
|
779 | 814 | log -r "follow('set:clean()')" |
|
780 | 815 | |
|
781 | 816 | $ hg log -r "follow('set:clean()')" |
|
782 | 817 | changeset: 0:67e992f2c4f3 |
|
783 | 818 | user: test |
|
784 | 819 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
785 | 820 | summary: base |
|
786 | 821 | |
|
787 | 822 | changeset: 1:3d5bf5654eda |
|
788 | 823 | user: test |
|
789 | 824 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
790 | 825 | summary: r1 |
|
791 | 826 | |
|
792 | 827 | |
|
793 | 828 | $ hg ci -Amb1 -d '1 0' |
|
794 | 829 | adding b1 |
|
795 | 830 | created new head |
|
796 | 831 | |
|
797 | 832 | |
|
798 | 833 | log -f |
|
799 | 834 | |
|
800 | 835 | $ hg log -f |
|
801 | 836 | changeset: 3:e62f78d544b4 |
|
802 | 837 | tag: tip |
|
803 | 838 | parent: 1:3d5bf5654eda |
|
804 | 839 | user: test |
|
805 | 840 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
806 | 841 | summary: b1 |
|
807 | 842 | |
|
808 | 843 | changeset: 1:3d5bf5654eda |
|
809 | 844 | user: test |
|
810 | 845 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
811 | 846 | summary: r1 |
|
812 | 847 | |
|
813 | 848 | changeset: 0:67e992f2c4f3 |
|
814 | 849 | user: test |
|
815 | 850 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
816 | 851 | summary: base |
|
817 | 852 | |
|
818 | 853 | |
|
819 | 854 | log -r follow('glob:b*') |
|
820 | 855 | |
|
821 | 856 | $ hg log -r "follow('glob:b*')" |
|
822 | 857 | changeset: 0:67e992f2c4f3 |
|
823 | 858 | user: test |
|
824 | 859 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
825 | 860 | summary: base |
|
826 | 861 | |
|
827 | 862 | changeset: 1:3d5bf5654eda |
|
828 | 863 | user: test |
|
829 | 864 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
830 | 865 | summary: r1 |
|
831 | 866 | |
|
832 | 867 | changeset: 3:e62f78d544b4 |
|
833 | 868 | tag: tip |
|
834 | 869 | parent: 1:3d5bf5654eda |
|
835 | 870 | user: test |
|
836 | 871 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
837 | 872 | summary: b1 |
|
838 | 873 | |
|
839 | 874 | log -f -r '1 + 4' |
|
840 | 875 | |
|
841 | 876 | $ hg up -C 0 |
|
842 | 877 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
843 | 878 | $ echo b2 > b2 |
|
844 | 879 | $ hg ci -Amb2 -d '1 0' |
|
845 | 880 | adding b2 |
|
846 | 881 | created new head |
|
847 | 882 | $ hg log -f -r '1 + 4' |
|
848 | 883 | changeset: 4:ddb82e70d1a1 |
|
849 | 884 | tag: tip |
|
850 | 885 | parent: 0:67e992f2c4f3 |
|
851 | 886 | user: test |
|
852 | 887 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
853 | 888 | summary: b2 |
|
854 | 889 | |
|
855 | 890 | changeset: 1:3d5bf5654eda |
|
856 | 891 | user: test |
|
857 | 892 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
858 | 893 | summary: r1 |
|
859 | 894 | |
|
860 | 895 | changeset: 0:67e992f2c4f3 |
|
861 | 896 | user: test |
|
862 | 897 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
863 | 898 | summary: base |
|
864 | 899 | |
|
865 | 900 | |
|
866 | 901 | log -fr with aliases: 'A' should be expanded, but 'reverse()' should have no |
|
867 | 902 | effect |
|
868 | 903 | |
|
869 | 904 | $ hg log --config 'revsetalias.reverse(x)=x' --config 'revsetalias.A=1+4' -qfrA |
|
870 | 905 | 4:ddb82e70d1a1 |
|
871 | 906 | 1:3d5bf5654eda |
|
872 | 907 | 0:67e992f2c4f3 |
|
873 | 908 | |
|
874 | 909 | log -r "follow('set:grep(b2)')" |
|
875 | 910 | |
|
876 | 911 | $ hg log -r "follow('set:grep(b2)')" |
|
877 | 912 | changeset: 4:ddb82e70d1a1 |
|
878 | 913 | tag: tip |
|
879 | 914 | parent: 0:67e992f2c4f3 |
|
880 | 915 | user: test |
|
881 | 916 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
882 | 917 | summary: b2 |
|
883 | 918 | |
|
884 | 919 | log -r "follow('set:grep(b2)', 4)" |
|
885 | 920 | |
|
886 | 921 | $ hg up -qC 0 |
|
887 | 922 | $ hg log -r "follow('set:grep(b2)', 4)" |
|
888 | 923 | changeset: 4:ddb82e70d1a1 |
|
889 | 924 | tag: tip |
|
890 | 925 | parent: 0:67e992f2c4f3 |
|
891 | 926 | user: test |
|
892 | 927 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
893 | 928 | summary: b2 |
|
894 | 929 | |
|
895 | 930 | |
|
896 | 931 | follow files starting from multiple revisions: |
|
897 | 932 | |
|
898 | 933 | $ hg log -T '{rev}: {files}\n' -r "follow('glob:b?', startrev=2+3+4)" |
|
899 | 934 | 3: b1 |
|
900 | 935 | 4: b2 |
|
901 | 936 | |
|
902 | 937 | follow files starting from empty revision: |
|
903 | 938 | |
|
904 | 939 | $ hg log -T '{rev}: {files}\n' -r "follow('glob:*', startrev=.-.)" |
|
905 | 940 | |
|
906 | 941 | follow starting from revisions: |
|
907 | 942 | |
|
908 | 943 | $ hg log -Gq -r "follow(startrev=2+4)" |
|
909 | 944 | o 4:ddb82e70d1a1 |
|
910 | 945 | | |
|
911 | 946 | | o 2:60c670bf5b30 |
|
912 | 947 | | | |
|
913 | 948 | | o 1:3d5bf5654eda |
|
914 | 949 | |/ |
|
915 | 950 | @ 0:67e992f2c4f3 |
|
916 | 951 | |
|
917 | 952 | |
|
918 | 953 | follow the current revision: |
|
919 | 954 | |
|
920 | 955 | $ hg log -Gq -r "follow()" |
|
921 | 956 | @ 0:67e992f2c4f3 |
|
922 | 957 | |
|
923 | 958 | |
|
924 | 959 | $ hg up -qC 4 |
|
925 | 960 | |
|
926 | 961 | log -f -r null |
|
927 | 962 | |
|
928 | 963 | $ hg log -f -r null |
|
929 | 964 | changeset: -1:000000000000 |
|
930 | 965 | user: |
|
931 | 966 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
932 | 967 | |
|
933 | 968 | $ hg log -f -r null -G |
|
934 | 969 | o changeset: -1:000000000000 |
|
935 | 970 | user: |
|
936 | 971 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
937 | 972 | |
|
938 | 973 | |
|
939 | 974 | |
|
940 | 975 | log -f with null parent |
|
941 | 976 | |
|
942 | 977 | $ hg up -C null |
|
943 | 978 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
944 | 979 | $ hg log -f |
|
945 | 980 | |
|
946 | 981 | |
|
947 | 982 | log -r . with two parents |
|
948 | 983 | |
|
949 | 984 | $ hg up -C 3 |
|
950 | 985 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
951 | 986 | $ hg merge tip |
|
952 | 987 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
953 | 988 | (branch merge, don't forget to commit) |
|
954 | 989 | $ hg log -r . |
|
955 | 990 | changeset: 3:e62f78d544b4 |
|
956 | 991 | parent: 1:3d5bf5654eda |
|
957 | 992 | user: test |
|
958 | 993 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
959 | 994 | summary: b1 |
|
960 | 995 | |
|
961 | 996 | |
|
962 | 997 | |
|
963 | 998 | log -r . with one parent |
|
964 | 999 | |
|
965 | 1000 | $ hg ci -mm12 -d '1 0' |
|
966 | 1001 | $ hg log -r . |
|
967 | 1002 | changeset: 5:302e9dd6890d |
|
968 | 1003 | tag: tip |
|
969 | 1004 | parent: 3:e62f78d544b4 |
|
970 | 1005 | parent: 4:ddb82e70d1a1 |
|
971 | 1006 | user: test |
|
972 | 1007 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
973 | 1008 | summary: m12 |
|
974 | 1009 | |
|
975 | 1010 | |
|
976 | 1011 | $ echo postm >> b1 |
|
977 | 1012 | $ hg ci -Amb1.1 -d'1 0' |
|
978 | 1013 | |
|
979 | 1014 | |
|
980 | 1015 | log --follow-first |
|
981 | 1016 | |
|
982 | 1017 | $ hg log --follow-first |
|
983 | 1018 | changeset: 6:2404bbcab562 |
|
984 | 1019 | tag: tip |
|
985 | 1020 | user: test |
|
986 | 1021 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
987 | 1022 | summary: b1.1 |
|
988 | 1023 | |
|
989 | 1024 | changeset: 5:302e9dd6890d |
|
990 | 1025 | parent: 3:e62f78d544b4 |
|
991 | 1026 | parent: 4:ddb82e70d1a1 |
|
992 | 1027 | user: test |
|
993 | 1028 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
994 | 1029 | summary: m12 |
|
995 | 1030 | |
|
996 | 1031 | changeset: 3:e62f78d544b4 |
|
997 | 1032 | parent: 1:3d5bf5654eda |
|
998 | 1033 | user: test |
|
999 | 1034 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1000 | 1035 | summary: b1 |
|
1001 | 1036 | |
|
1002 | 1037 | changeset: 1:3d5bf5654eda |
|
1003 | 1038 | user: test |
|
1004 | 1039 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1005 | 1040 | summary: r1 |
|
1006 | 1041 | |
|
1007 | 1042 | changeset: 0:67e992f2c4f3 |
|
1008 | 1043 | user: test |
|
1009 | 1044 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1010 | 1045 | summary: base |
|
1011 | 1046 | |
|
1012 | 1047 | |
|
1013 | 1048 | |
|
1014 | 1049 | log -P 2 |
|
1015 | 1050 | |
|
1016 | 1051 | $ hg log -P 2 |
|
1017 | 1052 | changeset: 6:2404bbcab562 |
|
1018 | 1053 | tag: tip |
|
1019 | 1054 | user: test |
|
1020 | 1055 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1021 | 1056 | summary: b1.1 |
|
1022 | 1057 | |
|
1023 | 1058 | changeset: 5:302e9dd6890d |
|
1024 | 1059 | parent: 3:e62f78d544b4 |
|
1025 | 1060 | parent: 4:ddb82e70d1a1 |
|
1026 | 1061 | user: test |
|
1027 | 1062 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1028 | 1063 | summary: m12 |
|
1029 | 1064 | |
|
1030 | 1065 | changeset: 4:ddb82e70d1a1 |
|
1031 | 1066 | parent: 0:67e992f2c4f3 |
|
1032 | 1067 | user: test |
|
1033 | 1068 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1034 | 1069 | summary: b2 |
|
1035 | 1070 | |
|
1036 | 1071 | changeset: 3:e62f78d544b4 |
|
1037 | 1072 | parent: 1:3d5bf5654eda |
|
1038 | 1073 | user: test |
|
1039 | 1074 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1040 | 1075 | summary: b1 |
|
1041 | 1076 | |
|
1042 | 1077 | |
|
1043 | 1078 | |
|
1044 | 1079 | log -r tip -p --git |
|
1045 | 1080 | |
|
1046 | 1081 | $ hg log -r tip -p --git |
|
1047 | 1082 | changeset: 6:2404bbcab562 |
|
1048 | 1083 | tag: tip |
|
1049 | 1084 | user: test |
|
1050 | 1085 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1051 | 1086 | summary: b1.1 |
|
1052 | 1087 | |
|
1053 | 1088 | diff --git a/b1 b/b1 |
|
1054 | 1089 | --- a/b1 |
|
1055 | 1090 | +++ b/b1 |
|
1056 | 1091 | @@ -1,1 +1,2 @@ |
|
1057 | 1092 | b1 |
|
1058 | 1093 | +postm |
|
1059 | 1094 | |
|
1060 | 1095 | |
|
1061 | 1096 | |
|
1062 | 1097 | log -r "" |
|
1063 | 1098 | |
|
1064 | 1099 | $ hg log -r '' |
|
1065 | 1100 | hg: parse error: empty query |
|
1066 | 1101 | [10] |
|
1067 | 1102 | |
|
1068 | 1103 | log -r <some unknown node id> |
|
1069 | 1104 | |
|
1070 | 1105 | $ hg log -r 1000000000000000000000000000000000000000 |
|
1071 | 1106 | abort: unknown revision '1000000000000000000000000000000000000000' |
|
1072 | 1107 | [255] |
|
1073 | 1108 | |
|
1074 | 1109 | log -k r1 |
|
1075 | 1110 | |
|
1076 | 1111 | $ hg log -k r1 |
|
1077 | 1112 | changeset: 1:3d5bf5654eda |
|
1078 | 1113 | user: test |
|
1079 | 1114 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1080 | 1115 | summary: r1 |
|
1081 | 1116 | |
|
1082 | 1117 | log -p -l2 --color=always |
|
1083 | 1118 | |
|
1084 | 1119 | $ hg --config extensions.color= --config color.mode=ansi \ |
|
1085 | 1120 | > log -p -l2 --color=always |
|
1086 | 1121 | \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) |
|
1087 | 1122 | tag: tip |
|
1088 | 1123 | user: test |
|
1089 | 1124 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1090 | 1125 | summary: b1.1 |
|
1091 | 1126 | |
|
1092 | 1127 | \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) |
|
1093 | 1128 | \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
1094 | 1129 | \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
1095 | 1130 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) |
|
1096 | 1131 | b1 |
|
1097 | 1132 | \x1b[0;32m+postm\x1b[0m (esc) |
|
1098 | 1133 | |
|
1099 | 1134 | \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) |
|
1100 | 1135 | parent: 3:e62f78d544b4 |
|
1101 | 1136 | parent: 4:ddb82e70d1a1 |
|
1102 | 1137 | user: test |
|
1103 | 1138 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1104 | 1139 | summary: m12 |
|
1105 | 1140 | |
|
1106 | 1141 | \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) |
|
1107 | 1142 | \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) |
|
1108 | 1143 | \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
1109 | 1144 | \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) |
|
1110 | 1145 | \x1b[0;32m+b2\x1b[0m (esc) |
|
1111 | 1146 | |
|
1112 | 1147 | |
|
1113 | 1148 | |
|
1114 | 1149 | log -r tip --stat |
|
1115 | 1150 | |
|
1116 | 1151 | $ hg log -r tip --stat |
|
1117 | 1152 | changeset: 6:2404bbcab562 |
|
1118 | 1153 | tag: tip |
|
1119 | 1154 | user: test |
|
1120 | 1155 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
1121 | 1156 | summary: b1.1 |
|
1122 | 1157 | |
|
1123 | 1158 | b1 | 1 + |
|
1124 | 1159 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
1125 | 1160 | |
|
1126 | 1161 | |
|
1127 | 1162 | $ cd .. |
|
1128 | 1163 | |
|
1129 | 1164 | log --follow --patch FILE in repository where linkrev isn't trustworthy |
|
1130 | 1165 | (issue5376, issue6124) |
|
1131 | 1166 | |
|
1132 | 1167 | $ hg init follow-dup |
|
1133 | 1168 | $ cd follow-dup |
|
1134 | 1169 | $ cat <<EOF >> .hg/hgrc |
|
1135 | 1170 | > [command-templates] |
|
1136 | 1171 | > log = '=== {rev}: {desc}\n' |
|
1137 | 1172 | > [diff] |
|
1138 | 1173 | > nodates = True |
|
1139 | 1174 | > EOF |
|
1140 | 1175 | $ echo 0 >> a |
|
1141 | 1176 | $ hg ci -qAm 'a0' |
|
1142 | 1177 | $ echo 1 >> a |
|
1143 | 1178 | $ hg ci -m 'a1' |
|
1144 | 1179 | $ hg up -q 0 |
|
1145 | 1180 | $ echo 1 >> a |
|
1146 | 1181 | $ touch b |
|
1147 | 1182 | $ hg ci -qAm 'a1 with b' |
|
1148 | 1183 | $ echo 3 >> a |
|
1149 | 1184 | $ hg ci -m 'a3' |
|
1150 | 1185 | |
|
1151 | 1186 | fctx.rev() == 2, but fctx.linkrev() == 1 |
|
1152 | 1187 | |
|
1153 | 1188 | $ hg log -pf a |
|
1154 | 1189 | === 3: a3 |
|
1155 | 1190 | diff -r 4ea02ba94d66 -r e7a6331a34f0 a |
|
1156 | 1191 | --- a/a |
|
1157 | 1192 | +++ b/a |
|
1158 | 1193 | @@ -1,2 +1,3 @@ |
|
1159 | 1194 | 0 |
|
1160 | 1195 | 1 |
|
1161 | 1196 | +3 |
|
1162 | 1197 | |
|
1163 | 1198 | === 2: a1 with b |
|
1164 | 1199 | diff -r 49b5e81287e2 -r 4ea02ba94d66 a |
|
1165 | 1200 | --- a/a |
|
1166 | 1201 | +++ b/a |
|
1167 | 1202 | @@ -1,1 +1,2 @@ |
|
1168 | 1203 | 0 |
|
1169 | 1204 | +1 |
|
1170 | 1205 | |
|
1171 | 1206 | === 0: a0 |
|
1172 | 1207 | diff -r 000000000000 -r 49b5e81287e2 a |
|
1173 | 1208 | --- /dev/null |
|
1174 | 1209 | +++ b/a |
|
1175 | 1210 | @@ -0,0 +1,1 @@ |
|
1176 | 1211 | +0 |
|
1177 | 1212 | |
|
1178 | 1213 | $ hg log -pr . a |
|
1179 | 1214 | === 3: a3 |
|
1180 | 1215 | diff -r 4ea02ba94d66 -r e7a6331a34f0 a |
|
1181 | 1216 | --- a/a |
|
1182 | 1217 | +++ b/a |
|
1183 | 1218 | @@ -1,2 +1,3 @@ |
|
1184 | 1219 | 0 |
|
1185 | 1220 | 1 |
|
1186 | 1221 | +3 |
|
1187 | 1222 | |
|
1188 | 1223 | |
|
1189 | 1224 | fctx.introrev() == 2, but fctx.linkrev() == 1 |
|
1190 | 1225 | |
|
1191 | 1226 | $ hg up -q 2 |
|
1192 | 1227 | $ hg log -pf a |
|
1193 | 1228 | === 2: a1 with b |
|
1194 | 1229 | diff -r 49b5e81287e2 -r 4ea02ba94d66 a |
|
1195 | 1230 | --- a/a |
|
1196 | 1231 | +++ b/a |
|
1197 | 1232 | @@ -1,1 +1,2 @@ |
|
1198 | 1233 | 0 |
|
1199 | 1234 | +1 |
|
1200 | 1235 | |
|
1201 | 1236 | === 0: a0 |
|
1202 | 1237 | diff -r 000000000000 -r 49b5e81287e2 a |
|
1203 | 1238 | --- /dev/null |
|
1204 | 1239 | +++ b/a |
|
1205 | 1240 | @@ -0,0 +1,1 @@ |
|
1206 | 1241 | +0 |
|
1207 | 1242 | |
|
1208 | 1243 | |
|
1209 | 1244 | BROKEN: should show the same diff as for rev 2 above |
|
1210 | 1245 | $ hg log -pr . a |
|
1211 | 1246 | |
|
1212 | 1247 | $ cd .. |
|
1213 | 1248 | |
|
1214 | 1249 | Multiple copy sources of a file: |
|
1215 | 1250 | |
|
1216 | 1251 | $ hg init follow-multi |
|
1217 | 1252 | $ cd follow-multi |
|
1218 | 1253 | $ echo 0 >> a |
|
1219 | 1254 | $ hg ci -qAm 'a' |
|
1220 | 1255 | $ hg cp a b |
|
1221 | 1256 | $ hg ci -m 'a->b' |
|
1222 | 1257 | $ echo 2 >> a |
|
1223 | 1258 | $ hg ci -m 'a' |
|
1224 | 1259 | $ echo 3 >> b |
|
1225 | 1260 | $ hg ci -m 'b' |
|
1226 | 1261 | $ echo 4 >> a |
|
1227 | 1262 | $ echo 4 >> b |
|
1228 | 1263 | $ hg ci -m 'a,b' |
|
1229 | 1264 | $ echo 5 >> a |
|
1230 | 1265 | $ hg ci -m 'a0' |
|
1231 | 1266 | $ echo 6 >> b |
|
1232 | 1267 | $ hg ci -m 'b0' |
|
1233 | 1268 | $ hg up -q 4 |
|
1234 | 1269 | $ echo 7 >> b |
|
1235 | 1270 | $ hg ci -m 'b1' |
|
1236 | 1271 | created new head |
|
1237 | 1272 | $ echo 8 >> a |
|
1238 | 1273 | $ hg ci -m 'a1' |
|
1239 | 1274 | $ hg rm a |
|
1240 | 1275 | $ hg mv b a |
|
1241 | 1276 | $ hg ci -m 'b1->a1' |
|
1242 | 1277 | $ hg merge -qt :local |
|
1243 | 1278 | $ hg ci -m '(a0,b1->a1)->a' |
|
1244 | 1279 | |
|
1245 | 1280 | $ hg log -GT '{rev}: {desc}\n' |
|
1246 | 1281 | @ 10: (a0,b1->a1)->a |
|
1247 | 1282 | |\ |
|
1248 | 1283 | | o 9: b1->a1 |
|
1249 | 1284 | | | |
|
1250 | 1285 | | o 8: a1 |
|
1251 | 1286 | | | |
|
1252 | 1287 | | o 7: b1 |
|
1253 | 1288 | | | |
|
1254 | 1289 | o | 6: b0 |
|
1255 | 1290 | | | |
|
1256 | 1291 | o | 5: a0 |
|
1257 | 1292 | |/ |
|
1258 | 1293 | o 4: a,b |
|
1259 | 1294 | | |
|
1260 | 1295 | o 3: b |
|
1261 | 1296 | | |
|
1262 | 1297 | o 2: a |
|
1263 | 1298 | | |
|
1264 | 1299 | o 1: a->b |
|
1265 | 1300 | | |
|
1266 | 1301 | o 0: a |
|
1267 | 1302 | |
|
1268 | 1303 | |
|
1269 | 1304 | since file 'a' has multiple copy sources at the revision 4, ancestors can't |
|
1270 | 1305 | be indexed solely by fctx.linkrev(). |
|
1271 | 1306 | |
|
1272 | 1307 | $ hg log -T '{rev}: {desc}\n' -f a |
|
1273 | 1308 | 10: (a0,b1->a1)->a |
|
1274 | 1309 | 9: b1->a1 |
|
1275 | 1310 | 7: b1 |
|
1276 | 1311 | 5: a0 |
|
1277 | 1312 | 4: a,b |
|
1278 | 1313 | 3: b |
|
1279 | 1314 | 2: a |
|
1280 | 1315 | 1: a->b |
|
1281 | 1316 | 0: a |
|
1282 | 1317 | |
|
1283 | 1318 | $ cd .. |
|
1284 | 1319 | |
|
1285 | 1320 | Test that log should respect the order of -rREV even if multiple OR conditions |
|
1286 | 1321 | are specified (issue5100): |
|
1287 | 1322 | |
|
1288 | 1323 | $ hg init revorder |
|
1289 | 1324 | $ cd revorder |
|
1290 | 1325 | |
|
1291 | 1326 | $ hg branch -q b0 |
|
1292 | 1327 | $ echo 0 >> f0 |
|
1293 | 1328 | $ hg ci -qAm k0 -u u0 |
|
1294 | 1329 | $ hg branch -q b1 |
|
1295 | 1330 | $ echo 1 >> f1 |
|
1296 | 1331 | $ hg ci -qAm k1 -u u1 |
|
1297 | 1332 | $ hg branch -q b2 |
|
1298 | 1333 | $ echo 2 >> f2 |
|
1299 | 1334 | $ hg ci -qAm k2 -u u2 |
|
1300 | 1335 | |
|
1301 | 1336 | $ hg update -q b2 |
|
1302 | 1337 | $ echo 3 >> f2 |
|
1303 | 1338 | $ hg ci -qAm k2 -u u2 |
|
1304 | 1339 | $ hg update -q b1 |
|
1305 | 1340 | $ echo 4 >> f1 |
|
1306 | 1341 | $ hg ci -qAm k1 -u u1 |
|
1307 | 1342 | $ hg update -q b0 |
|
1308 | 1343 | $ echo 5 >> f0 |
|
1309 | 1344 | $ hg ci -qAm k0 -u u0 |
|
1310 | 1345 | |
|
1311 | 1346 | summary of revisions: |
|
1312 | 1347 | |
|
1313 | 1348 | $ hg log -G -T '{rev} {branch} {author} {desc} {files}\n' |
|
1314 | 1349 | @ 5 b0 u0 k0 f0 |
|
1315 | 1350 | | |
|
1316 | 1351 | | o 4 b1 u1 k1 f1 |
|
1317 | 1352 | | | |
|
1318 | 1353 | | | o 3 b2 u2 k2 f2 |
|
1319 | 1354 | | | | |
|
1320 | 1355 | | | o 2 b2 u2 k2 f2 |
|
1321 | 1356 | | |/ |
|
1322 | 1357 | | o 1 b1 u1 k1 f1 |
|
1323 | 1358 | |/ |
|
1324 | 1359 | o 0 b0 u0 k0 f0 |
|
1325 | 1360 | |
|
1326 | 1361 | |
|
1327 | 1362 | log -b BRANCH in ascending order: |
|
1328 | 1363 | |
|
1329 | 1364 | $ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1 |
|
1330 | 1365 | 0 b0 |
|
1331 | 1366 | 1 b1 |
|
1332 | 1367 | 4 b1 |
|
1333 | 1368 | 5 b0 |
|
1334 | 1369 | $ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0 |
|
1335 | 1370 | 0 b0 |
|
1336 | 1371 | 1 b1 |
|
1337 | 1372 | 4 b1 |
|
1338 | 1373 | 5 b0 |
|
1339 | 1374 | |
|
1340 | 1375 | log --only-branch BRANCH in descending order: |
|
1341 | 1376 | |
|
1342 | 1377 | $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2 |
|
1343 | 1378 | 4 b1 |
|
1344 | 1379 | 3 b2 |
|
1345 | 1380 | 2 b2 |
|
1346 | 1381 | 1 b1 |
|
1347 | 1382 | $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1 |
|
1348 | 1383 | 4 b1 |
|
1349 | 1384 | 3 b2 |
|
1350 | 1385 | 2 b2 |
|
1351 | 1386 | 1 b1 |
|
1352 | 1387 | |
|
1353 | 1388 | log -u USER in ascending order, against compound set: |
|
1354 | 1389 | |
|
1355 | 1390 | $ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2 |
|
1356 | 1391 | 0 u0 |
|
1357 | 1392 | 2 u2 |
|
1358 | 1393 | 3 u2 |
|
1359 | 1394 | 5 u0 |
|
1360 | 1395 | $ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0 |
|
1361 | 1396 | 0 u0 |
|
1362 | 1397 | 2 u2 |
|
1363 | 1398 | 3 u2 |
|
1364 | 1399 | 5 u0 |
|
1365 | 1400 | |
|
1366 | 1401 | log -k TEXT in descending order, against compound set: |
|
1367 | 1402 | |
|
1368 | 1403 | $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2 |
|
1369 | 1404 | 5 k0 |
|
1370 | 1405 | 3 k2 |
|
1371 | 1406 | 2 k2 |
|
1372 | 1407 | 1 k1 |
|
1373 | 1408 | 0 k0 |
|
1374 | 1409 | $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0 |
|
1375 | 1410 | 5 k0 |
|
1376 | 1411 | 3 k2 |
|
1377 | 1412 | 2 k2 |
|
1378 | 1413 | 1 k1 |
|
1379 | 1414 | 0 k0 |
|
1380 | 1415 | |
|
1381 | 1416 | log -b/-u/-k shouldn't accept string-matcher syntax: |
|
1382 | 1417 | |
|
1383 | 1418 | $ hg log -b 're:.*' |
|
1384 | 1419 | abort: unknown revision 're:.*' |
|
1385 | 1420 | [255] |
|
1386 | 1421 | $ hg log -k 're:.*' |
|
1387 | 1422 | $ hg log -u 're:.*' |
|
1388 | 1423 | |
|
1389 | 1424 | log FILE in ascending order, against dagrange: |
|
1390 | 1425 | |
|
1391 | 1426 | $ hg log -r1:: -T '{rev} {files}\n' f1 f2 |
|
1392 | 1427 | 1 f1 |
|
1393 | 1428 | 2 f2 |
|
1394 | 1429 | 3 f2 |
|
1395 | 1430 | 4 f1 |
|
1396 | 1431 | $ hg log -r1:: -T '{rev} {files}\n' f2 f1 |
|
1397 | 1432 | 1 f1 |
|
1398 | 1433 | 2 f2 |
|
1399 | 1434 | 3 f2 |
|
1400 | 1435 | 4 f1 |
|
1401 | 1436 | |
|
1402 | 1437 | $ cd .. |
|
1403 | 1438 | |
|
1404 | 1439 | User |
|
1405 | 1440 | |
|
1406 | 1441 | $ hg init usertest |
|
1407 | 1442 | $ cd usertest |
|
1408 | 1443 | |
|
1409 | 1444 | $ echo a > a |
|
1410 | 1445 | $ hg ci -A -m "a" -u "User One <user1@example.org>" |
|
1411 | 1446 | adding a |
|
1412 | 1447 | $ echo b > b |
|
1413 | 1448 | $ hg ci -A -m "b" -u "User Two <user2@example.org>" |
|
1414 | 1449 | adding b |
|
1415 | 1450 | |
|
1416 | 1451 | $ hg log -u "User One <user1@example.org>" |
|
1417 | 1452 | changeset: 0:29a4c94f1924 |
|
1418 | 1453 | user: User One <user1@example.org> |
|
1419 | 1454 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1420 | 1455 | summary: a |
|
1421 | 1456 | |
|
1422 | 1457 | $ hg log -u "user1" -u "user2" |
|
1423 | 1458 | changeset: 1:e834b5e69c0e |
|
1424 | 1459 | tag: tip |
|
1425 | 1460 | user: User Two <user2@example.org> |
|
1426 | 1461 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1427 | 1462 | summary: b |
|
1428 | 1463 | |
|
1429 | 1464 | changeset: 0:29a4c94f1924 |
|
1430 | 1465 | user: User One <user1@example.org> |
|
1431 | 1466 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1432 | 1467 | summary: a |
|
1433 | 1468 | |
|
1434 | 1469 | $ hg log -u "user3" |
|
1435 | 1470 | |
|
1436 | 1471 | "-u USER" shouldn't be overridden by "user(USER)" alias |
|
1437 | 1472 | |
|
1438 | 1473 | $ hg log --config 'revsetalias.user(x)=branch(x)' -u default |
|
1439 | 1474 | $ hg log --config 'revsetalias.user(x)=branch(x)' -u user1 |
|
1440 | 1475 | changeset: 0:29a4c94f1924 |
|
1441 | 1476 | user: User One <user1@example.org> |
|
1442 | 1477 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1443 | 1478 | summary: a |
|
1444 | 1479 | |
|
1445 | 1480 | |
|
1446 | 1481 | $ cd .. |
|
1447 | 1482 | |
|
1448 | 1483 | $ hg init branches |
|
1449 | 1484 | $ cd branches |
|
1450 | 1485 | |
|
1451 | 1486 | $ echo a > a |
|
1452 | 1487 | $ hg ci -A -m "commit on default" |
|
1453 | 1488 | adding a |
|
1454 | 1489 | $ hg branch test |
|
1455 | 1490 | marked working directory as branch test |
|
1456 | 1491 | (branches are permanent and global, did you want a bookmark?) |
|
1457 | 1492 | $ echo b > b |
|
1458 | 1493 | $ hg ci -A -m "commit on test" |
|
1459 | 1494 | adding b |
|
1460 | 1495 | |
|
1461 | 1496 | $ hg up default |
|
1462 | 1497 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1463 | 1498 | $ echo c > c |
|
1464 | 1499 | $ hg ci -A -m "commit on default" |
|
1465 | 1500 | adding c |
|
1466 | 1501 | $ hg up test |
|
1467 | 1502 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1468 | 1503 | $ echo c > c |
|
1469 | 1504 | $ hg ci -A -m "commit on test" |
|
1470 | 1505 | adding c |
|
1471 | 1506 | |
|
1472 | 1507 | |
|
1473 | 1508 | log -b default |
|
1474 | 1509 | |
|
1475 | 1510 | $ hg log -b default |
|
1476 | 1511 | changeset: 2:c3a4f03cc9a7 |
|
1477 | 1512 | parent: 0:24427303d56f |
|
1478 | 1513 | user: test |
|
1479 | 1514 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1480 | 1515 | summary: commit on default |
|
1481 | 1516 | |
|
1482 | 1517 | changeset: 0:24427303d56f |
|
1483 | 1518 | user: test |
|
1484 | 1519 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1485 | 1520 | summary: commit on default |
|
1486 | 1521 | |
|
1487 | 1522 | |
|
1488 | 1523 | |
|
1489 | 1524 | log -b test |
|
1490 | 1525 | |
|
1491 | 1526 | $ hg log -b test |
|
1492 | 1527 | changeset: 3:f5d8de11c2e2 |
|
1493 | 1528 | branch: test |
|
1494 | 1529 | tag: tip |
|
1495 | 1530 | parent: 1:d32277701ccb |
|
1496 | 1531 | user: test |
|
1497 | 1532 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1498 | 1533 | summary: commit on test |
|
1499 | 1534 | |
|
1500 | 1535 | changeset: 1:d32277701ccb |
|
1501 | 1536 | branch: test |
|
1502 | 1537 | user: test |
|
1503 | 1538 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1504 | 1539 | summary: commit on test |
|
1505 | 1540 | |
|
1506 | 1541 | |
|
1507 | 1542 | |
|
1508 | 1543 | log -b dummy |
|
1509 | 1544 | |
|
1510 | 1545 | $ hg log -b dummy |
|
1511 | 1546 | abort: unknown revision 'dummy' |
|
1512 | 1547 | [255] |
|
1513 | 1548 | |
|
1514 | 1549 | |
|
1515 | 1550 | log -b . |
|
1516 | 1551 | |
|
1517 | 1552 | $ hg log -b . |
|
1518 | 1553 | changeset: 3:f5d8de11c2e2 |
|
1519 | 1554 | branch: test |
|
1520 | 1555 | tag: tip |
|
1521 | 1556 | parent: 1:d32277701ccb |
|
1522 | 1557 | user: test |
|
1523 | 1558 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1524 | 1559 | summary: commit on test |
|
1525 | 1560 | |
|
1526 | 1561 | changeset: 1:d32277701ccb |
|
1527 | 1562 | branch: test |
|
1528 | 1563 | user: test |
|
1529 | 1564 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1530 | 1565 | summary: commit on test |
|
1531 | 1566 | |
|
1532 | 1567 | |
|
1533 | 1568 | |
|
1534 | 1569 | log -b default -b test |
|
1535 | 1570 | |
|
1536 | 1571 | $ hg log -b default -b test |
|
1537 | 1572 | changeset: 3:f5d8de11c2e2 |
|
1538 | 1573 | branch: test |
|
1539 | 1574 | tag: tip |
|
1540 | 1575 | parent: 1:d32277701ccb |
|
1541 | 1576 | user: test |
|
1542 | 1577 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1543 | 1578 | summary: commit on test |
|
1544 | 1579 | |
|
1545 | 1580 | changeset: 2:c3a4f03cc9a7 |
|
1546 | 1581 | parent: 0:24427303d56f |
|
1547 | 1582 | user: test |
|
1548 | 1583 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1549 | 1584 | summary: commit on default |
|
1550 | 1585 | |
|
1551 | 1586 | changeset: 1:d32277701ccb |
|
1552 | 1587 | branch: test |
|
1553 | 1588 | user: test |
|
1554 | 1589 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1555 | 1590 | summary: commit on test |
|
1556 | 1591 | |
|
1557 | 1592 | changeset: 0:24427303d56f |
|
1558 | 1593 | user: test |
|
1559 | 1594 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1560 | 1595 | summary: commit on default |
|
1561 | 1596 | |
|
1562 | 1597 | |
|
1563 | 1598 | |
|
1564 | 1599 | log -b default -b . |
|
1565 | 1600 | |
|
1566 | 1601 | $ hg log -b default -b . |
|
1567 | 1602 | changeset: 3:f5d8de11c2e2 |
|
1568 | 1603 | branch: test |
|
1569 | 1604 | tag: tip |
|
1570 | 1605 | parent: 1:d32277701ccb |
|
1571 | 1606 | user: test |
|
1572 | 1607 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1573 | 1608 | summary: commit on test |
|
1574 | 1609 | |
|
1575 | 1610 | changeset: 2:c3a4f03cc9a7 |
|
1576 | 1611 | parent: 0:24427303d56f |
|
1577 | 1612 | user: test |
|
1578 | 1613 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1579 | 1614 | summary: commit on default |
|
1580 | 1615 | |
|
1581 | 1616 | changeset: 1:d32277701ccb |
|
1582 | 1617 | branch: test |
|
1583 | 1618 | user: test |
|
1584 | 1619 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1585 | 1620 | summary: commit on test |
|
1586 | 1621 | |
|
1587 | 1622 | changeset: 0:24427303d56f |
|
1588 | 1623 | user: test |
|
1589 | 1624 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1590 | 1625 | summary: commit on default |
|
1591 | 1626 | |
|
1592 | 1627 | |
|
1593 | 1628 | |
|
1594 | 1629 | log -b . -b test |
|
1595 | 1630 | |
|
1596 | 1631 | $ hg log -b . -b test |
|
1597 | 1632 | changeset: 3:f5d8de11c2e2 |
|
1598 | 1633 | branch: test |
|
1599 | 1634 | tag: tip |
|
1600 | 1635 | parent: 1:d32277701ccb |
|
1601 | 1636 | user: test |
|
1602 | 1637 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1603 | 1638 | summary: commit on test |
|
1604 | 1639 | |
|
1605 | 1640 | changeset: 1:d32277701ccb |
|
1606 | 1641 | branch: test |
|
1607 | 1642 | user: test |
|
1608 | 1643 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1609 | 1644 | summary: commit on test |
|
1610 | 1645 | |
|
1611 | 1646 | |
|
1612 | 1647 | |
|
1613 | 1648 | log -b 2 |
|
1614 | 1649 | |
|
1615 | 1650 | $ hg log -b 2 |
|
1616 | 1651 | changeset: 2:c3a4f03cc9a7 |
|
1617 | 1652 | parent: 0:24427303d56f |
|
1618 | 1653 | user: test |
|
1619 | 1654 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1620 | 1655 | summary: commit on default |
|
1621 | 1656 | |
|
1622 | 1657 | changeset: 0:24427303d56f |
|
1623 | 1658 | user: test |
|
1624 | 1659 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1625 | 1660 | summary: commit on default |
|
1626 | 1661 | |
|
1627 | 1662 | #if gettext |
|
1628 | 1663 | |
|
1629 | 1664 | Test that all log names are translated (e.g. branches, bookmarks, tags): |
|
1630 | 1665 | |
|
1631 | 1666 | $ hg bookmark babar -r tip |
|
1632 | 1667 | |
|
1633 | 1668 | $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip |
|
1634 | 1669 | \xc3\x84nderung: 3:f5d8de11c2e2 (esc) |
|
1635 | 1670 | Zweig: test |
|
1636 | 1671 | Lesezeichen: babar |
|
1637 | 1672 | Marke: tip |
|
1638 | 1673 | Vorg\xc3\xa4nger: 1:d32277701ccb (esc) |
|
1639 | 1674 | Nutzer: test |
|
1640 | 1675 | Datum: Thu Jan 01 00:00:00 1970 +0000 |
|
1641 | 1676 | Zusammenfassung: commit on test |
|
1642 | 1677 | |
|
1643 | 1678 | $ hg bookmark -d babar |
|
1644 | 1679 | |
|
1645 | 1680 | #endif |
|
1646 | 1681 | |
|
1647 | 1682 | log -p --cwd dir (in subdir) |
|
1648 | 1683 | |
|
1649 | 1684 | $ mkdir dir |
|
1650 | 1685 | $ hg log -p --cwd dir |
|
1651 | 1686 | changeset: 3:f5d8de11c2e2 |
|
1652 | 1687 | branch: test |
|
1653 | 1688 | tag: tip |
|
1654 | 1689 | parent: 1:d32277701ccb |
|
1655 | 1690 | user: test |
|
1656 | 1691 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1657 | 1692 | summary: commit on test |
|
1658 | 1693 | |
|
1659 | 1694 | diff -r d32277701ccb -r f5d8de11c2e2 c |
|
1660 | 1695 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1661 | 1696 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
1662 | 1697 | @@ -0,0 +1,1 @@ |
|
1663 | 1698 | +c |
|
1664 | 1699 | |
|
1665 | 1700 | changeset: 2:c3a4f03cc9a7 |
|
1666 | 1701 | parent: 0:24427303d56f |
|
1667 | 1702 | user: test |
|
1668 | 1703 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1669 | 1704 | summary: commit on default |
|
1670 | 1705 | |
|
1671 | 1706 | diff -r 24427303d56f -r c3a4f03cc9a7 c |
|
1672 | 1707 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1673 | 1708 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
1674 | 1709 | @@ -0,0 +1,1 @@ |
|
1675 | 1710 | +c |
|
1676 | 1711 | |
|
1677 | 1712 | changeset: 1:d32277701ccb |
|
1678 | 1713 | branch: test |
|
1679 | 1714 | user: test |
|
1680 | 1715 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1681 | 1716 | summary: commit on test |
|
1682 | 1717 | |
|
1683 | 1718 | diff -r 24427303d56f -r d32277701ccb b |
|
1684 | 1719 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1685 | 1720 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1686 | 1721 | @@ -0,0 +1,1 @@ |
|
1687 | 1722 | +b |
|
1688 | 1723 | |
|
1689 | 1724 | changeset: 0:24427303d56f |
|
1690 | 1725 | user: test |
|
1691 | 1726 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1692 | 1727 | summary: commit on default |
|
1693 | 1728 | |
|
1694 | 1729 | diff -r 000000000000 -r 24427303d56f a |
|
1695 | 1730 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1696 | 1731 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1697 | 1732 | @@ -0,0 +1,1 @@ |
|
1698 | 1733 | +a |
|
1699 | 1734 | |
|
1700 | 1735 | |
|
1701 | 1736 | |
|
1702 | 1737 | log -p -R repo |
|
1703 | 1738 | |
|
1704 | 1739 | $ cd dir |
|
1705 | 1740 | $ hg log -p -R .. ../a |
|
1706 | 1741 | changeset: 0:24427303d56f |
|
1707 | 1742 | user: test |
|
1708 | 1743 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1709 | 1744 | summary: commit on default |
|
1710 | 1745 | |
|
1711 | 1746 | diff -r 000000000000 -r 24427303d56f a |
|
1712 | 1747 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1713 | 1748 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1714 | 1749 | @@ -0,0 +1,1 @@ |
|
1715 | 1750 | +a |
|
1716 | 1751 | |
|
1717 | 1752 | |
|
1718 | 1753 | $ cd ../.. |
|
1719 | 1754 | |
|
1720 | 1755 | $ hg init follow2 |
|
1721 | 1756 | $ cd follow2 |
|
1722 | 1757 | |
|
1723 | 1758 | # Build the following history: |
|
1724 | 1759 | # tip - o - x - o - x - x |
|
1725 | 1760 | # \ / |
|
1726 | 1761 | # o - o - o - x |
|
1727 | 1762 | # \ / |
|
1728 | 1763 | # o |
|
1729 | 1764 | # |
|
1730 | 1765 | # Where "o" is a revision containing "foo" and |
|
1731 | 1766 | # "x" is a revision without "foo" |
|
1732 | 1767 | |
|
1733 | 1768 | $ touch init |
|
1734 | 1769 | $ hg ci -A -m "init, unrelated" |
|
1735 | 1770 | adding init |
|
1736 | 1771 | $ echo 'foo' > init |
|
1737 | 1772 | $ hg ci -m "change, unrelated" |
|
1738 | 1773 | $ echo 'foo' > foo |
|
1739 | 1774 | $ hg ci -A -m "add unrelated old foo" |
|
1740 | 1775 | adding foo |
|
1741 | 1776 | $ hg rm foo |
|
1742 | 1777 | $ hg ci -m "delete foo, unrelated" |
|
1743 | 1778 | $ echo 'related' > foo |
|
1744 | 1779 | $ hg ci -A -m "add foo, related" |
|
1745 | 1780 | adding foo |
|
1746 | 1781 | |
|
1747 | 1782 | $ hg up 0 |
|
1748 | 1783 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1749 | 1784 | $ touch branch |
|
1750 | 1785 | $ hg ci -A -m "first branch, unrelated" |
|
1751 | 1786 | adding branch |
|
1752 | 1787 | created new head |
|
1753 | 1788 | $ touch foo |
|
1754 | 1789 | $ hg ci -A -m "create foo, related" |
|
1755 | 1790 | adding foo |
|
1756 | 1791 | $ echo 'change' > foo |
|
1757 | 1792 | $ hg ci -m "change foo, related" |
|
1758 | 1793 | |
|
1759 | 1794 | $ hg up 6 |
|
1760 | 1795 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1761 | 1796 | $ echo 'change foo in branch' > foo |
|
1762 | 1797 | $ hg ci -m "change foo in branch, related" |
|
1763 | 1798 | created new head |
|
1764 | 1799 | $ hg merge 7 |
|
1765 | 1800 | merging foo |
|
1766 | 1801 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
|
1767 | 1802 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
1768 | 1803 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
1769 | 1804 | [1] |
|
1770 | 1805 | $ echo 'merge 1' > foo |
|
1771 | 1806 | $ hg resolve -m foo |
|
1772 | 1807 | (no more unresolved files) |
|
1773 | 1808 | $ hg ci -m "First merge, related" |
|
1774 | 1809 | |
|
1775 | 1810 | $ hg merge 4 |
|
1776 | 1811 | merging foo |
|
1777 | 1812 | warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
|
1778 | 1813 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
1779 | 1814 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
1780 | 1815 | [1] |
|
1781 | 1816 | $ echo 'merge 2' > foo |
|
1782 | 1817 | $ hg resolve -m foo |
|
1783 | 1818 | (no more unresolved files) |
|
1784 | 1819 | $ hg ci -m "Last merge, related" |
|
1785 | 1820 | |
|
1786 | 1821 | $ hg log --graph |
|
1787 | 1822 | @ changeset: 10:4dae8563d2c5 |
|
1788 | 1823 | |\ tag: tip |
|
1789 | 1824 | | | parent: 9:7b35701b003e |
|
1790 | 1825 | | | parent: 4:88176d361b69 |
|
1791 | 1826 | | | user: test |
|
1792 | 1827 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1793 | 1828 | | | summary: Last merge, related |
|
1794 | 1829 | | | |
|
1795 | 1830 | | o changeset: 9:7b35701b003e |
|
1796 | 1831 | | |\ parent: 8:e5416ad8a855 |
|
1797 | 1832 | | | | parent: 7:87fe3144dcfa |
|
1798 | 1833 | | | | user: test |
|
1799 | 1834 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1800 | 1835 | | | | summary: First merge, related |
|
1801 | 1836 | | | | |
|
1802 | 1837 | | | o changeset: 8:e5416ad8a855 |
|
1803 | 1838 | | | | parent: 6:dc6c325fe5ee |
|
1804 | 1839 | | | | user: test |
|
1805 | 1840 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1806 | 1841 | | | | summary: change foo in branch, related |
|
1807 | 1842 | | | | |
|
1808 | 1843 | | o | changeset: 7:87fe3144dcfa |
|
1809 | 1844 | | |/ user: test |
|
1810 | 1845 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1811 | 1846 | | | summary: change foo, related |
|
1812 | 1847 | | | |
|
1813 | 1848 | | o changeset: 6:dc6c325fe5ee |
|
1814 | 1849 | | | user: test |
|
1815 | 1850 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1816 | 1851 | | | summary: create foo, related |
|
1817 | 1852 | | | |
|
1818 | 1853 | | o changeset: 5:73db34516eb9 |
|
1819 | 1854 | | | parent: 0:e87515fd044a |
|
1820 | 1855 | | | user: test |
|
1821 | 1856 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1822 | 1857 | | | summary: first branch, unrelated |
|
1823 | 1858 | | | |
|
1824 | 1859 | o | changeset: 4:88176d361b69 |
|
1825 | 1860 | | | user: test |
|
1826 | 1861 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1827 | 1862 | | | summary: add foo, related |
|
1828 | 1863 | | | |
|
1829 | 1864 | o | changeset: 3:dd78ae4afb56 |
|
1830 | 1865 | | | user: test |
|
1831 | 1866 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1832 | 1867 | | | summary: delete foo, unrelated |
|
1833 | 1868 | | | |
|
1834 | 1869 | o | changeset: 2:c4c64aedf0f7 |
|
1835 | 1870 | | | user: test |
|
1836 | 1871 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1837 | 1872 | | | summary: add unrelated old foo |
|
1838 | 1873 | | | |
|
1839 | 1874 | o | changeset: 1:e5faa7440653 |
|
1840 | 1875 | |/ user: test |
|
1841 | 1876 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1842 | 1877 | | summary: change, unrelated |
|
1843 | 1878 | | |
|
1844 | 1879 | o changeset: 0:e87515fd044a |
|
1845 | 1880 | user: test |
|
1846 | 1881 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1847 | 1882 | summary: init, unrelated |
|
1848 | 1883 | |
|
1849 | 1884 | |
|
1850 | 1885 | $ hg --traceback log -f foo |
|
1851 | 1886 | changeset: 10:4dae8563d2c5 |
|
1852 | 1887 | tag: tip |
|
1853 | 1888 | parent: 9:7b35701b003e |
|
1854 | 1889 | parent: 4:88176d361b69 |
|
1855 | 1890 | user: test |
|
1856 | 1891 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1857 | 1892 | summary: Last merge, related |
|
1858 | 1893 | |
|
1859 | 1894 | changeset: 9:7b35701b003e |
|
1860 | 1895 | parent: 8:e5416ad8a855 |
|
1861 | 1896 | parent: 7:87fe3144dcfa |
|
1862 | 1897 | user: test |
|
1863 | 1898 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1864 | 1899 | summary: First merge, related |
|
1865 | 1900 | |
|
1866 | 1901 | changeset: 8:e5416ad8a855 |
|
1867 | 1902 | parent: 6:dc6c325fe5ee |
|
1868 | 1903 | user: test |
|
1869 | 1904 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1870 | 1905 | summary: change foo in branch, related |
|
1871 | 1906 | |
|
1872 | 1907 | changeset: 7:87fe3144dcfa |
|
1873 | 1908 | user: test |
|
1874 | 1909 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1875 | 1910 | summary: change foo, related |
|
1876 | 1911 | |
|
1877 | 1912 | changeset: 6:dc6c325fe5ee |
|
1878 | 1913 | user: test |
|
1879 | 1914 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1880 | 1915 | summary: create foo, related |
|
1881 | 1916 | |
|
1882 | 1917 | changeset: 4:88176d361b69 |
|
1883 | 1918 | user: test |
|
1884 | 1919 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1885 | 1920 | summary: add foo, related |
|
1886 | 1921 | |
|
1887 | 1922 | |
|
1888 | 1923 | Also check when maxrev < lastrevfilelog |
|
1889 | 1924 | |
|
1890 | 1925 | $ hg --traceback log -f -r4 foo |
|
1891 | 1926 | changeset: 4:88176d361b69 |
|
1892 | 1927 | user: test |
|
1893 | 1928 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1894 | 1929 | summary: add foo, related |
|
1895 | 1930 | |
|
1896 | 1931 | $ cd .. |
|
1897 | 1932 | |
|
1898 | 1933 | Issue2383: hg log showing _less_ differences than hg diff |
|
1899 | 1934 | |
|
1900 | 1935 | $ hg init issue2383 |
|
1901 | 1936 | $ cd issue2383 |
|
1902 | 1937 | |
|
1903 | 1938 | Create a test repo: |
|
1904 | 1939 | |
|
1905 | 1940 | $ echo a > a |
|
1906 | 1941 | $ hg ci -Am0 |
|
1907 | 1942 | adding a |
|
1908 | 1943 | $ echo b > b |
|
1909 | 1944 | $ hg ci -Am1 |
|
1910 | 1945 | adding b |
|
1911 | 1946 | $ hg co 0 |
|
1912 | 1947 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1913 | 1948 | $ echo b > a |
|
1914 | 1949 | $ hg ci -m2 |
|
1915 | 1950 | created new head |
|
1916 | 1951 | |
|
1917 | 1952 | Merge: |
|
1918 | 1953 | |
|
1919 | 1954 | $ hg merge |
|
1920 | 1955 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1921 | 1956 | (branch merge, don't forget to commit) |
|
1922 | 1957 | |
|
1923 | 1958 | Make sure there's a file listed in the merge to trigger the bug: |
|
1924 | 1959 | |
|
1925 | 1960 | $ echo c > a |
|
1926 | 1961 | $ hg ci -m3 |
|
1927 | 1962 | |
|
1928 | 1963 | Two files shown here in diff: |
|
1929 | 1964 | |
|
1930 | 1965 | $ hg diff --rev 2:3 |
|
1931 | 1966 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1932 | 1967 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1933 | 1968 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1934 | 1969 | @@ -1,1 +1,1 @@ |
|
1935 | 1970 | -b |
|
1936 | 1971 | +c |
|
1937 | 1972 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1938 | 1973 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1939 | 1974 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1940 | 1975 | @@ -0,0 +1,1 @@ |
|
1941 | 1976 | +b |
|
1942 | 1977 | |
|
1943 | 1978 | Diff here should be the same: |
|
1944 | 1979 | |
|
1945 | 1980 | $ hg log -vpr 3 |
|
1946 | 1981 | changeset: 3:8e07aafe1edc |
|
1947 | 1982 | tag: tip |
|
1948 | 1983 | parent: 2:b09be438c43a |
|
1949 | 1984 | parent: 1:925d80f479bb |
|
1950 | 1985 | user: test |
|
1951 | 1986 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1952 | 1987 | files: a |
|
1953 | 1988 | description: |
|
1954 | 1989 | 3 |
|
1955 | 1990 | |
|
1956 | 1991 | |
|
1957 | 1992 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1958 | 1993 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1959 | 1994 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1960 | 1995 | @@ -1,1 +1,1 @@ |
|
1961 | 1996 | -b |
|
1962 | 1997 | +c |
|
1963 | 1998 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1964 | 1999 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1965 | 2000 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1966 | 2001 | @@ -0,0 +1,1 @@ |
|
1967 | 2002 | +b |
|
1968 | 2003 | |
|
1969 | 2004 | $ cd .. |
|
1970 | 2005 | |
|
1971 | 2006 | 'hg log -r rev fn' when last(filelog(fn)) != rev |
|
1972 | 2007 | |
|
1973 | 2008 | $ hg init simplelog |
|
1974 | 2009 | $ cd simplelog |
|
1975 | 2010 | $ echo f > a |
|
1976 | 2011 | $ hg ci -Am'a' -d '0 0' |
|
1977 | 2012 | adding a |
|
1978 | 2013 | $ echo f >> a |
|
1979 | 2014 | $ hg ci -Am'a bis' -d '1 0' |
|
1980 | 2015 | |
|
1981 | 2016 | $ hg log -r0 a |
|
1982 | 2017 | changeset: 0:9f758d63dcde |
|
1983 | 2018 | user: test |
|
1984 | 2019 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1985 | 2020 | summary: a |
|
1986 | 2021 | |
|
1987 | 2022 | enable obsolete to test hidden feature |
|
1988 | 2023 | |
|
1989 | 2024 | $ cat >> $HGRCPATH << EOF |
|
1990 | 2025 | > [experimental] |
|
1991 | 2026 | > evolution.createmarkers=True |
|
1992 | 2027 | > EOF |
|
1993 | 2028 | |
|
1994 | 2029 | $ hg log --template='{rev}:{node}\n' |
|
1995 | 2030 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1996 | 2031 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1997 | 2032 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f |
|
1998 | 2033 | 1 new obsolescence markers |
|
1999 | 2034 | obsoleted 1 changesets |
|
2000 | 2035 | $ hg up null -q |
|
2001 | 2036 | $ hg log --template='{rev}:{node}\n' |
|
2002 | 2037 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
2003 | 2038 | $ hg log --template='{rev}:{node}\n' --hidden |
|
2004 | 2039 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
2005 | 2040 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
2006 | 2041 | $ hg log -r a |
|
2007 | 2042 | abort: hidden revision 'a' is pruned |
|
2008 | 2043 | (use --hidden to access hidden revisions) |
|
2009 | 2044 | [255] |
|
2010 | 2045 | |
|
2011 | 2046 | test that parent prevent a changeset to be hidden |
|
2012 | 2047 | |
|
2013 | 2048 | $ hg up 1 -q --hidden |
|
2014 | 2049 | updated to hidden changeset a765632148dc |
|
2015 | 2050 | (hidden revision 'a765632148dc' is pruned) |
|
2016 | 2051 | $ hg log --template='{rev}:{node}\n' |
|
2017 | 2052 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
2018 | 2053 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
2019 | 2054 | |
|
2020 | 2055 | test that second parent prevent a changeset to be hidden too |
|
2021 | 2056 | |
|
2022 | 2057 | $ hg debugsetparents 0 1 # nothing suitable to merge here |
|
2023 | 2058 | $ hg log --template='{rev}:{node}\n' |
|
2024 | 2059 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
2025 | 2060 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
2026 | 2061 | $ hg debugsetparents 1 |
|
2027 | 2062 | $ hg up -q null |
|
2028 | 2063 | |
|
2029 | 2064 | bookmarks prevent a changeset being hidden |
|
2030 | 2065 | |
|
2031 | 2066 | $ hg bookmark --hidden -r 1 X |
|
2032 | 2067 | bookmarking hidden changeset a765632148dc |
|
2033 | 2068 | (hidden revision 'a765632148dc' is pruned) |
|
2034 | 2069 | $ hg log --template '{rev}:{node}\n' |
|
2035 | 2070 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
2036 | 2071 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
2037 | 2072 | $ hg bookmark -d X |
|
2038 | 2073 | |
|
2039 | 2074 | divergent bookmarks are not hidden |
|
2040 | 2075 | |
|
2041 | 2076 | $ hg bookmark --hidden -r 1 X@foo |
|
2042 | 2077 | bookmarking hidden changeset a765632148dc |
|
2043 | 2078 | (hidden revision 'a765632148dc' is pruned) |
|
2044 | 2079 | $ hg log --template '{rev}:{node}\n' |
|
2045 | 2080 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
2046 | 2081 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
2047 | 2082 | |
|
2048 | 2083 | test hidden revision 0 (issue5385) |
|
2049 | 2084 | |
|
2050 | 2085 | $ hg bookmark -d X@foo |
|
2051 | 2086 | $ hg up null -q |
|
2052 | 2087 | $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
2053 | 2088 | 1 new obsolescence markers |
|
2054 | 2089 | obsoleted 1 changesets |
|
2055 | 2090 | $ echo f > b |
|
2056 | 2091 | $ hg ci -Am'b' -d '2 0' |
|
2057 | 2092 | adding b |
|
2058 | 2093 | $ echo f >> b |
|
2059 | 2094 | $ hg ci -m'b bis' -d '3 0' |
|
2060 | 2095 | $ hg log -T'{rev}:{node}\n' |
|
2061 | 2096 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
|
2062 | 2097 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
|
2063 | 2098 | |
|
2064 | 2099 | $ hg log -T'{rev}:{node}\n' -r: |
|
2065 | 2100 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
|
2066 | 2101 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
|
2067 | 2102 | $ hg log -T'{rev}:{node}\n' -r:tip |
|
2068 | 2103 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
|
2069 | 2104 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
|
2070 | 2105 | $ hg log -T'{rev}:{node}\n' -r:0 |
|
2071 | 2106 | abort: hidden revision '0' is pruned |
|
2072 | 2107 | (use --hidden to access hidden revisions) |
|
2073 | 2108 | [255] |
|
2074 | 2109 | $ hg log -T'{rev}:{node}\n' -f |
|
2075 | 2110 | 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e |
|
2076 | 2111 | 2:94375ec45bddd2a824535fc04855bd058c926ec0 |
|
2077 | 2112 | |
|
2078 | 2113 | clear extensions configuration |
|
2079 | 2114 | $ echo '[extensions]' >> $HGRCPATH |
|
2080 | 2115 | $ echo "obs=!" >> $HGRCPATH |
|
2081 | 2116 | $ cd .. |
|
2082 | 2117 | |
|
2083 | 2118 | test -u/-k for problematic encoding |
|
2084 | 2119 | # unicode: cp932: |
|
2085 | 2120 | # u30A2 0x83 0x41(= 'A') |
|
2086 | 2121 | # u30C2 0x83 0x61(= 'a') |
|
2087 | 2122 | |
|
2088 | 2123 | $ hg init problematicencoding |
|
2089 | 2124 | $ cd problematicencoding |
|
2090 | 2125 | |
|
2091 | 2126 | >>> with open('setup.sh', 'wb') as f: |
|
2092 | 2127 | ... f.write(u''' |
|
2093 | 2128 | ... echo a > text |
|
2094 | 2129 | ... hg add text |
|
2095 | 2130 | ... hg --encoding utf-8 commit -u '\u30A2' -m none |
|
2096 | 2131 | ... echo b > text |
|
2097 | 2132 | ... hg --encoding utf-8 commit -u '\u30C2' -m none |
|
2098 | 2133 | ... echo c > text |
|
2099 | 2134 | ... hg --encoding utf-8 commit -u none -m '\u30A2' |
|
2100 | 2135 | ... echo d > text |
|
2101 | 2136 | ... hg --encoding utf-8 commit -u none -m '\u30C2' |
|
2102 | 2137 | ... '''.encode('utf-8')) and None |
|
2103 | 2138 | $ sh < setup.sh |
|
2104 | 2139 | |
|
2105 | 2140 | test in problematic encoding |
|
2106 | 2141 | >>> with open('test.sh', 'wb') as f: |
|
2107 | 2142 | ... f.write(u''' |
|
2108 | 2143 | ... hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' |
|
2109 | 2144 | ... echo ==== |
|
2110 | 2145 | ... hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' |
|
2111 | 2146 | ... echo ==== |
|
2112 | 2147 | ... hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' |
|
2113 | 2148 | ... echo ==== |
|
2114 | 2149 | ... hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' |
|
2115 | 2150 | ... '''.encode('cp932')) and None |
|
2116 | 2151 | $ sh < test.sh |
|
2117 | 2152 | 0 |
|
2118 | 2153 | ==== |
|
2119 | 2154 | 1 |
|
2120 | 2155 | ==== |
|
2121 | 2156 | 2 |
|
2122 | 2157 | 0 |
|
2123 | 2158 | ==== |
|
2124 | 2159 | 3 |
|
2125 | 2160 | 1 |
|
2126 | 2161 | |
|
2127 | 2162 | $ cd .. |
|
2128 | 2163 | |
|
2129 | 2164 | test hg log on non-existent files and on directories |
|
2130 | 2165 | $ hg init issue1340 |
|
2131 | 2166 | $ cd issue1340 |
|
2132 | 2167 | $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6 |
|
2133 | 2168 | $ echo 1 > d1/f1 |
|
2134 | 2169 | $ echo 1 > D2/f1 |
|
2135 | 2170 | $ echo 1 > D3.i/f1 |
|
2136 | 2171 | $ echo 1 > d4.hg/f1 |
|
2137 | 2172 | $ echo 1 > d5.d/f1 |
|
2138 | 2173 | $ echo 1 > .d6/f1 |
|
2139 | 2174 | $ hg -q add . |
|
2140 | 2175 | $ hg commit -m "a bunch of weird directories" |
|
2141 | 2176 | $ hg log -l1 d1/f1 | grep changeset |
|
2142 | 2177 | changeset: 0:65624cd9070a |
|
2143 | 2178 | $ hg log -l1 f1 |
|
2144 | 2179 | $ hg log -l1 . | grep changeset |
|
2145 | 2180 | changeset: 0:65624cd9070a |
|
2146 | 2181 | $ hg log -l1 ./ | grep changeset |
|
2147 | 2182 | changeset: 0:65624cd9070a |
|
2148 | 2183 | $ hg log -l1 d1 | grep changeset |
|
2149 | 2184 | changeset: 0:65624cd9070a |
|
2150 | 2185 | $ hg log -l1 D2 | grep changeset |
|
2151 | 2186 | changeset: 0:65624cd9070a |
|
2152 | 2187 | $ hg log -l1 D2/f1 | grep changeset |
|
2153 | 2188 | changeset: 0:65624cd9070a |
|
2154 | 2189 | $ hg log -l1 D3.i | grep changeset |
|
2155 | 2190 | changeset: 0:65624cd9070a |
|
2156 | 2191 | $ hg log -l1 D3.i/f1 | grep changeset |
|
2157 | 2192 | changeset: 0:65624cd9070a |
|
2158 | 2193 | $ hg log -l1 d4.hg | grep changeset |
|
2159 | 2194 | changeset: 0:65624cd9070a |
|
2160 | 2195 | $ hg log -l1 d4.hg/f1 | grep changeset |
|
2161 | 2196 | changeset: 0:65624cd9070a |
|
2162 | 2197 | $ hg log -l1 d5.d | grep changeset |
|
2163 | 2198 | changeset: 0:65624cd9070a |
|
2164 | 2199 | $ hg log -l1 d5.d/f1 | grep changeset |
|
2165 | 2200 | changeset: 0:65624cd9070a |
|
2166 | 2201 | $ hg log -l1 .d6 | grep changeset |
|
2167 | 2202 | changeset: 0:65624cd9070a |
|
2168 | 2203 | $ hg log -l1 .d6/f1 | grep changeset |
|
2169 | 2204 | changeset: 0:65624cd9070a |
|
2170 | 2205 | |
|
2171 | 2206 | issue3772: hg log -r :null showing revision 0 as well |
|
2172 | 2207 | |
|
2173 | 2208 | $ hg log -r :null |
|
2174 | 2209 | changeset: 0:65624cd9070a |
|
2175 | 2210 | tag: tip |
|
2176 | 2211 | user: test |
|
2177 | 2212 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2178 | 2213 | summary: a bunch of weird directories |
|
2179 | 2214 | |
|
2180 | 2215 | changeset: -1:000000000000 |
|
2181 | 2216 | user: |
|
2182 | 2217 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2183 | 2218 | |
|
2184 | 2219 | $ hg log -r null:null |
|
2185 | 2220 | changeset: -1:000000000000 |
|
2186 | 2221 | user: |
|
2187 | 2222 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2188 | 2223 | |
|
2189 | 2224 | working-directory revision requires special treatment |
|
2190 | 2225 | |
|
2191 | 2226 | clean: |
|
2192 | 2227 | |
|
2193 | 2228 | $ hg log -r 'wdir()' --debug |
|
2194 | 2229 | changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
|
2195 | 2230 | phase: draft |
|
2196 | 2231 | parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 |
|
2197 | 2232 | parent: -1:0000000000000000000000000000000000000000 |
|
2198 | 2233 | manifest: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
|
2199 | 2234 | user: test |
|
2200 | 2235 | date: [A-Za-z0-9:+ ]+ (re) |
|
2201 | 2236 | extra: branch=default |
|
2202 | 2237 | |
|
2203 | 2238 | $ hg log -r 'wdir()' -p --stat |
|
2204 | 2239 | changeset: 2147483647:ffffffffffff |
|
2205 | 2240 | parent: 0:65624cd9070a |
|
2206 | 2241 | user: test |
|
2207 | 2242 | date: [A-Za-z0-9:+ ]+ (re) |
|
2208 | 2243 | |
|
2209 | 2244 | |
|
2210 | 2245 | |
|
2211 | 2246 | |
|
2212 | 2247 | dirty: |
|
2213 | 2248 | |
|
2214 | 2249 | $ echo 2 >> d1/f1 |
|
2215 | 2250 | $ echo 2 > d1/f2 |
|
2216 | 2251 | $ hg add d1/f2 |
|
2217 | 2252 | $ hg remove .d6/f1 |
|
2218 | 2253 | $ hg status |
|
2219 | 2254 | M d1/f1 |
|
2220 | 2255 | A d1/f2 |
|
2221 | 2256 | R .d6/f1 |
|
2222 | 2257 | |
|
2223 | 2258 | $ hg log -r 'wdir()' |
|
2224 | 2259 | changeset: 2147483647:ffffffffffff |
|
2225 | 2260 | parent: 0:65624cd9070a |
|
2226 | 2261 | user: test |
|
2227 | 2262 | date: [A-Za-z0-9:+ ]+ (re) |
|
2228 | 2263 | |
|
2229 | 2264 | $ hg log -r 'wdir()' -q |
|
2230 | 2265 | 2147483647:ffffffffffff |
|
2231 | 2266 | |
|
2232 | 2267 | $ hg log -r 'wdir()' --debug |
|
2233 | 2268 | changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
|
2234 | 2269 | phase: draft |
|
2235 | 2270 | parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 |
|
2236 | 2271 | parent: -1:0000000000000000000000000000000000000000 |
|
2237 | 2272 | manifest: 2147483647:ffffffffffffffffffffffffffffffffffffffff |
|
2238 | 2273 | user: test |
|
2239 | 2274 | date: [A-Za-z0-9:+ ]+ (re) |
|
2240 | 2275 | files: d1/f1 |
|
2241 | 2276 | files+: d1/f2 |
|
2242 | 2277 | files-: .d6/f1 |
|
2243 | 2278 | extra: branch=default |
|
2244 | 2279 | |
|
2245 | 2280 | $ hg log -r 'wdir()' -p --stat --git |
|
2246 | 2281 | changeset: 2147483647:ffffffffffff |
|
2247 | 2282 | parent: 0:65624cd9070a |
|
2248 | 2283 | user: test |
|
2249 | 2284 | date: [A-Za-z0-9:+ ]+ (re) |
|
2250 | 2285 | |
|
2251 | 2286 | .d6/f1 | 1 - |
|
2252 | 2287 | d1/f1 | 1 + |
|
2253 | 2288 | d1/f2 | 1 + |
|
2254 | 2289 | 3 files changed, 2 insertions(+), 1 deletions(-) |
|
2255 | 2290 | |
|
2256 | 2291 | diff --git a/.d6/f1 b/.d6/f1 |
|
2257 | 2292 | deleted file mode 100644 |
|
2258 | 2293 | --- a/.d6/f1 |
|
2259 | 2294 | +++ /dev/null |
|
2260 | 2295 | @@ -1,1 +0,0 @@ |
|
2261 | 2296 | -1 |
|
2262 | 2297 | diff --git a/d1/f1 b/d1/f1 |
|
2263 | 2298 | --- a/d1/f1 |
|
2264 | 2299 | +++ b/d1/f1 |
|
2265 | 2300 | @@ -1,1 +1,2 @@ |
|
2266 | 2301 | 1 |
|
2267 | 2302 | +2 |
|
2268 | 2303 | diff --git a/d1/f2 b/d1/f2 |
|
2269 | 2304 | new file mode 100644 |
|
2270 | 2305 | --- /dev/null |
|
2271 | 2306 | +++ b/d1/f2 |
|
2272 | 2307 | @@ -0,0 +1,1 @@ |
|
2273 | 2308 | +2 |
|
2274 | 2309 | |
|
2275 | 2310 | $ hg log -r 'wdir()' -Tjson |
|
2276 | 2311 | [ |
|
2277 | 2312 | { |
|
2278 | 2313 | "bookmarks": [], |
|
2279 | 2314 | "branch": "default", |
|
2280 | 2315 | "date": [*, 0], (glob) |
|
2281 | 2316 | "desc": "", |
|
2282 | 2317 | "node": "ffffffffffffffffffffffffffffffffffffffff", |
|
2283 | 2318 | "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"], |
|
2284 | 2319 | "phase": "draft", |
|
2285 | 2320 | "rev": 2147483647, |
|
2286 | 2321 | "tags": [], |
|
2287 | 2322 | "user": "test" |
|
2288 | 2323 | } |
|
2289 | 2324 | ] |
|
2290 | 2325 | |
|
2291 | 2326 | $ hg log -r 'wdir()' -Tjson -q |
|
2292 | 2327 | [ |
|
2293 | 2328 | { |
|
2294 | 2329 | "node": "ffffffffffffffffffffffffffffffffffffffff", |
|
2295 | 2330 | "rev": 2147483647 |
|
2296 | 2331 | } |
|
2297 | 2332 | ] |
|
2298 | 2333 | |
|
2299 | 2334 | $ hg log -r 'wdir()' -Tjson --debug |
|
2300 | 2335 | [ |
|
2301 | 2336 | { |
|
2302 | 2337 | "added": ["d1/f2"], |
|
2303 | 2338 | "bookmarks": [], |
|
2304 | 2339 | "branch": "default", |
|
2305 | 2340 | "date": [*, 0], (glob) |
|
2306 | 2341 | "desc": "", |
|
2307 | 2342 | "extra": {"branch": "default"}, |
|
2308 | 2343 | "manifest": "ffffffffffffffffffffffffffffffffffffffff", |
|
2309 | 2344 | "modified": ["d1/f1"], |
|
2310 | 2345 | "node": "ffffffffffffffffffffffffffffffffffffffff", |
|
2311 | 2346 | "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"], |
|
2312 | 2347 | "phase": "draft", |
|
2313 | 2348 | "removed": [".d6/f1"], |
|
2314 | 2349 | "rev": 2147483647, |
|
2315 | 2350 | "tags": [], |
|
2316 | 2351 | "user": "test" |
|
2317 | 2352 | } |
|
2318 | 2353 | ] |
|
2319 | 2354 | |
|
2320 | 2355 | follow files from wdir |
|
2321 | 2356 | |
|
2322 | 2357 | $ hg cp d1/f1 f1-copy |
|
2323 | 2358 | $ hg stat --all |
|
2324 | 2359 | M d1/f1 |
|
2325 | 2360 | A d1/f2 |
|
2326 | 2361 | A f1-copy |
|
2327 | 2362 | d1/f1 |
|
2328 | 2363 | R .d6/f1 |
|
2329 | 2364 | C D2/f1 |
|
2330 | 2365 | C D3.i/f1 |
|
2331 | 2366 | C d4.hg/f1 |
|
2332 | 2367 | C d5.d/f1 |
|
2333 | 2368 | |
|
2334 | 2369 | $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat d5.d/f1 |
|
2335 | 2370 | == 2147483647 == |
|
2336 | 2371 | |
|
2337 | 2372 | == 0 == |
|
2338 | 2373 | d5.d/f1 | 1 + |
|
2339 | 2374 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
2340 | 2375 | |
|
2341 | 2376 | |
|
2342 | 2377 | $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat d1/f1 |
|
2343 | 2378 | == 2147483647 == |
|
2344 | 2379 | d1/f1 | 1 + |
|
2345 | 2380 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
2346 | 2381 | |
|
2347 | 2382 | == 0 == |
|
2348 | 2383 | d1/f1 | 1 + |
|
2349 | 2384 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
2350 | 2385 | |
|
2351 | 2386 | |
|
2352 | 2387 | $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat d1/f2 |
|
2353 | 2388 | == 2147483647 == |
|
2354 | 2389 | d1/f2 | 1 + |
|
2355 | 2390 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
2356 | 2391 | |
|
2357 | 2392 | |
|
2358 | 2393 | $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat f1-copy |
|
2359 | 2394 | == 2147483647 == |
|
2360 | 2395 | f1-copy | 1 + |
|
2361 | 2396 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
2362 | 2397 | |
|
2363 | 2398 | == 0 == |
|
2364 | 2399 | d1/f1 | 1 + |
|
2365 | 2400 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
2366 | 2401 | |
|
2367 | 2402 | |
|
2368 | 2403 | $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat notfound |
|
2369 | 2404 | abort: cannot follow file not in any of the specified revisions: "notfound" |
|
2370 | 2405 | [255] |
|
2371 | 2406 | |
|
2372 | 2407 | follow files from wdir and non-wdir revision: |
|
2373 | 2408 | |
|
2374 | 2409 | $ hg log -T '{rev}\n' -fr'wdir()+.' f1-copy |
|
2375 | 2410 | f1-copy: no such file in rev 65624cd9070a |
|
2376 | 2411 | 2147483647 |
|
2377 | 2412 | 0 |
|
2378 | 2413 | |
|
2379 | 2414 | follow added/removed files from wdir parent |
|
2380 | 2415 | |
|
2381 | 2416 | $ hg log -T '{rev}\n' -f d1/f2 |
|
2382 | 2417 | abort: cannot follow nonexistent file: "d1/f2" |
|
2383 | 2418 | [255] |
|
2384 | 2419 | |
|
2385 | 2420 | $ hg log -T '{rev}\n' -f f1-copy |
|
2386 | 2421 | abort: cannot follow nonexistent file: "f1-copy" |
|
2387 | 2422 | [255] |
|
2388 | 2423 | |
|
2389 | 2424 | $ hg log -T '{rev}\n' -f .d6/f1 |
|
2390 | 2425 | abort: cannot follow file not in parent revision: ".d6/f1" |
|
2391 | 2426 | [255] |
|
2392 | 2427 | |
|
2393 | 2428 | $ hg revert -aqC |
|
2394 | 2429 | |
|
2395 | 2430 | Check that adding an arbitrary name shows up in log automatically |
|
2396 | 2431 | |
|
2397 | 2432 | $ cat > ../names.py <<EOF |
|
2398 | 2433 | > """A small extension to test adding arbitrary names to a repo""" |
|
2399 | 2434 | > from __future__ import absolute_import |
|
2400 | 2435 | > from mercurial import namespaces |
|
2401 | 2436 | > |
|
2402 | 2437 | > def reposetup(ui, repo): |
|
2403 | 2438 | > if not repo.local(): |
|
2404 | 2439 | > return |
|
2405 | 2440 | > foo = {b'foo': repo[0].node()} |
|
2406 | 2441 | > names = lambda r: foo.keys() |
|
2407 | 2442 | > namemap = lambda r, name: foo.get(name) |
|
2408 | 2443 | > nodemap = lambda r, node: [name for name, n in foo.items() |
|
2409 | 2444 | > if n == node] |
|
2410 | 2445 | > ns = namespaces.namespace( |
|
2411 | 2446 | > b"bars", templatename=b"bar", logname=b"barlog", |
|
2412 | 2447 | > colorname=b"barcolor", listnames=names, namemap=namemap, |
|
2413 | 2448 | > nodemap=nodemap) |
|
2414 | 2449 | > |
|
2415 | 2450 | > repo.names.addnamespace(ns) |
|
2416 | 2451 | > EOF |
|
2417 | 2452 | |
|
2418 | 2453 | $ hg --config extensions.names=../names.py log -r 0 |
|
2419 | 2454 | changeset: 0:65624cd9070a |
|
2420 | 2455 | tag: tip |
|
2421 | 2456 | barlog: foo |
|
2422 | 2457 | user: test |
|
2423 | 2458 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2424 | 2459 | summary: a bunch of weird directories |
|
2425 | 2460 | |
|
2426 | 2461 | $ hg --config extensions.names=../names.py \ |
|
2427 | 2462 | > --config extensions.color= --config color.log.barcolor=red \ |
|
2428 | 2463 | > --color=always log -r 0 |
|
2429 | 2464 | \x1b[0;33mchangeset: 0:65624cd9070a\x1b[0m (esc) |
|
2430 | 2465 | tag: tip |
|
2431 | 2466 | \x1b[0;31mbarlog: foo\x1b[0m (esc) |
|
2432 | 2467 | user: test |
|
2433 | 2468 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2434 | 2469 | summary: a bunch of weird directories |
|
2435 | 2470 | |
|
2436 | 2471 | $ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n' |
|
2437 | 2472 | foo |
|
2438 | 2473 | |
|
2439 | 2474 | Templater parse errors: |
|
2440 | 2475 | |
|
2441 | 2476 | simple error |
|
2442 | 2477 | $ hg log -r . -T '{shortest(node}' |
|
2443 | 2478 | hg: parse error at 14: unexpected token: end |
|
2444 | 2479 | ({shortest(node} |
|
2445 | 2480 | ^ here) |
|
2446 | 2481 | [10] |
|
2447 | 2482 | |
|
2448 | 2483 | multi-line template with error |
|
2449 | 2484 | $ hg log -r . -T 'line 1 |
|
2450 | 2485 | > line2 |
|
2451 | 2486 | > {shortest(node} |
|
2452 | 2487 | > line4\nline5' |
|
2453 | 2488 | hg: parse error at 27: unexpected token: end |
|
2454 | 2489 | (line 1\nline2\n{shortest(node}\nline4\nline5 |
|
2455 | 2490 | ^ here) |
|
2456 | 2491 | [10] |
|
2457 | 2492 | |
|
2458 | 2493 | $ cd .. |
|
2459 | 2494 | |
|
2460 | 2495 | New namespace is registered per repo instance, but the template keyword |
|
2461 | 2496 | is global. So we shouldn't expect the namespace always exists. Using |
|
2462 | 2497 | ssh:// makes sure a bundle repository is created from scratch. (issue6301) |
|
2463 | 2498 | |
|
2464 | 2499 | $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" \ |
|
2465 | 2500 | > -qr0 "ssh://user@dummy/`pwd`/a" a-clone |
|
2466 | 2501 | $ hg incoming --config extensions.names=names.py -R a-clone \ |
|
2467 | 2502 | > -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -T '{bars}\n' -l1 |
|
2468 | 2503 | comparing with ssh://user@dummy/$TESTTMP/a |
|
2469 | 2504 | searching for changes |
|
2470 | 2505 | |
|
2471 | 2506 | |
|
2472 | 2507 | hg log -f dir across branches |
|
2473 | 2508 | |
|
2474 | 2509 | $ hg init acrossbranches |
|
2475 | 2510 | $ cd acrossbranches |
|
2476 | 2511 | $ mkdir d |
|
2477 | 2512 | $ echo a > d/a && hg ci -Aqm a |
|
2478 | 2513 | $ echo b > d/a && hg ci -Aqm b |
|
2479 | 2514 | $ hg up -q 0 |
|
2480 | 2515 | $ echo b > d/a && hg ci -Aqm c |
|
2481 | 2516 | $ hg log -f d -T '{desc}' -G |
|
2482 | 2517 | @ c |
|
2483 | 2518 | | |
|
2484 | 2519 | o a |
|
2485 | 2520 | |
|
2486 | 2521 | Ensure that largefiles doesn't interfere with following a normal file |
|
2487 | 2522 | $ hg --config extensions.largefiles= log -f d -T '{desc}' -G |
|
2488 | 2523 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
|
2489 | 2524 | @ c |
|
2490 | 2525 | | |
|
2491 | 2526 | o a |
|
2492 | 2527 | |
|
2493 | 2528 | $ hg log -f d/a -T '{desc}' -G |
|
2494 | 2529 | @ c |
|
2495 | 2530 | | |
|
2496 | 2531 | o a |
|
2497 | 2532 | |
|
2498 | 2533 | $ cd .. |
|
2499 | 2534 | |
|
2500 | 2535 | hg log -f with linkrev pointing to another branch |
|
2501 | 2536 | ------------------------------------------------- |
|
2502 | 2537 | |
|
2503 | 2538 | create history with a filerev whose linkrev points to another branch |
|
2504 | 2539 | |
|
2505 | 2540 | $ hg init branchedlinkrev |
|
2506 | 2541 | $ cd branchedlinkrev |
|
2507 | 2542 | $ echo 1 > a |
|
2508 | 2543 | $ hg commit -Am 'content1' |
|
2509 | 2544 | adding a |
|
2510 | 2545 | $ echo 2 > a |
|
2511 | 2546 | $ hg commit -m 'content2' |
|
2512 | 2547 | $ hg up --rev 'desc(content1)' |
|
2513 | 2548 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2514 | 2549 | $ echo unrelated > unrelated |
|
2515 | 2550 | $ hg commit -Am 'unrelated' |
|
2516 | 2551 | adding unrelated |
|
2517 | 2552 | created new head |
|
2518 | 2553 | $ hg graft -r 'desc(content2)' |
|
2519 | 2554 | grafting 1:2294ae80ad84 "content2" |
|
2520 | 2555 | $ echo 3 > a |
|
2521 | 2556 | $ hg commit -m 'content3' |
|
2522 | 2557 | $ hg log -G |
|
2523 | 2558 | @ changeset: 4:50b9b36e9c5d |
|
2524 | 2559 | | tag: tip |
|
2525 | 2560 | | user: test |
|
2526 | 2561 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2527 | 2562 | | summary: content3 |
|
2528 | 2563 | | |
|
2529 | 2564 | o changeset: 3:15b2327059e5 |
|
2530 | 2565 | | user: test |
|
2531 | 2566 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2532 | 2567 | | summary: content2 |
|
2533 | 2568 | | |
|
2534 | 2569 | o changeset: 2:2029acd1168c |
|
2535 | 2570 | | parent: 0:ae0a3c9f9e95 |
|
2536 | 2571 | | user: test |
|
2537 | 2572 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2538 | 2573 | | summary: unrelated |
|
2539 | 2574 | | |
|
2540 | 2575 | | o changeset: 1:2294ae80ad84 |
|
2541 | 2576 | |/ user: test |
|
2542 | 2577 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2543 | 2578 | | summary: content2 |
|
2544 | 2579 | | |
|
2545 | 2580 | o changeset: 0:ae0a3c9f9e95 |
|
2546 | 2581 | user: test |
|
2547 | 2582 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2548 | 2583 | summary: content1 |
|
2549 | 2584 | |
|
2550 | 2585 | |
|
2551 | 2586 | log -f on the file should list the graft result. |
|
2552 | 2587 | |
|
2553 | 2588 | $ hg log -Gf a |
|
2554 | 2589 | @ changeset: 4:50b9b36e9c5d |
|
2555 | 2590 | | tag: tip |
|
2556 | 2591 | | user: test |
|
2557 | 2592 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2558 | 2593 | | summary: content3 |
|
2559 | 2594 | | |
|
2560 | 2595 | o changeset: 3:15b2327059e5 |
|
2561 | 2596 | : user: test |
|
2562 | 2597 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2563 | 2598 | : summary: content2 |
|
2564 | 2599 | : |
|
2565 | 2600 | o changeset: 0:ae0a3c9f9e95 |
|
2566 | 2601 | user: test |
|
2567 | 2602 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2568 | 2603 | summary: content1 |
|
2569 | 2604 | |
|
2570 | 2605 | |
|
2571 | 2606 | plain log lists the original version |
|
2572 | 2607 | (XXX we should probably list both) |
|
2573 | 2608 | |
|
2574 | 2609 | $ hg log -G a |
|
2575 | 2610 | @ changeset: 4:50b9b36e9c5d |
|
2576 | 2611 | : tag: tip |
|
2577 | 2612 | : user: test |
|
2578 | 2613 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2579 | 2614 | : summary: content3 |
|
2580 | 2615 | : |
|
2581 | 2616 | : o changeset: 1:2294ae80ad84 |
|
2582 | 2617 | :/ user: test |
|
2583 | 2618 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2584 | 2619 | : summary: content2 |
|
2585 | 2620 | : |
|
2586 | 2621 | o changeset: 0:ae0a3c9f9e95 |
|
2587 | 2622 | user: test |
|
2588 | 2623 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2589 | 2624 | summary: content1 |
|
2590 | 2625 | |
|
2591 | 2626 | |
|
2592 | 2627 | hg log -f from the grafted changeset |
|
2593 | 2628 | (The bootstrap should properly take the topology in account) |
|
2594 | 2629 | |
|
2595 | 2630 | $ hg up 'desc(content3)^' |
|
2596 | 2631 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2597 | 2632 | $ hg log -Gf a |
|
2598 | 2633 | @ changeset: 3:15b2327059e5 |
|
2599 | 2634 | : user: test |
|
2600 | 2635 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2601 | 2636 | : summary: content2 |
|
2602 | 2637 | : |
|
2603 | 2638 | o changeset: 0:ae0a3c9f9e95 |
|
2604 | 2639 | user: test |
|
2605 | 2640 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2606 | 2641 | summary: content1 |
|
2607 | 2642 | |
|
2608 | 2643 | |
|
2609 | 2644 | Test that we use the first non-hidden changeset in that case. |
|
2610 | 2645 | |
|
2611 | 2646 | (hide the changeset) |
|
2612 | 2647 | |
|
2613 | 2648 | $ hg log -T '{node}\n' -r 1 |
|
2614 | 2649 | 2294ae80ad8447bc78383182eeac50cb049df623 |
|
2615 | 2650 | $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623 |
|
2616 | 2651 | 1 new obsolescence markers |
|
2617 | 2652 | obsoleted 1 changesets |
|
2618 | 2653 | $ hg log -G |
|
2619 | 2654 | o changeset: 4:50b9b36e9c5d |
|
2620 | 2655 | | tag: tip |
|
2621 | 2656 | | user: test |
|
2622 | 2657 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2623 | 2658 | | summary: content3 |
|
2624 | 2659 | | |
|
2625 | 2660 | @ changeset: 3:15b2327059e5 |
|
2626 | 2661 | | user: test |
|
2627 | 2662 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2628 | 2663 | | summary: content2 |
|
2629 | 2664 | | |
|
2630 | 2665 | o changeset: 2:2029acd1168c |
|
2631 | 2666 | | parent: 0:ae0a3c9f9e95 |
|
2632 | 2667 | | user: test |
|
2633 | 2668 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2634 | 2669 | | summary: unrelated |
|
2635 | 2670 | | |
|
2636 | 2671 | o changeset: 0:ae0a3c9f9e95 |
|
2637 | 2672 | user: test |
|
2638 | 2673 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2639 | 2674 | summary: content1 |
|
2640 | 2675 | |
|
2641 | 2676 | |
|
2642 | 2677 | Check that log on the file does not drop the file revision. |
|
2643 | 2678 | |
|
2644 | 2679 | $ hg log -G a |
|
2645 | 2680 | o changeset: 4:50b9b36e9c5d |
|
2646 | 2681 | | tag: tip |
|
2647 | 2682 | | user: test |
|
2648 | 2683 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2649 | 2684 | | summary: content3 |
|
2650 | 2685 | | |
|
2651 | 2686 | @ changeset: 3:15b2327059e5 |
|
2652 | 2687 | : user: test |
|
2653 | 2688 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2654 | 2689 | : summary: content2 |
|
2655 | 2690 | : |
|
2656 | 2691 | o changeset: 0:ae0a3c9f9e95 |
|
2657 | 2692 | user: test |
|
2658 | 2693 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2659 | 2694 | summary: content1 |
|
2660 | 2695 | |
|
2661 | 2696 | |
|
2662 | 2697 | Even when a head revision is linkrev-shadowed. |
|
2663 | 2698 | |
|
2664 | 2699 | $ hg log -T '{node}\n' -r 4 |
|
2665 | 2700 | 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
|
2666 | 2701 | $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2 |
|
2667 | 2702 | 1 new obsolescence markers |
|
2668 | 2703 | obsoleted 1 changesets |
|
2669 | 2704 | $ hg log -G a |
|
2670 | 2705 | @ changeset: 3:15b2327059e5 |
|
2671 | 2706 | : tag: tip |
|
2672 | 2707 | : user: test |
|
2673 | 2708 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
2674 | 2709 | : summary: content2 |
|
2675 | 2710 | : |
|
2676 | 2711 | o changeset: 0:ae0a3c9f9e95 |
|
2677 | 2712 | user: test |
|
2678 | 2713 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2679 | 2714 | summary: content1 |
|
2680 | 2715 | |
|
2681 | 2716 | |
|
2682 | 2717 | $ cd .. |
|
2683 | 2718 | |
|
2684 | 2719 | Even when the file revision is missing from some head: |
|
2685 | 2720 | |
|
2686 | 2721 | $ hg init issue4490 |
|
2687 | 2722 | $ cd issue4490 |
|
2688 | 2723 | $ echo '[experimental]' >> .hg/hgrc |
|
2689 | 2724 | $ echo 'evolution.createmarkers=True' >> .hg/hgrc |
|
2690 | 2725 | $ echo a > a |
|
2691 | 2726 | $ hg ci -Am0 |
|
2692 | 2727 | adding a |
|
2693 | 2728 | $ echo b > b |
|
2694 | 2729 | $ hg ci -Am1 |
|
2695 | 2730 | adding b |
|
2696 | 2731 | $ echo B > b |
|
2697 | 2732 | $ hg ci --amend -m 1 |
|
2698 | 2733 | $ hg up 0 |
|
2699 | 2734 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2700 | 2735 | $ echo c > c |
|
2701 | 2736 | $ hg ci -Am2 |
|
2702 | 2737 | adding c |
|
2703 | 2738 | created new head |
|
2704 | 2739 | $ hg up 'head() and not .' |
|
2705 | 2740 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2706 | 2741 | $ hg log -G |
|
2707 | 2742 | o changeset: 3:db815d6d32e6 |
|
2708 | 2743 | | tag: tip |
|
2709 | 2744 | | parent: 0:f7b1eb17ad24 |
|
2710 | 2745 | | user: test |
|
2711 | 2746 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2712 | 2747 | | summary: 2 |
|
2713 | 2748 | | |
|
2714 | 2749 | | @ changeset: 2:9bc8ce7f9356 |
|
2715 | 2750 | |/ parent: 0:f7b1eb17ad24 |
|
2716 | 2751 | | user: test |
|
2717 | 2752 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2718 | 2753 | | summary: 1 |
|
2719 | 2754 | | |
|
2720 | 2755 | o changeset: 0:f7b1eb17ad24 |
|
2721 | 2756 | user: test |
|
2722 | 2757 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2723 | 2758 | summary: 0 |
|
2724 | 2759 | |
|
2725 | 2760 | $ hg log -f -G b |
|
2726 | 2761 | @ changeset: 2:9bc8ce7f9356 |
|
2727 | 2762 | | parent: 0:f7b1eb17ad24 |
|
2728 | 2763 | ~ user: test |
|
2729 | 2764 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2730 | 2765 | summary: 1 |
|
2731 | 2766 | |
|
2732 | 2767 | $ hg log -G b |
|
2733 | 2768 | @ changeset: 2:9bc8ce7f9356 |
|
2734 | 2769 | | parent: 0:f7b1eb17ad24 |
|
2735 | 2770 | ~ user: test |
|
2736 | 2771 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2737 | 2772 | summary: 1 |
|
2738 | 2773 | |
|
2739 | 2774 | $ cd .. |
|
2740 | 2775 | |
|
2741 | 2776 | Check proper report when the manifest changes but not the file issue4499 |
|
2742 | 2777 | ------------------------------------------------------------------------ |
|
2743 | 2778 | |
|
2744 | 2779 | $ hg init issue4499 |
|
2745 | 2780 | $ cd issue4499 |
|
2746 | 2781 | $ for f in A B C D F E G H I J K L M N O P Q R S T U; do |
|
2747 | 2782 | > echo 1 > $f; |
|
2748 | 2783 | > hg add $f; |
|
2749 | 2784 | > done |
|
2750 | 2785 | $ hg commit -m 'A1B1C1' |
|
2751 | 2786 | $ echo 2 > A |
|
2752 | 2787 | $ echo 2 > B |
|
2753 | 2788 | $ echo 2 > C |
|
2754 | 2789 | $ hg commit -m 'A2B2C2' |
|
2755 | 2790 | $ hg up 0 |
|
2756 | 2791 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2757 | 2792 | $ echo 3 > A |
|
2758 | 2793 | $ echo 2 > B |
|
2759 | 2794 | $ echo 2 > C |
|
2760 | 2795 | $ hg commit -m 'A3B2C2' |
|
2761 | 2796 | created new head |
|
2762 | 2797 | |
|
2763 | 2798 | $ hg log -G |
|
2764 | 2799 | @ changeset: 2:fe5fc3d0eb17 |
|
2765 | 2800 | | tag: tip |
|
2766 | 2801 | | parent: 0:abf4f0e38563 |
|
2767 | 2802 | | user: test |
|
2768 | 2803 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2769 | 2804 | | summary: A3B2C2 |
|
2770 | 2805 | | |
|
2771 | 2806 | | o changeset: 1:07dcc6b312c0 |
|
2772 | 2807 | |/ user: test |
|
2773 | 2808 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2774 | 2809 | | summary: A2B2C2 |
|
2775 | 2810 | | |
|
2776 | 2811 | o changeset: 0:abf4f0e38563 |
|
2777 | 2812 | user: test |
|
2778 | 2813 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2779 | 2814 | summary: A1B1C1 |
|
2780 | 2815 | |
|
2781 | 2816 | |
|
2782 | 2817 | Log -f on B should reports current changesets |
|
2783 | 2818 | |
|
2784 | 2819 | $ hg log -fG B |
|
2785 | 2820 | @ changeset: 2:fe5fc3d0eb17 |
|
2786 | 2821 | | tag: tip |
|
2787 | 2822 | | parent: 0:abf4f0e38563 |
|
2788 | 2823 | | user: test |
|
2789 | 2824 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2790 | 2825 | | summary: A3B2C2 |
|
2791 | 2826 | | |
|
2792 | 2827 | o changeset: 0:abf4f0e38563 |
|
2793 | 2828 | user: test |
|
2794 | 2829 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2795 | 2830 | summary: A1B1C1 |
|
2796 | 2831 | |
|
2797 | 2832 | $ cd .. |
|
2798 | 2833 | |
|
2799 | 2834 | --- going to test line wrap fix on using both --stat and -G (issue5800) |
|
2800 | 2835 | $ hg init issue5800 |
|
2801 | 2836 | $ cd issue5800 |
|
2802 | 2837 | $ touch a |
|
2803 | 2838 | $ hg ci -Am 'add a' |
|
2804 | 2839 | adding a |
|
2805 | 2840 | ---- now we are going to add 300 lines to a |
|
2806 | 2841 | $ for i in `$TESTDIR/seq.py 1 300`; do echo $i >> a; done |
|
2807 | 2842 | $ hg ci -m 'modify a' |
|
2808 | 2843 | $ hg log |
|
2809 | 2844 | changeset: 1:a98683e6a834 |
|
2810 | 2845 | tag: tip |
|
2811 | 2846 | user: test |
|
2812 | 2847 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2813 | 2848 | summary: modify a |
|
2814 | 2849 | |
|
2815 | 2850 | changeset: 0:ac82d8b1f7c4 |
|
2816 | 2851 | user: test |
|
2817 | 2852 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2818 | 2853 | summary: add a |
|
2819 | 2854 | |
|
2820 | 2855 | ---- now visualise the changes we made without template |
|
2821 | 2856 | $ hg log -l1 -r a98683e6a834 --stat -G |
|
2822 | 2857 | @ changeset: 1:a98683e6a834 |
|
2823 | 2858 | | tag: tip |
|
2824 | 2859 | ~ user: test |
|
2825 | 2860 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2826 | 2861 | summary: modify a |
|
2827 | 2862 | |
|
2828 | 2863 | a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
|
2829 | 2864 | 1 files changed, 300 insertions(+), 0 deletions(-) |
|
2830 | 2865 | |
|
2831 | 2866 | ---- with template |
|
2832 | 2867 | $ hg log -l1 -r a98683e6a834 --stat -G -T bisect |
|
2833 | 2868 | @ changeset: 1:a98683e6a834 |
|
2834 | 2869 | | bisect: |
|
2835 | 2870 | ~ tag: tip |
|
2836 | 2871 | user: test |
|
2837 | 2872 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2838 | 2873 | summary: modify a |
|
2839 | 2874 | |
|
2840 | 2875 | a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
|
2841 | 2876 | 1 files changed, 300 insertions(+), 0 deletions(-) |
|
2842 | 2877 | |
|
2843 | 2878 | $ hg log -l1 -r a98683e6a834 --stat -G -T changelog |
|
2844 | 2879 | 1970-01-01 test <test> |
|
2845 | 2880 | |
|
2846 | 2881 | @ * a: |
|
2847 | 2882 | | modify a |
|
2848 | 2883 | ~ [a98683e6a834] [tip] |
|
2849 | 2884 | |
|
2850 | 2885 | a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
|
2851 | 2886 | 1 files changed, 300 insertions(+), 0 deletions(-) |
|
2852 | 2887 | |
|
2853 | 2888 | $ hg log -l1 -r a98683e6a834 --stat -G -T compact |
|
2854 | 2889 | @ 1[tip] a98683e6a834 1970-01-01 00:00 +0000 test |
|
2855 | 2890 | | modify a |
|
2856 | 2891 | ~ |
|
2857 | 2892 | a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
|
2858 | 2893 | 1 files changed, 300 insertions(+), 0 deletions(-) |
|
2859 | 2894 | |
|
2860 | 2895 | $ hg log -l1 -r a98683e6a834 --stat -G -T default |
|
2861 | 2896 | @ changeset: 1:a98683e6a834 |
|
2862 | 2897 | | tag: tip |
|
2863 | 2898 | ~ user: test |
|
2864 | 2899 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2865 | 2900 | summary: modify a |
|
2866 | 2901 | |
|
2867 | 2902 | a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
|
2868 | 2903 | 1 files changed, 300 insertions(+), 0 deletions(-) |
|
2869 | 2904 | |
|
2870 | 2905 | $ hg log -l1 -r a98683e6a834 --stat -G -T phases |
|
2871 | 2906 | @ changeset: 1:a98683e6a834 |
|
2872 | 2907 | | tag: tip |
|
2873 | 2908 | ~ phase: draft |
|
2874 | 2909 | user: test |
|
2875 | 2910 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2876 | 2911 | summary: modify a |
|
2877 | 2912 | |
|
2878 | 2913 | a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
|
2879 | 2914 | 1 files changed, 300 insertions(+), 0 deletions(-) |
|
2880 | 2915 | |
|
2881 | 2916 | $ hg log -l1 -r a98683e6a834 --stat -G -T show |
|
2882 | 2917 | @ changeset: 1:a98683e6a834 |
|
2883 | 2918 | | tag: tip |
|
2884 | 2919 | ~ user: test |
|
2885 | 2920 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2886 | 2921 | summary: modify a |
|
2887 | 2922 | |
|
2888 | 2923 | a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
|
2889 | 2924 | 1 files changed, 300 insertions(+), 0 deletions(-) |
|
2890 | 2925 | |
|
2891 | 2926 | $ hg log -l1 -r a98683e6a834 --stat -G -T status |
|
2892 | 2927 | @ changeset: 1:a98683e6a834 |
|
2893 | 2928 | | tag: tip |
|
2894 | 2929 | ~ user: test |
|
2895 | 2930 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2896 | 2931 | summary: modify a |
|
2897 | 2932 | files: |
|
2898 | 2933 | M a |
|
2899 | 2934 | |
|
2900 | 2935 | a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
|
2901 | 2936 | 1 files changed, 300 insertions(+), 0 deletions(-) |
|
2902 | 2937 | |
|
2903 | 2938 | $ hg log -l1 -r a98683e6a834 --stat -G -T xml |
|
2904 | 2939 | <?xml version="1.0"?> |
|
2905 | 2940 | <log> |
|
2906 | 2941 | @ <logentry revision="1" node="a98683e6a8340830a7683909768b62871e84bc9d"> |
|
2907 | 2942 | | <tag>tip</tag> |
|
2908 | 2943 | ~ <author email="test">test</author> |
|
2909 | 2944 | <date>1970-01-01T00:00:00+00:00</date> |
|
2910 | 2945 | <msg xml:space="preserve">modify a</msg> |
|
2911 | 2946 | </logentry> |
|
2912 | 2947 | a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
|
2913 | 2948 | 1 files changed, 300 insertions(+), 0 deletions(-) |
|
2914 | 2949 | |
|
2915 | 2950 | </log> |
|
2916 | 2951 | |
|
2917 | 2952 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now