##// END OF EJS Templates
log: fix handling of root (or empty) path provided by matcher (issue6478)...
Yuya Nishihara -
r47352:9842c00f stable
parent child Browse files
Show More
@@ -1,3689 +1,3689 b''
1 # localrepo.py - read/write repository class for mercurial
1 # localrepo.py - read/write repository class for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import errno
10 import errno
11 import functools
11 import functools
12 import os
12 import os
13 import random
13 import random
14 import sys
14 import sys
15 import time
15 import time
16 import weakref
16 import weakref
17
17
18 from .i18n import _
18 from .i18n import _
19 from .node import (
19 from .node import (
20 bin,
20 bin,
21 hex,
21 hex,
22 nullid,
22 nullid,
23 nullrev,
23 nullrev,
24 short,
24 short,
25 )
25 )
26 from .pycompat import (
26 from .pycompat import (
27 delattr,
27 delattr,
28 getattr,
28 getattr,
29 )
29 )
30 from . import (
30 from . import (
31 bookmarks,
31 bookmarks,
32 branchmap,
32 branchmap,
33 bundle2,
33 bundle2,
34 bundlecaches,
34 bundlecaches,
35 changegroup,
35 changegroup,
36 color,
36 color,
37 commit,
37 commit,
38 context,
38 context,
39 dirstate,
39 dirstate,
40 dirstateguard,
40 dirstateguard,
41 discovery,
41 discovery,
42 encoding,
42 encoding,
43 error,
43 error,
44 exchange,
44 exchange,
45 extensions,
45 extensions,
46 filelog,
46 filelog,
47 hook,
47 hook,
48 lock as lockmod,
48 lock as lockmod,
49 match as matchmod,
49 match as matchmod,
50 mergestate as mergestatemod,
50 mergestate as mergestatemod,
51 mergeutil,
51 mergeutil,
52 namespaces,
52 namespaces,
53 narrowspec,
53 narrowspec,
54 obsolete,
54 obsolete,
55 pathutil,
55 pathutil,
56 phases,
56 phases,
57 pushkey,
57 pushkey,
58 pycompat,
58 pycompat,
59 rcutil,
59 rcutil,
60 repoview,
60 repoview,
61 requirements as requirementsmod,
61 requirements as requirementsmod,
62 revlog,
62 revlog,
63 revset,
63 revset,
64 revsetlang,
64 revsetlang,
65 scmutil,
65 scmutil,
66 sparse,
66 sparse,
67 store as storemod,
67 store as storemod,
68 subrepoutil,
68 subrepoutil,
69 tags as tagsmod,
69 tags as tagsmod,
70 transaction,
70 transaction,
71 txnutil,
71 txnutil,
72 util,
72 util,
73 vfs as vfsmod,
73 vfs as vfsmod,
74 )
74 )
75
75
76 from .interfaces import (
76 from .interfaces import (
77 repository,
77 repository,
78 util as interfaceutil,
78 util as interfaceutil,
79 )
79 )
80
80
81 from .utils import (
81 from .utils import (
82 hashutil,
82 hashutil,
83 procutil,
83 procutil,
84 stringutil,
84 stringutil,
85 )
85 )
86
86
87 from .revlogutils import constants as revlogconst
87 from .revlogutils import constants as revlogconst
88
88
89 release = lockmod.release
89 release = lockmod.release
90 urlerr = util.urlerr
90 urlerr = util.urlerr
91 urlreq = util.urlreq
91 urlreq = util.urlreq
92
92
93 # set of (path, vfs-location) tuples. vfs-location is:
93 # set of (path, vfs-location) tuples. vfs-location is:
94 # - 'plain for vfs relative paths
94 # - 'plain for vfs relative paths
95 # - '' for svfs relative paths
95 # - '' for svfs relative paths
96 _cachedfiles = set()
96 _cachedfiles = set()
97
97
98
98
99 class _basefilecache(scmutil.filecache):
99 class _basefilecache(scmutil.filecache):
100 """All filecache usage on repo are done for logic that should be unfiltered"""
100 """All filecache usage on repo are done for logic that should be unfiltered"""
101
101
102 def __get__(self, repo, type=None):
102 def __get__(self, repo, type=None):
103 if repo is None:
103 if repo is None:
104 return self
104 return self
105 # proxy to unfiltered __dict__ since filtered repo has no entry
105 # proxy to unfiltered __dict__ since filtered repo has no entry
106 unfi = repo.unfiltered()
106 unfi = repo.unfiltered()
107 try:
107 try:
108 return unfi.__dict__[self.sname]
108 return unfi.__dict__[self.sname]
109 except KeyError:
109 except KeyError:
110 pass
110 pass
111 return super(_basefilecache, self).__get__(unfi, type)
111 return super(_basefilecache, self).__get__(unfi, type)
112
112
113 def set(self, repo, value):
113 def set(self, repo, value):
114 return super(_basefilecache, self).set(repo.unfiltered(), value)
114 return super(_basefilecache, self).set(repo.unfiltered(), value)
115
115
116
116
117 class repofilecache(_basefilecache):
117 class repofilecache(_basefilecache):
118 """filecache for files in .hg but outside of .hg/store"""
118 """filecache for files in .hg but outside of .hg/store"""
119
119
120 def __init__(self, *paths):
120 def __init__(self, *paths):
121 super(repofilecache, self).__init__(*paths)
121 super(repofilecache, self).__init__(*paths)
122 for path in paths:
122 for path in paths:
123 _cachedfiles.add((path, b'plain'))
123 _cachedfiles.add((path, b'plain'))
124
124
125 def join(self, obj, fname):
125 def join(self, obj, fname):
126 return obj.vfs.join(fname)
126 return obj.vfs.join(fname)
127
127
128
128
129 class storecache(_basefilecache):
129 class storecache(_basefilecache):
130 """filecache for files in the store"""
130 """filecache for files in the store"""
131
131
132 def __init__(self, *paths):
132 def __init__(self, *paths):
133 super(storecache, self).__init__(*paths)
133 super(storecache, self).__init__(*paths)
134 for path in paths:
134 for path in paths:
135 _cachedfiles.add((path, b''))
135 _cachedfiles.add((path, b''))
136
136
137 def join(self, obj, fname):
137 def join(self, obj, fname):
138 return obj.sjoin(fname)
138 return obj.sjoin(fname)
139
139
140
140
141 class mixedrepostorecache(_basefilecache):
141 class mixedrepostorecache(_basefilecache):
142 """filecache for a mix files in .hg/store and outside"""
142 """filecache for a mix files in .hg/store and outside"""
143
143
144 def __init__(self, *pathsandlocations):
144 def __init__(self, *pathsandlocations):
145 # scmutil.filecache only uses the path for passing back into our
145 # scmutil.filecache only uses the path for passing back into our
146 # join(), so we can safely pass a list of paths and locations
146 # join(), so we can safely pass a list of paths and locations
147 super(mixedrepostorecache, self).__init__(*pathsandlocations)
147 super(mixedrepostorecache, self).__init__(*pathsandlocations)
148 _cachedfiles.update(pathsandlocations)
148 _cachedfiles.update(pathsandlocations)
149
149
150 def join(self, obj, fnameandlocation):
150 def join(self, obj, fnameandlocation):
151 fname, location = fnameandlocation
151 fname, location = fnameandlocation
152 if location == b'plain':
152 if location == b'plain':
153 return obj.vfs.join(fname)
153 return obj.vfs.join(fname)
154 else:
154 else:
155 if location != b'':
155 if location != b'':
156 raise error.ProgrammingError(
156 raise error.ProgrammingError(
157 b'unexpected location: %s' % location
157 b'unexpected location: %s' % location
158 )
158 )
159 return obj.sjoin(fname)
159 return obj.sjoin(fname)
160
160
161
161
162 def isfilecached(repo, name):
162 def isfilecached(repo, name):
163 """check if a repo has already cached "name" filecache-ed property
163 """check if a repo has already cached "name" filecache-ed property
164
164
165 This returns (cachedobj-or-None, iscached) tuple.
165 This returns (cachedobj-or-None, iscached) tuple.
166 """
166 """
167 cacheentry = repo.unfiltered()._filecache.get(name, None)
167 cacheentry = repo.unfiltered()._filecache.get(name, None)
168 if not cacheentry:
168 if not cacheentry:
169 return None, False
169 return None, False
170 return cacheentry.obj, True
170 return cacheentry.obj, True
171
171
172
172
173 class unfilteredpropertycache(util.propertycache):
173 class unfilteredpropertycache(util.propertycache):
174 """propertycache that apply to unfiltered repo only"""
174 """propertycache that apply to unfiltered repo only"""
175
175
176 def __get__(self, repo, type=None):
176 def __get__(self, repo, type=None):
177 unfi = repo.unfiltered()
177 unfi = repo.unfiltered()
178 if unfi is repo:
178 if unfi is repo:
179 return super(unfilteredpropertycache, self).__get__(unfi)
179 return super(unfilteredpropertycache, self).__get__(unfi)
180 return getattr(unfi, self.name)
180 return getattr(unfi, self.name)
181
181
182
182
183 class filteredpropertycache(util.propertycache):
183 class filteredpropertycache(util.propertycache):
184 """propertycache that must take filtering in account"""
184 """propertycache that must take filtering in account"""
185
185
186 def cachevalue(self, obj, value):
186 def cachevalue(self, obj, value):
187 object.__setattr__(obj, self.name, value)
187 object.__setattr__(obj, self.name, value)
188
188
189
189
190 def hasunfilteredcache(repo, name):
190 def hasunfilteredcache(repo, name):
191 """check if a repo has an unfilteredpropertycache value for <name>"""
191 """check if a repo has an unfilteredpropertycache value for <name>"""
192 return name in vars(repo.unfiltered())
192 return name in vars(repo.unfiltered())
193
193
194
194
195 def unfilteredmethod(orig):
195 def unfilteredmethod(orig):
196 """decorate method that always need to be run on unfiltered version"""
196 """decorate method that always need to be run on unfiltered version"""
197
197
198 @functools.wraps(orig)
198 @functools.wraps(orig)
199 def wrapper(repo, *args, **kwargs):
199 def wrapper(repo, *args, **kwargs):
200 return orig(repo.unfiltered(), *args, **kwargs)
200 return orig(repo.unfiltered(), *args, **kwargs)
201
201
202 return wrapper
202 return wrapper
203
203
204
204
205 moderncaps = {
205 moderncaps = {
206 b'lookup',
206 b'lookup',
207 b'branchmap',
207 b'branchmap',
208 b'pushkey',
208 b'pushkey',
209 b'known',
209 b'known',
210 b'getbundle',
210 b'getbundle',
211 b'unbundle',
211 b'unbundle',
212 }
212 }
213 legacycaps = moderncaps.union({b'changegroupsubset'})
213 legacycaps = moderncaps.union({b'changegroupsubset'})
214
214
215
215
216 @interfaceutil.implementer(repository.ipeercommandexecutor)
216 @interfaceutil.implementer(repository.ipeercommandexecutor)
217 class localcommandexecutor(object):
217 class localcommandexecutor(object):
218 def __init__(self, peer):
218 def __init__(self, peer):
219 self._peer = peer
219 self._peer = peer
220 self._sent = False
220 self._sent = False
221 self._closed = False
221 self._closed = False
222
222
223 def __enter__(self):
223 def __enter__(self):
224 return self
224 return self
225
225
226 def __exit__(self, exctype, excvalue, exctb):
226 def __exit__(self, exctype, excvalue, exctb):
227 self.close()
227 self.close()
228
228
229 def callcommand(self, command, args):
229 def callcommand(self, command, args):
230 if self._sent:
230 if self._sent:
231 raise error.ProgrammingError(
231 raise error.ProgrammingError(
232 b'callcommand() cannot be used after sendcommands()'
232 b'callcommand() cannot be used after sendcommands()'
233 )
233 )
234
234
235 if self._closed:
235 if self._closed:
236 raise error.ProgrammingError(
236 raise error.ProgrammingError(
237 b'callcommand() cannot be used after close()'
237 b'callcommand() cannot be used after close()'
238 )
238 )
239
239
240 # We don't need to support anything fancy. Just call the named
240 # We don't need to support anything fancy. Just call the named
241 # method on the peer and return a resolved future.
241 # method on the peer and return a resolved future.
242 fn = getattr(self._peer, pycompat.sysstr(command))
242 fn = getattr(self._peer, pycompat.sysstr(command))
243
243
244 f = pycompat.futures.Future()
244 f = pycompat.futures.Future()
245
245
246 try:
246 try:
247 result = fn(**pycompat.strkwargs(args))
247 result = fn(**pycompat.strkwargs(args))
248 except Exception:
248 except Exception:
249 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
249 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
250 else:
250 else:
251 f.set_result(result)
251 f.set_result(result)
252
252
253 return f
253 return f
254
254
255 def sendcommands(self):
255 def sendcommands(self):
256 self._sent = True
256 self._sent = True
257
257
258 def close(self):
258 def close(self):
259 self._closed = True
259 self._closed = True
260
260
261
261
262 @interfaceutil.implementer(repository.ipeercommands)
262 @interfaceutil.implementer(repository.ipeercommands)
263 class localpeer(repository.peer):
263 class localpeer(repository.peer):
264 '''peer for a local repo; reflects only the most recent API'''
264 '''peer for a local repo; reflects only the most recent API'''
265
265
266 def __init__(self, repo, caps=None):
266 def __init__(self, repo, caps=None):
267 super(localpeer, self).__init__()
267 super(localpeer, self).__init__()
268
268
269 if caps is None:
269 if caps is None:
270 caps = moderncaps.copy()
270 caps = moderncaps.copy()
271 self._repo = repo.filtered(b'served')
271 self._repo = repo.filtered(b'served')
272 self.ui = repo.ui
272 self.ui = repo.ui
273 self._caps = repo._restrictcapabilities(caps)
273 self._caps = repo._restrictcapabilities(caps)
274
274
275 # Begin of _basepeer interface.
275 # Begin of _basepeer interface.
276
276
277 def url(self):
277 def url(self):
278 return self._repo.url()
278 return self._repo.url()
279
279
280 def local(self):
280 def local(self):
281 return self._repo
281 return self._repo
282
282
283 def peer(self):
283 def peer(self):
284 return self
284 return self
285
285
286 def canpush(self):
286 def canpush(self):
287 return True
287 return True
288
288
289 def close(self):
289 def close(self):
290 self._repo.close()
290 self._repo.close()
291
291
292 # End of _basepeer interface.
292 # End of _basepeer interface.
293
293
294 # Begin of _basewirecommands interface.
294 # Begin of _basewirecommands interface.
295
295
296 def branchmap(self):
296 def branchmap(self):
297 return self._repo.branchmap()
297 return self._repo.branchmap()
298
298
299 def capabilities(self):
299 def capabilities(self):
300 return self._caps
300 return self._caps
301
301
302 def clonebundles(self):
302 def clonebundles(self):
303 return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE)
303 return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE)
304
304
305 def debugwireargs(self, one, two, three=None, four=None, five=None):
305 def debugwireargs(self, one, two, three=None, four=None, five=None):
306 """Used to test argument passing over the wire"""
306 """Used to test argument passing over the wire"""
307 return b"%s %s %s %s %s" % (
307 return b"%s %s %s %s %s" % (
308 one,
308 one,
309 two,
309 two,
310 pycompat.bytestr(three),
310 pycompat.bytestr(three),
311 pycompat.bytestr(four),
311 pycompat.bytestr(four),
312 pycompat.bytestr(five),
312 pycompat.bytestr(five),
313 )
313 )
314
314
315 def getbundle(
315 def getbundle(
316 self, source, heads=None, common=None, bundlecaps=None, **kwargs
316 self, source, heads=None, common=None, bundlecaps=None, **kwargs
317 ):
317 ):
318 chunks = exchange.getbundlechunks(
318 chunks = exchange.getbundlechunks(
319 self._repo,
319 self._repo,
320 source,
320 source,
321 heads=heads,
321 heads=heads,
322 common=common,
322 common=common,
323 bundlecaps=bundlecaps,
323 bundlecaps=bundlecaps,
324 **kwargs
324 **kwargs
325 )[1]
325 )[1]
326 cb = util.chunkbuffer(chunks)
326 cb = util.chunkbuffer(chunks)
327
327
328 if exchange.bundle2requested(bundlecaps):
328 if exchange.bundle2requested(bundlecaps):
329 # When requesting a bundle2, getbundle returns a stream to make the
329 # When requesting a bundle2, getbundle returns a stream to make the
330 # wire level function happier. We need to build a proper object
330 # wire level function happier. We need to build a proper object
331 # from it in local peer.
331 # from it in local peer.
332 return bundle2.getunbundler(self.ui, cb)
332 return bundle2.getunbundler(self.ui, cb)
333 else:
333 else:
334 return changegroup.getunbundler(b'01', cb, None)
334 return changegroup.getunbundler(b'01', cb, None)
335
335
336 def heads(self):
336 def heads(self):
337 return self._repo.heads()
337 return self._repo.heads()
338
338
339 def known(self, nodes):
339 def known(self, nodes):
340 return self._repo.known(nodes)
340 return self._repo.known(nodes)
341
341
342 def listkeys(self, namespace):
342 def listkeys(self, namespace):
343 return self._repo.listkeys(namespace)
343 return self._repo.listkeys(namespace)
344
344
345 def lookup(self, key):
345 def lookup(self, key):
346 return self._repo.lookup(key)
346 return self._repo.lookup(key)
347
347
348 def pushkey(self, namespace, key, old, new):
348 def pushkey(self, namespace, key, old, new):
349 return self._repo.pushkey(namespace, key, old, new)
349 return self._repo.pushkey(namespace, key, old, new)
350
350
351 def stream_out(self):
351 def stream_out(self):
352 raise error.Abort(_(b'cannot perform stream clone against local peer'))
352 raise error.Abort(_(b'cannot perform stream clone against local peer'))
353
353
354 def unbundle(self, bundle, heads, url):
354 def unbundle(self, bundle, heads, url):
355 """apply a bundle on a repo
355 """apply a bundle on a repo
356
356
357 This function handles the repo locking itself."""
357 This function handles the repo locking itself."""
358 try:
358 try:
359 try:
359 try:
360 bundle = exchange.readbundle(self.ui, bundle, None)
360 bundle = exchange.readbundle(self.ui, bundle, None)
361 ret = exchange.unbundle(self._repo, bundle, heads, b'push', url)
361 ret = exchange.unbundle(self._repo, bundle, heads, b'push', url)
362 if util.safehasattr(ret, b'getchunks'):
362 if util.safehasattr(ret, b'getchunks'):
363 # This is a bundle20 object, turn it into an unbundler.
363 # This is a bundle20 object, turn it into an unbundler.
364 # This little dance should be dropped eventually when the
364 # This little dance should be dropped eventually when the
365 # API is finally improved.
365 # API is finally improved.
366 stream = util.chunkbuffer(ret.getchunks())
366 stream = util.chunkbuffer(ret.getchunks())
367 ret = bundle2.getunbundler(self.ui, stream)
367 ret = bundle2.getunbundler(self.ui, stream)
368 return ret
368 return ret
369 except Exception as exc:
369 except Exception as exc:
370 # If the exception contains output salvaged from a bundle2
370 # If the exception contains output salvaged from a bundle2
371 # reply, we need to make sure it is printed before continuing
371 # reply, we need to make sure it is printed before continuing
372 # to fail. So we build a bundle2 with such output and consume
372 # to fail. So we build a bundle2 with such output and consume
373 # it directly.
373 # it directly.
374 #
374 #
375 # This is not very elegant but allows a "simple" solution for
375 # This is not very elegant but allows a "simple" solution for
376 # issue4594
376 # issue4594
377 output = getattr(exc, '_bundle2salvagedoutput', ())
377 output = getattr(exc, '_bundle2salvagedoutput', ())
378 if output:
378 if output:
379 bundler = bundle2.bundle20(self._repo.ui)
379 bundler = bundle2.bundle20(self._repo.ui)
380 for out in output:
380 for out in output:
381 bundler.addpart(out)
381 bundler.addpart(out)
382 stream = util.chunkbuffer(bundler.getchunks())
382 stream = util.chunkbuffer(bundler.getchunks())
383 b = bundle2.getunbundler(self.ui, stream)
383 b = bundle2.getunbundler(self.ui, stream)
384 bundle2.processbundle(self._repo, b)
384 bundle2.processbundle(self._repo, b)
385 raise
385 raise
386 except error.PushRaced as exc:
386 except error.PushRaced as exc:
387 raise error.ResponseError(
387 raise error.ResponseError(
388 _(b'push failed:'), stringutil.forcebytestr(exc)
388 _(b'push failed:'), stringutil.forcebytestr(exc)
389 )
389 )
390
390
391 # End of _basewirecommands interface.
391 # End of _basewirecommands interface.
392
392
393 # Begin of peer interface.
393 # Begin of peer interface.
394
394
395 def commandexecutor(self):
395 def commandexecutor(self):
396 return localcommandexecutor(self)
396 return localcommandexecutor(self)
397
397
398 # End of peer interface.
398 # End of peer interface.
399
399
400
400
401 @interfaceutil.implementer(repository.ipeerlegacycommands)
401 @interfaceutil.implementer(repository.ipeerlegacycommands)
402 class locallegacypeer(localpeer):
402 class locallegacypeer(localpeer):
403 """peer extension which implements legacy methods too; used for tests with
403 """peer extension which implements legacy methods too; used for tests with
404 restricted capabilities"""
404 restricted capabilities"""
405
405
406 def __init__(self, repo):
406 def __init__(self, repo):
407 super(locallegacypeer, self).__init__(repo, caps=legacycaps)
407 super(locallegacypeer, self).__init__(repo, caps=legacycaps)
408
408
409 # Begin of baselegacywirecommands interface.
409 # Begin of baselegacywirecommands interface.
410
410
411 def between(self, pairs):
411 def between(self, pairs):
412 return self._repo.between(pairs)
412 return self._repo.between(pairs)
413
413
414 def branches(self, nodes):
414 def branches(self, nodes):
415 return self._repo.branches(nodes)
415 return self._repo.branches(nodes)
416
416
417 def changegroup(self, nodes, source):
417 def changegroup(self, nodes, source):
418 outgoing = discovery.outgoing(
418 outgoing = discovery.outgoing(
419 self._repo, missingroots=nodes, ancestorsof=self._repo.heads()
419 self._repo, missingroots=nodes, ancestorsof=self._repo.heads()
420 )
420 )
421 return changegroup.makechangegroup(self._repo, outgoing, b'01', source)
421 return changegroup.makechangegroup(self._repo, outgoing, b'01', source)
422
422
423 def changegroupsubset(self, bases, heads, source):
423 def changegroupsubset(self, bases, heads, source):
424 outgoing = discovery.outgoing(
424 outgoing = discovery.outgoing(
425 self._repo, missingroots=bases, ancestorsof=heads
425 self._repo, missingroots=bases, ancestorsof=heads
426 )
426 )
427 return changegroup.makechangegroup(self._repo, outgoing, b'01', source)
427 return changegroup.makechangegroup(self._repo, outgoing, b'01', source)
428
428
429 # End of baselegacywirecommands interface.
429 # End of baselegacywirecommands interface.
430
430
431
431
432 # Functions receiving (ui, features) that extensions can register to impact
432 # Functions receiving (ui, features) that extensions can register to impact
433 # the ability to load repositories with custom requirements. Only
433 # the ability to load repositories with custom requirements. Only
434 # functions defined in loaded extensions are called.
434 # functions defined in loaded extensions are called.
435 #
435 #
436 # The function receives a set of requirement strings that the repository
436 # The function receives a set of requirement strings that the repository
437 # is capable of opening. Functions will typically add elements to the
437 # is capable of opening. Functions will typically add elements to the
438 # set to reflect that the extension knows how to handle that requirements.
438 # set to reflect that the extension knows how to handle that requirements.
439 featuresetupfuncs = set()
439 featuresetupfuncs = set()
440
440
441
441
442 def _getsharedvfs(hgvfs, requirements):
442 def _getsharedvfs(hgvfs, requirements):
443 """returns the vfs object pointing to root of shared source
443 """returns the vfs object pointing to root of shared source
444 repo for a shared repository
444 repo for a shared repository
445
445
446 hgvfs is vfs pointing at .hg/ of current repo (shared one)
446 hgvfs is vfs pointing at .hg/ of current repo (shared one)
447 requirements is a set of requirements of current repo (shared one)
447 requirements is a set of requirements of current repo (shared one)
448 """
448 """
449 # The ``shared`` or ``relshared`` requirements indicate the
449 # The ``shared`` or ``relshared`` requirements indicate the
450 # store lives in the path contained in the ``.hg/sharedpath`` file.
450 # store lives in the path contained in the ``.hg/sharedpath`` file.
451 # This is an absolute path for ``shared`` and relative to
451 # This is an absolute path for ``shared`` and relative to
452 # ``.hg/`` for ``relshared``.
452 # ``.hg/`` for ``relshared``.
453 sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n')
453 sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n')
454 if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements:
454 if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements:
455 sharedpath = hgvfs.join(sharedpath)
455 sharedpath = hgvfs.join(sharedpath)
456
456
457 sharedvfs = vfsmod.vfs(sharedpath, realpath=True)
457 sharedvfs = vfsmod.vfs(sharedpath, realpath=True)
458
458
459 if not sharedvfs.exists():
459 if not sharedvfs.exists():
460 raise error.RepoError(
460 raise error.RepoError(
461 _(b'.hg/sharedpath points to nonexistent directory %s')
461 _(b'.hg/sharedpath points to nonexistent directory %s')
462 % sharedvfs.base
462 % sharedvfs.base
463 )
463 )
464 return sharedvfs
464 return sharedvfs
465
465
466
466
467 def _readrequires(vfs, allowmissing):
467 def _readrequires(vfs, allowmissing):
468 """reads the require file present at root of this vfs
468 """reads the require file present at root of this vfs
469 and return a set of requirements
469 and return a set of requirements
470
470
471 If allowmissing is True, we suppress ENOENT if raised"""
471 If allowmissing is True, we suppress ENOENT if raised"""
472 # requires file contains a newline-delimited list of
472 # requires file contains a newline-delimited list of
473 # features/capabilities the opener (us) must have in order to use
473 # features/capabilities the opener (us) must have in order to use
474 # the repository. This file was introduced in Mercurial 0.9.2,
474 # the repository. This file was introduced in Mercurial 0.9.2,
475 # which means very old repositories may not have one. We assume
475 # which means very old repositories may not have one. We assume
476 # a missing file translates to no requirements.
476 # a missing file translates to no requirements.
477 try:
477 try:
478 requirements = set(vfs.read(b'requires').splitlines())
478 requirements = set(vfs.read(b'requires').splitlines())
479 except IOError as e:
479 except IOError as e:
480 if not (allowmissing and e.errno == errno.ENOENT):
480 if not (allowmissing and e.errno == errno.ENOENT):
481 raise
481 raise
482 requirements = set()
482 requirements = set()
483 return requirements
483 return requirements
484
484
485
485
486 def makelocalrepository(baseui, path, intents=None):
486 def makelocalrepository(baseui, path, intents=None):
487 """Create a local repository object.
487 """Create a local repository object.
488
488
489 Given arguments needed to construct a local repository, this function
489 Given arguments needed to construct a local repository, this function
490 performs various early repository loading functionality (such as
490 performs various early repository loading functionality (such as
491 reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that
491 reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that
492 the repository can be opened, derives a type suitable for representing
492 the repository can be opened, derives a type suitable for representing
493 that repository, and returns an instance of it.
493 that repository, and returns an instance of it.
494
494
495 The returned object conforms to the ``repository.completelocalrepository``
495 The returned object conforms to the ``repository.completelocalrepository``
496 interface.
496 interface.
497
497
498 The repository type is derived by calling a series of factory functions
498 The repository type is derived by calling a series of factory functions
499 for each aspect/interface of the final repository. These are defined by
499 for each aspect/interface of the final repository. These are defined by
500 ``REPO_INTERFACES``.
500 ``REPO_INTERFACES``.
501
501
502 Each factory function is called to produce a type implementing a specific
502 Each factory function is called to produce a type implementing a specific
503 interface. The cumulative list of returned types will be combined into a
503 interface. The cumulative list of returned types will be combined into a
504 new type and that type will be instantiated to represent the local
504 new type and that type will be instantiated to represent the local
505 repository.
505 repository.
506
506
507 The factory functions each receive various state that may be consulted
507 The factory functions each receive various state that may be consulted
508 as part of deriving a type.
508 as part of deriving a type.
509
509
510 Extensions should wrap these factory functions to customize repository type
510 Extensions should wrap these factory functions to customize repository type
511 creation. Note that an extension's wrapped function may be called even if
511 creation. Note that an extension's wrapped function may be called even if
512 that extension is not loaded for the repo being constructed. Extensions
512 that extension is not loaded for the repo being constructed. Extensions
513 should check if their ``__name__`` appears in the
513 should check if their ``__name__`` appears in the
514 ``extensionmodulenames`` set passed to the factory function and no-op if
514 ``extensionmodulenames`` set passed to the factory function and no-op if
515 not.
515 not.
516 """
516 """
517 ui = baseui.copy()
517 ui = baseui.copy()
518 # Prevent copying repo configuration.
518 # Prevent copying repo configuration.
519 ui.copy = baseui.copy
519 ui.copy = baseui.copy
520
520
521 # Working directory VFS rooted at repository root.
521 # Working directory VFS rooted at repository root.
522 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
522 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
523
523
524 # Main VFS for .hg/ directory.
524 # Main VFS for .hg/ directory.
525 hgpath = wdirvfs.join(b'.hg')
525 hgpath = wdirvfs.join(b'.hg')
526 hgvfs = vfsmod.vfs(hgpath, cacheaudited=True)
526 hgvfs = vfsmod.vfs(hgpath, cacheaudited=True)
527 # Whether this repository is shared one or not
527 # Whether this repository is shared one or not
528 shared = False
528 shared = False
529 # If this repository is shared, vfs pointing to shared repo
529 # If this repository is shared, vfs pointing to shared repo
530 sharedvfs = None
530 sharedvfs = None
531
531
532 # The .hg/ path should exist and should be a directory. All other
532 # The .hg/ path should exist and should be a directory. All other
533 # cases are errors.
533 # cases are errors.
534 if not hgvfs.isdir():
534 if not hgvfs.isdir():
535 try:
535 try:
536 hgvfs.stat()
536 hgvfs.stat()
537 except OSError as e:
537 except OSError as e:
538 if e.errno != errno.ENOENT:
538 if e.errno != errno.ENOENT:
539 raise
539 raise
540 except ValueError as e:
540 except ValueError as e:
541 # Can be raised on Python 3.8 when path is invalid.
541 # Can be raised on Python 3.8 when path is invalid.
542 raise error.Abort(
542 raise error.Abort(
543 _(b'invalid path %s: %s') % (path, pycompat.bytestr(e))
543 _(b'invalid path %s: %s') % (path, pycompat.bytestr(e))
544 )
544 )
545
545
546 raise error.RepoError(_(b'repository %s not found') % path)
546 raise error.RepoError(_(b'repository %s not found') % path)
547
547
548 requirements = _readrequires(hgvfs, True)
548 requirements = _readrequires(hgvfs, True)
549 shared = (
549 shared = (
550 requirementsmod.SHARED_REQUIREMENT in requirements
550 requirementsmod.SHARED_REQUIREMENT in requirements
551 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
551 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
552 )
552 )
553 storevfs = None
553 storevfs = None
554 if shared:
554 if shared:
555 # This is a shared repo
555 # This is a shared repo
556 sharedvfs = _getsharedvfs(hgvfs, requirements)
556 sharedvfs = _getsharedvfs(hgvfs, requirements)
557 storevfs = vfsmod.vfs(sharedvfs.join(b'store'))
557 storevfs = vfsmod.vfs(sharedvfs.join(b'store'))
558 else:
558 else:
559 storevfs = vfsmod.vfs(hgvfs.join(b'store'))
559 storevfs = vfsmod.vfs(hgvfs.join(b'store'))
560
560
561 # if .hg/requires contains the sharesafe requirement, it means
561 # if .hg/requires contains the sharesafe requirement, it means
562 # there exists a `.hg/store/requires` too and we should read it
562 # there exists a `.hg/store/requires` too and we should read it
563 # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement
563 # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement
564 # is present. We never write SHARESAFE_REQUIREMENT for a repo if store
564 # is present. We never write SHARESAFE_REQUIREMENT for a repo if store
565 # is not present, refer checkrequirementscompat() for that
565 # is not present, refer checkrequirementscompat() for that
566 #
566 #
567 # However, if SHARESAFE_REQUIREMENT is not present, it means that the
567 # However, if SHARESAFE_REQUIREMENT is not present, it means that the
568 # repository was shared the old way. We check the share source .hg/requires
568 # repository was shared the old way. We check the share source .hg/requires
569 # for SHARESAFE_REQUIREMENT to detect whether the current repository needs
569 # for SHARESAFE_REQUIREMENT to detect whether the current repository needs
570 # to be reshared
570 # to be reshared
571 hint = _("see `hg help config.format.use-share-safe` for more information")
571 hint = _("see `hg help config.format.use-share-safe` for more information")
572 if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
572 if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
573
573
574 if (
574 if (
575 shared
575 shared
576 and requirementsmod.SHARESAFE_REQUIREMENT
576 and requirementsmod.SHARESAFE_REQUIREMENT
577 not in _readrequires(sharedvfs, True)
577 not in _readrequires(sharedvfs, True)
578 ):
578 ):
579 mismatch_warn = ui.configbool(
579 mismatch_warn = ui.configbool(
580 b'share', b'safe-mismatch.source-not-safe.warn'
580 b'share', b'safe-mismatch.source-not-safe.warn'
581 )
581 )
582 mismatch_config = ui.config(
582 mismatch_config = ui.config(
583 b'share', b'safe-mismatch.source-not-safe'
583 b'share', b'safe-mismatch.source-not-safe'
584 )
584 )
585 if mismatch_config in (
585 if mismatch_config in (
586 b'downgrade-allow',
586 b'downgrade-allow',
587 b'allow',
587 b'allow',
588 b'downgrade-abort',
588 b'downgrade-abort',
589 ):
589 ):
590 # prevent cyclic import localrepo -> upgrade -> localrepo
590 # prevent cyclic import localrepo -> upgrade -> localrepo
591 from . import upgrade
591 from . import upgrade
592
592
593 upgrade.downgrade_share_to_non_safe(
593 upgrade.downgrade_share_to_non_safe(
594 ui,
594 ui,
595 hgvfs,
595 hgvfs,
596 sharedvfs,
596 sharedvfs,
597 requirements,
597 requirements,
598 mismatch_config,
598 mismatch_config,
599 mismatch_warn,
599 mismatch_warn,
600 )
600 )
601 elif mismatch_config == b'abort':
601 elif mismatch_config == b'abort':
602 raise error.Abort(
602 raise error.Abort(
603 _(b"share source does not support share-safe requirement"),
603 _(b"share source does not support share-safe requirement"),
604 hint=hint,
604 hint=hint,
605 )
605 )
606 else:
606 else:
607 raise error.Abort(
607 raise error.Abort(
608 _(
608 _(
609 b"share-safe mismatch with source.\nUnrecognized"
609 b"share-safe mismatch with source.\nUnrecognized"
610 b" value '%s' of `share.safe-mismatch.source-not-safe`"
610 b" value '%s' of `share.safe-mismatch.source-not-safe`"
611 b" set."
611 b" set."
612 )
612 )
613 % mismatch_config,
613 % mismatch_config,
614 hint=hint,
614 hint=hint,
615 )
615 )
616 else:
616 else:
617 requirements |= _readrequires(storevfs, False)
617 requirements |= _readrequires(storevfs, False)
618 elif shared:
618 elif shared:
619 sourcerequires = _readrequires(sharedvfs, False)
619 sourcerequires = _readrequires(sharedvfs, False)
620 if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires:
620 if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires:
621 mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe')
621 mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe')
622 mismatch_warn = ui.configbool(
622 mismatch_warn = ui.configbool(
623 b'share', b'safe-mismatch.source-safe.warn'
623 b'share', b'safe-mismatch.source-safe.warn'
624 )
624 )
625 if mismatch_config in (
625 if mismatch_config in (
626 b'upgrade-allow',
626 b'upgrade-allow',
627 b'allow',
627 b'allow',
628 b'upgrade-abort',
628 b'upgrade-abort',
629 ):
629 ):
630 # prevent cyclic import localrepo -> upgrade -> localrepo
630 # prevent cyclic import localrepo -> upgrade -> localrepo
631 from . import upgrade
631 from . import upgrade
632
632
633 upgrade.upgrade_share_to_safe(
633 upgrade.upgrade_share_to_safe(
634 ui,
634 ui,
635 hgvfs,
635 hgvfs,
636 storevfs,
636 storevfs,
637 requirements,
637 requirements,
638 mismatch_config,
638 mismatch_config,
639 mismatch_warn,
639 mismatch_warn,
640 )
640 )
641 elif mismatch_config == b'abort':
641 elif mismatch_config == b'abort':
642 raise error.Abort(
642 raise error.Abort(
643 _(
643 _(
644 b'version mismatch: source uses share-safe'
644 b'version mismatch: source uses share-safe'
645 b' functionality while the current share does not'
645 b' functionality while the current share does not'
646 ),
646 ),
647 hint=hint,
647 hint=hint,
648 )
648 )
649 else:
649 else:
650 raise error.Abort(
650 raise error.Abort(
651 _(
651 _(
652 b"share-safe mismatch with source.\nUnrecognized"
652 b"share-safe mismatch with source.\nUnrecognized"
653 b" value '%s' of `share.safe-mismatch.source-safe` set."
653 b" value '%s' of `share.safe-mismatch.source-safe` set."
654 )
654 )
655 % mismatch_config,
655 % mismatch_config,
656 hint=hint,
656 hint=hint,
657 )
657 )
658
658
659 # The .hg/hgrc file may load extensions or contain config options
659 # The .hg/hgrc file may load extensions or contain config options
660 # that influence repository construction. Attempt to load it and
660 # that influence repository construction. Attempt to load it and
661 # process any new extensions that it may have pulled in.
661 # process any new extensions that it may have pulled in.
662 if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs):
662 if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs):
663 afterhgrcload(ui, wdirvfs, hgvfs, requirements)
663 afterhgrcload(ui, wdirvfs, hgvfs, requirements)
664 extensions.loadall(ui)
664 extensions.loadall(ui)
665 extensions.populateui(ui)
665 extensions.populateui(ui)
666
666
667 # Set of module names of extensions loaded for this repository.
667 # Set of module names of extensions loaded for this repository.
668 extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)}
668 extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)}
669
669
670 supportedrequirements = gathersupportedrequirements(ui)
670 supportedrequirements = gathersupportedrequirements(ui)
671
671
672 # We first validate the requirements are known.
672 # We first validate the requirements are known.
673 ensurerequirementsrecognized(requirements, supportedrequirements)
673 ensurerequirementsrecognized(requirements, supportedrequirements)
674
674
675 # Then we validate that the known set is reasonable to use together.
675 # Then we validate that the known set is reasonable to use together.
676 ensurerequirementscompatible(ui, requirements)
676 ensurerequirementscompatible(ui, requirements)
677
677
678 # TODO there are unhandled edge cases related to opening repositories with
678 # TODO there are unhandled edge cases related to opening repositories with
679 # shared storage. If storage is shared, we should also test for requirements
679 # shared storage. If storage is shared, we should also test for requirements
680 # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in
680 # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in
681 # that repo, as that repo may load extensions needed to open it. This is a
681 # that repo, as that repo may load extensions needed to open it. This is a
682 # bit complicated because we don't want the other hgrc to overwrite settings
682 # bit complicated because we don't want the other hgrc to overwrite settings
683 # in this hgrc.
683 # in this hgrc.
684 #
684 #
685 # This bug is somewhat mitigated by the fact that we copy the .hg/requires
685 # This bug is somewhat mitigated by the fact that we copy the .hg/requires
686 # file when sharing repos. But if a requirement is added after the share is
686 # file when sharing repos. But if a requirement is added after the share is
687 # performed, thereby introducing a new requirement for the opener, we may
687 # performed, thereby introducing a new requirement for the opener, we may
688 # will not see that and could encounter a run-time error interacting with
688 # will not see that and could encounter a run-time error interacting with
689 # that shared store since it has an unknown-to-us requirement.
689 # that shared store since it has an unknown-to-us requirement.
690
690
691 # At this point, we know we should be capable of opening the repository.
691 # At this point, we know we should be capable of opening the repository.
692 # Now get on with doing that.
692 # Now get on with doing that.
693
693
694 features = set()
694 features = set()
695
695
696 # The "store" part of the repository holds versioned data. How it is
696 # The "store" part of the repository holds versioned data. How it is
697 # accessed is determined by various requirements. If `shared` or
697 # accessed is determined by various requirements. If `shared` or
698 # `relshared` requirements are present, this indicates current repository
698 # `relshared` requirements are present, this indicates current repository
699 # is a share and store exists in path mentioned in `.hg/sharedpath`
699 # is a share and store exists in path mentioned in `.hg/sharedpath`
700 if shared:
700 if shared:
701 storebasepath = sharedvfs.base
701 storebasepath = sharedvfs.base
702 cachepath = sharedvfs.join(b'cache')
702 cachepath = sharedvfs.join(b'cache')
703 features.add(repository.REPO_FEATURE_SHARED_STORAGE)
703 features.add(repository.REPO_FEATURE_SHARED_STORAGE)
704 else:
704 else:
705 storebasepath = hgvfs.base
705 storebasepath = hgvfs.base
706 cachepath = hgvfs.join(b'cache')
706 cachepath = hgvfs.join(b'cache')
707 wcachepath = hgvfs.join(b'wcache')
707 wcachepath = hgvfs.join(b'wcache')
708
708
709 # The store has changed over time and the exact layout is dictated by
709 # The store has changed over time and the exact layout is dictated by
710 # requirements. The store interface abstracts differences across all
710 # requirements. The store interface abstracts differences across all
711 # of them.
711 # of them.
712 store = makestore(
712 store = makestore(
713 requirements,
713 requirements,
714 storebasepath,
714 storebasepath,
715 lambda base: vfsmod.vfs(base, cacheaudited=True),
715 lambda base: vfsmod.vfs(base, cacheaudited=True),
716 )
716 )
717 hgvfs.createmode = store.createmode
717 hgvfs.createmode = store.createmode
718
718
719 storevfs = store.vfs
719 storevfs = store.vfs
720 storevfs.options = resolvestorevfsoptions(ui, requirements, features)
720 storevfs.options = resolvestorevfsoptions(ui, requirements, features)
721
721
722 # The cache vfs is used to manage cache files.
722 # The cache vfs is used to manage cache files.
723 cachevfs = vfsmod.vfs(cachepath, cacheaudited=True)
723 cachevfs = vfsmod.vfs(cachepath, cacheaudited=True)
724 cachevfs.createmode = store.createmode
724 cachevfs.createmode = store.createmode
725 # The cache vfs is used to manage cache files related to the working copy
725 # The cache vfs is used to manage cache files related to the working copy
726 wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True)
726 wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True)
727 wcachevfs.createmode = store.createmode
727 wcachevfs.createmode = store.createmode
728
728
729 # Now resolve the type for the repository object. We do this by repeatedly
729 # Now resolve the type for the repository object. We do this by repeatedly
730 # calling a factory function to produces types for specific aspects of the
730 # calling a factory function to produces types for specific aspects of the
731 # repo's operation. The aggregate returned types are used as base classes
731 # repo's operation. The aggregate returned types are used as base classes
732 # for a dynamically-derived type, which will represent our new repository.
732 # for a dynamically-derived type, which will represent our new repository.
733
733
734 bases = []
734 bases = []
735 extrastate = {}
735 extrastate = {}
736
736
737 for iface, fn in REPO_INTERFACES:
737 for iface, fn in REPO_INTERFACES:
738 # We pass all potentially useful state to give extensions tons of
738 # We pass all potentially useful state to give extensions tons of
739 # flexibility.
739 # flexibility.
740 typ = fn()(
740 typ = fn()(
741 ui=ui,
741 ui=ui,
742 intents=intents,
742 intents=intents,
743 requirements=requirements,
743 requirements=requirements,
744 features=features,
744 features=features,
745 wdirvfs=wdirvfs,
745 wdirvfs=wdirvfs,
746 hgvfs=hgvfs,
746 hgvfs=hgvfs,
747 store=store,
747 store=store,
748 storevfs=storevfs,
748 storevfs=storevfs,
749 storeoptions=storevfs.options,
749 storeoptions=storevfs.options,
750 cachevfs=cachevfs,
750 cachevfs=cachevfs,
751 wcachevfs=wcachevfs,
751 wcachevfs=wcachevfs,
752 extensionmodulenames=extensionmodulenames,
752 extensionmodulenames=extensionmodulenames,
753 extrastate=extrastate,
753 extrastate=extrastate,
754 baseclasses=bases,
754 baseclasses=bases,
755 )
755 )
756
756
757 if not isinstance(typ, type):
757 if not isinstance(typ, type):
758 raise error.ProgrammingError(
758 raise error.ProgrammingError(
759 b'unable to construct type for %s' % iface
759 b'unable to construct type for %s' % iface
760 )
760 )
761
761
762 bases.append(typ)
762 bases.append(typ)
763
763
764 # type() allows you to use characters in type names that wouldn't be
764 # type() allows you to use characters in type names that wouldn't be
765 # recognized as Python symbols in source code. We abuse that to add
765 # recognized as Python symbols in source code. We abuse that to add
766 # rich information about our constructed repo.
766 # rich information about our constructed repo.
767 name = pycompat.sysstr(
767 name = pycompat.sysstr(
768 b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements)))
768 b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements)))
769 )
769 )
770
770
771 cls = type(name, tuple(bases), {})
771 cls = type(name, tuple(bases), {})
772
772
773 return cls(
773 return cls(
774 baseui=baseui,
774 baseui=baseui,
775 ui=ui,
775 ui=ui,
776 origroot=path,
776 origroot=path,
777 wdirvfs=wdirvfs,
777 wdirvfs=wdirvfs,
778 hgvfs=hgvfs,
778 hgvfs=hgvfs,
779 requirements=requirements,
779 requirements=requirements,
780 supportedrequirements=supportedrequirements,
780 supportedrequirements=supportedrequirements,
781 sharedpath=storebasepath,
781 sharedpath=storebasepath,
782 store=store,
782 store=store,
783 cachevfs=cachevfs,
783 cachevfs=cachevfs,
784 wcachevfs=wcachevfs,
784 wcachevfs=wcachevfs,
785 features=features,
785 features=features,
786 intents=intents,
786 intents=intents,
787 )
787 )
788
788
789
789
790 def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None):
790 def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None):
791 """Load hgrc files/content into a ui instance.
791 """Load hgrc files/content into a ui instance.
792
792
793 This is called during repository opening to load any additional
793 This is called during repository opening to load any additional
794 config files or settings relevant to the current repository.
794 config files or settings relevant to the current repository.
795
795
796 Returns a bool indicating whether any additional configs were loaded.
796 Returns a bool indicating whether any additional configs were loaded.
797
797
798 Extensions should monkeypatch this function to modify how per-repo
798 Extensions should monkeypatch this function to modify how per-repo
799 configs are loaded. For example, an extension may wish to pull in
799 configs are loaded. For example, an extension may wish to pull in
800 configs from alternate files or sources.
800 configs from alternate files or sources.
801
801
802 sharedvfs is vfs object pointing to source repo if the current one is a
802 sharedvfs is vfs object pointing to source repo if the current one is a
803 shared one
803 shared one
804 """
804 """
805 if not rcutil.use_repo_hgrc():
805 if not rcutil.use_repo_hgrc():
806 return False
806 return False
807
807
808 ret = False
808 ret = False
809 # first load config from shared source if we has to
809 # first load config from shared source if we has to
810 if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs:
810 if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs:
811 try:
811 try:
812 ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base)
812 ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base)
813 ret = True
813 ret = True
814 except IOError:
814 except IOError:
815 pass
815 pass
816
816
817 try:
817 try:
818 ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base)
818 ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base)
819 ret = True
819 ret = True
820 except IOError:
820 except IOError:
821 pass
821 pass
822
822
823 try:
823 try:
824 ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base)
824 ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base)
825 ret = True
825 ret = True
826 except IOError:
826 except IOError:
827 pass
827 pass
828
828
829 return ret
829 return ret
830
830
831
831
832 def afterhgrcload(ui, wdirvfs, hgvfs, requirements):
832 def afterhgrcload(ui, wdirvfs, hgvfs, requirements):
833 """Perform additional actions after .hg/hgrc is loaded.
833 """Perform additional actions after .hg/hgrc is loaded.
834
834
835 This function is called during repository loading immediately after
835 This function is called during repository loading immediately after
836 the .hg/hgrc file is loaded and before per-repo extensions are loaded.
836 the .hg/hgrc file is loaded and before per-repo extensions are loaded.
837
837
838 The function can be used to validate configs, automatically add
838 The function can be used to validate configs, automatically add
839 options (including extensions) based on requirements, etc.
839 options (including extensions) based on requirements, etc.
840 """
840 """
841
841
842 # Map of requirements to list of extensions to load automatically when
842 # Map of requirements to list of extensions to load automatically when
843 # requirement is present.
843 # requirement is present.
844 autoextensions = {
844 autoextensions = {
845 b'git': [b'git'],
845 b'git': [b'git'],
846 b'largefiles': [b'largefiles'],
846 b'largefiles': [b'largefiles'],
847 b'lfs': [b'lfs'],
847 b'lfs': [b'lfs'],
848 }
848 }
849
849
850 for requirement, names in sorted(autoextensions.items()):
850 for requirement, names in sorted(autoextensions.items()):
851 if requirement not in requirements:
851 if requirement not in requirements:
852 continue
852 continue
853
853
854 for name in names:
854 for name in names:
855 if not ui.hasconfig(b'extensions', name):
855 if not ui.hasconfig(b'extensions', name):
856 ui.setconfig(b'extensions', name, b'', source=b'autoload')
856 ui.setconfig(b'extensions', name, b'', source=b'autoload')
857
857
858
858
859 def gathersupportedrequirements(ui):
859 def gathersupportedrequirements(ui):
860 """Determine the complete set of recognized requirements."""
860 """Determine the complete set of recognized requirements."""
861 # Start with all requirements supported by this file.
861 # Start with all requirements supported by this file.
862 supported = set(localrepository._basesupported)
862 supported = set(localrepository._basesupported)
863
863
864 # Execute ``featuresetupfuncs`` entries if they belong to an extension
864 # Execute ``featuresetupfuncs`` entries if they belong to an extension
865 # relevant to this ui instance.
865 # relevant to this ui instance.
866 modules = {m.__name__ for n, m in extensions.extensions(ui)}
866 modules = {m.__name__ for n, m in extensions.extensions(ui)}
867
867
868 for fn in featuresetupfuncs:
868 for fn in featuresetupfuncs:
869 if fn.__module__ in modules:
869 if fn.__module__ in modules:
870 fn(ui, supported)
870 fn(ui, supported)
871
871
872 # Add derived requirements from registered compression engines.
872 # Add derived requirements from registered compression engines.
873 for name in util.compengines:
873 for name in util.compengines:
874 engine = util.compengines[name]
874 engine = util.compengines[name]
875 if engine.available() and engine.revlogheader():
875 if engine.available() and engine.revlogheader():
876 supported.add(b'exp-compression-%s' % name)
876 supported.add(b'exp-compression-%s' % name)
877 if engine.name() == b'zstd':
877 if engine.name() == b'zstd':
878 supported.add(b'revlog-compression-zstd')
878 supported.add(b'revlog-compression-zstd')
879
879
880 return supported
880 return supported
881
881
882
882
883 def ensurerequirementsrecognized(requirements, supported):
883 def ensurerequirementsrecognized(requirements, supported):
884 """Validate that a set of local requirements is recognized.
884 """Validate that a set of local requirements is recognized.
885
885
886 Receives a set of requirements. Raises an ``error.RepoError`` if there
886 Receives a set of requirements. Raises an ``error.RepoError`` if there
887 exists any requirement in that set that currently loaded code doesn't
887 exists any requirement in that set that currently loaded code doesn't
888 recognize.
888 recognize.
889
889
890 Returns a set of supported requirements.
890 Returns a set of supported requirements.
891 """
891 """
892 missing = set()
892 missing = set()
893
893
894 for requirement in requirements:
894 for requirement in requirements:
895 if requirement in supported:
895 if requirement in supported:
896 continue
896 continue
897
897
898 if not requirement or not requirement[0:1].isalnum():
898 if not requirement or not requirement[0:1].isalnum():
899 raise error.RequirementError(_(b'.hg/requires file is corrupt'))
899 raise error.RequirementError(_(b'.hg/requires file is corrupt'))
900
900
901 missing.add(requirement)
901 missing.add(requirement)
902
902
903 if missing:
903 if missing:
904 raise error.RequirementError(
904 raise error.RequirementError(
905 _(b'repository requires features unknown to this Mercurial: %s')
905 _(b'repository requires features unknown to this Mercurial: %s')
906 % b' '.join(sorted(missing)),
906 % b' '.join(sorted(missing)),
907 hint=_(
907 hint=_(
908 b'see https://mercurial-scm.org/wiki/MissingRequirement '
908 b'see https://mercurial-scm.org/wiki/MissingRequirement '
909 b'for more information'
909 b'for more information'
910 ),
910 ),
911 )
911 )
912
912
913
913
914 def ensurerequirementscompatible(ui, requirements):
914 def ensurerequirementscompatible(ui, requirements):
915 """Validates that a set of recognized requirements is mutually compatible.
915 """Validates that a set of recognized requirements is mutually compatible.
916
916
917 Some requirements may not be compatible with others or require
917 Some requirements may not be compatible with others or require
918 config options that aren't enabled. This function is called during
918 config options that aren't enabled. This function is called during
919 repository opening to ensure that the set of requirements needed
919 repository opening to ensure that the set of requirements needed
920 to open a repository is sane and compatible with config options.
920 to open a repository is sane and compatible with config options.
921
921
922 Extensions can monkeypatch this function to perform additional
922 Extensions can monkeypatch this function to perform additional
923 checking.
923 checking.
924
924
925 ``error.RepoError`` should be raised on failure.
925 ``error.RepoError`` should be raised on failure.
926 """
926 """
927 if (
927 if (
928 requirementsmod.SPARSE_REQUIREMENT in requirements
928 requirementsmod.SPARSE_REQUIREMENT in requirements
929 and not sparse.enabled
929 and not sparse.enabled
930 ):
930 ):
931 raise error.RepoError(
931 raise error.RepoError(
932 _(
932 _(
933 b'repository is using sparse feature but '
933 b'repository is using sparse feature but '
934 b'sparse is not enabled; enable the '
934 b'sparse is not enabled; enable the '
935 b'"sparse" extensions to access'
935 b'"sparse" extensions to access'
936 )
936 )
937 )
937 )
938
938
939
939
940 def makestore(requirements, path, vfstype):
940 def makestore(requirements, path, vfstype):
941 """Construct a storage object for a repository."""
941 """Construct a storage object for a repository."""
942 if b'store' in requirements:
942 if b'store' in requirements:
943 if b'fncache' in requirements:
943 if b'fncache' in requirements:
944 return storemod.fncachestore(
944 return storemod.fncachestore(
945 path, vfstype, b'dotencode' in requirements
945 path, vfstype, b'dotencode' in requirements
946 )
946 )
947
947
948 return storemod.encodedstore(path, vfstype)
948 return storemod.encodedstore(path, vfstype)
949
949
950 return storemod.basicstore(path, vfstype)
950 return storemod.basicstore(path, vfstype)
951
951
952
952
953 def resolvestorevfsoptions(ui, requirements, features):
953 def resolvestorevfsoptions(ui, requirements, features):
954 """Resolve the options to pass to the store vfs opener.
954 """Resolve the options to pass to the store vfs opener.
955
955
956 The returned dict is used to influence behavior of the storage layer.
956 The returned dict is used to influence behavior of the storage layer.
957 """
957 """
958 options = {}
958 options = {}
959
959
960 if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements:
960 if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements:
961 options[b'treemanifest'] = True
961 options[b'treemanifest'] = True
962
962
963 # experimental config: format.manifestcachesize
963 # experimental config: format.manifestcachesize
964 manifestcachesize = ui.configint(b'format', b'manifestcachesize')
964 manifestcachesize = ui.configint(b'format', b'manifestcachesize')
965 if manifestcachesize is not None:
965 if manifestcachesize is not None:
966 options[b'manifestcachesize'] = manifestcachesize
966 options[b'manifestcachesize'] = manifestcachesize
967
967
968 # In the absence of another requirement superseding a revlog-related
968 # In the absence of another requirement superseding a revlog-related
969 # requirement, we have to assume the repo is using revlog version 0.
969 # requirement, we have to assume the repo is using revlog version 0.
970 # This revlog format is super old and we don't bother trying to parse
970 # This revlog format is super old and we don't bother trying to parse
971 # opener options for it because those options wouldn't do anything
971 # opener options for it because those options wouldn't do anything
972 # meaningful on such old repos.
972 # meaningful on such old repos.
973 if (
973 if (
974 b'revlogv1' in requirements
974 b'revlogv1' in requirements
975 or requirementsmod.REVLOGV2_REQUIREMENT in requirements
975 or requirementsmod.REVLOGV2_REQUIREMENT in requirements
976 ):
976 ):
977 options.update(resolverevlogstorevfsoptions(ui, requirements, features))
977 options.update(resolverevlogstorevfsoptions(ui, requirements, features))
978 else: # explicitly mark repo as using revlogv0
978 else: # explicitly mark repo as using revlogv0
979 options[b'revlogv0'] = True
979 options[b'revlogv0'] = True
980
980
981 if requirementsmod.COPIESSDC_REQUIREMENT in requirements:
981 if requirementsmod.COPIESSDC_REQUIREMENT in requirements:
982 options[b'copies-storage'] = b'changeset-sidedata'
982 options[b'copies-storage'] = b'changeset-sidedata'
983 else:
983 else:
984 writecopiesto = ui.config(b'experimental', b'copies.write-to')
984 writecopiesto = ui.config(b'experimental', b'copies.write-to')
985 copiesextramode = (b'changeset-only', b'compatibility')
985 copiesextramode = (b'changeset-only', b'compatibility')
986 if writecopiesto in copiesextramode:
986 if writecopiesto in copiesextramode:
987 options[b'copies-storage'] = b'extra'
987 options[b'copies-storage'] = b'extra'
988
988
989 return options
989 return options
990
990
991
991
992 def resolverevlogstorevfsoptions(ui, requirements, features):
992 def resolverevlogstorevfsoptions(ui, requirements, features):
993 """Resolve opener options specific to revlogs."""
993 """Resolve opener options specific to revlogs."""
994
994
995 options = {}
995 options = {}
996 options[b'flagprocessors'] = {}
996 options[b'flagprocessors'] = {}
997
997
998 if b'revlogv1' in requirements:
998 if b'revlogv1' in requirements:
999 options[b'revlogv1'] = True
999 options[b'revlogv1'] = True
1000 if requirementsmod.REVLOGV2_REQUIREMENT in requirements:
1000 if requirementsmod.REVLOGV2_REQUIREMENT in requirements:
1001 options[b'revlogv2'] = True
1001 options[b'revlogv2'] = True
1002
1002
1003 if b'generaldelta' in requirements:
1003 if b'generaldelta' in requirements:
1004 options[b'generaldelta'] = True
1004 options[b'generaldelta'] = True
1005
1005
1006 # experimental config: format.chunkcachesize
1006 # experimental config: format.chunkcachesize
1007 chunkcachesize = ui.configint(b'format', b'chunkcachesize')
1007 chunkcachesize = ui.configint(b'format', b'chunkcachesize')
1008 if chunkcachesize is not None:
1008 if chunkcachesize is not None:
1009 options[b'chunkcachesize'] = chunkcachesize
1009 options[b'chunkcachesize'] = chunkcachesize
1010
1010
1011 deltabothparents = ui.configbool(
1011 deltabothparents = ui.configbool(
1012 b'storage', b'revlog.optimize-delta-parent-choice'
1012 b'storage', b'revlog.optimize-delta-parent-choice'
1013 )
1013 )
1014 options[b'deltabothparents'] = deltabothparents
1014 options[b'deltabothparents'] = deltabothparents
1015
1015
1016 lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta')
1016 lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta')
1017 lazydeltabase = False
1017 lazydeltabase = False
1018 if lazydelta:
1018 if lazydelta:
1019 lazydeltabase = ui.configbool(
1019 lazydeltabase = ui.configbool(
1020 b'storage', b'revlog.reuse-external-delta-parent'
1020 b'storage', b'revlog.reuse-external-delta-parent'
1021 )
1021 )
1022 if lazydeltabase is None:
1022 if lazydeltabase is None:
1023 lazydeltabase = not scmutil.gddeltaconfig(ui)
1023 lazydeltabase = not scmutil.gddeltaconfig(ui)
1024 options[b'lazydelta'] = lazydelta
1024 options[b'lazydelta'] = lazydelta
1025 options[b'lazydeltabase'] = lazydeltabase
1025 options[b'lazydeltabase'] = lazydeltabase
1026
1026
1027 chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan')
1027 chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan')
1028 if 0 <= chainspan:
1028 if 0 <= chainspan:
1029 options[b'maxdeltachainspan'] = chainspan
1029 options[b'maxdeltachainspan'] = chainspan
1030
1030
1031 mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold')
1031 mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold')
1032 if mmapindexthreshold is not None:
1032 if mmapindexthreshold is not None:
1033 options[b'mmapindexthreshold'] = mmapindexthreshold
1033 options[b'mmapindexthreshold'] = mmapindexthreshold
1034
1034
1035 withsparseread = ui.configbool(b'experimental', b'sparse-read')
1035 withsparseread = ui.configbool(b'experimental', b'sparse-read')
1036 srdensitythres = float(
1036 srdensitythres = float(
1037 ui.config(b'experimental', b'sparse-read.density-threshold')
1037 ui.config(b'experimental', b'sparse-read.density-threshold')
1038 )
1038 )
1039 srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size')
1039 srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size')
1040 options[b'with-sparse-read'] = withsparseread
1040 options[b'with-sparse-read'] = withsparseread
1041 options[b'sparse-read-density-threshold'] = srdensitythres
1041 options[b'sparse-read-density-threshold'] = srdensitythres
1042 options[b'sparse-read-min-gap-size'] = srmingapsize
1042 options[b'sparse-read-min-gap-size'] = srmingapsize
1043
1043
1044 sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements
1044 sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements
1045 options[b'sparse-revlog'] = sparserevlog
1045 options[b'sparse-revlog'] = sparserevlog
1046 if sparserevlog:
1046 if sparserevlog:
1047 options[b'generaldelta'] = True
1047 options[b'generaldelta'] = True
1048
1048
1049 sidedata = requirementsmod.SIDEDATA_REQUIREMENT in requirements
1049 sidedata = requirementsmod.SIDEDATA_REQUIREMENT in requirements
1050 options[b'side-data'] = sidedata
1050 options[b'side-data'] = sidedata
1051
1051
1052 maxchainlen = None
1052 maxchainlen = None
1053 if sparserevlog:
1053 if sparserevlog:
1054 maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH
1054 maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH
1055 # experimental config: format.maxchainlen
1055 # experimental config: format.maxchainlen
1056 maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen)
1056 maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen)
1057 if maxchainlen is not None:
1057 if maxchainlen is not None:
1058 options[b'maxchainlen'] = maxchainlen
1058 options[b'maxchainlen'] = maxchainlen
1059
1059
1060 for r in requirements:
1060 for r in requirements:
1061 # we allow multiple compression engine requirement to co-exist because
1061 # we allow multiple compression engine requirement to co-exist because
1062 # strickly speaking, revlog seems to support mixed compression style.
1062 # strickly speaking, revlog seems to support mixed compression style.
1063 #
1063 #
1064 # The compression used for new entries will be "the last one"
1064 # The compression used for new entries will be "the last one"
1065 prefix = r.startswith
1065 prefix = r.startswith
1066 if prefix(b'revlog-compression-') or prefix(b'exp-compression-'):
1066 if prefix(b'revlog-compression-') or prefix(b'exp-compression-'):
1067 options[b'compengine'] = r.split(b'-', 2)[2]
1067 options[b'compengine'] = r.split(b'-', 2)[2]
1068
1068
1069 options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level')
1069 options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level')
1070 if options[b'zlib.level'] is not None:
1070 if options[b'zlib.level'] is not None:
1071 if not (0 <= options[b'zlib.level'] <= 9):
1071 if not (0 <= options[b'zlib.level'] <= 9):
1072 msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d')
1072 msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d')
1073 raise error.Abort(msg % options[b'zlib.level'])
1073 raise error.Abort(msg % options[b'zlib.level'])
1074 options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level')
1074 options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level')
1075 if options[b'zstd.level'] is not None:
1075 if options[b'zstd.level'] is not None:
1076 if not (0 <= options[b'zstd.level'] <= 22):
1076 if not (0 <= options[b'zstd.level'] <= 22):
1077 msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d')
1077 msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d')
1078 raise error.Abort(msg % options[b'zstd.level'])
1078 raise error.Abort(msg % options[b'zstd.level'])
1079
1079
1080 if requirementsmod.NARROW_REQUIREMENT in requirements:
1080 if requirementsmod.NARROW_REQUIREMENT in requirements:
1081 options[b'enableellipsis'] = True
1081 options[b'enableellipsis'] = True
1082
1082
1083 if ui.configbool(b'experimental', b'rust.index'):
1083 if ui.configbool(b'experimental', b'rust.index'):
1084 options[b'rust.index'] = True
1084 options[b'rust.index'] = True
1085 if requirementsmod.NODEMAP_REQUIREMENT in requirements:
1085 if requirementsmod.NODEMAP_REQUIREMENT in requirements:
1086 slow_path = ui.config(
1086 slow_path = ui.config(
1087 b'storage', b'revlog.persistent-nodemap.slow-path'
1087 b'storage', b'revlog.persistent-nodemap.slow-path'
1088 )
1088 )
1089 if slow_path not in (b'allow', b'warn', b'abort'):
1089 if slow_path not in (b'allow', b'warn', b'abort'):
1090 default = ui.config_default(
1090 default = ui.config_default(
1091 b'storage', b'revlog.persistent-nodemap.slow-path'
1091 b'storage', b'revlog.persistent-nodemap.slow-path'
1092 )
1092 )
1093 msg = _(
1093 msg = _(
1094 b'unknown value for config '
1094 b'unknown value for config '
1095 b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n'
1095 b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n'
1096 )
1096 )
1097 ui.warn(msg % slow_path)
1097 ui.warn(msg % slow_path)
1098 if not ui.quiet:
1098 if not ui.quiet:
1099 ui.warn(_(b'falling back to default value: %s\n') % default)
1099 ui.warn(_(b'falling back to default value: %s\n') % default)
1100 slow_path = default
1100 slow_path = default
1101
1101
1102 msg = _(
1102 msg = _(
1103 b"accessing `persistent-nodemap` repository without associated "
1103 b"accessing `persistent-nodemap` repository without associated "
1104 b"fast implementation."
1104 b"fast implementation."
1105 )
1105 )
1106 hint = _(
1106 hint = _(
1107 b"check `hg help config.format.use-persistent-nodemap` "
1107 b"check `hg help config.format.use-persistent-nodemap` "
1108 b"for details"
1108 b"for details"
1109 )
1109 )
1110 if not revlog.HAS_FAST_PERSISTENT_NODEMAP:
1110 if not revlog.HAS_FAST_PERSISTENT_NODEMAP:
1111 if slow_path == b'warn':
1111 if slow_path == b'warn':
1112 msg = b"warning: " + msg + b'\n'
1112 msg = b"warning: " + msg + b'\n'
1113 ui.warn(msg)
1113 ui.warn(msg)
1114 if not ui.quiet:
1114 if not ui.quiet:
1115 hint = b'(' + hint + b')\n'
1115 hint = b'(' + hint + b')\n'
1116 ui.warn(hint)
1116 ui.warn(hint)
1117 if slow_path == b'abort':
1117 if slow_path == b'abort':
1118 raise error.Abort(msg, hint=hint)
1118 raise error.Abort(msg, hint=hint)
1119 options[b'persistent-nodemap'] = True
1119 options[b'persistent-nodemap'] = True
1120 if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'):
1120 if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'):
1121 options[b'persistent-nodemap.mmap'] = True
1121 options[b'persistent-nodemap.mmap'] = True
1122 if ui.configbool(b'devel', b'persistent-nodemap'):
1122 if ui.configbool(b'devel', b'persistent-nodemap'):
1123 options[b'devel-force-nodemap'] = True
1123 options[b'devel-force-nodemap'] = True
1124
1124
1125 return options
1125 return options
1126
1126
1127
1127
1128 def makemain(**kwargs):
1128 def makemain(**kwargs):
1129 """Produce a type conforming to ``ilocalrepositorymain``."""
1129 """Produce a type conforming to ``ilocalrepositorymain``."""
1130 return localrepository
1130 return localrepository
1131
1131
1132
1132
1133 @interfaceutil.implementer(repository.ilocalrepositoryfilestorage)
1133 @interfaceutil.implementer(repository.ilocalrepositoryfilestorage)
1134 class revlogfilestorage(object):
1134 class revlogfilestorage(object):
1135 """File storage when using revlogs."""
1135 """File storage when using revlogs."""
1136
1136
1137 def file(self, path):
1137 def file(self, path):
1138 if path[0] == b'/':
1138 if path.startswith(b'/'):
1139 path = path[1:]
1139 path = path[1:]
1140
1140
1141 return filelog.filelog(self.svfs, path)
1141 return filelog.filelog(self.svfs, path)
1142
1142
1143
1143
1144 @interfaceutil.implementer(repository.ilocalrepositoryfilestorage)
1144 @interfaceutil.implementer(repository.ilocalrepositoryfilestorage)
1145 class revlognarrowfilestorage(object):
1145 class revlognarrowfilestorage(object):
1146 """File storage when using revlogs and narrow files."""
1146 """File storage when using revlogs and narrow files."""
1147
1147
1148 def file(self, path):
1148 def file(self, path):
1149 if path[0] == b'/':
1149 if path.startswith(b'/'):
1150 path = path[1:]
1150 path = path[1:]
1151
1151
1152 return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch)
1152 return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch)
1153
1153
1154
1154
1155 def makefilestorage(requirements, features, **kwargs):
1155 def makefilestorage(requirements, features, **kwargs):
1156 """Produce a type conforming to ``ilocalrepositoryfilestorage``."""
1156 """Produce a type conforming to ``ilocalrepositoryfilestorage``."""
1157 features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE)
1157 features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE)
1158 features.add(repository.REPO_FEATURE_STREAM_CLONE)
1158 features.add(repository.REPO_FEATURE_STREAM_CLONE)
1159
1159
1160 if requirementsmod.NARROW_REQUIREMENT in requirements:
1160 if requirementsmod.NARROW_REQUIREMENT in requirements:
1161 return revlognarrowfilestorage
1161 return revlognarrowfilestorage
1162 else:
1162 else:
1163 return revlogfilestorage
1163 return revlogfilestorage
1164
1164
1165
1165
1166 # List of repository interfaces and factory functions for them. Each
1166 # List of repository interfaces and factory functions for them. Each
1167 # will be called in order during ``makelocalrepository()`` to iteratively
1167 # will be called in order during ``makelocalrepository()`` to iteratively
1168 # derive the final type for a local repository instance. We capture the
1168 # derive the final type for a local repository instance. We capture the
1169 # function as a lambda so we don't hold a reference and the module-level
1169 # function as a lambda so we don't hold a reference and the module-level
1170 # functions can be wrapped.
1170 # functions can be wrapped.
1171 REPO_INTERFACES = [
1171 REPO_INTERFACES = [
1172 (repository.ilocalrepositorymain, lambda: makemain),
1172 (repository.ilocalrepositorymain, lambda: makemain),
1173 (repository.ilocalrepositoryfilestorage, lambda: makefilestorage),
1173 (repository.ilocalrepositoryfilestorage, lambda: makefilestorage),
1174 ]
1174 ]
1175
1175
1176
1176
1177 @interfaceutil.implementer(repository.ilocalrepositorymain)
1177 @interfaceutil.implementer(repository.ilocalrepositorymain)
1178 class localrepository(object):
1178 class localrepository(object):
1179 """Main class for representing local repositories.
1179 """Main class for representing local repositories.
1180
1180
1181 All local repositories are instances of this class.
1181 All local repositories are instances of this class.
1182
1182
1183 Constructed on its own, instances of this class are not usable as
1183 Constructed on its own, instances of this class are not usable as
1184 repository objects. To obtain a usable repository object, call
1184 repository objects. To obtain a usable repository object, call
1185 ``hg.repository()``, ``localrepo.instance()``, or
1185 ``hg.repository()``, ``localrepo.instance()``, or
1186 ``localrepo.makelocalrepository()``. The latter is the lowest-level.
1186 ``localrepo.makelocalrepository()``. The latter is the lowest-level.
1187 ``instance()`` adds support for creating new repositories.
1187 ``instance()`` adds support for creating new repositories.
1188 ``hg.repository()`` adds more extension integration, including calling
1188 ``hg.repository()`` adds more extension integration, including calling
1189 ``reposetup()``. Generally speaking, ``hg.repository()`` should be
1189 ``reposetup()``. Generally speaking, ``hg.repository()`` should be
1190 used.
1190 used.
1191 """
1191 """
1192
1192
1193 # obsolete experimental requirements:
1193 # obsolete experimental requirements:
1194 # - manifestv2: An experimental new manifest format that allowed
1194 # - manifestv2: An experimental new manifest format that allowed
1195 # for stem compression of long paths. Experiment ended up not
1195 # for stem compression of long paths. Experiment ended up not
1196 # being successful (repository sizes went up due to worse delta
1196 # being successful (repository sizes went up due to worse delta
1197 # chains), and the code was deleted in 4.6.
1197 # chains), and the code was deleted in 4.6.
1198 supportedformats = {
1198 supportedformats = {
1199 b'revlogv1',
1199 b'revlogv1',
1200 b'generaldelta',
1200 b'generaldelta',
1201 requirementsmod.TREEMANIFEST_REQUIREMENT,
1201 requirementsmod.TREEMANIFEST_REQUIREMENT,
1202 requirementsmod.COPIESSDC_REQUIREMENT,
1202 requirementsmod.COPIESSDC_REQUIREMENT,
1203 requirementsmod.REVLOGV2_REQUIREMENT,
1203 requirementsmod.REVLOGV2_REQUIREMENT,
1204 requirementsmod.SIDEDATA_REQUIREMENT,
1204 requirementsmod.SIDEDATA_REQUIREMENT,
1205 requirementsmod.SPARSEREVLOG_REQUIREMENT,
1205 requirementsmod.SPARSEREVLOG_REQUIREMENT,
1206 requirementsmod.NODEMAP_REQUIREMENT,
1206 requirementsmod.NODEMAP_REQUIREMENT,
1207 bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT,
1207 bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT,
1208 requirementsmod.SHARESAFE_REQUIREMENT,
1208 requirementsmod.SHARESAFE_REQUIREMENT,
1209 }
1209 }
1210 _basesupported = supportedformats | {
1210 _basesupported = supportedformats | {
1211 b'store',
1211 b'store',
1212 b'fncache',
1212 b'fncache',
1213 requirementsmod.SHARED_REQUIREMENT,
1213 requirementsmod.SHARED_REQUIREMENT,
1214 requirementsmod.RELATIVE_SHARED_REQUIREMENT,
1214 requirementsmod.RELATIVE_SHARED_REQUIREMENT,
1215 b'dotencode',
1215 b'dotencode',
1216 requirementsmod.SPARSE_REQUIREMENT,
1216 requirementsmod.SPARSE_REQUIREMENT,
1217 requirementsmod.INTERNAL_PHASE_REQUIREMENT,
1217 requirementsmod.INTERNAL_PHASE_REQUIREMENT,
1218 }
1218 }
1219
1219
1220 # list of prefix for file which can be written without 'wlock'
1220 # list of prefix for file which can be written without 'wlock'
1221 # Extensions should extend this list when needed
1221 # Extensions should extend this list when needed
1222 _wlockfreeprefix = {
1222 _wlockfreeprefix = {
1223 # We migh consider requiring 'wlock' for the next
1223 # We migh consider requiring 'wlock' for the next
1224 # two, but pretty much all the existing code assume
1224 # two, but pretty much all the existing code assume
1225 # wlock is not needed so we keep them excluded for
1225 # wlock is not needed so we keep them excluded for
1226 # now.
1226 # now.
1227 b'hgrc',
1227 b'hgrc',
1228 b'requires',
1228 b'requires',
1229 # XXX cache is a complicatged business someone
1229 # XXX cache is a complicatged business someone
1230 # should investigate this in depth at some point
1230 # should investigate this in depth at some point
1231 b'cache/',
1231 b'cache/',
1232 # XXX shouldn't be dirstate covered by the wlock?
1232 # XXX shouldn't be dirstate covered by the wlock?
1233 b'dirstate',
1233 b'dirstate',
1234 # XXX bisect was still a bit too messy at the time
1234 # XXX bisect was still a bit too messy at the time
1235 # this changeset was introduced. Someone should fix
1235 # this changeset was introduced. Someone should fix
1236 # the remainig bit and drop this line
1236 # the remainig bit and drop this line
1237 b'bisect.state',
1237 b'bisect.state',
1238 }
1238 }
1239
1239
1240 def __init__(
1240 def __init__(
1241 self,
1241 self,
1242 baseui,
1242 baseui,
1243 ui,
1243 ui,
1244 origroot,
1244 origroot,
1245 wdirvfs,
1245 wdirvfs,
1246 hgvfs,
1246 hgvfs,
1247 requirements,
1247 requirements,
1248 supportedrequirements,
1248 supportedrequirements,
1249 sharedpath,
1249 sharedpath,
1250 store,
1250 store,
1251 cachevfs,
1251 cachevfs,
1252 wcachevfs,
1252 wcachevfs,
1253 features,
1253 features,
1254 intents=None,
1254 intents=None,
1255 ):
1255 ):
1256 """Create a new local repository instance.
1256 """Create a new local repository instance.
1257
1257
1258 Most callers should use ``hg.repository()``, ``localrepo.instance()``,
1258 Most callers should use ``hg.repository()``, ``localrepo.instance()``,
1259 or ``localrepo.makelocalrepository()`` for obtaining a new repository
1259 or ``localrepo.makelocalrepository()`` for obtaining a new repository
1260 object.
1260 object.
1261
1261
1262 Arguments:
1262 Arguments:
1263
1263
1264 baseui
1264 baseui
1265 ``ui.ui`` instance that ``ui`` argument was based off of.
1265 ``ui.ui`` instance that ``ui`` argument was based off of.
1266
1266
1267 ui
1267 ui
1268 ``ui.ui`` instance for use by the repository.
1268 ``ui.ui`` instance for use by the repository.
1269
1269
1270 origroot
1270 origroot
1271 ``bytes`` path to working directory root of this repository.
1271 ``bytes`` path to working directory root of this repository.
1272
1272
1273 wdirvfs
1273 wdirvfs
1274 ``vfs.vfs`` rooted at the working directory.
1274 ``vfs.vfs`` rooted at the working directory.
1275
1275
1276 hgvfs
1276 hgvfs
1277 ``vfs.vfs`` rooted at .hg/
1277 ``vfs.vfs`` rooted at .hg/
1278
1278
1279 requirements
1279 requirements
1280 ``set`` of bytestrings representing repository opening requirements.
1280 ``set`` of bytestrings representing repository opening requirements.
1281
1281
1282 supportedrequirements
1282 supportedrequirements
1283 ``set`` of bytestrings representing repository requirements that we
1283 ``set`` of bytestrings representing repository requirements that we
1284 know how to open. May be a supetset of ``requirements``.
1284 know how to open. May be a supetset of ``requirements``.
1285
1285
1286 sharedpath
1286 sharedpath
1287 ``bytes`` Defining path to storage base directory. Points to a
1287 ``bytes`` Defining path to storage base directory. Points to a
1288 ``.hg/`` directory somewhere.
1288 ``.hg/`` directory somewhere.
1289
1289
1290 store
1290 store
1291 ``store.basicstore`` (or derived) instance providing access to
1291 ``store.basicstore`` (or derived) instance providing access to
1292 versioned storage.
1292 versioned storage.
1293
1293
1294 cachevfs
1294 cachevfs
1295 ``vfs.vfs`` used for cache files.
1295 ``vfs.vfs`` used for cache files.
1296
1296
1297 wcachevfs
1297 wcachevfs
1298 ``vfs.vfs`` used for cache files related to the working copy.
1298 ``vfs.vfs`` used for cache files related to the working copy.
1299
1299
1300 features
1300 features
1301 ``set`` of bytestrings defining features/capabilities of this
1301 ``set`` of bytestrings defining features/capabilities of this
1302 instance.
1302 instance.
1303
1303
1304 intents
1304 intents
1305 ``set`` of system strings indicating what this repo will be used
1305 ``set`` of system strings indicating what this repo will be used
1306 for.
1306 for.
1307 """
1307 """
1308 self.baseui = baseui
1308 self.baseui = baseui
1309 self.ui = ui
1309 self.ui = ui
1310 self.origroot = origroot
1310 self.origroot = origroot
1311 # vfs rooted at working directory.
1311 # vfs rooted at working directory.
1312 self.wvfs = wdirvfs
1312 self.wvfs = wdirvfs
1313 self.root = wdirvfs.base
1313 self.root = wdirvfs.base
1314 # vfs rooted at .hg/. Used to access most non-store paths.
1314 # vfs rooted at .hg/. Used to access most non-store paths.
1315 self.vfs = hgvfs
1315 self.vfs = hgvfs
1316 self.path = hgvfs.base
1316 self.path = hgvfs.base
1317 self.requirements = requirements
1317 self.requirements = requirements
1318 self.supported = supportedrequirements
1318 self.supported = supportedrequirements
1319 self.sharedpath = sharedpath
1319 self.sharedpath = sharedpath
1320 self.store = store
1320 self.store = store
1321 self.cachevfs = cachevfs
1321 self.cachevfs = cachevfs
1322 self.wcachevfs = wcachevfs
1322 self.wcachevfs = wcachevfs
1323 self.features = features
1323 self.features = features
1324
1324
1325 self.filtername = None
1325 self.filtername = None
1326
1326
1327 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1327 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1328 b'devel', b'check-locks'
1328 b'devel', b'check-locks'
1329 ):
1329 ):
1330 self.vfs.audit = self._getvfsward(self.vfs.audit)
1330 self.vfs.audit = self._getvfsward(self.vfs.audit)
1331 # A list of callback to shape the phase if no data were found.
1331 # A list of callback to shape the phase if no data were found.
1332 # Callback are in the form: func(repo, roots) --> processed root.
1332 # Callback are in the form: func(repo, roots) --> processed root.
1333 # This list it to be filled by extension during repo setup
1333 # This list it to be filled by extension during repo setup
1334 self._phasedefaults = []
1334 self._phasedefaults = []
1335
1335
1336 color.setup(self.ui)
1336 color.setup(self.ui)
1337
1337
1338 self.spath = self.store.path
1338 self.spath = self.store.path
1339 self.svfs = self.store.vfs
1339 self.svfs = self.store.vfs
1340 self.sjoin = self.store.join
1340 self.sjoin = self.store.join
1341 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1341 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1342 b'devel', b'check-locks'
1342 b'devel', b'check-locks'
1343 ):
1343 ):
1344 if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs
1344 if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs
1345 self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit)
1345 self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit)
1346 else: # standard vfs
1346 else: # standard vfs
1347 self.svfs.audit = self._getsvfsward(self.svfs.audit)
1347 self.svfs.audit = self._getsvfsward(self.svfs.audit)
1348
1348
1349 self._dirstatevalidatewarned = False
1349 self._dirstatevalidatewarned = False
1350
1350
1351 self._branchcaches = branchmap.BranchMapCache()
1351 self._branchcaches = branchmap.BranchMapCache()
1352 self._revbranchcache = None
1352 self._revbranchcache = None
1353 self._filterpats = {}
1353 self._filterpats = {}
1354 self._datafilters = {}
1354 self._datafilters = {}
1355 self._transref = self._lockref = self._wlockref = None
1355 self._transref = self._lockref = self._wlockref = None
1356
1356
1357 # A cache for various files under .hg/ that tracks file changes,
1357 # A cache for various files under .hg/ that tracks file changes,
1358 # (used by the filecache decorator)
1358 # (used by the filecache decorator)
1359 #
1359 #
1360 # Maps a property name to its util.filecacheentry
1360 # Maps a property name to its util.filecacheentry
1361 self._filecache = {}
1361 self._filecache = {}
1362
1362
1363 # hold sets of revision to be filtered
1363 # hold sets of revision to be filtered
1364 # should be cleared when something might have changed the filter value:
1364 # should be cleared when something might have changed the filter value:
1365 # - new changesets,
1365 # - new changesets,
1366 # - phase change,
1366 # - phase change,
1367 # - new obsolescence marker,
1367 # - new obsolescence marker,
1368 # - working directory parent change,
1368 # - working directory parent change,
1369 # - bookmark changes
1369 # - bookmark changes
1370 self.filteredrevcache = {}
1370 self.filteredrevcache = {}
1371
1371
1372 # post-dirstate-status hooks
1372 # post-dirstate-status hooks
1373 self._postdsstatus = []
1373 self._postdsstatus = []
1374
1374
1375 # generic mapping between names and nodes
1375 # generic mapping between names and nodes
1376 self.names = namespaces.namespaces()
1376 self.names = namespaces.namespaces()
1377
1377
1378 # Key to signature value.
1378 # Key to signature value.
1379 self._sparsesignaturecache = {}
1379 self._sparsesignaturecache = {}
1380 # Signature to cached matcher instance.
1380 # Signature to cached matcher instance.
1381 self._sparsematchercache = {}
1381 self._sparsematchercache = {}
1382
1382
1383 self._extrafilterid = repoview.extrafilter(ui)
1383 self._extrafilterid = repoview.extrafilter(ui)
1384
1384
1385 self.filecopiesmode = None
1385 self.filecopiesmode = None
1386 if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements:
1386 if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements:
1387 self.filecopiesmode = b'changeset-sidedata'
1387 self.filecopiesmode = b'changeset-sidedata'
1388
1388
1389 def _getvfsward(self, origfunc):
1389 def _getvfsward(self, origfunc):
1390 """build a ward for self.vfs"""
1390 """build a ward for self.vfs"""
1391 rref = weakref.ref(self)
1391 rref = weakref.ref(self)
1392
1392
1393 def checkvfs(path, mode=None):
1393 def checkvfs(path, mode=None):
1394 ret = origfunc(path, mode=mode)
1394 ret = origfunc(path, mode=mode)
1395 repo = rref()
1395 repo = rref()
1396 if (
1396 if (
1397 repo is None
1397 repo is None
1398 or not util.safehasattr(repo, b'_wlockref')
1398 or not util.safehasattr(repo, b'_wlockref')
1399 or not util.safehasattr(repo, b'_lockref')
1399 or not util.safehasattr(repo, b'_lockref')
1400 ):
1400 ):
1401 return
1401 return
1402 if mode in (None, b'r', b'rb'):
1402 if mode in (None, b'r', b'rb'):
1403 return
1403 return
1404 if path.startswith(repo.path):
1404 if path.startswith(repo.path):
1405 # truncate name relative to the repository (.hg)
1405 # truncate name relative to the repository (.hg)
1406 path = path[len(repo.path) + 1 :]
1406 path = path[len(repo.path) + 1 :]
1407 if path.startswith(b'cache/'):
1407 if path.startswith(b'cache/'):
1408 msg = b'accessing cache with vfs instead of cachevfs: "%s"'
1408 msg = b'accessing cache with vfs instead of cachevfs: "%s"'
1409 repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs")
1409 repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs")
1410 # path prefixes covered by 'lock'
1410 # path prefixes covered by 'lock'
1411 vfs_path_prefixes = (
1411 vfs_path_prefixes = (
1412 b'journal.',
1412 b'journal.',
1413 b'undo.',
1413 b'undo.',
1414 b'strip-backup/',
1414 b'strip-backup/',
1415 b'cache/',
1415 b'cache/',
1416 )
1416 )
1417 if any(path.startswith(prefix) for prefix in vfs_path_prefixes):
1417 if any(path.startswith(prefix) for prefix in vfs_path_prefixes):
1418 if repo._currentlock(repo._lockref) is None:
1418 if repo._currentlock(repo._lockref) is None:
1419 repo.ui.develwarn(
1419 repo.ui.develwarn(
1420 b'write with no lock: "%s"' % path,
1420 b'write with no lock: "%s"' % path,
1421 stacklevel=3,
1421 stacklevel=3,
1422 config=b'check-locks',
1422 config=b'check-locks',
1423 )
1423 )
1424 elif repo._currentlock(repo._wlockref) is None:
1424 elif repo._currentlock(repo._wlockref) is None:
1425 # rest of vfs files are covered by 'wlock'
1425 # rest of vfs files are covered by 'wlock'
1426 #
1426 #
1427 # exclude special files
1427 # exclude special files
1428 for prefix in self._wlockfreeprefix:
1428 for prefix in self._wlockfreeprefix:
1429 if path.startswith(prefix):
1429 if path.startswith(prefix):
1430 return
1430 return
1431 repo.ui.develwarn(
1431 repo.ui.develwarn(
1432 b'write with no wlock: "%s"' % path,
1432 b'write with no wlock: "%s"' % path,
1433 stacklevel=3,
1433 stacklevel=3,
1434 config=b'check-locks',
1434 config=b'check-locks',
1435 )
1435 )
1436 return ret
1436 return ret
1437
1437
1438 return checkvfs
1438 return checkvfs
1439
1439
1440 def _getsvfsward(self, origfunc):
1440 def _getsvfsward(self, origfunc):
1441 """build a ward for self.svfs"""
1441 """build a ward for self.svfs"""
1442 rref = weakref.ref(self)
1442 rref = weakref.ref(self)
1443
1443
1444 def checksvfs(path, mode=None):
1444 def checksvfs(path, mode=None):
1445 ret = origfunc(path, mode=mode)
1445 ret = origfunc(path, mode=mode)
1446 repo = rref()
1446 repo = rref()
1447 if repo is None or not util.safehasattr(repo, b'_lockref'):
1447 if repo is None or not util.safehasattr(repo, b'_lockref'):
1448 return
1448 return
1449 if mode in (None, b'r', b'rb'):
1449 if mode in (None, b'r', b'rb'):
1450 return
1450 return
1451 if path.startswith(repo.sharedpath):
1451 if path.startswith(repo.sharedpath):
1452 # truncate name relative to the repository (.hg)
1452 # truncate name relative to the repository (.hg)
1453 path = path[len(repo.sharedpath) + 1 :]
1453 path = path[len(repo.sharedpath) + 1 :]
1454 if repo._currentlock(repo._lockref) is None:
1454 if repo._currentlock(repo._lockref) is None:
1455 repo.ui.develwarn(
1455 repo.ui.develwarn(
1456 b'write with no lock: "%s"' % path, stacklevel=4
1456 b'write with no lock: "%s"' % path, stacklevel=4
1457 )
1457 )
1458 return ret
1458 return ret
1459
1459
1460 return checksvfs
1460 return checksvfs
1461
1461
1462 def close(self):
1462 def close(self):
1463 self._writecaches()
1463 self._writecaches()
1464
1464
1465 def _writecaches(self):
1465 def _writecaches(self):
1466 if self._revbranchcache:
1466 if self._revbranchcache:
1467 self._revbranchcache.write()
1467 self._revbranchcache.write()
1468
1468
1469 def _restrictcapabilities(self, caps):
1469 def _restrictcapabilities(self, caps):
1470 if self.ui.configbool(b'experimental', b'bundle2-advertise'):
1470 if self.ui.configbool(b'experimental', b'bundle2-advertise'):
1471 caps = set(caps)
1471 caps = set(caps)
1472 capsblob = bundle2.encodecaps(
1472 capsblob = bundle2.encodecaps(
1473 bundle2.getrepocaps(self, role=b'client')
1473 bundle2.getrepocaps(self, role=b'client')
1474 )
1474 )
1475 caps.add(b'bundle2=' + urlreq.quote(capsblob))
1475 caps.add(b'bundle2=' + urlreq.quote(capsblob))
1476 return caps
1476 return caps
1477
1477
1478 # Don't cache auditor/nofsauditor, or you'll end up with reference cycle:
1478 # Don't cache auditor/nofsauditor, or you'll end up with reference cycle:
1479 # self -> auditor -> self._checknested -> self
1479 # self -> auditor -> self._checknested -> self
1480
1480
1481 @property
1481 @property
1482 def auditor(self):
1482 def auditor(self):
1483 # This is only used by context.workingctx.match in order to
1483 # This is only used by context.workingctx.match in order to
1484 # detect files in subrepos.
1484 # detect files in subrepos.
1485 return pathutil.pathauditor(self.root, callback=self._checknested)
1485 return pathutil.pathauditor(self.root, callback=self._checknested)
1486
1486
1487 @property
1487 @property
1488 def nofsauditor(self):
1488 def nofsauditor(self):
1489 # This is only used by context.basectx.match in order to detect
1489 # This is only used by context.basectx.match in order to detect
1490 # files in subrepos.
1490 # files in subrepos.
1491 return pathutil.pathauditor(
1491 return pathutil.pathauditor(
1492 self.root, callback=self._checknested, realfs=False, cached=True
1492 self.root, callback=self._checknested, realfs=False, cached=True
1493 )
1493 )
1494
1494
1495 def _checknested(self, path):
1495 def _checknested(self, path):
1496 """Determine if path is a legal nested repository."""
1496 """Determine if path is a legal nested repository."""
1497 if not path.startswith(self.root):
1497 if not path.startswith(self.root):
1498 return False
1498 return False
1499 subpath = path[len(self.root) + 1 :]
1499 subpath = path[len(self.root) + 1 :]
1500 normsubpath = util.pconvert(subpath)
1500 normsubpath = util.pconvert(subpath)
1501
1501
1502 # XXX: Checking against the current working copy is wrong in
1502 # XXX: Checking against the current working copy is wrong in
1503 # the sense that it can reject things like
1503 # the sense that it can reject things like
1504 #
1504 #
1505 # $ hg cat -r 10 sub/x.txt
1505 # $ hg cat -r 10 sub/x.txt
1506 #
1506 #
1507 # if sub/ is no longer a subrepository in the working copy
1507 # if sub/ is no longer a subrepository in the working copy
1508 # parent revision.
1508 # parent revision.
1509 #
1509 #
1510 # However, it can of course also allow things that would have
1510 # However, it can of course also allow things that would have
1511 # been rejected before, such as the above cat command if sub/
1511 # been rejected before, such as the above cat command if sub/
1512 # is a subrepository now, but was a normal directory before.
1512 # is a subrepository now, but was a normal directory before.
1513 # The old path auditor would have rejected by mistake since it
1513 # The old path auditor would have rejected by mistake since it
1514 # panics when it sees sub/.hg/.
1514 # panics when it sees sub/.hg/.
1515 #
1515 #
1516 # All in all, checking against the working copy seems sensible
1516 # All in all, checking against the working copy seems sensible
1517 # since we want to prevent access to nested repositories on
1517 # since we want to prevent access to nested repositories on
1518 # the filesystem *now*.
1518 # the filesystem *now*.
1519 ctx = self[None]
1519 ctx = self[None]
1520 parts = util.splitpath(subpath)
1520 parts = util.splitpath(subpath)
1521 while parts:
1521 while parts:
1522 prefix = b'/'.join(parts)
1522 prefix = b'/'.join(parts)
1523 if prefix in ctx.substate:
1523 if prefix in ctx.substate:
1524 if prefix == normsubpath:
1524 if prefix == normsubpath:
1525 return True
1525 return True
1526 else:
1526 else:
1527 sub = ctx.sub(prefix)
1527 sub = ctx.sub(prefix)
1528 return sub.checknested(subpath[len(prefix) + 1 :])
1528 return sub.checknested(subpath[len(prefix) + 1 :])
1529 else:
1529 else:
1530 parts.pop()
1530 parts.pop()
1531 return False
1531 return False
1532
1532
1533 def peer(self):
1533 def peer(self):
1534 return localpeer(self) # not cached to avoid reference cycle
1534 return localpeer(self) # not cached to avoid reference cycle
1535
1535
1536 def unfiltered(self):
1536 def unfiltered(self):
1537 """Return unfiltered version of the repository
1537 """Return unfiltered version of the repository
1538
1538
1539 Intended to be overwritten by filtered repo."""
1539 Intended to be overwritten by filtered repo."""
1540 return self
1540 return self
1541
1541
1542 def filtered(self, name, visibilityexceptions=None):
1542 def filtered(self, name, visibilityexceptions=None):
1543 """Return a filtered version of a repository
1543 """Return a filtered version of a repository
1544
1544
1545 The `name` parameter is the identifier of the requested view. This
1545 The `name` parameter is the identifier of the requested view. This
1546 will return a repoview object set "exactly" to the specified view.
1546 will return a repoview object set "exactly" to the specified view.
1547
1547
1548 This function does not apply recursive filtering to a repository. For
1548 This function does not apply recursive filtering to a repository. For
1549 example calling `repo.filtered("served")` will return a repoview using
1549 example calling `repo.filtered("served")` will return a repoview using
1550 the "served" view, regardless of the initial view used by `repo`.
1550 the "served" view, regardless of the initial view used by `repo`.
1551
1551
1552 In other word, there is always only one level of `repoview` "filtering".
1552 In other word, there is always only one level of `repoview` "filtering".
1553 """
1553 """
1554 if self._extrafilterid is not None and b'%' not in name:
1554 if self._extrafilterid is not None and b'%' not in name:
1555 name = name + b'%' + self._extrafilterid
1555 name = name + b'%' + self._extrafilterid
1556
1556
1557 cls = repoview.newtype(self.unfiltered().__class__)
1557 cls = repoview.newtype(self.unfiltered().__class__)
1558 return cls(self, name, visibilityexceptions)
1558 return cls(self, name, visibilityexceptions)
1559
1559
1560 @mixedrepostorecache(
1560 @mixedrepostorecache(
1561 (b'bookmarks', b'plain'),
1561 (b'bookmarks', b'plain'),
1562 (b'bookmarks.current', b'plain'),
1562 (b'bookmarks.current', b'plain'),
1563 (b'bookmarks', b''),
1563 (b'bookmarks', b''),
1564 (b'00changelog.i', b''),
1564 (b'00changelog.i', b''),
1565 )
1565 )
1566 def _bookmarks(self):
1566 def _bookmarks(self):
1567 # Since the multiple files involved in the transaction cannot be
1567 # Since the multiple files involved in the transaction cannot be
1568 # written atomically (with current repository format), there is a race
1568 # written atomically (with current repository format), there is a race
1569 # condition here.
1569 # condition here.
1570 #
1570 #
1571 # 1) changelog content A is read
1571 # 1) changelog content A is read
1572 # 2) outside transaction update changelog to content B
1572 # 2) outside transaction update changelog to content B
1573 # 3) outside transaction update bookmark file referring to content B
1573 # 3) outside transaction update bookmark file referring to content B
1574 # 4) bookmarks file content is read and filtered against changelog-A
1574 # 4) bookmarks file content is read and filtered against changelog-A
1575 #
1575 #
1576 # When this happens, bookmarks against nodes missing from A are dropped.
1576 # When this happens, bookmarks against nodes missing from A are dropped.
1577 #
1577 #
1578 # Having this happening during read is not great, but it become worse
1578 # Having this happening during read is not great, but it become worse
1579 # when this happen during write because the bookmarks to the "unknown"
1579 # when this happen during write because the bookmarks to the "unknown"
1580 # nodes will be dropped for good. However, writes happen within locks.
1580 # nodes will be dropped for good. However, writes happen within locks.
1581 # This locking makes it possible to have a race free consistent read.
1581 # This locking makes it possible to have a race free consistent read.
1582 # For this purpose data read from disc before locking are
1582 # For this purpose data read from disc before locking are
1583 # "invalidated" right after the locks are taken. This invalidations are
1583 # "invalidated" right after the locks are taken. This invalidations are
1584 # "light", the `filecache` mechanism keep the data in memory and will
1584 # "light", the `filecache` mechanism keep the data in memory and will
1585 # reuse them if the underlying files did not changed. Not parsing the
1585 # reuse them if the underlying files did not changed. Not parsing the
1586 # same data multiple times helps performances.
1586 # same data multiple times helps performances.
1587 #
1587 #
1588 # Unfortunately in the case describe above, the files tracked by the
1588 # Unfortunately in the case describe above, the files tracked by the
1589 # bookmarks file cache might not have changed, but the in-memory
1589 # bookmarks file cache might not have changed, but the in-memory
1590 # content is still "wrong" because we used an older changelog content
1590 # content is still "wrong" because we used an older changelog content
1591 # to process the on-disk data. So after locking, the changelog would be
1591 # to process the on-disk data. So after locking, the changelog would be
1592 # refreshed but `_bookmarks` would be preserved.
1592 # refreshed but `_bookmarks` would be preserved.
1593 # Adding `00changelog.i` to the list of tracked file is not
1593 # Adding `00changelog.i` to the list of tracked file is not
1594 # enough, because at the time we build the content for `_bookmarks` in
1594 # enough, because at the time we build the content for `_bookmarks` in
1595 # (4), the changelog file has already diverged from the content used
1595 # (4), the changelog file has already diverged from the content used
1596 # for loading `changelog` in (1)
1596 # for loading `changelog` in (1)
1597 #
1597 #
1598 # To prevent the issue, we force the changelog to be explicitly
1598 # To prevent the issue, we force the changelog to be explicitly
1599 # reloaded while computing `_bookmarks`. The data race can still happen
1599 # reloaded while computing `_bookmarks`. The data race can still happen
1600 # without the lock (with a narrower window), but it would no longer go
1600 # without the lock (with a narrower window), but it would no longer go
1601 # undetected during the lock time refresh.
1601 # undetected during the lock time refresh.
1602 #
1602 #
1603 # The new schedule is as follow
1603 # The new schedule is as follow
1604 #
1604 #
1605 # 1) filecache logic detect that `_bookmarks` needs to be computed
1605 # 1) filecache logic detect that `_bookmarks` needs to be computed
1606 # 2) cachestat for `bookmarks` and `changelog` are captured (for book)
1606 # 2) cachestat for `bookmarks` and `changelog` are captured (for book)
1607 # 3) We force `changelog` filecache to be tested
1607 # 3) We force `changelog` filecache to be tested
1608 # 4) cachestat for `changelog` are captured (for changelog)
1608 # 4) cachestat for `changelog` are captured (for changelog)
1609 # 5) `_bookmarks` is computed and cached
1609 # 5) `_bookmarks` is computed and cached
1610 #
1610 #
1611 # The step in (3) ensure we have a changelog at least as recent as the
1611 # The step in (3) ensure we have a changelog at least as recent as the
1612 # cache stat computed in (1). As a result at locking time:
1612 # cache stat computed in (1). As a result at locking time:
1613 # * if the changelog did not changed since (1) -> we can reuse the data
1613 # * if the changelog did not changed since (1) -> we can reuse the data
1614 # * otherwise -> the bookmarks get refreshed.
1614 # * otherwise -> the bookmarks get refreshed.
1615 self._refreshchangelog()
1615 self._refreshchangelog()
1616 return bookmarks.bmstore(self)
1616 return bookmarks.bmstore(self)
1617
1617
1618 def _refreshchangelog(self):
1618 def _refreshchangelog(self):
1619 """make sure the in memory changelog match the on-disk one"""
1619 """make sure the in memory changelog match the on-disk one"""
1620 if 'changelog' in vars(self) and self.currenttransaction() is None:
1620 if 'changelog' in vars(self) and self.currenttransaction() is None:
1621 del self.changelog
1621 del self.changelog
1622
1622
1623 @property
1623 @property
1624 def _activebookmark(self):
1624 def _activebookmark(self):
1625 return self._bookmarks.active
1625 return self._bookmarks.active
1626
1626
1627 # _phasesets depend on changelog. what we need is to call
1627 # _phasesets depend on changelog. what we need is to call
1628 # _phasecache.invalidate() if '00changelog.i' was changed, but it
1628 # _phasecache.invalidate() if '00changelog.i' was changed, but it
1629 # can't be easily expressed in filecache mechanism.
1629 # can't be easily expressed in filecache mechanism.
1630 @storecache(b'phaseroots', b'00changelog.i')
1630 @storecache(b'phaseroots', b'00changelog.i')
1631 def _phasecache(self):
1631 def _phasecache(self):
1632 return phases.phasecache(self, self._phasedefaults)
1632 return phases.phasecache(self, self._phasedefaults)
1633
1633
1634 @storecache(b'obsstore')
1634 @storecache(b'obsstore')
1635 def obsstore(self):
1635 def obsstore(self):
1636 return obsolete.makestore(self.ui, self)
1636 return obsolete.makestore(self.ui, self)
1637
1637
1638 @storecache(b'00changelog.i')
1638 @storecache(b'00changelog.i')
1639 def changelog(self):
1639 def changelog(self):
1640 # load dirstate before changelog to avoid race see issue6303
1640 # load dirstate before changelog to avoid race see issue6303
1641 self.dirstate.prefetch_parents()
1641 self.dirstate.prefetch_parents()
1642 return self.store.changelog(txnutil.mayhavepending(self.root))
1642 return self.store.changelog(txnutil.mayhavepending(self.root))
1643
1643
1644 @storecache(b'00manifest.i')
1644 @storecache(b'00manifest.i')
1645 def manifestlog(self):
1645 def manifestlog(self):
1646 return self.store.manifestlog(self, self._storenarrowmatch)
1646 return self.store.manifestlog(self, self._storenarrowmatch)
1647
1647
1648 @repofilecache(b'dirstate')
1648 @repofilecache(b'dirstate')
1649 def dirstate(self):
1649 def dirstate(self):
1650 return self._makedirstate()
1650 return self._makedirstate()
1651
1651
1652 def _makedirstate(self):
1652 def _makedirstate(self):
1653 """Extension point for wrapping the dirstate per-repo."""
1653 """Extension point for wrapping the dirstate per-repo."""
1654 sparsematchfn = lambda: sparse.matcher(self)
1654 sparsematchfn = lambda: sparse.matcher(self)
1655
1655
1656 return dirstate.dirstate(
1656 return dirstate.dirstate(
1657 self.vfs, self.ui, self.root, self._dirstatevalidate, sparsematchfn
1657 self.vfs, self.ui, self.root, self._dirstatevalidate, sparsematchfn
1658 )
1658 )
1659
1659
1660 def _dirstatevalidate(self, node):
1660 def _dirstatevalidate(self, node):
1661 try:
1661 try:
1662 self.changelog.rev(node)
1662 self.changelog.rev(node)
1663 return node
1663 return node
1664 except error.LookupError:
1664 except error.LookupError:
1665 if not self._dirstatevalidatewarned:
1665 if not self._dirstatevalidatewarned:
1666 self._dirstatevalidatewarned = True
1666 self._dirstatevalidatewarned = True
1667 self.ui.warn(
1667 self.ui.warn(
1668 _(b"warning: ignoring unknown working parent %s!\n")
1668 _(b"warning: ignoring unknown working parent %s!\n")
1669 % short(node)
1669 % short(node)
1670 )
1670 )
1671 return nullid
1671 return nullid
1672
1672
1673 @storecache(narrowspec.FILENAME)
1673 @storecache(narrowspec.FILENAME)
1674 def narrowpats(self):
1674 def narrowpats(self):
1675 """matcher patterns for this repository's narrowspec
1675 """matcher patterns for this repository's narrowspec
1676
1676
1677 A tuple of (includes, excludes).
1677 A tuple of (includes, excludes).
1678 """
1678 """
1679 return narrowspec.load(self)
1679 return narrowspec.load(self)
1680
1680
1681 @storecache(narrowspec.FILENAME)
1681 @storecache(narrowspec.FILENAME)
1682 def _storenarrowmatch(self):
1682 def _storenarrowmatch(self):
1683 if requirementsmod.NARROW_REQUIREMENT not in self.requirements:
1683 if requirementsmod.NARROW_REQUIREMENT not in self.requirements:
1684 return matchmod.always()
1684 return matchmod.always()
1685 include, exclude = self.narrowpats
1685 include, exclude = self.narrowpats
1686 return narrowspec.match(self.root, include=include, exclude=exclude)
1686 return narrowspec.match(self.root, include=include, exclude=exclude)
1687
1687
1688 @storecache(narrowspec.FILENAME)
1688 @storecache(narrowspec.FILENAME)
1689 def _narrowmatch(self):
1689 def _narrowmatch(self):
1690 if requirementsmod.NARROW_REQUIREMENT not in self.requirements:
1690 if requirementsmod.NARROW_REQUIREMENT not in self.requirements:
1691 return matchmod.always()
1691 return matchmod.always()
1692 narrowspec.checkworkingcopynarrowspec(self)
1692 narrowspec.checkworkingcopynarrowspec(self)
1693 include, exclude = self.narrowpats
1693 include, exclude = self.narrowpats
1694 return narrowspec.match(self.root, include=include, exclude=exclude)
1694 return narrowspec.match(self.root, include=include, exclude=exclude)
1695
1695
1696 def narrowmatch(self, match=None, includeexact=False):
1696 def narrowmatch(self, match=None, includeexact=False):
1697 """matcher corresponding the the repo's narrowspec
1697 """matcher corresponding the the repo's narrowspec
1698
1698
1699 If `match` is given, then that will be intersected with the narrow
1699 If `match` is given, then that will be intersected with the narrow
1700 matcher.
1700 matcher.
1701
1701
1702 If `includeexact` is True, then any exact matches from `match` will
1702 If `includeexact` is True, then any exact matches from `match` will
1703 be included even if they're outside the narrowspec.
1703 be included even if they're outside the narrowspec.
1704 """
1704 """
1705 if match:
1705 if match:
1706 if includeexact and not self._narrowmatch.always():
1706 if includeexact and not self._narrowmatch.always():
1707 # do not exclude explicitly-specified paths so that they can
1707 # do not exclude explicitly-specified paths so that they can
1708 # be warned later on
1708 # be warned later on
1709 em = matchmod.exact(match.files())
1709 em = matchmod.exact(match.files())
1710 nm = matchmod.unionmatcher([self._narrowmatch, em])
1710 nm = matchmod.unionmatcher([self._narrowmatch, em])
1711 return matchmod.intersectmatchers(match, nm)
1711 return matchmod.intersectmatchers(match, nm)
1712 return matchmod.intersectmatchers(match, self._narrowmatch)
1712 return matchmod.intersectmatchers(match, self._narrowmatch)
1713 return self._narrowmatch
1713 return self._narrowmatch
1714
1714
1715 def setnarrowpats(self, newincludes, newexcludes):
1715 def setnarrowpats(self, newincludes, newexcludes):
1716 narrowspec.save(self, newincludes, newexcludes)
1716 narrowspec.save(self, newincludes, newexcludes)
1717 self.invalidate(clearfilecache=True)
1717 self.invalidate(clearfilecache=True)
1718
1718
1719 @unfilteredpropertycache
1719 @unfilteredpropertycache
1720 def _quick_access_changeid_null(self):
1720 def _quick_access_changeid_null(self):
1721 return {
1721 return {
1722 b'null': (nullrev, nullid),
1722 b'null': (nullrev, nullid),
1723 nullrev: (nullrev, nullid),
1723 nullrev: (nullrev, nullid),
1724 nullid: (nullrev, nullid),
1724 nullid: (nullrev, nullid),
1725 }
1725 }
1726
1726
1727 @unfilteredpropertycache
1727 @unfilteredpropertycache
1728 def _quick_access_changeid_wc(self):
1728 def _quick_access_changeid_wc(self):
1729 # also fast path access to the working copy parents
1729 # also fast path access to the working copy parents
1730 # however, only do it for filter that ensure wc is visible.
1730 # however, only do it for filter that ensure wc is visible.
1731 quick = self._quick_access_changeid_null.copy()
1731 quick = self._quick_access_changeid_null.copy()
1732 cl = self.unfiltered().changelog
1732 cl = self.unfiltered().changelog
1733 for node in self.dirstate.parents():
1733 for node in self.dirstate.parents():
1734 if node == nullid:
1734 if node == nullid:
1735 continue
1735 continue
1736 rev = cl.index.get_rev(node)
1736 rev = cl.index.get_rev(node)
1737 if rev is None:
1737 if rev is None:
1738 # unknown working copy parent case:
1738 # unknown working copy parent case:
1739 #
1739 #
1740 # skip the fast path and let higher code deal with it
1740 # skip the fast path and let higher code deal with it
1741 continue
1741 continue
1742 pair = (rev, node)
1742 pair = (rev, node)
1743 quick[rev] = pair
1743 quick[rev] = pair
1744 quick[node] = pair
1744 quick[node] = pair
1745 # also add the parents of the parents
1745 # also add the parents of the parents
1746 for r in cl.parentrevs(rev):
1746 for r in cl.parentrevs(rev):
1747 if r == nullrev:
1747 if r == nullrev:
1748 continue
1748 continue
1749 n = cl.node(r)
1749 n = cl.node(r)
1750 pair = (r, n)
1750 pair = (r, n)
1751 quick[r] = pair
1751 quick[r] = pair
1752 quick[n] = pair
1752 quick[n] = pair
1753 p1node = self.dirstate.p1()
1753 p1node = self.dirstate.p1()
1754 if p1node != nullid:
1754 if p1node != nullid:
1755 quick[b'.'] = quick[p1node]
1755 quick[b'.'] = quick[p1node]
1756 return quick
1756 return quick
1757
1757
1758 @unfilteredmethod
1758 @unfilteredmethod
1759 def _quick_access_changeid_invalidate(self):
1759 def _quick_access_changeid_invalidate(self):
1760 if '_quick_access_changeid_wc' in vars(self):
1760 if '_quick_access_changeid_wc' in vars(self):
1761 del self.__dict__['_quick_access_changeid_wc']
1761 del self.__dict__['_quick_access_changeid_wc']
1762
1762
1763 @property
1763 @property
1764 def _quick_access_changeid(self):
1764 def _quick_access_changeid(self):
1765 """an helper dictionnary for __getitem__ calls
1765 """an helper dictionnary for __getitem__ calls
1766
1766
1767 This contains a list of symbol we can recognise right away without
1767 This contains a list of symbol we can recognise right away without
1768 further processing.
1768 further processing.
1769 """
1769 """
1770 if self.filtername in repoview.filter_has_wc:
1770 if self.filtername in repoview.filter_has_wc:
1771 return self._quick_access_changeid_wc
1771 return self._quick_access_changeid_wc
1772 return self._quick_access_changeid_null
1772 return self._quick_access_changeid_null
1773
1773
1774 def __getitem__(self, changeid):
1774 def __getitem__(self, changeid):
1775 # dealing with special cases
1775 # dealing with special cases
1776 if changeid is None:
1776 if changeid is None:
1777 return context.workingctx(self)
1777 return context.workingctx(self)
1778 if isinstance(changeid, context.basectx):
1778 if isinstance(changeid, context.basectx):
1779 return changeid
1779 return changeid
1780
1780
1781 # dealing with multiple revisions
1781 # dealing with multiple revisions
1782 if isinstance(changeid, slice):
1782 if isinstance(changeid, slice):
1783 # wdirrev isn't contiguous so the slice shouldn't include it
1783 # wdirrev isn't contiguous so the slice shouldn't include it
1784 return [
1784 return [
1785 self[i]
1785 self[i]
1786 for i in pycompat.xrange(*changeid.indices(len(self)))
1786 for i in pycompat.xrange(*changeid.indices(len(self)))
1787 if i not in self.changelog.filteredrevs
1787 if i not in self.changelog.filteredrevs
1788 ]
1788 ]
1789
1789
1790 # dealing with some special values
1790 # dealing with some special values
1791 quick_access = self._quick_access_changeid.get(changeid)
1791 quick_access = self._quick_access_changeid.get(changeid)
1792 if quick_access is not None:
1792 if quick_access is not None:
1793 rev, node = quick_access
1793 rev, node = quick_access
1794 return context.changectx(self, rev, node, maybe_filtered=False)
1794 return context.changectx(self, rev, node, maybe_filtered=False)
1795 if changeid == b'tip':
1795 if changeid == b'tip':
1796 node = self.changelog.tip()
1796 node = self.changelog.tip()
1797 rev = self.changelog.rev(node)
1797 rev = self.changelog.rev(node)
1798 return context.changectx(self, rev, node)
1798 return context.changectx(self, rev, node)
1799
1799
1800 # dealing with arbitrary values
1800 # dealing with arbitrary values
1801 try:
1801 try:
1802 if isinstance(changeid, int):
1802 if isinstance(changeid, int):
1803 node = self.changelog.node(changeid)
1803 node = self.changelog.node(changeid)
1804 rev = changeid
1804 rev = changeid
1805 elif changeid == b'.':
1805 elif changeid == b'.':
1806 # this is a hack to delay/avoid loading obsmarkers
1806 # this is a hack to delay/avoid loading obsmarkers
1807 # when we know that '.' won't be hidden
1807 # when we know that '.' won't be hidden
1808 node = self.dirstate.p1()
1808 node = self.dirstate.p1()
1809 rev = self.unfiltered().changelog.rev(node)
1809 rev = self.unfiltered().changelog.rev(node)
1810 elif len(changeid) == 20:
1810 elif len(changeid) == 20:
1811 try:
1811 try:
1812 node = changeid
1812 node = changeid
1813 rev = self.changelog.rev(changeid)
1813 rev = self.changelog.rev(changeid)
1814 except error.FilteredLookupError:
1814 except error.FilteredLookupError:
1815 changeid = hex(changeid) # for the error message
1815 changeid = hex(changeid) # for the error message
1816 raise
1816 raise
1817 except LookupError:
1817 except LookupError:
1818 # check if it might have come from damaged dirstate
1818 # check if it might have come from damaged dirstate
1819 #
1819 #
1820 # XXX we could avoid the unfiltered if we had a recognizable
1820 # XXX we could avoid the unfiltered if we had a recognizable
1821 # exception for filtered changeset access
1821 # exception for filtered changeset access
1822 if (
1822 if (
1823 self.local()
1823 self.local()
1824 and changeid in self.unfiltered().dirstate.parents()
1824 and changeid in self.unfiltered().dirstate.parents()
1825 ):
1825 ):
1826 msg = _(b"working directory has unknown parent '%s'!")
1826 msg = _(b"working directory has unknown parent '%s'!")
1827 raise error.Abort(msg % short(changeid))
1827 raise error.Abort(msg % short(changeid))
1828 changeid = hex(changeid) # for the error message
1828 changeid = hex(changeid) # for the error message
1829 raise
1829 raise
1830
1830
1831 elif len(changeid) == 40:
1831 elif len(changeid) == 40:
1832 node = bin(changeid)
1832 node = bin(changeid)
1833 rev = self.changelog.rev(node)
1833 rev = self.changelog.rev(node)
1834 else:
1834 else:
1835 raise error.ProgrammingError(
1835 raise error.ProgrammingError(
1836 b"unsupported changeid '%s' of type %s"
1836 b"unsupported changeid '%s' of type %s"
1837 % (changeid, pycompat.bytestr(type(changeid)))
1837 % (changeid, pycompat.bytestr(type(changeid)))
1838 )
1838 )
1839
1839
1840 return context.changectx(self, rev, node)
1840 return context.changectx(self, rev, node)
1841
1841
1842 except (error.FilteredIndexError, error.FilteredLookupError):
1842 except (error.FilteredIndexError, error.FilteredLookupError):
1843 raise error.FilteredRepoLookupError(
1843 raise error.FilteredRepoLookupError(
1844 _(b"filtered revision '%s'") % pycompat.bytestr(changeid)
1844 _(b"filtered revision '%s'") % pycompat.bytestr(changeid)
1845 )
1845 )
1846 except (IndexError, LookupError):
1846 except (IndexError, LookupError):
1847 raise error.RepoLookupError(
1847 raise error.RepoLookupError(
1848 _(b"unknown revision '%s'") % pycompat.bytestr(changeid)
1848 _(b"unknown revision '%s'") % pycompat.bytestr(changeid)
1849 )
1849 )
1850 except error.WdirUnsupported:
1850 except error.WdirUnsupported:
1851 return context.workingctx(self)
1851 return context.workingctx(self)
1852
1852
1853 def __contains__(self, changeid):
1853 def __contains__(self, changeid):
1854 """True if the given changeid exists"""
1854 """True if the given changeid exists"""
1855 try:
1855 try:
1856 self[changeid]
1856 self[changeid]
1857 return True
1857 return True
1858 except error.RepoLookupError:
1858 except error.RepoLookupError:
1859 return False
1859 return False
1860
1860
1861 def __nonzero__(self):
1861 def __nonzero__(self):
1862 return True
1862 return True
1863
1863
1864 __bool__ = __nonzero__
1864 __bool__ = __nonzero__
1865
1865
1866 def __len__(self):
1866 def __len__(self):
1867 # no need to pay the cost of repoview.changelog
1867 # no need to pay the cost of repoview.changelog
1868 unfi = self.unfiltered()
1868 unfi = self.unfiltered()
1869 return len(unfi.changelog)
1869 return len(unfi.changelog)
1870
1870
1871 def __iter__(self):
1871 def __iter__(self):
1872 return iter(self.changelog)
1872 return iter(self.changelog)
1873
1873
1874 def revs(self, expr, *args):
1874 def revs(self, expr, *args):
1875 """Find revisions matching a revset.
1875 """Find revisions matching a revset.
1876
1876
1877 The revset is specified as a string ``expr`` that may contain
1877 The revset is specified as a string ``expr`` that may contain
1878 %-formatting to escape certain types. See ``revsetlang.formatspec``.
1878 %-formatting to escape certain types. See ``revsetlang.formatspec``.
1879
1879
1880 Revset aliases from the configuration are not expanded. To expand
1880 Revset aliases from the configuration are not expanded. To expand
1881 user aliases, consider calling ``scmutil.revrange()`` or
1881 user aliases, consider calling ``scmutil.revrange()`` or
1882 ``repo.anyrevs([expr], user=True)``.
1882 ``repo.anyrevs([expr], user=True)``.
1883
1883
1884 Returns a smartset.abstractsmartset, which is a list-like interface
1884 Returns a smartset.abstractsmartset, which is a list-like interface
1885 that contains integer revisions.
1885 that contains integer revisions.
1886 """
1886 """
1887 tree = revsetlang.spectree(expr, *args)
1887 tree = revsetlang.spectree(expr, *args)
1888 return revset.makematcher(tree)(self)
1888 return revset.makematcher(tree)(self)
1889
1889
1890 def set(self, expr, *args):
1890 def set(self, expr, *args):
1891 """Find revisions matching a revset and emit changectx instances.
1891 """Find revisions matching a revset and emit changectx instances.
1892
1892
1893 This is a convenience wrapper around ``revs()`` that iterates the
1893 This is a convenience wrapper around ``revs()`` that iterates the
1894 result and is a generator of changectx instances.
1894 result and is a generator of changectx instances.
1895
1895
1896 Revset aliases from the configuration are not expanded. To expand
1896 Revset aliases from the configuration are not expanded. To expand
1897 user aliases, consider calling ``scmutil.revrange()``.
1897 user aliases, consider calling ``scmutil.revrange()``.
1898 """
1898 """
1899 for r in self.revs(expr, *args):
1899 for r in self.revs(expr, *args):
1900 yield self[r]
1900 yield self[r]
1901
1901
1902 def anyrevs(self, specs, user=False, localalias=None):
1902 def anyrevs(self, specs, user=False, localalias=None):
1903 """Find revisions matching one of the given revsets.
1903 """Find revisions matching one of the given revsets.
1904
1904
1905 Revset aliases from the configuration are not expanded by default. To
1905 Revset aliases from the configuration are not expanded by default. To
1906 expand user aliases, specify ``user=True``. To provide some local
1906 expand user aliases, specify ``user=True``. To provide some local
1907 definitions overriding user aliases, set ``localalias`` to
1907 definitions overriding user aliases, set ``localalias`` to
1908 ``{name: definitionstring}``.
1908 ``{name: definitionstring}``.
1909 """
1909 """
1910 if specs == [b'null']:
1910 if specs == [b'null']:
1911 return revset.baseset([nullrev])
1911 return revset.baseset([nullrev])
1912 if specs == [b'.']:
1912 if specs == [b'.']:
1913 quick_data = self._quick_access_changeid.get(b'.')
1913 quick_data = self._quick_access_changeid.get(b'.')
1914 if quick_data is not None:
1914 if quick_data is not None:
1915 return revset.baseset([quick_data[0]])
1915 return revset.baseset([quick_data[0]])
1916 if user:
1916 if user:
1917 m = revset.matchany(
1917 m = revset.matchany(
1918 self.ui,
1918 self.ui,
1919 specs,
1919 specs,
1920 lookup=revset.lookupfn(self),
1920 lookup=revset.lookupfn(self),
1921 localalias=localalias,
1921 localalias=localalias,
1922 )
1922 )
1923 else:
1923 else:
1924 m = revset.matchany(None, specs, localalias=localalias)
1924 m = revset.matchany(None, specs, localalias=localalias)
1925 return m(self)
1925 return m(self)
1926
1926
1927 def url(self):
1927 def url(self):
1928 return b'file:' + self.root
1928 return b'file:' + self.root
1929
1929
1930 def hook(self, name, throw=False, **args):
1930 def hook(self, name, throw=False, **args):
1931 """Call a hook, passing this repo instance.
1931 """Call a hook, passing this repo instance.
1932
1932
1933 This a convenience method to aid invoking hooks. Extensions likely
1933 This a convenience method to aid invoking hooks. Extensions likely
1934 won't call this unless they have registered a custom hook or are
1934 won't call this unless they have registered a custom hook or are
1935 replacing code that is expected to call a hook.
1935 replacing code that is expected to call a hook.
1936 """
1936 """
1937 return hook.hook(self.ui, self, name, throw, **args)
1937 return hook.hook(self.ui, self, name, throw, **args)
1938
1938
1939 @filteredpropertycache
1939 @filteredpropertycache
1940 def _tagscache(self):
1940 def _tagscache(self):
1941 """Returns a tagscache object that contains various tags related
1941 """Returns a tagscache object that contains various tags related
1942 caches."""
1942 caches."""
1943
1943
1944 # This simplifies its cache management by having one decorated
1944 # This simplifies its cache management by having one decorated
1945 # function (this one) and the rest simply fetch things from it.
1945 # function (this one) and the rest simply fetch things from it.
1946 class tagscache(object):
1946 class tagscache(object):
1947 def __init__(self):
1947 def __init__(self):
1948 # These two define the set of tags for this repository. tags
1948 # These two define the set of tags for this repository. tags
1949 # maps tag name to node; tagtypes maps tag name to 'global' or
1949 # maps tag name to node; tagtypes maps tag name to 'global' or
1950 # 'local'. (Global tags are defined by .hgtags across all
1950 # 'local'. (Global tags are defined by .hgtags across all
1951 # heads, and local tags are defined in .hg/localtags.)
1951 # heads, and local tags are defined in .hg/localtags.)
1952 # They constitute the in-memory cache of tags.
1952 # They constitute the in-memory cache of tags.
1953 self.tags = self.tagtypes = None
1953 self.tags = self.tagtypes = None
1954
1954
1955 self.nodetagscache = self.tagslist = None
1955 self.nodetagscache = self.tagslist = None
1956
1956
1957 cache = tagscache()
1957 cache = tagscache()
1958 cache.tags, cache.tagtypes = self._findtags()
1958 cache.tags, cache.tagtypes = self._findtags()
1959
1959
1960 return cache
1960 return cache
1961
1961
1962 def tags(self):
1962 def tags(self):
1963 '''return a mapping of tag to node'''
1963 '''return a mapping of tag to node'''
1964 t = {}
1964 t = {}
1965 if self.changelog.filteredrevs:
1965 if self.changelog.filteredrevs:
1966 tags, tt = self._findtags()
1966 tags, tt = self._findtags()
1967 else:
1967 else:
1968 tags = self._tagscache.tags
1968 tags = self._tagscache.tags
1969 rev = self.changelog.rev
1969 rev = self.changelog.rev
1970 for k, v in pycompat.iteritems(tags):
1970 for k, v in pycompat.iteritems(tags):
1971 try:
1971 try:
1972 # ignore tags to unknown nodes
1972 # ignore tags to unknown nodes
1973 rev(v)
1973 rev(v)
1974 t[k] = v
1974 t[k] = v
1975 except (error.LookupError, ValueError):
1975 except (error.LookupError, ValueError):
1976 pass
1976 pass
1977 return t
1977 return t
1978
1978
1979 def _findtags(self):
1979 def _findtags(self):
1980 """Do the hard work of finding tags. Return a pair of dicts
1980 """Do the hard work of finding tags. Return a pair of dicts
1981 (tags, tagtypes) where tags maps tag name to node, and tagtypes
1981 (tags, tagtypes) where tags maps tag name to node, and tagtypes
1982 maps tag name to a string like \'global\' or \'local\'.
1982 maps tag name to a string like \'global\' or \'local\'.
1983 Subclasses or extensions are free to add their own tags, but
1983 Subclasses or extensions are free to add their own tags, but
1984 should be aware that the returned dicts will be retained for the
1984 should be aware that the returned dicts will be retained for the
1985 duration of the localrepo object."""
1985 duration of the localrepo object."""
1986
1986
1987 # XXX what tagtype should subclasses/extensions use? Currently
1987 # XXX what tagtype should subclasses/extensions use? Currently
1988 # mq and bookmarks add tags, but do not set the tagtype at all.
1988 # mq and bookmarks add tags, but do not set the tagtype at all.
1989 # Should each extension invent its own tag type? Should there
1989 # Should each extension invent its own tag type? Should there
1990 # be one tagtype for all such "virtual" tags? Or is the status
1990 # be one tagtype for all such "virtual" tags? Or is the status
1991 # quo fine?
1991 # quo fine?
1992
1992
1993 # map tag name to (node, hist)
1993 # map tag name to (node, hist)
1994 alltags = tagsmod.findglobaltags(self.ui, self)
1994 alltags = tagsmod.findglobaltags(self.ui, self)
1995 # map tag name to tag type
1995 # map tag name to tag type
1996 tagtypes = {tag: b'global' for tag in alltags}
1996 tagtypes = {tag: b'global' for tag in alltags}
1997
1997
1998 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
1998 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
1999
1999
2000 # Build the return dicts. Have to re-encode tag names because
2000 # Build the return dicts. Have to re-encode tag names because
2001 # the tags module always uses UTF-8 (in order not to lose info
2001 # the tags module always uses UTF-8 (in order not to lose info
2002 # writing to the cache), but the rest of Mercurial wants them in
2002 # writing to the cache), but the rest of Mercurial wants them in
2003 # local encoding.
2003 # local encoding.
2004 tags = {}
2004 tags = {}
2005 for (name, (node, hist)) in pycompat.iteritems(alltags):
2005 for (name, (node, hist)) in pycompat.iteritems(alltags):
2006 if node != nullid:
2006 if node != nullid:
2007 tags[encoding.tolocal(name)] = node
2007 tags[encoding.tolocal(name)] = node
2008 tags[b'tip'] = self.changelog.tip()
2008 tags[b'tip'] = self.changelog.tip()
2009 tagtypes = {
2009 tagtypes = {
2010 encoding.tolocal(name): value
2010 encoding.tolocal(name): value
2011 for (name, value) in pycompat.iteritems(tagtypes)
2011 for (name, value) in pycompat.iteritems(tagtypes)
2012 }
2012 }
2013 return (tags, tagtypes)
2013 return (tags, tagtypes)
2014
2014
2015 def tagtype(self, tagname):
2015 def tagtype(self, tagname):
2016 """
2016 """
2017 return the type of the given tag. result can be:
2017 return the type of the given tag. result can be:
2018
2018
2019 'local' : a local tag
2019 'local' : a local tag
2020 'global' : a global tag
2020 'global' : a global tag
2021 None : tag does not exist
2021 None : tag does not exist
2022 """
2022 """
2023
2023
2024 return self._tagscache.tagtypes.get(tagname)
2024 return self._tagscache.tagtypes.get(tagname)
2025
2025
2026 def tagslist(self):
2026 def tagslist(self):
2027 '''return a list of tags ordered by revision'''
2027 '''return a list of tags ordered by revision'''
2028 if not self._tagscache.tagslist:
2028 if not self._tagscache.tagslist:
2029 l = []
2029 l = []
2030 for t, n in pycompat.iteritems(self.tags()):
2030 for t, n in pycompat.iteritems(self.tags()):
2031 l.append((self.changelog.rev(n), t, n))
2031 l.append((self.changelog.rev(n), t, n))
2032 self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)]
2032 self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)]
2033
2033
2034 return self._tagscache.tagslist
2034 return self._tagscache.tagslist
2035
2035
2036 def nodetags(self, node):
2036 def nodetags(self, node):
2037 '''return the tags associated with a node'''
2037 '''return the tags associated with a node'''
2038 if not self._tagscache.nodetagscache:
2038 if not self._tagscache.nodetagscache:
2039 nodetagscache = {}
2039 nodetagscache = {}
2040 for t, n in pycompat.iteritems(self._tagscache.tags):
2040 for t, n in pycompat.iteritems(self._tagscache.tags):
2041 nodetagscache.setdefault(n, []).append(t)
2041 nodetagscache.setdefault(n, []).append(t)
2042 for tags in pycompat.itervalues(nodetagscache):
2042 for tags in pycompat.itervalues(nodetagscache):
2043 tags.sort()
2043 tags.sort()
2044 self._tagscache.nodetagscache = nodetagscache
2044 self._tagscache.nodetagscache = nodetagscache
2045 return self._tagscache.nodetagscache.get(node, [])
2045 return self._tagscache.nodetagscache.get(node, [])
2046
2046
2047 def nodebookmarks(self, node):
2047 def nodebookmarks(self, node):
2048 """return the list of bookmarks pointing to the specified node"""
2048 """return the list of bookmarks pointing to the specified node"""
2049 return self._bookmarks.names(node)
2049 return self._bookmarks.names(node)
2050
2050
2051 def branchmap(self):
2051 def branchmap(self):
2052 """returns a dictionary {branch: [branchheads]} with branchheads
2052 """returns a dictionary {branch: [branchheads]} with branchheads
2053 ordered by increasing revision number"""
2053 ordered by increasing revision number"""
2054 return self._branchcaches[self]
2054 return self._branchcaches[self]
2055
2055
2056 @unfilteredmethod
2056 @unfilteredmethod
2057 def revbranchcache(self):
2057 def revbranchcache(self):
2058 if not self._revbranchcache:
2058 if not self._revbranchcache:
2059 self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
2059 self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
2060 return self._revbranchcache
2060 return self._revbranchcache
2061
2061
2062 def branchtip(self, branch, ignoremissing=False):
2062 def branchtip(self, branch, ignoremissing=False):
2063 """return the tip node for a given branch
2063 """return the tip node for a given branch
2064
2064
2065 If ignoremissing is True, then this method will not raise an error.
2065 If ignoremissing is True, then this method will not raise an error.
2066 This is helpful for callers that only expect None for a missing branch
2066 This is helpful for callers that only expect None for a missing branch
2067 (e.g. namespace).
2067 (e.g. namespace).
2068
2068
2069 """
2069 """
2070 try:
2070 try:
2071 return self.branchmap().branchtip(branch)
2071 return self.branchmap().branchtip(branch)
2072 except KeyError:
2072 except KeyError:
2073 if not ignoremissing:
2073 if not ignoremissing:
2074 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
2074 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
2075 else:
2075 else:
2076 pass
2076 pass
2077
2077
2078 def lookup(self, key):
2078 def lookup(self, key):
2079 node = scmutil.revsymbol(self, key).node()
2079 node = scmutil.revsymbol(self, key).node()
2080 if node is None:
2080 if node is None:
2081 raise error.RepoLookupError(_(b"unknown revision '%s'") % key)
2081 raise error.RepoLookupError(_(b"unknown revision '%s'") % key)
2082 return node
2082 return node
2083
2083
2084 def lookupbranch(self, key):
2084 def lookupbranch(self, key):
2085 if self.branchmap().hasbranch(key):
2085 if self.branchmap().hasbranch(key):
2086 return key
2086 return key
2087
2087
2088 return scmutil.revsymbol(self, key).branch()
2088 return scmutil.revsymbol(self, key).branch()
2089
2089
2090 def known(self, nodes):
2090 def known(self, nodes):
2091 cl = self.changelog
2091 cl = self.changelog
2092 get_rev = cl.index.get_rev
2092 get_rev = cl.index.get_rev
2093 filtered = cl.filteredrevs
2093 filtered = cl.filteredrevs
2094 result = []
2094 result = []
2095 for n in nodes:
2095 for n in nodes:
2096 r = get_rev(n)
2096 r = get_rev(n)
2097 resp = not (r is None or r in filtered)
2097 resp = not (r is None or r in filtered)
2098 result.append(resp)
2098 result.append(resp)
2099 return result
2099 return result
2100
2100
2101 def local(self):
2101 def local(self):
2102 return self
2102 return self
2103
2103
2104 def publishing(self):
2104 def publishing(self):
2105 # it's safe (and desirable) to trust the publish flag unconditionally
2105 # it's safe (and desirable) to trust the publish flag unconditionally
2106 # so that we don't finalize changes shared between users via ssh or nfs
2106 # so that we don't finalize changes shared between users via ssh or nfs
2107 return self.ui.configbool(b'phases', b'publish', untrusted=True)
2107 return self.ui.configbool(b'phases', b'publish', untrusted=True)
2108
2108
2109 def cancopy(self):
2109 def cancopy(self):
2110 # so statichttprepo's override of local() works
2110 # so statichttprepo's override of local() works
2111 if not self.local():
2111 if not self.local():
2112 return False
2112 return False
2113 if not self.publishing():
2113 if not self.publishing():
2114 return True
2114 return True
2115 # if publishing we can't copy if there is filtered content
2115 # if publishing we can't copy if there is filtered content
2116 return not self.filtered(b'visible').changelog.filteredrevs
2116 return not self.filtered(b'visible').changelog.filteredrevs
2117
2117
2118 def shared(self):
2118 def shared(self):
2119 '''the type of shared repository (None if not shared)'''
2119 '''the type of shared repository (None if not shared)'''
2120 if self.sharedpath != self.path:
2120 if self.sharedpath != self.path:
2121 return b'store'
2121 return b'store'
2122 return None
2122 return None
2123
2123
2124 def wjoin(self, f, *insidef):
2124 def wjoin(self, f, *insidef):
2125 return self.vfs.reljoin(self.root, f, *insidef)
2125 return self.vfs.reljoin(self.root, f, *insidef)
2126
2126
2127 def setparents(self, p1, p2=nullid):
2127 def setparents(self, p1, p2=nullid):
2128 self[None].setparents(p1, p2)
2128 self[None].setparents(p1, p2)
2129 self._quick_access_changeid_invalidate()
2129 self._quick_access_changeid_invalidate()
2130
2130
2131 def filectx(self, path, changeid=None, fileid=None, changectx=None):
2131 def filectx(self, path, changeid=None, fileid=None, changectx=None):
2132 """changeid must be a changeset revision, if specified.
2132 """changeid must be a changeset revision, if specified.
2133 fileid can be a file revision or node."""
2133 fileid can be a file revision or node."""
2134 return context.filectx(
2134 return context.filectx(
2135 self, path, changeid, fileid, changectx=changectx
2135 self, path, changeid, fileid, changectx=changectx
2136 )
2136 )
2137
2137
2138 def getcwd(self):
2138 def getcwd(self):
2139 return self.dirstate.getcwd()
2139 return self.dirstate.getcwd()
2140
2140
2141 def pathto(self, f, cwd=None):
2141 def pathto(self, f, cwd=None):
2142 return self.dirstate.pathto(f, cwd)
2142 return self.dirstate.pathto(f, cwd)
2143
2143
2144 def _loadfilter(self, filter):
2144 def _loadfilter(self, filter):
2145 if filter not in self._filterpats:
2145 if filter not in self._filterpats:
2146 l = []
2146 l = []
2147 for pat, cmd in self.ui.configitems(filter):
2147 for pat, cmd in self.ui.configitems(filter):
2148 if cmd == b'!':
2148 if cmd == b'!':
2149 continue
2149 continue
2150 mf = matchmod.match(self.root, b'', [pat])
2150 mf = matchmod.match(self.root, b'', [pat])
2151 fn = None
2151 fn = None
2152 params = cmd
2152 params = cmd
2153 for name, filterfn in pycompat.iteritems(self._datafilters):
2153 for name, filterfn in pycompat.iteritems(self._datafilters):
2154 if cmd.startswith(name):
2154 if cmd.startswith(name):
2155 fn = filterfn
2155 fn = filterfn
2156 params = cmd[len(name) :].lstrip()
2156 params = cmd[len(name) :].lstrip()
2157 break
2157 break
2158 if not fn:
2158 if not fn:
2159 fn = lambda s, c, **kwargs: procutil.filter(s, c)
2159 fn = lambda s, c, **kwargs: procutil.filter(s, c)
2160 fn.__name__ = 'commandfilter'
2160 fn.__name__ = 'commandfilter'
2161 # Wrap old filters not supporting keyword arguments
2161 # Wrap old filters not supporting keyword arguments
2162 if not pycompat.getargspec(fn)[2]:
2162 if not pycompat.getargspec(fn)[2]:
2163 oldfn = fn
2163 oldfn = fn
2164 fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c)
2164 fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c)
2165 fn.__name__ = 'compat-' + oldfn.__name__
2165 fn.__name__ = 'compat-' + oldfn.__name__
2166 l.append((mf, fn, params))
2166 l.append((mf, fn, params))
2167 self._filterpats[filter] = l
2167 self._filterpats[filter] = l
2168 return self._filterpats[filter]
2168 return self._filterpats[filter]
2169
2169
2170 def _filter(self, filterpats, filename, data):
2170 def _filter(self, filterpats, filename, data):
2171 for mf, fn, cmd in filterpats:
2171 for mf, fn, cmd in filterpats:
2172 if mf(filename):
2172 if mf(filename):
2173 self.ui.debug(
2173 self.ui.debug(
2174 b"filtering %s through %s\n"
2174 b"filtering %s through %s\n"
2175 % (filename, cmd or pycompat.sysbytes(fn.__name__))
2175 % (filename, cmd or pycompat.sysbytes(fn.__name__))
2176 )
2176 )
2177 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
2177 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
2178 break
2178 break
2179
2179
2180 return data
2180 return data
2181
2181
2182 @unfilteredpropertycache
2182 @unfilteredpropertycache
2183 def _encodefilterpats(self):
2183 def _encodefilterpats(self):
2184 return self._loadfilter(b'encode')
2184 return self._loadfilter(b'encode')
2185
2185
2186 @unfilteredpropertycache
2186 @unfilteredpropertycache
2187 def _decodefilterpats(self):
2187 def _decodefilterpats(self):
2188 return self._loadfilter(b'decode')
2188 return self._loadfilter(b'decode')
2189
2189
2190 def adddatafilter(self, name, filter):
2190 def adddatafilter(self, name, filter):
2191 self._datafilters[name] = filter
2191 self._datafilters[name] = filter
2192
2192
2193 def wread(self, filename):
2193 def wread(self, filename):
2194 if self.wvfs.islink(filename):
2194 if self.wvfs.islink(filename):
2195 data = self.wvfs.readlink(filename)
2195 data = self.wvfs.readlink(filename)
2196 else:
2196 else:
2197 data = self.wvfs.read(filename)
2197 data = self.wvfs.read(filename)
2198 return self._filter(self._encodefilterpats, filename, data)
2198 return self._filter(self._encodefilterpats, filename, data)
2199
2199
2200 def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs):
2200 def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs):
2201 """write ``data`` into ``filename`` in the working directory
2201 """write ``data`` into ``filename`` in the working directory
2202
2202
2203 This returns length of written (maybe decoded) data.
2203 This returns length of written (maybe decoded) data.
2204 """
2204 """
2205 data = self._filter(self._decodefilterpats, filename, data)
2205 data = self._filter(self._decodefilterpats, filename, data)
2206 if b'l' in flags:
2206 if b'l' in flags:
2207 self.wvfs.symlink(data, filename)
2207 self.wvfs.symlink(data, filename)
2208 else:
2208 else:
2209 self.wvfs.write(
2209 self.wvfs.write(
2210 filename, data, backgroundclose=backgroundclose, **kwargs
2210 filename, data, backgroundclose=backgroundclose, **kwargs
2211 )
2211 )
2212 if b'x' in flags:
2212 if b'x' in flags:
2213 self.wvfs.setflags(filename, False, True)
2213 self.wvfs.setflags(filename, False, True)
2214 else:
2214 else:
2215 self.wvfs.setflags(filename, False, False)
2215 self.wvfs.setflags(filename, False, False)
2216 return len(data)
2216 return len(data)
2217
2217
2218 def wwritedata(self, filename, data):
2218 def wwritedata(self, filename, data):
2219 return self._filter(self._decodefilterpats, filename, data)
2219 return self._filter(self._decodefilterpats, filename, data)
2220
2220
2221 def currenttransaction(self):
2221 def currenttransaction(self):
2222 """return the current transaction or None if non exists"""
2222 """return the current transaction or None if non exists"""
2223 if self._transref:
2223 if self._transref:
2224 tr = self._transref()
2224 tr = self._transref()
2225 else:
2225 else:
2226 tr = None
2226 tr = None
2227
2227
2228 if tr and tr.running():
2228 if tr and tr.running():
2229 return tr
2229 return tr
2230 return None
2230 return None
2231
2231
2232 def transaction(self, desc, report=None):
2232 def transaction(self, desc, report=None):
2233 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
2233 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
2234 b'devel', b'check-locks'
2234 b'devel', b'check-locks'
2235 ):
2235 ):
2236 if self._currentlock(self._lockref) is None:
2236 if self._currentlock(self._lockref) is None:
2237 raise error.ProgrammingError(b'transaction requires locking')
2237 raise error.ProgrammingError(b'transaction requires locking')
2238 tr = self.currenttransaction()
2238 tr = self.currenttransaction()
2239 if tr is not None:
2239 if tr is not None:
2240 return tr.nest(name=desc)
2240 return tr.nest(name=desc)
2241
2241
2242 # abort here if the journal already exists
2242 # abort here if the journal already exists
2243 if self.svfs.exists(b"journal"):
2243 if self.svfs.exists(b"journal"):
2244 raise error.RepoError(
2244 raise error.RepoError(
2245 _(b"abandoned transaction found"),
2245 _(b"abandoned transaction found"),
2246 hint=_(b"run 'hg recover' to clean up transaction"),
2246 hint=_(b"run 'hg recover' to clean up transaction"),
2247 )
2247 )
2248
2248
2249 idbase = b"%.40f#%f" % (random.random(), time.time())
2249 idbase = b"%.40f#%f" % (random.random(), time.time())
2250 ha = hex(hashutil.sha1(idbase).digest())
2250 ha = hex(hashutil.sha1(idbase).digest())
2251 txnid = b'TXN:' + ha
2251 txnid = b'TXN:' + ha
2252 self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid)
2252 self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid)
2253
2253
2254 self._writejournal(desc)
2254 self._writejournal(desc)
2255 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
2255 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
2256 if report:
2256 if report:
2257 rp = report
2257 rp = report
2258 else:
2258 else:
2259 rp = self.ui.warn
2259 rp = self.ui.warn
2260 vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/
2260 vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/
2261 # we must avoid cyclic reference between repo and transaction.
2261 # we must avoid cyclic reference between repo and transaction.
2262 reporef = weakref.ref(self)
2262 reporef = weakref.ref(self)
2263 # Code to track tag movement
2263 # Code to track tag movement
2264 #
2264 #
2265 # Since tags are all handled as file content, it is actually quite hard
2265 # Since tags are all handled as file content, it is actually quite hard
2266 # to track these movement from a code perspective. So we fallback to a
2266 # to track these movement from a code perspective. So we fallback to a
2267 # tracking at the repository level. One could envision to track changes
2267 # tracking at the repository level. One could envision to track changes
2268 # to the '.hgtags' file through changegroup apply but that fails to
2268 # to the '.hgtags' file through changegroup apply but that fails to
2269 # cope with case where transaction expose new heads without changegroup
2269 # cope with case where transaction expose new heads without changegroup
2270 # being involved (eg: phase movement).
2270 # being involved (eg: phase movement).
2271 #
2271 #
2272 # For now, We gate the feature behind a flag since this likely comes
2272 # For now, We gate the feature behind a flag since this likely comes
2273 # with performance impacts. The current code run more often than needed
2273 # with performance impacts. The current code run more often than needed
2274 # and do not use caches as much as it could. The current focus is on
2274 # and do not use caches as much as it could. The current focus is on
2275 # the behavior of the feature so we disable it by default. The flag
2275 # the behavior of the feature so we disable it by default. The flag
2276 # will be removed when we are happy with the performance impact.
2276 # will be removed when we are happy with the performance impact.
2277 #
2277 #
2278 # Once this feature is no longer experimental move the following
2278 # Once this feature is no longer experimental move the following
2279 # documentation to the appropriate help section:
2279 # documentation to the appropriate help section:
2280 #
2280 #
2281 # The ``HG_TAG_MOVED`` variable will be set if the transaction touched
2281 # The ``HG_TAG_MOVED`` variable will be set if the transaction touched
2282 # tags (new or changed or deleted tags). In addition the details of
2282 # tags (new or changed or deleted tags). In addition the details of
2283 # these changes are made available in a file at:
2283 # these changes are made available in a file at:
2284 # ``REPOROOT/.hg/changes/tags.changes``.
2284 # ``REPOROOT/.hg/changes/tags.changes``.
2285 # Make sure you check for HG_TAG_MOVED before reading that file as it
2285 # Make sure you check for HG_TAG_MOVED before reading that file as it
2286 # might exist from a previous transaction even if no tag were touched
2286 # might exist from a previous transaction even if no tag were touched
2287 # in this one. Changes are recorded in a line base format::
2287 # in this one. Changes are recorded in a line base format::
2288 #
2288 #
2289 # <action> <hex-node> <tag-name>\n
2289 # <action> <hex-node> <tag-name>\n
2290 #
2290 #
2291 # Actions are defined as follow:
2291 # Actions are defined as follow:
2292 # "-R": tag is removed,
2292 # "-R": tag is removed,
2293 # "+A": tag is added,
2293 # "+A": tag is added,
2294 # "-M": tag is moved (old value),
2294 # "-M": tag is moved (old value),
2295 # "+M": tag is moved (new value),
2295 # "+M": tag is moved (new value),
2296 tracktags = lambda x: None
2296 tracktags = lambda x: None
2297 # experimental config: experimental.hook-track-tags
2297 # experimental config: experimental.hook-track-tags
2298 shouldtracktags = self.ui.configbool(
2298 shouldtracktags = self.ui.configbool(
2299 b'experimental', b'hook-track-tags'
2299 b'experimental', b'hook-track-tags'
2300 )
2300 )
2301 if desc != b'strip' and shouldtracktags:
2301 if desc != b'strip' and shouldtracktags:
2302 oldheads = self.changelog.headrevs()
2302 oldheads = self.changelog.headrevs()
2303
2303
2304 def tracktags(tr2):
2304 def tracktags(tr2):
2305 repo = reporef()
2305 repo = reporef()
2306 oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads)
2306 oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads)
2307 newheads = repo.changelog.headrevs()
2307 newheads = repo.changelog.headrevs()
2308 newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads)
2308 newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads)
2309 # notes: we compare lists here.
2309 # notes: we compare lists here.
2310 # As we do it only once buiding set would not be cheaper
2310 # As we do it only once buiding set would not be cheaper
2311 changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes)
2311 changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes)
2312 if changes:
2312 if changes:
2313 tr2.hookargs[b'tag_moved'] = b'1'
2313 tr2.hookargs[b'tag_moved'] = b'1'
2314 with repo.vfs(
2314 with repo.vfs(
2315 b'changes/tags.changes', b'w', atomictemp=True
2315 b'changes/tags.changes', b'w', atomictemp=True
2316 ) as changesfile:
2316 ) as changesfile:
2317 # note: we do not register the file to the transaction
2317 # note: we do not register the file to the transaction
2318 # because we needs it to still exist on the transaction
2318 # because we needs it to still exist on the transaction
2319 # is close (for txnclose hooks)
2319 # is close (for txnclose hooks)
2320 tagsmod.writediff(changesfile, changes)
2320 tagsmod.writediff(changesfile, changes)
2321
2321
2322 def validate(tr2):
2322 def validate(tr2):
2323 """will run pre-closing hooks"""
2323 """will run pre-closing hooks"""
2324 # XXX the transaction API is a bit lacking here so we take a hacky
2324 # XXX the transaction API is a bit lacking here so we take a hacky
2325 # path for now
2325 # path for now
2326 #
2326 #
2327 # We cannot add this as a "pending" hooks since the 'tr.hookargs'
2327 # We cannot add this as a "pending" hooks since the 'tr.hookargs'
2328 # dict is copied before these run. In addition we needs the data
2328 # dict is copied before these run. In addition we needs the data
2329 # available to in memory hooks too.
2329 # available to in memory hooks too.
2330 #
2330 #
2331 # Moreover, we also need to make sure this runs before txnclose
2331 # Moreover, we also need to make sure this runs before txnclose
2332 # hooks and there is no "pending" mechanism that would execute
2332 # hooks and there is no "pending" mechanism that would execute
2333 # logic only if hooks are about to run.
2333 # logic only if hooks are about to run.
2334 #
2334 #
2335 # Fixing this limitation of the transaction is also needed to track
2335 # Fixing this limitation of the transaction is also needed to track
2336 # other families of changes (bookmarks, phases, obsolescence).
2336 # other families of changes (bookmarks, phases, obsolescence).
2337 #
2337 #
2338 # This will have to be fixed before we remove the experimental
2338 # This will have to be fixed before we remove the experimental
2339 # gating.
2339 # gating.
2340 tracktags(tr2)
2340 tracktags(tr2)
2341 repo = reporef()
2341 repo = reporef()
2342
2342
2343 singleheadopt = (b'experimental', b'single-head-per-branch')
2343 singleheadopt = (b'experimental', b'single-head-per-branch')
2344 singlehead = repo.ui.configbool(*singleheadopt)
2344 singlehead = repo.ui.configbool(*singleheadopt)
2345 if singlehead:
2345 if singlehead:
2346 singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1]
2346 singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1]
2347 accountclosed = singleheadsub.get(
2347 accountclosed = singleheadsub.get(
2348 b"account-closed-heads", False
2348 b"account-closed-heads", False
2349 )
2349 )
2350 if singleheadsub.get(b"public-changes-only", False):
2350 if singleheadsub.get(b"public-changes-only", False):
2351 filtername = b"immutable"
2351 filtername = b"immutable"
2352 else:
2352 else:
2353 filtername = b"visible"
2353 filtername = b"visible"
2354 scmutil.enforcesinglehead(
2354 scmutil.enforcesinglehead(
2355 repo, tr2, desc, accountclosed, filtername
2355 repo, tr2, desc, accountclosed, filtername
2356 )
2356 )
2357 if hook.hashook(repo.ui, b'pretxnclose-bookmark'):
2357 if hook.hashook(repo.ui, b'pretxnclose-bookmark'):
2358 for name, (old, new) in sorted(
2358 for name, (old, new) in sorted(
2359 tr.changes[b'bookmarks'].items()
2359 tr.changes[b'bookmarks'].items()
2360 ):
2360 ):
2361 args = tr.hookargs.copy()
2361 args = tr.hookargs.copy()
2362 args.update(bookmarks.preparehookargs(name, old, new))
2362 args.update(bookmarks.preparehookargs(name, old, new))
2363 repo.hook(
2363 repo.hook(
2364 b'pretxnclose-bookmark',
2364 b'pretxnclose-bookmark',
2365 throw=True,
2365 throw=True,
2366 **pycompat.strkwargs(args)
2366 **pycompat.strkwargs(args)
2367 )
2367 )
2368 if hook.hashook(repo.ui, b'pretxnclose-phase'):
2368 if hook.hashook(repo.ui, b'pretxnclose-phase'):
2369 cl = repo.unfiltered().changelog
2369 cl = repo.unfiltered().changelog
2370 for revs, (old, new) in tr.changes[b'phases']:
2370 for revs, (old, new) in tr.changes[b'phases']:
2371 for rev in revs:
2371 for rev in revs:
2372 args = tr.hookargs.copy()
2372 args = tr.hookargs.copy()
2373 node = hex(cl.node(rev))
2373 node = hex(cl.node(rev))
2374 args.update(phases.preparehookargs(node, old, new))
2374 args.update(phases.preparehookargs(node, old, new))
2375 repo.hook(
2375 repo.hook(
2376 b'pretxnclose-phase',
2376 b'pretxnclose-phase',
2377 throw=True,
2377 throw=True,
2378 **pycompat.strkwargs(args)
2378 **pycompat.strkwargs(args)
2379 )
2379 )
2380
2380
2381 repo.hook(
2381 repo.hook(
2382 b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs)
2382 b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs)
2383 )
2383 )
2384
2384
2385 def releasefn(tr, success):
2385 def releasefn(tr, success):
2386 repo = reporef()
2386 repo = reporef()
2387 if repo is None:
2387 if repo is None:
2388 # If the repo has been GC'd (and this release function is being
2388 # If the repo has been GC'd (and this release function is being
2389 # called from transaction.__del__), there's not much we can do,
2389 # called from transaction.__del__), there's not much we can do,
2390 # so just leave the unfinished transaction there and let the
2390 # so just leave the unfinished transaction there and let the
2391 # user run `hg recover`.
2391 # user run `hg recover`.
2392 return
2392 return
2393 if success:
2393 if success:
2394 # this should be explicitly invoked here, because
2394 # this should be explicitly invoked here, because
2395 # in-memory changes aren't written out at closing
2395 # in-memory changes aren't written out at closing
2396 # transaction, if tr.addfilegenerator (via
2396 # transaction, if tr.addfilegenerator (via
2397 # dirstate.write or so) isn't invoked while
2397 # dirstate.write or so) isn't invoked while
2398 # transaction running
2398 # transaction running
2399 repo.dirstate.write(None)
2399 repo.dirstate.write(None)
2400 else:
2400 else:
2401 # discard all changes (including ones already written
2401 # discard all changes (including ones already written
2402 # out) in this transaction
2402 # out) in this transaction
2403 narrowspec.restorebackup(self, b'journal.narrowspec')
2403 narrowspec.restorebackup(self, b'journal.narrowspec')
2404 narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate')
2404 narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate')
2405 repo.dirstate.restorebackup(None, b'journal.dirstate')
2405 repo.dirstate.restorebackup(None, b'journal.dirstate')
2406
2406
2407 repo.invalidate(clearfilecache=True)
2407 repo.invalidate(clearfilecache=True)
2408
2408
2409 tr = transaction.transaction(
2409 tr = transaction.transaction(
2410 rp,
2410 rp,
2411 self.svfs,
2411 self.svfs,
2412 vfsmap,
2412 vfsmap,
2413 b"journal",
2413 b"journal",
2414 b"undo",
2414 b"undo",
2415 aftertrans(renames),
2415 aftertrans(renames),
2416 self.store.createmode,
2416 self.store.createmode,
2417 validator=validate,
2417 validator=validate,
2418 releasefn=releasefn,
2418 releasefn=releasefn,
2419 checkambigfiles=_cachedfiles,
2419 checkambigfiles=_cachedfiles,
2420 name=desc,
2420 name=desc,
2421 )
2421 )
2422 tr.changes[b'origrepolen'] = len(self)
2422 tr.changes[b'origrepolen'] = len(self)
2423 tr.changes[b'obsmarkers'] = set()
2423 tr.changes[b'obsmarkers'] = set()
2424 tr.changes[b'phases'] = []
2424 tr.changes[b'phases'] = []
2425 tr.changes[b'bookmarks'] = {}
2425 tr.changes[b'bookmarks'] = {}
2426
2426
2427 tr.hookargs[b'txnid'] = txnid
2427 tr.hookargs[b'txnid'] = txnid
2428 tr.hookargs[b'txnname'] = desc
2428 tr.hookargs[b'txnname'] = desc
2429 tr.hookargs[b'changes'] = tr.changes
2429 tr.hookargs[b'changes'] = tr.changes
2430 # note: writing the fncache only during finalize mean that the file is
2430 # note: writing the fncache only during finalize mean that the file is
2431 # outdated when running hooks. As fncache is used for streaming clone,
2431 # outdated when running hooks. As fncache is used for streaming clone,
2432 # this is not expected to break anything that happen during the hooks.
2432 # this is not expected to break anything that happen during the hooks.
2433 tr.addfinalize(b'flush-fncache', self.store.write)
2433 tr.addfinalize(b'flush-fncache', self.store.write)
2434
2434
2435 def txnclosehook(tr2):
2435 def txnclosehook(tr2):
2436 """To be run if transaction is successful, will schedule a hook run"""
2436 """To be run if transaction is successful, will schedule a hook run"""
2437 # Don't reference tr2 in hook() so we don't hold a reference.
2437 # Don't reference tr2 in hook() so we don't hold a reference.
2438 # This reduces memory consumption when there are multiple
2438 # This reduces memory consumption when there are multiple
2439 # transactions per lock. This can likely go away if issue5045
2439 # transactions per lock. This can likely go away if issue5045
2440 # fixes the function accumulation.
2440 # fixes the function accumulation.
2441 hookargs = tr2.hookargs
2441 hookargs = tr2.hookargs
2442
2442
2443 def hookfunc(unused_success):
2443 def hookfunc(unused_success):
2444 repo = reporef()
2444 repo = reporef()
2445 if hook.hashook(repo.ui, b'txnclose-bookmark'):
2445 if hook.hashook(repo.ui, b'txnclose-bookmark'):
2446 bmchanges = sorted(tr.changes[b'bookmarks'].items())
2446 bmchanges = sorted(tr.changes[b'bookmarks'].items())
2447 for name, (old, new) in bmchanges:
2447 for name, (old, new) in bmchanges:
2448 args = tr.hookargs.copy()
2448 args = tr.hookargs.copy()
2449 args.update(bookmarks.preparehookargs(name, old, new))
2449 args.update(bookmarks.preparehookargs(name, old, new))
2450 repo.hook(
2450 repo.hook(
2451 b'txnclose-bookmark',
2451 b'txnclose-bookmark',
2452 throw=False,
2452 throw=False,
2453 **pycompat.strkwargs(args)
2453 **pycompat.strkwargs(args)
2454 )
2454 )
2455
2455
2456 if hook.hashook(repo.ui, b'txnclose-phase'):
2456 if hook.hashook(repo.ui, b'txnclose-phase'):
2457 cl = repo.unfiltered().changelog
2457 cl = repo.unfiltered().changelog
2458 phasemv = sorted(
2458 phasemv = sorted(
2459 tr.changes[b'phases'], key=lambda r: r[0][0]
2459 tr.changes[b'phases'], key=lambda r: r[0][0]
2460 )
2460 )
2461 for revs, (old, new) in phasemv:
2461 for revs, (old, new) in phasemv:
2462 for rev in revs:
2462 for rev in revs:
2463 args = tr.hookargs.copy()
2463 args = tr.hookargs.copy()
2464 node = hex(cl.node(rev))
2464 node = hex(cl.node(rev))
2465 args.update(phases.preparehookargs(node, old, new))
2465 args.update(phases.preparehookargs(node, old, new))
2466 repo.hook(
2466 repo.hook(
2467 b'txnclose-phase',
2467 b'txnclose-phase',
2468 throw=False,
2468 throw=False,
2469 **pycompat.strkwargs(args)
2469 **pycompat.strkwargs(args)
2470 )
2470 )
2471
2471
2472 repo.hook(
2472 repo.hook(
2473 b'txnclose', throw=False, **pycompat.strkwargs(hookargs)
2473 b'txnclose', throw=False, **pycompat.strkwargs(hookargs)
2474 )
2474 )
2475
2475
2476 reporef()._afterlock(hookfunc)
2476 reporef()._afterlock(hookfunc)
2477
2477
2478 tr.addfinalize(b'txnclose-hook', txnclosehook)
2478 tr.addfinalize(b'txnclose-hook', txnclosehook)
2479 # Include a leading "-" to make it happen before the transaction summary
2479 # Include a leading "-" to make it happen before the transaction summary
2480 # reports registered via scmutil.registersummarycallback() whose names
2480 # reports registered via scmutil.registersummarycallback() whose names
2481 # are 00-txnreport etc. That way, the caches will be warm when the
2481 # are 00-txnreport etc. That way, the caches will be warm when the
2482 # callbacks run.
2482 # callbacks run.
2483 tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr))
2483 tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr))
2484
2484
2485 def txnaborthook(tr2):
2485 def txnaborthook(tr2):
2486 """To be run if transaction is aborted"""
2486 """To be run if transaction is aborted"""
2487 reporef().hook(
2487 reporef().hook(
2488 b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs)
2488 b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs)
2489 )
2489 )
2490
2490
2491 tr.addabort(b'txnabort-hook', txnaborthook)
2491 tr.addabort(b'txnabort-hook', txnaborthook)
2492 # avoid eager cache invalidation. in-memory data should be identical
2492 # avoid eager cache invalidation. in-memory data should be identical
2493 # to stored data if transaction has no error.
2493 # to stored data if transaction has no error.
2494 tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats)
2494 tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats)
2495 self._transref = weakref.ref(tr)
2495 self._transref = weakref.ref(tr)
2496 scmutil.registersummarycallback(self, tr, desc)
2496 scmutil.registersummarycallback(self, tr, desc)
2497 return tr
2497 return tr
2498
2498
2499 def _journalfiles(self):
2499 def _journalfiles(self):
2500 return (
2500 return (
2501 (self.svfs, b'journal'),
2501 (self.svfs, b'journal'),
2502 (self.svfs, b'journal.narrowspec'),
2502 (self.svfs, b'journal.narrowspec'),
2503 (self.vfs, b'journal.narrowspec.dirstate'),
2503 (self.vfs, b'journal.narrowspec.dirstate'),
2504 (self.vfs, b'journal.dirstate'),
2504 (self.vfs, b'journal.dirstate'),
2505 (self.vfs, b'journal.branch'),
2505 (self.vfs, b'journal.branch'),
2506 (self.vfs, b'journal.desc'),
2506 (self.vfs, b'journal.desc'),
2507 (bookmarks.bookmarksvfs(self), b'journal.bookmarks'),
2507 (bookmarks.bookmarksvfs(self), b'journal.bookmarks'),
2508 (self.svfs, b'journal.phaseroots'),
2508 (self.svfs, b'journal.phaseroots'),
2509 )
2509 )
2510
2510
2511 def undofiles(self):
2511 def undofiles(self):
2512 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
2512 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
2513
2513
2514 @unfilteredmethod
2514 @unfilteredmethod
2515 def _writejournal(self, desc):
2515 def _writejournal(self, desc):
2516 self.dirstate.savebackup(None, b'journal.dirstate')
2516 self.dirstate.savebackup(None, b'journal.dirstate')
2517 narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate')
2517 narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate')
2518 narrowspec.savebackup(self, b'journal.narrowspec')
2518 narrowspec.savebackup(self, b'journal.narrowspec')
2519 self.vfs.write(
2519 self.vfs.write(
2520 b"journal.branch", encoding.fromlocal(self.dirstate.branch())
2520 b"journal.branch", encoding.fromlocal(self.dirstate.branch())
2521 )
2521 )
2522 self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc))
2522 self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc))
2523 bookmarksvfs = bookmarks.bookmarksvfs(self)
2523 bookmarksvfs = bookmarks.bookmarksvfs(self)
2524 bookmarksvfs.write(
2524 bookmarksvfs.write(
2525 b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")
2525 b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")
2526 )
2526 )
2527 self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots"))
2527 self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots"))
2528
2528
2529 def recover(self):
2529 def recover(self):
2530 with self.lock():
2530 with self.lock():
2531 if self.svfs.exists(b"journal"):
2531 if self.svfs.exists(b"journal"):
2532 self.ui.status(_(b"rolling back interrupted transaction\n"))
2532 self.ui.status(_(b"rolling back interrupted transaction\n"))
2533 vfsmap = {
2533 vfsmap = {
2534 b'': self.svfs,
2534 b'': self.svfs,
2535 b'plain': self.vfs,
2535 b'plain': self.vfs,
2536 }
2536 }
2537 transaction.rollback(
2537 transaction.rollback(
2538 self.svfs,
2538 self.svfs,
2539 vfsmap,
2539 vfsmap,
2540 b"journal",
2540 b"journal",
2541 self.ui.warn,
2541 self.ui.warn,
2542 checkambigfiles=_cachedfiles,
2542 checkambigfiles=_cachedfiles,
2543 )
2543 )
2544 self.invalidate()
2544 self.invalidate()
2545 return True
2545 return True
2546 else:
2546 else:
2547 self.ui.warn(_(b"no interrupted transaction available\n"))
2547 self.ui.warn(_(b"no interrupted transaction available\n"))
2548 return False
2548 return False
2549
2549
2550 def rollback(self, dryrun=False, force=False):
2550 def rollback(self, dryrun=False, force=False):
2551 wlock = lock = dsguard = None
2551 wlock = lock = dsguard = None
2552 try:
2552 try:
2553 wlock = self.wlock()
2553 wlock = self.wlock()
2554 lock = self.lock()
2554 lock = self.lock()
2555 if self.svfs.exists(b"undo"):
2555 if self.svfs.exists(b"undo"):
2556 dsguard = dirstateguard.dirstateguard(self, b'rollback')
2556 dsguard = dirstateguard.dirstateguard(self, b'rollback')
2557
2557
2558 return self._rollback(dryrun, force, dsguard)
2558 return self._rollback(dryrun, force, dsguard)
2559 else:
2559 else:
2560 self.ui.warn(_(b"no rollback information available\n"))
2560 self.ui.warn(_(b"no rollback information available\n"))
2561 return 1
2561 return 1
2562 finally:
2562 finally:
2563 release(dsguard, lock, wlock)
2563 release(dsguard, lock, wlock)
2564
2564
2565 @unfilteredmethod # Until we get smarter cache management
2565 @unfilteredmethod # Until we get smarter cache management
2566 def _rollback(self, dryrun, force, dsguard):
2566 def _rollback(self, dryrun, force, dsguard):
2567 ui = self.ui
2567 ui = self.ui
2568 try:
2568 try:
2569 args = self.vfs.read(b'undo.desc').splitlines()
2569 args = self.vfs.read(b'undo.desc').splitlines()
2570 (oldlen, desc, detail) = (int(args[0]), args[1], None)
2570 (oldlen, desc, detail) = (int(args[0]), args[1], None)
2571 if len(args) >= 3:
2571 if len(args) >= 3:
2572 detail = args[2]
2572 detail = args[2]
2573 oldtip = oldlen - 1
2573 oldtip = oldlen - 1
2574
2574
2575 if detail and ui.verbose:
2575 if detail and ui.verbose:
2576 msg = _(
2576 msg = _(
2577 b'repository tip rolled back to revision %d'
2577 b'repository tip rolled back to revision %d'
2578 b' (undo %s: %s)\n'
2578 b' (undo %s: %s)\n'
2579 ) % (oldtip, desc, detail)
2579 ) % (oldtip, desc, detail)
2580 else:
2580 else:
2581 msg = _(
2581 msg = _(
2582 b'repository tip rolled back to revision %d (undo %s)\n'
2582 b'repository tip rolled back to revision %d (undo %s)\n'
2583 ) % (oldtip, desc)
2583 ) % (oldtip, desc)
2584 except IOError:
2584 except IOError:
2585 msg = _(b'rolling back unknown transaction\n')
2585 msg = _(b'rolling back unknown transaction\n')
2586 desc = None
2586 desc = None
2587
2587
2588 if not force and self[b'.'] != self[b'tip'] and desc == b'commit':
2588 if not force and self[b'.'] != self[b'tip'] and desc == b'commit':
2589 raise error.Abort(
2589 raise error.Abort(
2590 _(
2590 _(
2591 b'rollback of last commit while not checked out '
2591 b'rollback of last commit while not checked out '
2592 b'may lose data'
2592 b'may lose data'
2593 ),
2593 ),
2594 hint=_(b'use -f to force'),
2594 hint=_(b'use -f to force'),
2595 )
2595 )
2596
2596
2597 ui.status(msg)
2597 ui.status(msg)
2598 if dryrun:
2598 if dryrun:
2599 return 0
2599 return 0
2600
2600
2601 parents = self.dirstate.parents()
2601 parents = self.dirstate.parents()
2602 self.destroying()
2602 self.destroying()
2603 vfsmap = {b'plain': self.vfs, b'': self.svfs}
2603 vfsmap = {b'plain': self.vfs, b'': self.svfs}
2604 transaction.rollback(
2604 transaction.rollback(
2605 self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles
2605 self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles
2606 )
2606 )
2607 bookmarksvfs = bookmarks.bookmarksvfs(self)
2607 bookmarksvfs = bookmarks.bookmarksvfs(self)
2608 if bookmarksvfs.exists(b'undo.bookmarks'):
2608 if bookmarksvfs.exists(b'undo.bookmarks'):
2609 bookmarksvfs.rename(
2609 bookmarksvfs.rename(
2610 b'undo.bookmarks', b'bookmarks', checkambig=True
2610 b'undo.bookmarks', b'bookmarks', checkambig=True
2611 )
2611 )
2612 if self.svfs.exists(b'undo.phaseroots'):
2612 if self.svfs.exists(b'undo.phaseroots'):
2613 self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
2613 self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
2614 self.invalidate()
2614 self.invalidate()
2615
2615
2616 has_node = self.changelog.index.has_node
2616 has_node = self.changelog.index.has_node
2617 parentgone = any(not has_node(p) for p in parents)
2617 parentgone = any(not has_node(p) for p in parents)
2618 if parentgone:
2618 if parentgone:
2619 # prevent dirstateguard from overwriting already restored one
2619 # prevent dirstateguard from overwriting already restored one
2620 dsguard.close()
2620 dsguard.close()
2621
2621
2622 narrowspec.restorebackup(self, b'undo.narrowspec')
2622 narrowspec.restorebackup(self, b'undo.narrowspec')
2623 narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate')
2623 narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate')
2624 self.dirstate.restorebackup(None, b'undo.dirstate')
2624 self.dirstate.restorebackup(None, b'undo.dirstate')
2625 try:
2625 try:
2626 branch = self.vfs.read(b'undo.branch')
2626 branch = self.vfs.read(b'undo.branch')
2627 self.dirstate.setbranch(encoding.tolocal(branch))
2627 self.dirstate.setbranch(encoding.tolocal(branch))
2628 except IOError:
2628 except IOError:
2629 ui.warn(
2629 ui.warn(
2630 _(
2630 _(
2631 b'named branch could not be reset: '
2631 b'named branch could not be reset: '
2632 b'current branch is still \'%s\'\n'
2632 b'current branch is still \'%s\'\n'
2633 )
2633 )
2634 % self.dirstate.branch()
2634 % self.dirstate.branch()
2635 )
2635 )
2636
2636
2637 parents = tuple([p.rev() for p in self[None].parents()])
2637 parents = tuple([p.rev() for p in self[None].parents()])
2638 if len(parents) > 1:
2638 if len(parents) > 1:
2639 ui.status(
2639 ui.status(
2640 _(
2640 _(
2641 b'working directory now based on '
2641 b'working directory now based on '
2642 b'revisions %d and %d\n'
2642 b'revisions %d and %d\n'
2643 )
2643 )
2644 % parents
2644 % parents
2645 )
2645 )
2646 else:
2646 else:
2647 ui.status(
2647 ui.status(
2648 _(b'working directory now based on revision %d\n') % parents
2648 _(b'working directory now based on revision %d\n') % parents
2649 )
2649 )
2650 mergestatemod.mergestate.clean(self)
2650 mergestatemod.mergestate.clean(self)
2651
2651
2652 # TODO: if we know which new heads may result from this rollback, pass
2652 # TODO: if we know which new heads may result from this rollback, pass
2653 # them to destroy(), which will prevent the branchhead cache from being
2653 # them to destroy(), which will prevent the branchhead cache from being
2654 # invalidated.
2654 # invalidated.
2655 self.destroyed()
2655 self.destroyed()
2656 return 0
2656 return 0
2657
2657
2658 def _buildcacheupdater(self, newtransaction):
2658 def _buildcacheupdater(self, newtransaction):
2659 """called during transaction to build the callback updating cache
2659 """called during transaction to build the callback updating cache
2660
2660
2661 Lives on the repository to help extension who might want to augment
2661 Lives on the repository to help extension who might want to augment
2662 this logic. For this purpose, the created transaction is passed to the
2662 this logic. For this purpose, the created transaction is passed to the
2663 method.
2663 method.
2664 """
2664 """
2665 # we must avoid cyclic reference between repo and transaction.
2665 # we must avoid cyclic reference between repo and transaction.
2666 reporef = weakref.ref(self)
2666 reporef = weakref.ref(self)
2667
2667
2668 def updater(tr):
2668 def updater(tr):
2669 repo = reporef()
2669 repo = reporef()
2670 repo.updatecaches(tr)
2670 repo.updatecaches(tr)
2671
2671
2672 return updater
2672 return updater
2673
2673
2674 @unfilteredmethod
2674 @unfilteredmethod
2675 def updatecaches(self, tr=None, full=False):
2675 def updatecaches(self, tr=None, full=False):
2676 """warm appropriate caches
2676 """warm appropriate caches
2677
2677
2678 If this function is called after a transaction closed. The transaction
2678 If this function is called after a transaction closed. The transaction
2679 will be available in the 'tr' argument. This can be used to selectively
2679 will be available in the 'tr' argument. This can be used to selectively
2680 update caches relevant to the changes in that transaction.
2680 update caches relevant to the changes in that transaction.
2681
2681
2682 If 'full' is set, make sure all caches the function knows about have
2682 If 'full' is set, make sure all caches the function knows about have
2683 up-to-date data. Even the ones usually loaded more lazily.
2683 up-to-date data. Even the ones usually loaded more lazily.
2684 """
2684 """
2685 if tr is not None and tr.hookargs.get(b'source') == b'strip':
2685 if tr is not None and tr.hookargs.get(b'source') == b'strip':
2686 # During strip, many caches are invalid but
2686 # During strip, many caches are invalid but
2687 # later call to `destroyed` will refresh them.
2687 # later call to `destroyed` will refresh them.
2688 return
2688 return
2689
2689
2690 if tr is None or tr.changes[b'origrepolen'] < len(self):
2690 if tr is None or tr.changes[b'origrepolen'] < len(self):
2691 # accessing the 'served' branchmap should refresh all the others,
2691 # accessing the 'served' branchmap should refresh all the others,
2692 self.ui.debug(b'updating the branch cache\n')
2692 self.ui.debug(b'updating the branch cache\n')
2693 self.filtered(b'served').branchmap()
2693 self.filtered(b'served').branchmap()
2694 self.filtered(b'served.hidden').branchmap()
2694 self.filtered(b'served.hidden').branchmap()
2695
2695
2696 if full:
2696 if full:
2697 unfi = self.unfiltered()
2697 unfi = self.unfiltered()
2698
2698
2699 self.changelog.update_caches(transaction=tr)
2699 self.changelog.update_caches(transaction=tr)
2700 self.manifestlog.update_caches(transaction=tr)
2700 self.manifestlog.update_caches(transaction=tr)
2701
2701
2702 rbc = unfi.revbranchcache()
2702 rbc = unfi.revbranchcache()
2703 for r in unfi.changelog:
2703 for r in unfi.changelog:
2704 rbc.branchinfo(r)
2704 rbc.branchinfo(r)
2705 rbc.write()
2705 rbc.write()
2706
2706
2707 # ensure the working copy parents are in the manifestfulltextcache
2707 # ensure the working copy parents are in the manifestfulltextcache
2708 for ctx in self[b'.'].parents():
2708 for ctx in self[b'.'].parents():
2709 ctx.manifest() # accessing the manifest is enough
2709 ctx.manifest() # accessing the manifest is enough
2710
2710
2711 # accessing fnode cache warms the cache
2711 # accessing fnode cache warms the cache
2712 tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs())
2712 tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs())
2713 # accessing tags warm the cache
2713 # accessing tags warm the cache
2714 self.tags()
2714 self.tags()
2715 self.filtered(b'served').tags()
2715 self.filtered(b'served').tags()
2716
2716
2717 # The `full` arg is documented as updating even the lazily-loaded
2717 # The `full` arg is documented as updating even the lazily-loaded
2718 # caches immediately, so we're forcing a write to cause these caches
2718 # caches immediately, so we're forcing a write to cause these caches
2719 # to be warmed up even if they haven't explicitly been requested
2719 # to be warmed up even if they haven't explicitly been requested
2720 # yet (if they've never been used by hg, they won't ever have been
2720 # yet (if they've never been used by hg, they won't ever have been
2721 # written, even if they're a subset of another kind of cache that
2721 # written, even if they're a subset of another kind of cache that
2722 # *has* been used).
2722 # *has* been used).
2723 for filt in repoview.filtertable.keys():
2723 for filt in repoview.filtertable.keys():
2724 filtered = self.filtered(filt)
2724 filtered = self.filtered(filt)
2725 filtered.branchmap().write(filtered)
2725 filtered.branchmap().write(filtered)
2726
2726
2727 def invalidatecaches(self):
2727 def invalidatecaches(self):
2728
2728
2729 if '_tagscache' in vars(self):
2729 if '_tagscache' in vars(self):
2730 # can't use delattr on proxy
2730 # can't use delattr on proxy
2731 del self.__dict__['_tagscache']
2731 del self.__dict__['_tagscache']
2732
2732
2733 self._branchcaches.clear()
2733 self._branchcaches.clear()
2734 self.invalidatevolatilesets()
2734 self.invalidatevolatilesets()
2735 self._sparsesignaturecache.clear()
2735 self._sparsesignaturecache.clear()
2736
2736
2737 def invalidatevolatilesets(self):
2737 def invalidatevolatilesets(self):
2738 self.filteredrevcache.clear()
2738 self.filteredrevcache.clear()
2739 obsolete.clearobscaches(self)
2739 obsolete.clearobscaches(self)
2740 self._quick_access_changeid_invalidate()
2740 self._quick_access_changeid_invalidate()
2741
2741
2742 def invalidatedirstate(self):
2742 def invalidatedirstate(self):
2743 """Invalidates the dirstate, causing the next call to dirstate
2743 """Invalidates the dirstate, causing the next call to dirstate
2744 to check if it was modified since the last time it was read,
2744 to check if it was modified since the last time it was read,
2745 rereading it if it has.
2745 rereading it if it has.
2746
2746
2747 This is different to dirstate.invalidate() that it doesn't always
2747 This is different to dirstate.invalidate() that it doesn't always
2748 rereads the dirstate. Use dirstate.invalidate() if you want to
2748 rereads the dirstate. Use dirstate.invalidate() if you want to
2749 explicitly read the dirstate again (i.e. restoring it to a previous
2749 explicitly read the dirstate again (i.e. restoring it to a previous
2750 known good state)."""
2750 known good state)."""
2751 if hasunfilteredcache(self, 'dirstate'):
2751 if hasunfilteredcache(self, 'dirstate'):
2752 for k in self.dirstate._filecache:
2752 for k in self.dirstate._filecache:
2753 try:
2753 try:
2754 delattr(self.dirstate, k)
2754 delattr(self.dirstate, k)
2755 except AttributeError:
2755 except AttributeError:
2756 pass
2756 pass
2757 delattr(self.unfiltered(), 'dirstate')
2757 delattr(self.unfiltered(), 'dirstate')
2758
2758
2759 def invalidate(self, clearfilecache=False):
2759 def invalidate(self, clearfilecache=False):
2760 """Invalidates both store and non-store parts other than dirstate
2760 """Invalidates both store and non-store parts other than dirstate
2761
2761
2762 If a transaction is running, invalidation of store is omitted,
2762 If a transaction is running, invalidation of store is omitted,
2763 because discarding in-memory changes might cause inconsistency
2763 because discarding in-memory changes might cause inconsistency
2764 (e.g. incomplete fncache causes unintentional failure, but
2764 (e.g. incomplete fncache causes unintentional failure, but
2765 redundant one doesn't).
2765 redundant one doesn't).
2766 """
2766 """
2767 unfiltered = self.unfiltered() # all file caches are stored unfiltered
2767 unfiltered = self.unfiltered() # all file caches are stored unfiltered
2768 for k in list(self._filecache.keys()):
2768 for k in list(self._filecache.keys()):
2769 # dirstate is invalidated separately in invalidatedirstate()
2769 # dirstate is invalidated separately in invalidatedirstate()
2770 if k == b'dirstate':
2770 if k == b'dirstate':
2771 continue
2771 continue
2772 if (
2772 if (
2773 k == b'changelog'
2773 k == b'changelog'
2774 and self.currenttransaction()
2774 and self.currenttransaction()
2775 and self.changelog._delayed
2775 and self.changelog._delayed
2776 ):
2776 ):
2777 # The changelog object may store unwritten revisions. We don't
2777 # The changelog object may store unwritten revisions. We don't
2778 # want to lose them.
2778 # want to lose them.
2779 # TODO: Solve the problem instead of working around it.
2779 # TODO: Solve the problem instead of working around it.
2780 continue
2780 continue
2781
2781
2782 if clearfilecache:
2782 if clearfilecache:
2783 del self._filecache[k]
2783 del self._filecache[k]
2784 try:
2784 try:
2785 delattr(unfiltered, k)
2785 delattr(unfiltered, k)
2786 except AttributeError:
2786 except AttributeError:
2787 pass
2787 pass
2788 self.invalidatecaches()
2788 self.invalidatecaches()
2789 if not self.currenttransaction():
2789 if not self.currenttransaction():
2790 # TODO: Changing contents of store outside transaction
2790 # TODO: Changing contents of store outside transaction
2791 # causes inconsistency. We should make in-memory store
2791 # causes inconsistency. We should make in-memory store
2792 # changes detectable, and abort if changed.
2792 # changes detectable, and abort if changed.
2793 self.store.invalidatecaches()
2793 self.store.invalidatecaches()
2794
2794
2795 def invalidateall(self):
2795 def invalidateall(self):
2796 """Fully invalidates both store and non-store parts, causing the
2796 """Fully invalidates both store and non-store parts, causing the
2797 subsequent operation to reread any outside changes."""
2797 subsequent operation to reread any outside changes."""
2798 # extension should hook this to invalidate its caches
2798 # extension should hook this to invalidate its caches
2799 self.invalidate()
2799 self.invalidate()
2800 self.invalidatedirstate()
2800 self.invalidatedirstate()
2801
2801
2802 @unfilteredmethod
2802 @unfilteredmethod
2803 def _refreshfilecachestats(self, tr):
2803 def _refreshfilecachestats(self, tr):
2804 """Reload stats of cached files so that they are flagged as valid"""
2804 """Reload stats of cached files so that they are flagged as valid"""
2805 for k, ce in self._filecache.items():
2805 for k, ce in self._filecache.items():
2806 k = pycompat.sysstr(k)
2806 k = pycompat.sysstr(k)
2807 if k == 'dirstate' or k not in self.__dict__:
2807 if k == 'dirstate' or k not in self.__dict__:
2808 continue
2808 continue
2809 ce.refresh()
2809 ce.refresh()
2810
2810
2811 def _lock(
2811 def _lock(
2812 self,
2812 self,
2813 vfs,
2813 vfs,
2814 lockname,
2814 lockname,
2815 wait,
2815 wait,
2816 releasefn,
2816 releasefn,
2817 acquirefn,
2817 acquirefn,
2818 desc,
2818 desc,
2819 ):
2819 ):
2820 timeout = 0
2820 timeout = 0
2821 warntimeout = 0
2821 warntimeout = 0
2822 if wait:
2822 if wait:
2823 timeout = self.ui.configint(b"ui", b"timeout")
2823 timeout = self.ui.configint(b"ui", b"timeout")
2824 warntimeout = self.ui.configint(b"ui", b"timeout.warn")
2824 warntimeout = self.ui.configint(b"ui", b"timeout.warn")
2825 # internal config: ui.signal-safe-lock
2825 # internal config: ui.signal-safe-lock
2826 signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock')
2826 signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock')
2827
2827
2828 l = lockmod.trylock(
2828 l = lockmod.trylock(
2829 self.ui,
2829 self.ui,
2830 vfs,
2830 vfs,
2831 lockname,
2831 lockname,
2832 timeout,
2832 timeout,
2833 warntimeout,
2833 warntimeout,
2834 releasefn=releasefn,
2834 releasefn=releasefn,
2835 acquirefn=acquirefn,
2835 acquirefn=acquirefn,
2836 desc=desc,
2836 desc=desc,
2837 signalsafe=signalsafe,
2837 signalsafe=signalsafe,
2838 )
2838 )
2839 return l
2839 return l
2840
2840
2841 def _afterlock(self, callback):
2841 def _afterlock(self, callback):
2842 """add a callback to be run when the repository is fully unlocked
2842 """add a callback to be run when the repository is fully unlocked
2843
2843
2844 The callback will be executed when the outermost lock is released
2844 The callback will be executed when the outermost lock is released
2845 (with wlock being higher level than 'lock')."""
2845 (with wlock being higher level than 'lock')."""
2846 for ref in (self._wlockref, self._lockref):
2846 for ref in (self._wlockref, self._lockref):
2847 l = ref and ref()
2847 l = ref and ref()
2848 if l and l.held:
2848 if l and l.held:
2849 l.postrelease.append(callback)
2849 l.postrelease.append(callback)
2850 break
2850 break
2851 else: # no lock have been found.
2851 else: # no lock have been found.
2852 callback(True)
2852 callback(True)
2853
2853
2854 def lock(self, wait=True):
2854 def lock(self, wait=True):
2855 """Lock the repository store (.hg/store) and return a weak reference
2855 """Lock the repository store (.hg/store) and return a weak reference
2856 to the lock. Use this before modifying the store (e.g. committing or
2856 to the lock. Use this before modifying the store (e.g. committing or
2857 stripping). If you are opening a transaction, get a lock as well.)
2857 stripping). If you are opening a transaction, get a lock as well.)
2858
2858
2859 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
2859 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
2860 'wlock' first to avoid a dead-lock hazard."""
2860 'wlock' first to avoid a dead-lock hazard."""
2861 l = self._currentlock(self._lockref)
2861 l = self._currentlock(self._lockref)
2862 if l is not None:
2862 if l is not None:
2863 l.lock()
2863 l.lock()
2864 return l
2864 return l
2865
2865
2866 l = self._lock(
2866 l = self._lock(
2867 vfs=self.svfs,
2867 vfs=self.svfs,
2868 lockname=b"lock",
2868 lockname=b"lock",
2869 wait=wait,
2869 wait=wait,
2870 releasefn=None,
2870 releasefn=None,
2871 acquirefn=self.invalidate,
2871 acquirefn=self.invalidate,
2872 desc=_(b'repository %s') % self.origroot,
2872 desc=_(b'repository %s') % self.origroot,
2873 )
2873 )
2874 self._lockref = weakref.ref(l)
2874 self._lockref = weakref.ref(l)
2875 return l
2875 return l
2876
2876
2877 def wlock(self, wait=True):
2877 def wlock(self, wait=True):
2878 """Lock the non-store parts of the repository (everything under
2878 """Lock the non-store parts of the repository (everything under
2879 .hg except .hg/store) and return a weak reference to the lock.
2879 .hg except .hg/store) and return a weak reference to the lock.
2880
2880
2881 Use this before modifying files in .hg.
2881 Use this before modifying files in .hg.
2882
2882
2883 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
2883 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
2884 'wlock' first to avoid a dead-lock hazard."""
2884 'wlock' first to avoid a dead-lock hazard."""
2885 l = self._wlockref and self._wlockref()
2885 l = self._wlockref and self._wlockref()
2886 if l is not None and l.held:
2886 if l is not None and l.held:
2887 l.lock()
2887 l.lock()
2888 return l
2888 return l
2889
2889
2890 # We do not need to check for non-waiting lock acquisition. Such
2890 # We do not need to check for non-waiting lock acquisition. Such
2891 # acquisition would not cause dead-lock as they would just fail.
2891 # acquisition would not cause dead-lock as they would just fail.
2892 if wait and (
2892 if wait and (
2893 self.ui.configbool(b'devel', b'all-warnings')
2893 self.ui.configbool(b'devel', b'all-warnings')
2894 or self.ui.configbool(b'devel', b'check-locks')
2894 or self.ui.configbool(b'devel', b'check-locks')
2895 ):
2895 ):
2896 if self._currentlock(self._lockref) is not None:
2896 if self._currentlock(self._lockref) is not None:
2897 self.ui.develwarn(b'"wlock" acquired after "lock"')
2897 self.ui.develwarn(b'"wlock" acquired after "lock"')
2898
2898
2899 def unlock():
2899 def unlock():
2900 if self.dirstate.pendingparentchange():
2900 if self.dirstate.pendingparentchange():
2901 self.dirstate.invalidate()
2901 self.dirstate.invalidate()
2902 else:
2902 else:
2903 self.dirstate.write(None)
2903 self.dirstate.write(None)
2904
2904
2905 self._filecache[b'dirstate'].refresh()
2905 self._filecache[b'dirstate'].refresh()
2906
2906
2907 l = self._lock(
2907 l = self._lock(
2908 self.vfs,
2908 self.vfs,
2909 b"wlock",
2909 b"wlock",
2910 wait,
2910 wait,
2911 unlock,
2911 unlock,
2912 self.invalidatedirstate,
2912 self.invalidatedirstate,
2913 _(b'working directory of %s') % self.origroot,
2913 _(b'working directory of %s') % self.origroot,
2914 )
2914 )
2915 self._wlockref = weakref.ref(l)
2915 self._wlockref = weakref.ref(l)
2916 return l
2916 return l
2917
2917
2918 def _currentlock(self, lockref):
2918 def _currentlock(self, lockref):
2919 """Returns the lock if it's held, or None if it's not."""
2919 """Returns the lock if it's held, or None if it's not."""
2920 if lockref is None:
2920 if lockref is None:
2921 return None
2921 return None
2922 l = lockref()
2922 l = lockref()
2923 if l is None or not l.held:
2923 if l is None or not l.held:
2924 return None
2924 return None
2925 return l
2925 return l
2926
2926
2927 def currentwlock(self):
2927 def currentwlock(self):
2928 """Returns the wlock if it's held, or None if it's not."""
2928 """Returns the wlock if it's held, or None if it's not."""
2929 return self._currentlock(self._wlockref)
2929 return self._currentlock(self._wlockref)
2930
2930
2931 def checkcommitpatterns(self, wctx, match, status, fail):
2931 def checkcommitpatterns(self, wctx, match, status, fail):
2932 """check for commit arguments that aren't committable"""
2932 """check for commit arguments that aren't committable"""
2933 if match.isexact() or match.prefix():
2933 if match.isexact() or match.prefix():
2934 matched = set(status.modified + status.added + status.removed)
2934 matched = set(status.modified + status.added + status.removed)
2935
2935
2936 for f in match.files():
2936 for f in match.files():
2937 f = self.dirstate.normalize(f)
2937 f = self.dirstate.normalize(f)
2938 if f == b'.' or f in matched or f in wctx.substate:
2938 if f == b'.' or f in matched or f in wctx.substate:
2939 continue
2939 continue
2940 if f in status.deleted:
2940 if f in status.deleted:
2941 fail(f, _(b'file not found!'))
2941 fail(f, _(b'file not found!'))
2942 # Is it a directory that exists or used to exist?
2942 # Is it a directory that exists or used to exist?
2943 if self.wvfs.isdir(f) or wctx.p1().hasdir(f):
2943 if self.wvfs.isdir(f) or wctx.p1().hasdir(f):
2944 d = f + b'/'
2944 d = f + b'/'
2945 for mf in matched:
2945 for mf in matched:
2946 if mf.startswith(d):
2946 if mf.startswith(d):
2947 break
2947 break
2948 else:
2948 else:
2949 fail(f, _(b"no match under directory!"))
2949 fail(f, _(b"no match under directory!"))
2950 elif f not in self.dirstate:
2950 elif f not in self.dirstate:
2951 fail(f, _(b"file not tracked!"))
2951 fail(f, _(b"file not tracked!"))
2952
2952
2953 @unfilteredmethod
2953 @unfilteredmethod
2954 def commit(
2954 def commit(
2955 self,
2955 self,
2956 text=b"",
2956 text=b"",
2957 user=None,
2957 user=None,
2958 date=None,
2958 date=None,
2959 match=None,
2959 match=None,
2960 force=False,
2960 force=False,
2961 editor=None,
2961 editor=None,
2962 extra=None,
2962 extra=None,
2963 ):
2963 ):
2964 """Add a new revision to current repository.
2964 """Add a new revision to current repository.
2965
2965
2966 Revision information is gathered from the working directory,
2966 Revision information is gathered from the working directory,
2967 match can be used to filter the committed files. If editor is
2967 match can be used to filter the committed files. If editor is
2968 supplied, it is called to get a commit message.
2968 supplied, it is called to get a commit message.
2969 """
2969 """
2970 if extra is None:
2970 if extra is None:
2971 extra = {}
2971 extra = {}
2972
2972
2973 def fail(f, msg):
2973 def fail(f, msg):
2974 raise error.InputError(b'%s: %s' % (f, msg))
2974 raise error.InputError(b'%s: %s' % (f, msg))
2975
2975
2976 if not match:
2976 if not match:
2977 match = matchmod.always()
2977 match = matchmod.always()
2978
2978
2979 if not force:
2979 if not force:
2980 match.bad = fail
2980 match.bad = fail
2981
2981
2982 # lock() for recent changelog (see issue4368)
2982 # lock() for recent changelog (see issue4368)
2983 with self.wlock(), self.lock():
2983 with self.wlock(), self.lock():
2984 wctx = self[None]
2984 wctx = self[None]
2985 merge = len(wctx.parents()) > 1
2985 merge = len(wctx.parents()) > 1
2986
2986
2987 if not force and merge and not match.always():
2987 if not force and merge and not match.always():
2988 raise error.Abort(
2988 raise error.Abort(
2989 _(
2989 _(
2990 b'cannot partially commit a merge '
2990 b'cannot partially commit a merge '
2991 b'(do not specify files or patterns)'
2991 b'(do not specify files or patterns)'
2992 )
2992 )
2993 )
2993 )
2994
2994
2995 status = self.status(match=match, clean=force)
2995 status = self.status(match=match, clean=force)
2996 if force:
2996 if force:
2997 status.modified.extend(
2997 status.modified.extend(
2998 status.clean
2998 status.clean
2999 ) # mq may commit clean files
2999 ) # mq may commit clean files
3000
3000
3001 # check subrepos
3001 # check subrepos
3002 subs, commitsubs, newstate = subrepoutil.precommit(
3002 subs, commitsubs, newstate = subrepoutil.precommit(
3003 self.ui, wctx, status, match, force=force
3003 self.ui, wctx, status, match, force=force
3004 )
3004 )
3005
3005
3006 # make sure all explicit patterns are matched
3006 # make sure all explicit patterns are matched
3007 if not force:
3007 if not force:
3008 self.checkcommitpatterns(wctx, match, status, fail)
3008 self.checkcommitpatterns(wctx, match, status, fail)
3009
3009
3010 cctx = context.workingcommitctx(
3010 cctx = context.workingcommitctx(
3011 self, status, text, user, date, extra
3011 self, status, text, user, date, extra
3012 )
3012 )
3013
3013
3014 ms = mergestatemod.mergestate.read(self)
3014 ms = mergestatemod.mergestate.read(self)
3015 mergeutil.checkunresolved(ms)
3015 mergeutil.checkunresolved(ms)
3016
3016
3017 # internal config: ui.allowemptycommit
3017 # internal config: ui.allowemptycommit
3018 if cctx.isempty() and not self.ui.configbool(
3018 if cctx.isempty() and not self.ui.configbool(
3019 b'ui', b'allowemptycommit'
3019 b'ui', b'allowemptycommit'
3020 ):
3020 ):
3021 self.ui.debug(b'nothing to commit, clearing merge state\n')
3021 self.ui.debug(b'nothing to commit, clearing merge state\n')
3022 ms.reset()
3022 ms.reset()
3023 return None
3023 return None
3024
3024
3025 if merge and cctx.deleted():
3025 if merge and cctx.deleted():
3026 raise error.Abort(_(b"cannot commit merge with missing files"))
3026 raise error.Abort(_(b"cannot commit merge with missing files"))
3027
3027
3028 if editor:
3028 if editor:
3029 cctx._text = editor(self, cctx, subs)
3029 cctx._text = editor(self, cctx, subs)
3030 edited = text != cctx._text
3030 edited = text != cctx._text
3031
3031
3032 # Save commit message in case this transaction gets rolled back
3032 # Save commit message in case this transaction gets rolled back
3033 # (e.g. by a pretxncommit hook). Leave the content alone on
3033 # (e.g. by a pretxncommit hook). Leave the content alone on
3034 # the assumption that the user will use the same editor again.
3034 # the assumption that the user will use the same editor again.
3035 msgfn = self.savecommitmessage(cctx._text)
3035 msgfn = self.savecommitmessage(cctx._text)
3036
3036
3037 # commit subs and write new state
3037 # commit subs and write new state
3038 if subs:
3038 if subs:
3039 uipathfn = scmutil.getuipathfn(self)
3039 uipathfn = scmutil.getuipathfn(self)
3040 for s in sorted(commitsubs):
3040 for s in sorted(commitsubs):
3041 sub = wctx.sub(s)
3041 sub = wctx.sub(s)
3042 self.ui.status(
3042 self.ui.status(
3043 _(b'committing subrepository %s\n')
3043 _(b'committing subrepository %s\n')
3044 % uipathfn(subrepoutil.subrelpath(sub))
3044 % uipathfn(subrepoutil.subrelpath(sub))
3045 )
3045 )
3046 sr = sub.commit(cctx._text, user, date)
3046 sr = sub.commit(cctx._text, user, date)
3047 newstate[s] = (newstate[s][0], sr)
3047 newstate[s] = (newstate[s][0], sr)
3048 subrepoutil.writestate(self, newstate)
3048 subrepoutil.writestate(self, newstate)
3049
3049
3050 p1, p2 = self.dirstate.parents()
3050 p1, p2 = self.dirstate.parents()
3051 hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or b'')
3051 hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or b'')
3052 try:
3052 try:
3053 self.hook(
3053 self.hook(
3054 b"precommit", throw=True, parent1=hookp1, parent2=hookp2
3054 b"precommit", throw=True, parent1=hookp1, parent2=hookp2
3055 )
3055 )
3056 with self.transaction(b'commit'):
3056 with self.transaction(b'commit'):
3057 ret = self.commitctx(cctx, True)
3057 ret = self.commitctx(cctx, True)
3058 # update bookmarks, dirstate and mergestate
3058 # update bookmarks, dirstate and mergestate
3059 bookmarks.update(self, [p1, p2], ret)
3059 bookmarks.update(self, [p1, p2], ret)
3060 cctx.markcommitted(ret)
3060 cctx.markcommitted(ret)
3061 ms.reset()
3061 ms.reset()
3062 except: # re-raises
3062 except: # re-raises
3063 if edited:
3063 if edited:
3064 self.ui.write(
3064 self.ui.write(
3065 _(b'note: commit message saved in %s\n') % msgfn
3065 _(b'note: commit message saved in %s\n') % msgfn
3066 )
3066 )
3067 self.ui.write(
3067 self.ui.write(
3068 _(
3068 _(
3069 b"note: use 'hg commit --logfile "
3069 b"note: use 'hg commit --logfile "
3070 b".hg/last-message.txt --edit' to reuse it\n"
3070 b".hg/last-message.txt --edit' to reuse it\n"
3071 )
3071 )
3072 )
3072 )
3073 raise
3073 raise
3074
3074
3075 def commithook(unused_success):
3075 def commithook(unused_success):
3076 # hack for command that use a temporary commit (eg: histedit)
3076 # hack for command that use a temporary commit (eg: histedit)
3077 # temporary commit got stripped before hook release
3077 # temporary commit got stripped before hook release
3078 if self.changelog.hasnode(ret):
3078 if self.changelog.hasnode(ret):
3079 self.hook(
3079 self.hook(
3080 b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2
3080 b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2
3081 )
3081 )
3082
3082
3083 self._afterlock(commithook)
3083 self._afterlock(commithook)
3084 return ret
3084 return ret
3085
3085
3086 @unfilteredmethod
3086 @unfilteredmethod
3087 def commitctx(self, ctx, error=False, origctx=None):
3087 def commitctx(self, ctx, error=False, origctx=None):
3088 return commit.commitctx(self, ctx, error=error, origctx=origctx)
3088 return commit.commitctx(self, ctx, error=error, origctx=origctx)
3089
3089
3090 @unfilteredmethod
3090 @unfilteredmethod
3091 def destroying(self):
3091 def destroying(self):
3092 """Inform the repository that nodes are about to be destroyed.
3092 """Inform the repository that nodes are about to be destroyed.
3093 Intended for use by strip and rollback, so there's a common
3093 Intended for use by strip and rollback, so there's a common
3094 place for anything that has to be done before destroying history.
3094 place for anything that has to be done before destroying history.
3095
3095
3096 This is mostly useful for saving state that is in memory and waiting
3096 This is mostly useful for saving state that is in memory and waiting
3097 to be flushed when the current lock is released. Because a call to
3097 to be flushed when the current lock is released. Because a call to
3098 destroyed is imminent, the repo will be invalidated causing those
3098 destroyed is imminent, the repo will be invalidated causing those
3099 changes to stay in memory (waiting for the next unlock), or vanish
3099 changes to stay in memory (waiting for the next unlock), or vanish
3100 completely.
3100 completely.
3101 """
3101 """
3102 # When using the same lock to commit and strip, the phasecache is left
3102 # When using the same lock to commit and strip, the phasecache is left
3103 # dirty after committing. Then when we strip, the repo is invalidated,
3103 # dirty after committing. Then when we strip, the repo is invalidated,
3104 # causing those changes to disappear.
3104 # causing those changes to disappear.
3105 if '_phasecache' in vars(self):
3105 if '_phasecache' in vars(self):
3106 self._phasecache.write()
3106 self._phasecache.write()
3107
3107
3108 @unfilteredmethod
3108 @unfilteredmethod
3109 def destroyed(self):
3109 def destroyed(self):
3110 """Inform the repository that nodes have been destroyed.
3110 """Inform the repository that nodes have been destroyed.
3111 Intended for use by strip and rollback, so there's a common
3111 Intended for use by strip and rollback, so there's a common
3112 place for anything that has to be done after destroying history.
3112 place for anything that has to be done after destroying history.
3113 """
3113 """
3114 # When one tries to:
3114 # When one tries to:
3115 # 1) destroy nodes thus calling this method (e.g. strip)
3115 # 1) destroy nodes thus calling this method (e.g. strip)
3116 # 2) use phasecache somewhere (e.g. commit)
3116 # 2) use phasecache somewhere (e.g. commit)
3117 #
3117 #
3118 # then 2) will fail because the phasecache contains nodes that were
3118 # then 2) will fail because the phasecache contains nodes that were
3119 # removed. We can either remove phasecache from the filecache,
3119 # removed. We can either remove phasecache from the filecache,
3120 # causing it to reload next time it is accessed, or simply filter
3120 # causing it to reload next time it is accessed, or simply filter
3121 # the removed nodes now and write the updated cache.
3121 # the removed nodes now and write the updated cache.
3122 self._phasecache.filterunknown(self)
3122 self._phasecache.filterunknown(self)
3123 self._phasecache.write()
3123 self._phasecache.write()
3124
3124
3125 # refresh all repository caches
3125 # refresh all repository caches
3126 self.updatecaches()
3126 self.updatecaches()
3127
3127
3128 # Ensure the persistent tag cache is updated. Doing it now
3128 # Ensure the persistent tag cache is updated. Doing it now
3129 # means that the tag cache only has to worry about destroyed
3129 # means that the tag cache only has to worry about destroyed
3130 # heads immediately after a strip/rollback. That in turn
3130 # heads immediately after a strip/rollback. That in turn
3131 # guarantees that "cachetip == currenttip" (comparing both rev
3131 # guarantees that "cachetip == currenttip" (comparing both rev
3132 # and node) always means no nodes have been added or destroyed.
3132 # and node) always means no nodes have been added or destroyed.
3133
3133
3134 # XXX this is suboptimal when qrefresh'ing: we strip the current
3134 # XXX this is suboptimal when qrefresh'ing: we strip the current
3135 # head, refresh the tag cache, then immediately add a new head.
3135 # head, refresh the tag cache, then immediately add a new head.
3136 # But I think doing it this way is necessary for the "instant
3136 # But I think doing it this way is necessary for the "instant
3137 # tag cache retrieval" case to work.
3137 # tag cache retrieval" case to work.
3138 self.invalidate()
3138 self.invalidate()
3139
3139
3140 def status(
3140 def status(
3141 self,
3141 self,
3142 node1=b'.',
3142 node1=b'.',
3143 node2=None,
3143 node2=None,
3144 match=None,
3144 match=None,
3145 ignored=False,
3145 ignored=False,
3146 clean=False,
3146 clean=False,
3147 unknown=False,
3147 unknown=False,
3148 listsubrepos=False,
3148 listsubrepos=False,
3149 ):
3149 ):
3150 '''a convenience method that calls node1.status(node2)'''
3150 '''a convenience method that calls node1.status(node2)'''
3151 return self[node1].status(
3151 return self[node1].status(
3152 node2, match, ignored, clean, unknown, listsubrepos
3152 node2, match, ignored, clean, unknown, listsubrepos
3153 )
3153 )
3154
3154
3155 def addpostdsstatus(self, ps):
3155 def addpostdsstatus(self, ps):
3156 """Add a callback to run within the wlock, at the point at which status
3156 """Add a callback to run within the wlock, at the point at which status
3157 fixups happen.
3157 fixups happen.
3158
3158
3159 On status completion, callback(wctx, status) will be called with the
3159 On status completion, callback(wctx, status) will be called with the
3160 wlock held, unless the dirstate has changed from underneath or the wlock
3160 wlock held, unless the dirstate has changed from underneath or the wlock
3161 couldn't be grabbed.
3161 couldn't be grabbed.
3162
3162
3163 Callbacks should not capture and use a cached copy of the dirstate --
3163 Callbacks should not capture and use a cached copy of the dirstate --
3164 it might change in the meanwhile. Instead, they should access the
3164 it might change in the meanwhile. Instead, they should access the
3165 dirstate via wctx.repo().dirstate.
3165 dirstate via wctx.repo().dirstate.
3166
3166
3167 This list is emptied out after each status run -- extensions should
3167 This list is emptied out after each status run -- extensions should
3168 make sure it adds to this list each time dirstate.status is called.
3168 make sure it adds to this list each time dirstate.status is called.
3169 Extensions should also make sure they don't call this for statuses
3169 Extensions should also make sure they don't call this for statuses
3170 that don't involve the dirstate.
3170 that don't involve the dirstate.
3171 """
3171 """
3172
3172
3173 # The list is located here for uniqueness reasons -- it is actually
3173 # The list is located here for uniqueness reasons -- it is actually
3174 # managed by the workingctx, but that isn't unique per-repo.
3174 # managed by the workingctx, but that isn't unique per-repo.
3175 self._postdsstatus.append(ps)
3175 self._postdsstatus.append(ps)
3176
3176
3177 def postdsstatus(self):
3177 def postdsstatus(self):
3178 """Used by workingctx to get the list of post-dirstate-status hooks."""
3178 """Used by workingctx to get the list of post-dirstate-status hooks."""
3179 return self._postdsstatus
3179 return self._postdsstatus
3180
3180
3181 def clearpostdsstatus(self):
3181 def clearpostdsstatus(self):
3182 """Used by workingctx to clear post-dirstate-status hooks."""
3182 """Used by workingctx to clear post-dirstate-status hooks."""
3183 del self._postdsstatus[:]
3183 del self._postdsstatus[:]
3184
3184
3185 def heads(self, start=None):
3185 def heads(self, start=None):
3186 if start is None:
3186 if start is None:
3187 cl = self.changelog
3187 cl = self.changelog
3188 headrevs = reversed(cl.headrevs())
3188 headrevs = reversed(cl.headrevs())
3189 return [cl.node(rev) for rev in headrevs]
3189 return [cl.node(rev) for rev in headrevs]
3190
3190
3191 heads = self.changelog.heads(start)
3191 heads = self.changelog.heads(start)
3192 # sort the output in rev descending order
3192 # sort the output in rev descending order
3193 return sorted(heads, key=self.changelog.rev, reverse=True)
3193 return sorted(heads, key=self.changelog.rev, reverse=True)
3194
3194
3195 def branchheads(self, branch=None, start=None, closed=False):
3195 def branchheads(self, branch=None, start=None, closed=False):
3196 """return a (possibly filtered) list of heads for the given branch
3196 """return a (possibly filtered) list of heads for the given branch
3197
3197
3198 Heads are returned in topological order, from newest to oldest.
3198 Heads are returned in topological order, from newest to oldest.
3199 If branch is None, use the dirstate branch.
3199 If branch is None, use the dirstate branch.
3200 If start is not None, return only heads reachable from start.
3200 If start is not None, return only heads reachable from start.
3201 If closed is True, return heads that are marked as closed as well.
3201 If closed is True, return heads that are marked as closed as well.
3202 """
3202 """
3203 if branch is None:
3203 if branch is None:
3204 branch = self[None].branch()
3204 branch = self[None].branch()
3205 branches = self.branchmap()
3205 branches = self.branchmap()
3206 if not branches.hasbranch(branch):
3206 if not branches.hasbranch(branch):
3207 return []
3207 return []
3208 # the cache returns heads ordered lowest to highest
3208 # the cache returns heads ordered lowest to highest
3209 bheads = list(reversed(branches.branchheads(branch, closed=closed)))
3209 bheads = list(reversed(branches.branchheads(branch, closed=closed)))
3210 if start is not None:
3210 if start is not None:
3211 # filter out the heads that cannot be reached from startrev
3211 # filter out the heads that cannot be reached from startrev
3212 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
3212 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
3213 bheads = [h for h in bheads if h in fbheads]
3213 bheads = [h for h in bheads if h in fbheads]
3214 return bheads
3214 return bheads
3215
3215
3216 def branches(self, nodes):
3216 def branches(self, nodes):
3217 if not nodes:
3217 if not nodes:
3218 nodes = [self.changelog.tip()]
3218 nodes = [self.changelog.tip()]
3219 b = []
3219 b = []
3220 for n in nodes:
3220 for n in nodes:
3221 t = n
3221 t = n
3222 while True:
3222 while True:
3223 p = self.changelog.parents(n)
3223 p = self.changelog.parents(n)
3224 if p[1] != nullid or p[0] == nullid:
3224 if p[1] != nullid or p[0] == nullid:
3225 b.append((t, n, p[0], p[1]))
3225 b.append((t, n, p[0], p[1]))
3226 break
3226 break
3227 n = p[0]
3227 n = p[0]
3228 return b
3228 return b
3229
3229
3230 def between(self, pairs):
3230 def between(self, pairs):
3231 r = []
3231 r = []
3232
3232
3233 for top, bottom in pairs:
3233 for top, bottom in pairs:
3234 n, l, i = top, [], 0
3234 n, l, i = top, [], 0
3235 f = 1
3235 f = 1
3236
3236
3237 while n != bottom and n != nullid:
3237 while n != bottom and n != nullid:
3238 p = self.changelog.parents(n)[0]
3238 p = self.changelog.parents(n)[0]
3239 if i == f:
3239 if i == f:
3240 l.append(n)
3240 l.append(n)
3241 f = f * 2
3241 f = f * 2
3242 n = p
3242 n = p
3243 i += 1
3243 i += 1
3244
3244
3245 r.append(l)
3245 r.append(l)
3246
3246
3247 return r
3247 return r
3248
3248
3249 def checkpush(self, pushop):
3249 def checkpush(self, pushop):
3250 """Extensions can override this function if additional checks have
3250 """Extensions can override this function if additional checks have
3251 to be performed before pushing, or call it if they override push
3251 to be performed before pushing, or call it if they override push
3252 command.
3252 command.
3253 """
3253 """
3254
3254
3255 @unfilteredpropertycache
3255 @unfilteredpropertycache
3256 def prepushoutgoinghooks(self):
3256 def prepushoutgoinghooks(self):
3257 """Return util.hooks consists of a pushop with repo, remote, outgoing
3257 """Return util.hooks consists of a pushop with repo, remote, outgoing
3258 methods, which are called before pushing changesets.
3258 methods, which are called before pushing changesets.
3259 """
3259 """
3260 return util.hooks()
3260 return util.hooks()
3261
3261
3262 def pushkey(self, namespace, key, old, new):
3262 def pushkey(self, namespace, key, old, new):
3263 try:
3263 try:
3264 tr = self.currenttransaction()
3264 tr = self.currenttransaction()
3265 hookargs = {}
3265 hookargs = {}
3266 if tr is not None:
3266 if tr is not None:
3267 hookargs.update(tr.hookargs)
3267 hookargs.update(tr.hookargs)
3268 hookargs = pycompat.strkwargs(hookargs)
3268 hookargs = pycompat.strkwargs(hookargs)
3269 hookargs['namespace'] = namespace
3269 hookargs['namespace'] = namespace
3270 hookargs['key'] = key
3270 hookargs['key'] = key
3271 hookargs['old'] = old
3271 hookargs['old'] = old
3272 hookargs['new'] = new
3272 hookargs['new'] = new
3273 self.hook(b'prepushkey', throw=True, **hookargs)
3273 self.hook(b'prepushkey', throw=True, **hookargs)
3274 except error.HookAbort as exc:
3274 except error.HookAbort as exc:
3275 self.ui.write_err(_(b"pushkey-abort: %s\n") % exc)
3275 self.ui.write_err(_(b"pushkey-abort: %s\n") % exc)
3276 if exc.hint:
3276 if exc.hint:
3277 self.ui.write_err(_(b"(%s)\n") % exc.hint)
3277 self.ui.write_err(_(b"(%s)\n") % exc.hint)
3278 return False
3278 return False
3279 self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key))
3279 self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key))
3280 ret = pushkey.push(self, namespace, key, old, new)
3280 ret = pushkey.push(self, namespace, key, old, new)
3281
3281
3282 def runhook(unused_success):
3282 def runhook(unused_success):
3283 self.hook(
3283 self.hook(
3284 b'pushkey',
3284 b'pushkey',
3285 namespace=namespace,
3285 namespace=namespace,
3286 key=key,
3286 key=key,
3287 old=old,
3287 old=old,
3288 new=new,
3288 new=new,
3289 ret=ret,
3289 ret=ret,
3290 )
3290 )
3291
3291
3292 self._afterlock(runhook)
3292 self._afterlock(runhook)
3293 return ret
3293 return ret
3294
3294
3295 def listkeys(self, namespace):
3295 def listkeys(self, namespace):
3296 self.hook(b'prelistkeys', throw=True, namespace=namespace)
3296 self.hook(b'prelistkeys', throw=True, namespace=namespace)
3297 self.ui.debug(b'listing keys for "%s"\n' % namespace)
3297 self.ui.debug(b'listing keys for "%s"\n' % namespace)
3298 values = pushkey.list(self, namespace)
3298 values = pushkey.list(self, namespace)
3299 self.hook(b'listkeys', namespace=namespace, values=values)
3299 self.hook(b'listkeys', namespace=namespace, values=values)
3300 return values
3300 return values
3301
3301
3302 def debugwireargs(self, one, two, three=None, four=None, five=None):
3302 def debugwireargs(self, one, two, three=None, four=None, five=None):
3303 '''used to test argument passing over the wire'''
3303 '''used to test argument passing over the wire'''
3304 return b"%s %s %s %s %s" % (
3304 return b"%s %s %s %s %s" % (
3305 one,
3305 one,
3306 two,
3306 two,
3307 pycompat.bytestr(three),
3307 pycompat.bytestr(three),
3308 pycompat.bytestr(four),
3308 pycompat.bytestr(four),
3309 pycompat.bytestr(five),
3309 pycompat.bytestr(five),
3310 )
3310 )
3311
3311
3312 def savecommitmessage(self, text):
3312 def savecommitmessage(self, text):
3313 fp = self.vfs(b'last-message.txt', b'wb')
3313 fp = self.vfs(b'last-message.txt', b'wb')
3314 try:
3314 try:
3315 fp.write(text)
3315 fp.write(text)
3316 finally:
3316 finally:
3317 fp.close()
3317 fp.close()
3318 return self.pathto(fp.name[len(self.root) + 1 :])
3318 return self.pathto(fp.name[len(self.root) + 1 :])
3319
3319
3320
3320
3321 # used to avoid circular references so destructors work
3321 # used to avoid circular references so destructors work
3322 def aftertrans(files):
3322 def aftertrans(files):
3323 renamefiles = [tuple(t) for t in files]
3323 renamefiles = [tuple(t) for t in files]
3324
3324
3325 def a():
3325 def a():
3326 for vfs, src, dest in renamefiles:
3326 for vfs, src, dest in renamefiles:
3327 # if src and dest refer to a same file, vfs.rename is a no-op,
3327 # if src and dest refer to a same file, vfs.rename is a no-op,
3328 # leaving both src and dest on disk. delete dest to make sure
3328 # leaving both src and dest on disk. delete dest to make sure
3329 # the rename couldn't be such a no-op.
3329 # the rename couldn't be such a no-op.
3330 vfs.tryunlink(dest)
3330 vfs.tryunlink(dest)
3331 try:
3331 try:
3332 vfs.rename(src, dest)
3332 vfs.rename(src, dest)
3333 except OSError: # journal file does not yet exist
3333 except OSError: # journal file does not yet exist
3334 pass
3334 pass
3335
3335
3336 return a
3336 return a
3337
3337
3338
3338
3339 def undoname(fn):
3339 def undoname(fn):
3340 base, name = os.path.split(fn)
3340 base, name = os.path.split(fn)
3341 assert name.startswith(b'journal')
3341 assert name.startswith(b'journal')
3342 return os.path.join(base, name.replace(b'journal', b'undo', 1))
3342 return os.path.join(base, name.replace(b'journal', b'undo', 1))
3343
3343
3344
3344
3345 def instance(ui, path, create, intents=None, createopts=None):
3345 def instance(ui, path, create, intents=None, createopts=None):
3346 localpath = util.urllocalpath(path)
3346 localpath = util.urllocalpath(path)
3347 if create:
3347 if create:
3348 createrepository(ui, localpath, createopts=createopts)
3348 createrepository(ui, localpath, createopts=createopts)
3349
3349
3350 return makelocalrepository(ui, localpath, intents=intents)
3350 return makelocalrepository(ui, localpath, intents=intents)
3351
3351
3352
3352
3353 def islocal(path):
3353 def islocal(path):
3354 return True
3354 return True
3355
3355
3356
3356
3357 def defaultcreateopts(ui, createopts=None):
3357 def defaultcreateopts(ui, createopts=None):
3358 """Populate the default creation options for a repository.
3358 """Populate the default creation options for a repository.
3359
3359
3360 A dictionary of explicitly requested creation options can be passed
3360 A dictionary of explicitly requested creation options can be passed
3361 in. Missing keys will be populated.
3361 in. Missing keys will be populated.
3362 """
3362 """
3363 createopts = dict(createopts or {})
3363 createopts = dict(createopts or {})
3364
3364
3365 if b'backend' not in createopts:
3365 if b'backend' not in createopts:
3366 # experimental config: storage.new-repo-backend
3366 # experimental config: storage.new-repo-backend
3367 createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend')
3367 createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend')
3368
3368
3369 return createopts
3369 return createopts
3370
3370
3371
3371
3372 def newreporequirements(ui, createopts):
3372 def newreporequirements(ui, createopts):
3373 """Determine the set of requirements for a new local repository.
3373 """Determine the set of requirements for a new local repository.
3374
3374
3375 Extensions can wrap this function to specify custom requirements for
3375 Extensions can wrap this function to specify custom requirements for
3376 new repositories.
3376 new repositories.
3377 """
3377 """
3378 # If the repo is being created from a shared repository, we copy
3378 # If the repo is being created from a shared repository, we copy
3379 # its requirements.
3379 # its requirements.
3380 if b'sharedrepo' in createopts:
3380 if b'sharedrepo' in createopts:
3381 requirements = set(createopts[b'sharedrepo'].requirements)
3381 requirements = set(createopts[b'sharedrepo'].requirements)
3382 if createopts.get(b'sharedrelative'):
3382 if createopts.get(b'sharedrelative'):
3383 requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT)
3383 requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT)
3384 else:
3384 else:
3385 requirements.add(requirementsmod.SHARED_REQUIREMENT)
3385 requirements.add(requirementsmod.SHARED_REQUIREMENT)
3386
3386
3387 return requirements
3387 return requirements
3388
3388
3389 if b'backend' not in createopts:
3389 if b'backend' not in createopts:
3390 raise error.ProgrammingError(
3390 raise error.ProgrammingError(
3391 b'backend key not present in createopts; '
3391 b'backend key not present in createopts; '
3392 b'was defaultcreateopts() called?'
3392 b'was defaultcreateopts() called?'
3393 )
3393 )
3394
3394
3395 if createopts[b'backend'] != b'revlogv1':
3395 if createopts[b'backend'] != b'revlogv1':
3396 raise error.Abort(
3396 raise error.Abort(
3397 _(
3397 _(
3398 b'unable to determine repository requirements for '
3398 b'unable to determine repository requirements for '
3399 b'storage backend: %s'
3399 b'storage backend: %s'
3400 )
3400 )
3401 % createopts[b'backend']
3401 % createopts[b'backend']
3402 )
3402 )
3403
3403
3404 requirements = {b'revlogv1'}
3404 requirements = {b'revlogv1'}
3405 if ui.configbool(b'format', b'usestore'):
3405 if ui.configbool(b'format', b'usestore'):
3406 requirements.add(b'store')
3406 requirements.add(b'store')
3407 if ui.configbool(b'format', b'usefncache'):
3407 if ui.configbool(b'format', b'usefncache'):
3408 requirements.add(b'fncache')
3408 requirements.add(b'fncache')
3409 if ui.configbool(b'format', b'dotencode'):
3409 if ui.configbool(b'format', b'dotencode'):
3410 requirements.add(b'dotencode')
3410 requirements.add(b'dotencode')
3411
3411
3412 compengines = ui.configlist(b'format', b'revlog-compression')
3412 compengines = ui.configlist(b'format', b'revlog-compression')
3413 for compengine in compengines:
3413 for compengine in compengines:
3414 if compengine in util.compengines:
3414 if compengine in util.compengines:
3415 break
3415 break
3416 else:
3416 else:
3417 raise error.Abort(
3417 raise error.Abort(
3418 _(
3418 _(
3419 b'compression engines %s defined by '
3419 b'compression engines %s defined by '
3420 b'format.revlog-compression not available'
3420 b'format.revlog-compression not available'
3421 )
3421 )
3422 % b', '.join(b'"%s"' % e for e in compengines),
3422 % b', '.join(b'"%s"' % e for e in compengines),
3423 hint=_(
3423 hint=_(
3424 b'run "hg debuginstall" to list available '
3424 b'run "hg debuginstall" to list available '
3425 b'compression engines'
3425 b'compression engines'
3426 ),
3426 ),
3427 )
3427 )
3428
3428
3429 # zlib is the historical default and doesn't need an explicit requirement.
3429 # zlib is the historical default and doesn't need an explicit requirement.
3430 if compengine == b'zstd':
3430 if compengine == b'zstd':
3431 requirements.add(b'revlog-compression-zstd')
3431 requirements.add(b'revlog-compression-zstd')
3432 elif compengine != b'zlib':
3432 elif compengine != b'zlib':
3433 requirements.add(b'exp-compression-%s' % compengine)
3433 requirements.add(b'exp-compression-%s' % compengine)
3434
3434
3435 if scmutil.gdinitconfig(ui):
3435 if scmutil.gdinitconfig(ui):
3436 requirements.add(b'generaldelta')
3436 requirements.add(b'generaldelta')
3437 if ui.configbool(b'format', b'sparse-revlog'):
3437 if ui.configbool(b'format', b'sparse-revlog'):
3438 requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT)
3438 requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT)
3439
3439
3440 # experimental config: format.exp-use-side-data
3440 # experimental config: format.exp-use-side-data
3441 if ui.configbool(b'format', b'exp-use-side-data'):
3441 if ui.configbool(b'format', b'exp-use-side-data'):
3442 requirements.add(requirementsmod.SIDEDATA_REQUIREMENT)
3442 requirements.add(requirementsmod.SIDEDATA_REQUIREMENT)
3443 # experimental config: format.exp-use-copies-side-data-changeset
3443 # experimental config: format.exp-use-copies-side-data-changeset
3444 if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
3444 if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
3445 requirements.add(requirementsmod.SIDEDATA_REQUIREMENT)
3445 requirements.add(requirementsmod.SIDEDATA_REQUIREMENT)
3446 requirements.add(requirementsmod.COPIESSDC_REQUIREMENT)
3446 requirements.add(requirementsmod.COPIESSDC_REQUIREMENT)
3447 if ui.configbool(b'experimental', b'treemanifest'):
3447 if ui.configbool(b'experimental', b'treemanifest'):
3448 requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT)
3448 requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT)
3449
3449
3450 revlogv2 = ui.config(b'experimental', b'revlogv2')
3450 revlogv2 = ui.config(b'experimental', b'revlogv2')
3451 if revlogv2 == b'enable-unstable-format-and-corrupt-my-data':
3451 if revlogv2 == b'enable-unstable-format-and-corrupt-my-data':
3452 requirements.remove(b'revlogv1')
3452 requirements.remove(b'revlogv1')
3453 # generaldelta is implied by revlogv2.
3453 # generaldelta is implied by revlogv2.
3454 requirements.discard(b'generaldelta')
3454 requirements.discard(b'generaldelta')
3455 requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
3455 requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
3456 # experimental config: format.internal-phase
3456 # experimental config: format.internal-phase
3457 if ui.configbool(b'format', b'internal-phase'):
3457 if ui.configbool(b'format', b'internal-phase'):
3458 requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT)
3458 requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT)
3459
3459
3460 if createopts.get(b'narrowfiles'):
3460 if createopts.get(b'narrowfiles'):
3461 requirements.add(requirementsmod.NARROW_REQUIREMENT)
3461 requirements.add(requirementsmod.NARROW_REQUIREMENT)
3462
3462
3463 if createopts.get(b'lfs'):
3463 if createopts.get(b'lfs'):
3464 requirements.add(b'lfs')
3464 requirements.add(b'lfs')
3465
3465
3466 if ui.configbool(b'format', b'bookmarks-in-store'):
3466 if ui.configbool(b'format', b'bookmarks-in-store'):
3467 requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT)
3467 requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT)
3468
3468
3469 if ui.configbool(b'format', b'use-persistent-nodemap'):
3469 if ui.configbool(b'format', b'use-persistent-nodemap'):
3470 requirements.add(requirementsmod.NODEMAP_REQUIREMENT)
3470 requirements.add(requirementsmod.NODEMAP_REQUIREMENT)
3471
3471
3472 # if share-safe is enabled, let's create the new repository with the new
3472 # if share-safe is enabled, let's create the new repository with the new
3473 # requirement
3473 # requirement
3474 if ui.configbool(b'format', b'use-share-safe'):
3474 if ui.configbool(b'format', b'use-share-safe'):
3475 requirements.add(requirementsmod.SHARESAFE_REQUIREMENT)
3475 requirements.add(requirementsmod.SHARESAFE_REQUIREMENT)
3476
3476
3477 return requirements
3477 return requirements
3478
3478
3479
3479
3480 def checkrequirementscompat(ui, requirements):
3480 def checkrequirementscompat(ui, requirements):
3481 """Checks compatibility of repository requirements enabled and disabled.
3481 """Checks compatibility of repository requirements enabled and disabled.
3482
3482
3483 Returns a set of requirements which needs to be dropped because dependend
3483 Returns a set of requirements which needs to be dropped because dependend
3484 requirements are not enabled. Also warns users about it"""
3484 requirements are not enabled. Also warns users about it"""
3485
3485
3486 dropped = set()
3486 dropped = set()
3487
3487
3488 if b'store' not in requirements:
3488 if b'store' not in requirements:
3489 if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements:
3489 if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements:
3490 ui.warn(
3490 ui.warn(
3491 _(
3491 _(
3492 b'ignoring enabled \'format.bookmarks-in-store\' config '
3492 b'ignoring enabled \'format.bookmarks-in-store\' config '
3493 b'beacuse it is incompatible with disabled '
3493 b'beacuse it is incompatible with disabled '
3494 b'\'format.usestore\' config\n'
3494 b'\'format.usestore\' config\n'
3495 )
3495 )
3496 )
3496 )
3497 dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT)
3497 dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT)
3498
3498
3499 if (
3499 if (
3500 requirementsmod.SHARED_REQUIREMENT in requirements
3500 requirementsmod.SHARED_REQUIREMENT in requirements
3501 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
3501 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
3502 ):
3502 ):
3503 raise error.Abort(
3503 raise error.Abort(
3504 _(
3504 _(
3505 b"cannot create shared repository as source was created"
3505 b"cannot create shared repository as source was created"
3506 b" with 'format.usestore' config disabled"
3506 b" with 'format.usestore' config disabled"
3507 )
3507 )
3508 )
3508 )
3509
3509
3510 if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
3510 if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
3511 ui.warn(
3511 ui.warn(
3512 _(
3512 _(
3513 b"ignoring enabled 'format.use-share-safe' config because "
3513 b"ignoring enabled 'format.use-share-safe' config because "
3514 b"it is incompatible with disabled 'format.usestore'"
3514 b"it is incompatible with disabled 'format.usestore'"
3515 b" config\n"
3515 b" config\n"
3516 )
3516 )
3517 )
3517 )
3518 dropped.add(requirementsmod.SHARESAFE_REQUIREMENT)
3518 dropped.add(requirementsmod.SHARESAFE_REQUIREMENT)
3519
3519
3520 return dropped
3520 return dropped
3521
3521
3522
3522
3523 def filterknowncreateopts(ui, createopts):
3523 def filterknowncreateopts(ui, createopts):
3524 """Filters a dict of repo creation options against options that are known.
3524 """Filters a dict of repo creation options against options that are known.
3525
3525
3526 Receives a dict of repo creation options and returns a dict of those
3526 Receives a dict of repo creation options and returns a dict of those
3527 options that we don't know how to handle.
3527 options that we don't know how to handle.
3528
3528
3529 This function is called as part of repository creation. If the
3529 This function is called as part of repository creation. If the
3530 returned dict contains any items, repository creation will not
3530 returned dict contains any items, repository creation will not
3531 be allowed, as it means there was a request to create a repository
3531 be allowed, as it means there was a request to create a repository
3532 with options not recognized by loaded code.
3532 with options not recognized by loaded code.
3533
3533
3534 Extensions can wrap this function to filter out creation options
3534 Extensions can wrap this function to filter out creation options
3535 they know how to handle.
3535 they know how to handle.
3536 """
3536 """
3537 known = {
3537 known = {
3538 b'backend',
3538 b'backend',
3539 b'lfs',
3539 b'lfs',
3540 b'narrowfiles',
3540 b'narrowfiles',
3541 b'sharedrepo',
3541 b'sharedrepo',
3542 b'sharedrelative',
3542 b'sharedrelative',
3543 b'shareditems',
3543 b'shareditems',
3544 b'shallowfilestore',
3544 b'shallowfilestore',
3545 }
3545 }
3546
3546
3547 return {k: v for k, v in createopts.items() if k not in known}
3547 return {k: v for k, v in createopts.items() if k not in known}
3548
3548
3549
3549
3550 def createrepository(ui, path, createopts=None):
3550 def createrepository(ui, path, createopts=None):
3551 """Create a new repository in a vfs.
3551 """Create a new repository in a vfs.
3552
3552
3553 ``path`` path to the new repo's working directory.
3553 ``path`` path to the new repo's working directory.
3554 ``createopts`` options for the new repository.
3554 ``createopts`` options for the new repository.
3555
3555
3556 The following keys for ``createopts`` are recognized:
3556 The following keys for ``createopts`` are recognized:
3557
3557
3558 backend
3558 backend
3559 The storage backend to use.
3559 The storage backend to use.
3560 lfs
3560 lfs
3561 Repository will be created with ``lfs`` requirement. The lfs extension
3561 Repository will be created with ``lfs`` requirement. The lfs extension
3562 will automatically be loaded when the repository is accessed.
3562 will automatically be loaded when the repository is accessed.
3563 narrowfiles
3563 narrowfiles
3564 Set up repository to support narrow file storage.
3564 Set up repository to support narrow file storage.
3565 sharedrepo
3565 sharedrepo
3566 Repository object from which storage should be shared.
3566 Repository object from which storage should be shared.
3567 sharedrelative
3567 sharedrelative
3568 Boolean indicating if the path to the shared repo should be
3568 Boolean indicating if the path to the shared repo should be
3569 stored as relative. By default, the pointer to the "parent" repo
3569 stored as relative. By default, the pointer to the "parent" repo
3570 is stored as an absolute path.
3570 is stored as an absolute path.
3571 shareditems
3571 shareditems
3572 Set of items to share to the new repository (in addition to storage).
3572 Set of items to share to the new repository (in addition to storage).
3573 shallowfilestore
3573 shallowfilestore
3574 Indicates that storage for files should be shallow (not all ancestor
3574 Indicates that storage for files should be shallow (not all ancestor
3575 revisions are known).
3575 revisions are known).
3576 """
3576 """
3577 createopts = defaultcreateopts(ui, createopts=createopts)
3577 createopts = defaultcreateopts(ui, createopts=createopts)
3578
3578
3579 unknownopts = filterknowncreateopts(ui, createopts)
3579 unknownopts = filterknowncreateopts(ui, createopts)
3580
3580
3581 if not isinstance(unknownopts, dict):
3581 if not isinstance(unknownopts, dict):
3582 raise error.ProgrammingError(
3582 raise error.ProgrammingError(
3583 b'filterknowncreateopts() did not return a dict'
3583 b'filterknowncreateopts() did not return a dict'
3584 )
3584 )
3585
3585
3586 if unknownopts:
3586 if unknownopts:
3587 raise error.Abort(
3587 raise error.Abort(
3588 _(
3588 _(
3589 b'unable to create repository because of unknown '
3589 b'unable to create repository because of unknown '
3590 b'creation option: %s'
3590 b'creation option: %s'
3591 )
3591 )
3592 % b', '.join(sorted(unknownopts)),
3592 % b', '.join(sorted(unknownopts)),
3593 hint=_(b'is a required extension not loaded?'),
3593 hint=_(b'is a required extension not loaded?'),
3594 )
3594 )
3595
3595
3596 requirements = newreporequirements(ui, createopts=createopts)
3596 requirements = newreporequirements(ui, createopts=createopts)
3597 requirements -= checkrequirementscompat(ui, requirements)
3597 requirements -= checkrequirementscompat(ui, requirements)
3598
3598
3599 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
3599 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
3600
3600
3601 hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg'))
3601 hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg'))
3602 if hgvfs.exists():
3602 if hgvfs.exists():
3603 raise error.RepoError(_(b'repository %s already exists') % path)
3603 raise error.RepoError(_(b'repository %s already exists') % path)
3604
3604
3605 if b'sharedrepo' in createopts:
3605 if b'sharedrepo' in createopts:
3606 sharedpath = createopts[b'sharedrepo'].sharedpath
3606 sharedpath = createopts[b'sharedrepo'].sharedpath
3607
3607
3608 if createopts.get(b'sharedrelative'):
3608 if createopts.get(b'sharedrelative'):
3609 try:
3609 try:
3610 sharedpath = os.path.relpath(sharedpath, hgvfs.base)
3610 sharedpath = os.path.relpath(sharedpath, hgvfs.base)
3611 except (IOError, ValueError) as e:
3611 except (IOError, ValueError) as e:
3612 # ValueError is raised on Windows if the drive letters differ
3612 # ValueError is raised on Windows if the drive letters differ
3613 # on each path.
3613 # on each path.
3614 raise error.Abort(
3614 raise error.Abort(
3615 _(b'cannot calculate relative path'),
3615 _(b'cannot calculate relative path'),
3616 hint=stringutil.forcebytestr(e),
3616 hint=stringutil.forcebytestr(e),
3617 )
3617 )
3618
3618
3619 if not wdirvfs.exists():
3619 if not wdirvfs.exists():
3620 wdirvfs.makedirs()
3620 wdirvfs.makedirs()
3621
3621
3622 hgvfs.makedir(notindexed=True)
3622 hgvfs.makedir(notindexed=True)
3623 if b'sharedrepo' not in createopts:
3623 if b'sharedrepo' not in createopts:
3624 hgvfs.mkdir(b'cache')
3624 hgvfs.mkdir(b'cache')
3625 hgvfs.mkdir(b'wcache')
3625 hgvfs.mkdir(b'wcache')
3626
3626
3627 if b'store' in requirements and b'sharedrepo' not in createopts:
3627 if b'store' in requirements and b'sharedrepo' not in createopts:
3628 hgvfs.mkdir(b'store')
3628 hgvfs.mkdir(b'store')
3629
3629
3630 # We create an invalid changelog outside the store so very old
3630 # We create an invalid changelog outside the store so very old
3631 # Mercurial versions (which didn't know about the requirements
3631 # Mercurial versions (which didn't know about the requirements
3632 # file) encounter an error on reading the changelog. This
3632 # file) encounter an error on reading the changelog. This
3633 # effectively locks out old clients and prevents them from
3633 # effectively locks out old clients and prevents them from
3634 # mucking with a repo in an unknown format.
3634 # mucking with a repo in an unknown format.
3635 #
3635 #
3636 # The revlog header has version 2, which won't be recognized by
3636 # The revlog header has version 2, which won't be recognized by
3637 # such old clients.
3637 # such old clients.
3638 hgvfs.append(
3638 hgvfs.append(
3639 b'00changelog.i',
3639 b'00changelog.i',
3640 b'\0\0\0\2 dummy changelog to prevent using the old repo '
3640 b'\0\0\0\2 dummy changelog to prevent using the old repo '
3641 b'layout',
3641 b'layout',
3642 )
3642 )
3643
3643
3644 # Filter the requirements into working copy and store ones
3644 # Filter the requirements into working copy and store ones
3645 wcreq, storereq = scmutil.filterrequirements(requirements)
3645 wcreq, storereq = scmutil.filterrequirements(requirements)
3646 # write working copy ones
3646 # write working copy ones
3647 scmutil.writerequires(hgvfs, wcreq)
3647 scmutil.writerequires(hgvfs, wcreq)
3648 # If there are store requirements and the current repository
3648 # If there are store requirements and the current repository
3649 # is not a shared one, write stored requirements
3649 # is not a shared one, write stored requirements
3650 # For new shared repository, we don't need to write the store
3650 # For new shared repository, we don't need to write the store
3651 # requirements as they are already present in store requires
3651 # requirements as they are already present in store requires
3652 if storereq and b'sharedrepo' not in createopts:
3652 if storereq and b'sharedrepo' not in createopts:
3653 storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True)
3653 storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True)
3654 scmutil.writerequires(storevfs, storereq)
3654 scmutil.writerequires(storevfs, storereq)
3655
3655
3656 # Write out file telling readers where to find the shared store.
3656 # Write out file telling readers where to find the shared store.
3657 if b'sharedrepo' in createopts:
3657 if b'sharedrepo' in createopts:
3658 hgvfs.write(b'sharedpath', sharedpath)
3658 hgvfs.write(b'sharedpath', sharedpath)
3659
3659
3660 if createopts.get(b'shareditems'):
3660 if createopts.get(b'shareditems'):
3661 shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n'
3661 shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n'
3662 hgvfs.write(b'shared', shared)
3662 hgvfs.write(b'shared', shared)
3663
3663
3664
3664
3665 def poisonrepository(repo):
3665 def poisonrepository(repo):
3666 """Poison a repository instance so it can no longer be used."""
3666 """Poison a repository instance so it can no longer be used."""
3667 # Perform any cleanup on the instance.
3667 # Perform any cleanup on the instance.
3668 repo.close()
3668 repo.close()
3669
3669
3670 # Our strategy is to replace the type of the object with one that
3670 # Our strategy is to replace the type of the object with one that
3671 # has all attribute lookups result in error.
3671 # has all attribute lookups result in error.
3672 #
3672 #
3673 # But we have to allow the close() method because some constructors
3673 # But we have to allow the close() method because some constructors
3674 # of repos call close() on repo references.
3674 # of repos call close() on repo references.
3675 class poisonedrepository(object):
3675 class poisonedrepository(object):
3676 def __getattribute__(self, item):
3676 def __getattribute__(self, item):
3677 if item == 'close':
3677 if item == 'close':
3678 return object.__getattribute__(self, item)
3678 return object.__getattribute__(self, item)
3679
3679
3680 raise error.ProgrammingError(
3680 raise error.ProgrammingError(
3681 b'repo instances should not be used after unshare'
3681 b'repo instances should not be used after unshare'
3682 )
3682 )
3683
3683
3684 def close(self):
3684 def close(self):
3685 pass
3685 pass
3686
3686
3687 # We may have a repoview, which intercepts __setattr__. So be sure
3687 # We may have a repoview, which intercepts __setattr__. So be sure
3688 # we operate at the lowest level possible.
3688 # we operate at the lowest level possible.
3689 object.__setattr__(repo, '__class__', poisonedrepository)
3689 object.__setattr__(repo, '__class__', poisonedrepository)
@@ -1,1219 +1,1219 b''
1 # logcmdutil.py - utility for log-like commands
1 # logcmdutil.py - utility for log-like commands
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import itertools
10 import itertools
11 import os
11 import os
12 import posixpath
12 import posixpath
13
13
14 from .i18n import _
14 from .i18n import _
15 from .node import (
15 from .node import (
16 nullid,
16 nullid,
17 wdirid,
17 wdirid,
18 wdirrev,
18 wdirrev,
19 )
19 )
20
20
21 from .thirdparty import attr
21 from .thirdparty import attr
22
22
23 from . import (
23 from . import (
24 dagop,
24 dagop,
25 error,
25 error,
26 formatter,
26 formatter,
27 graphmod,
27 graphmod,
28 match as matchmod,
28 match as matchmod,
29 mdiff,
29 mdiff,
30 patch,
30 patch,
31 pathutil,
31 pathutil,
32 pycompat,
32 pycompat,
33 revset,
33 revset,
34 revsetlang,
34 revsetlang,
35 scmutil,
35 scmutil,
36 smartset,
36 smartset,
37 templatekw,
37 templatekw,
38 templater,
38 templater,
39 util,
39 util,
40 )
40 )
41 from .utils import (
41 from .utils import (
42 dateutil,
42 dateutil,
43 stringutil,
43 stringutil,
44 )
44 )
45
45
46
46
47 if pycompat.TYPE_CHECKING:
47 if pycompat.TYPE_CHECKING:
48 from typing import (
48 from typing import (
49 Any,
49 Any,
50 Callable,
50 Callable,
51 Dict,
51 Dict,
52 List,
52 List,
53 Optional,
53 Optional,
54 Tuple,
54 Tuple,
55 )
55 )
56
56
57 for t in (Any, Callable, Dict, List, Optional, Tuple):
57 for t in (Any, Callable, Dict, List, Optional, Tuple):
58 assert t
58 assert t
59
59
60
60
61 def getlimit(opts):
61 def getlimit(opts):
62 """get the log limit according to option -l/--limit"""
62 """get the log limit according to option -l/--limit"""
63 limit = opts.get(b'limit')
63 limit = opts.get(b'limit')
64 if limit:
64 if limit:
65 try:
65 try:
66 limit = int(limit)
66 limit = int(limit)
67 except ValueError:
67 except ValueError:
68 raise error.Abort(_(b'limit must be a positive integer'))
68 raise error.Abort(_(b'limit must be a positive integer'))
69 if limit <= 0:
69 if limit <= 0:
70 raise error.Abort(_(b'limit must be positive'))
70 raise error.Abort(_(b'limit must be positive'))
71 else:
71 else:
72 limit = None
72 limit = None
73 return limit
73 return limit
74
74
75
75
76 def diffordiffstat(
76 def diffordiffstat(
77 ui,
77 ui,
78 repo,
78 repo,
79 diffopts,
79 diffopts,
80 ctx1,
80 ctx1,
81 ctx2,
81 ctx2,
82 match,
82 match,
83 changes=None,
83 changes=None,
84 stat=False,
84 stat=False,
85 fp=None,
85 fp=None,
86 graphwidth=0,
86 graphwidth=0,
87 prefix=b'',
87 prefix=b'',
88 root=b'',
88 root=b'',
89 listsubrepos=False,
89 listsubrepos=False,
90 hunksfilterfn=None,
90 hunksfilterfn=None,
91 ):
91 ):
92 '''show diff or diffstat.'''
92 '''show diff or diffstat.'''
93 if root:
93 if root:
94 relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
94 relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
95 else:
95 else:
96 relroot = b''
96 relroot = b''
97 copysourcematch = None
97 copysourcematch = None
98
98
99 def compose(f, g):
99 def compose(f, g):
100 return lambda x: f(g(x))
100 return lambda x: f(g(x))
101
101
102 def pathfn(f):
102 def pathfn(f):
103 return posixpath.join(prefix, f)
103 return posixpath.join(prefix, f)
104
104
105 if relroot != b'':
105 if relroot != b'':
106 # XXX relative roots currently don't work if the root is within a
106 # XXX relative roots currently don't work if the root is within a
107 # subrepo
107 # subrepo
108 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
108 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
109 uirelroot = uipathfn(pathfn(relroot))
109 uirelroot = uipathfn(pathfn(relroot))
110 relroot += b'/'
110 relroot += b'/'
111 for matchroot in match.files():
111 for matchroot in match.files():
112 if not matchroot.startswith(relroot):
112 if not matchroot.startswith(relroot):
113 ui.warn(
113 ui.warn(
114 _(b'warning: %s not inside relative root %s\n')
114 _(b'warning: %s not inside relative root %s\n')
115 % (uipathfn(pathfn(matchroot)), uirelroot)
115 % (uipathfn(pathfn(matchroot)), uirelroot)
116 )
116 )
117
117
118 relrootmatch = scmutil.match(ctx2, pats=[relroot], default=b'path')
118 relrootmatch = scmutil.match(ctx2, pats=[relroot], default=b'path')
119 match = matchmod.intersectmatchers(match, relrootmatch)
119 match = matchmod.intersectmatchers(match, relrootmatch)
120 copysourcematch = relrootmatch
120 copysourcematch = relrootmatch
121
121
122 checkroot = repo.ui.configbool(
122 checkroot = repo.ui.configbool(
123 b'devel', b'all-warnings'
123 b'devel', b'all-warnings'
124 ) or repo.ui.configbool(b'devel', b'check-relroot')
124 ) or repo.ui.configbool(b'devel', b'check-relroot')
125
125
126 def relrootpathfn(f):
126 def relrootpathfn(f):
127 if checkroot and not f.startswith(relroot):
127 if checkroot and not f.startswith(relroot):
128 raise AssertionError(
128 raise AssertionError(
129 b"file %s doesn't start with relroot %s" % (f, relroot)
129 b"file %s doesn't start with relroot %s" % (f, relroot)
130 )
130 )
131 return f[len(relroot) :]
131 return f[len(relroot) :]
132
132
133 pathfn = compose(relrootpathfn, pathfn)
133 pathfn = compose(relrootpathfn, pathfn)
134
134
135 if stat:
135 if stat:
136 diffopts = diffopts.copy(context=0, noprefix=False)
136 diffopts = diffopts.copy(context=0, noprefix=False)
137 width = 80
137 width = 80
138 if not ui.plain():
138 if not ui.plain():
139 width = ui.termwidth() - graphwidth
139 width = ui.termwidth() - graphwidth
140 # If an explicit --root was given, don't respect ui.relative-paths
140 # If an explicit --root was given, don't respect ui.relative-paths
141 if not relroot:
141 if not relroot:
142 pathfn = compose(scmutil.getuipathfn(repo), pathfn)
142 pathfn = compose(scmutil.getuipathfn(repo), pathfn)
143
143
144 chunks = ctx2.diff(
144 chunks = ctx2.diff(
145 ctx1,
145 ctx1,
146 match,
146 match,
147 changes,
147 changes,
148 opts=diffopts,
148 opts=diffopts,
149 pathfn=pathfn,
149 pathfn=pathfn,
150 copysourcematch=copysourcematch,
150 copysourcematch=copysourcematch,
151 hunksfilterfn=hunksfilterfn,
151 hunksfilterfn=hunksfilterfn,
152 )
152 )
153
153
154 if fp is not None or ui.canwritewithoutlabels():
154 if fp is not None or ui.canwritewithoutlabels():
155 out = fp or ui
155 out = fp or ui
156 if stat:
156 if stat:
157 chunks = [patch.diffstat(util.iterlines(chunks), width=width)]
157 chunks = [patch.diffstat(util.iterlines(chunks), width=width)]
158 for chunk in util.filechunkiter(util.chunkbuffer(chunks)):
158 for chunk in util.filechunkiter(util.chunkbuffer(chunks)):
159 out.write(chunk)
159 out.write(chunk)
160 else:
160 else:
161 if stat:
161 if stat:
162 chunks = patch.diffstatui(util.iterlines(chunks), width=width)
162 chunks = patch.diffstatui(util.iterlines(chunks), width=width)
163 else:
163 else:
164 chunks = patch.difflabel(
164 chunks = patch.difflabel(
165 lambda chunks, **kwargs: chunks, chunks, opts=diffopts
165 lambda chunks, **kwargs: chunks, chunks, opts=diffopts
166 )
166 )
167 if ui.canbatchlabeledwrites():
167 if ui.canbatchlabeledwrites():
168
168
169 def gen():
169 def gen():
170 for chunk, label in chunks:
170 for chunk, label in chunks:
171 yield ui.label(chunk, label=label)
171 yield ui.label(chunk, label=label)
172
172
173 for chunk in util.filechunkiter(util.chunkbuffer(gen())):
173 for chunk in util.filechunkiter(util.chunkbuffer(gen())):
174 ui.write(chunk)
174 ui.write(chunk)
175 else:
175 else:
176 for chunk, label in chunks:
176 for chunk, label in chunks:
177 ui.write(chunk, label=label)
177 ui.write(chunk, label=label)
178
178
179 node2 = ctx2.node()
179 node2 = ctx2.node()
180 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
180 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
181 tempnode2 = node2
181 tempnode2 = node2
182 try:
182 try:
183 if node2 is not None:
183 if node2 is not None:
184 tempnode2 = ctx2.substate[subpath][1]
184 tempnode2 = ctx2.substate[subpath][1]
185 except KeyError:
185 except KeyError:
186 # A subrepo that existed in node1 was deleted between node1 and
186 # A subrepo that existed in node1 was deleted between node1 and
187 # node2 (inclusive). Thus, ctx2's substate won't contain that
187 # node2 (inclusive). Thus, ctx2's substate won't contain that
188 # subpath. The best we can do is to ignore it.
188 # subpath. The best we can do is to ignore it.
189 tempnode2 = None
189 tempnode2 = None
190 submatch = matchmod.subdirmatcher(subpath, match)
190 submatch = matchmod.subdirmatcher(subpath, match)
191 subprefix = repo.wvfs.reljoin(prefix, subpath)
191 subprefix = repo.wvfs.reljoin(prefix, subpath)
192 if listsubrepos or match.exact(subpath) or any(submatch.files()):
192 if listsubrepos or match.exact(subpath) or any(submatch.files()):
193 sub.diff(
193 sub.diff(
194 ui,
194 ui,
195 diffopts,
195 diffopts,
196 tempnode2,
196 tempnode2,
197 submatch,
197 submatch,
198 changes=changes,
198 changes=changes,
199 stat=stat,
199 stat=stat,
200 fp=fp,
200 fp=fp,
201 prefix=subprefix,
201 prefix=subprefix,
202 )
202 )
203
203
204
204
205 class changesetdiffer(object):
205 class changesetdiffer(object):
206 """Generate diff of changeset with pre-configured filtering functions"""
206 """Generate diff of changeset with pre-configured filtering functions"""
207
207
208 def _makefilematcher(self, ctx):
208 def _makefilematcher(self, ctx):
209 return scmutil.matchall(ctx.repo())
209 return scmutil.matchall(ctx.repo())
210
210
211 def _makehunksfilter(self, ctx):
211 def _makehunksfilter(self, ctx):
212 return None
212 return None
213
213
214 def showdiff(self, ui, ctx, diffopts, graphwidth=0, stat=False):
214 def showdiff(self, ui, ctx, diffopts, graphwidth=0, stat=False):
215 diffordiffstat(
215 diffordiffstat(
216 ui,
216 ui,
217 ctx.repo(),
217 ctx.repo(),
218 diffopts,
218 diffopts,
219 ctx.p1(),
219 ctx.p1(),
220 ctx,
220 ctx,
221 match=self._makefilematcher(ctx),
221 match=self._makefilematcher(ctx),
222 stat=stat,
222 stat=stat,
223 graphwidth=graphwidth,
223 graphwidth=graphwidth,
224 hunksfilterfn=self._makehunksfilter(ctx),
224 hunksfilterfn=self._makehunksfilter(ctx),
225 )
225 )
226
226
227
227
228 def changesetlabels(ctx):
228 def changesetlabels(ctx):
229 labels = [b'log.changeset', b'changeset.%s' % ctx.phasestr()]
229 labels = [b'log.changeset', b'changeset.%s' % ctx.phasestr()]
230 if ctx.obsolete():
230 if ctx.obsolete():
231 labels.append(b'changeset.obsolete')
231 labels.append(b'changeset.obsolete')
232 if ctx.isunstable():
232 if ctx.isunstable():
233 labels.append(b'changeset.unstable')
233 labels.append(b'changeset.unstable')
234 for instability in ctx.instabilities():
234 for instability in ctx.instabilities():
235 labels.append(b'instability.%s' % instability)
235 labels.append(b'instability.%s' % instability)
236 return b' '.join(labels)
236 return b' '.join(labels)
237
237
238
238
239 class changesetprinter(object):
239 class changesetprinter(object):
240 '''show changeset information when templating not requested.'''
240 '''show changeset information when templating not requested.'''
241
241
242 def __init__(self, ui, repo, differ=None, diffopts=None, buffered=False):
242 def __init__(self, ui, repo, differ=None, diffopts=None, buffered=False):
243 self.ui = ui
243 self.ui = ui
244 self.repo = repo
244 self.repo = repo
245 self.buffered = buffered
245 self.buffered = buffered
246 self._differ = differ or changesetdiffer()
246 self._differ = differ or changesetdiffer()
247 self._diffopts = patch.diffallopts(ui, diffopts)
247 self._diffopts = patch.diffallopts(ui, diffopts)
248 self._includestat = diffopts and diffopts.get(b'stat')
248 self._includestat = diffopts and diffopts.get(b'stat')
249 self._includediff = diffopts and diffopts.get(b'patch')
249 self._includediff = diffopts and diffopts.get(b'patch')
250 self.header = {}
250 self.header = {}
251 self.hunk = {}
251 self.hunk = {}
252 self.lastheader = None
252 self.lastheader = None
253 self.footer = None
253 self.footer = None
254 self._columns = templatekw.getlogcolumns()
254 self._columns = templatekw.getlogcolumns()
255
255
256 def flush(self, ctx):
256 def flush(self, ctx):
257 rev = ctx.rev()
257 rev = ctx.rev()
258 if rev in self.header:
258 if rev in self.header:
259 h = self.header[rev]
259 h = self.header[rev]
260 if h != self.lastheader:
260 if h != self.lastheader:
261 self.lastheader = h
261 self.lastheader = h
262 self.ui.write(h)
262 self.ui.write(h)
263 del self.header[rev]
263 del self.header[rev]
264 if rev in self.hunk:
264 if rev in self.hunk:
265 self.ui.write(self.hunk[rev])
265 self.ui.write(self.hunk[rev])
266 del self.hunk[rev]
266 del self.hunk[rev]
267
267
268 def close(self):
268 def close(self):
269 if self.footer:
269 if self.footer:
270 self.ui.write(self.footer)
270 self.ui.write(self.footer)
271
271
272 def show(self, ctx, copies=None, **props):
272 def show(self, ctx, copies=None, **props):
273 props = pycompat.byteskwargs(props)
273 props = pycompat.byteskwargs(props)
274 if self.buffered:
274 if self.buffered:
275 self.ui.pushbuffer(labeled=True)
275 self.ui.pushbuffer(labeled=True)
276 self._show(ctx, copies, props)
276 self._show(ctx, copies, props)
277 self.hunk[ctx.rev()] = self.ui.popbuffer()
277 self.hunk[ctx.rev()] = self.ui.popbuffer()
278 else:
278 else:
279 self._show(ctx, copies, props)
279 self._show(ctx, copies, props)
280
280
281 def _show(self, ctx, copies, props):
281 def _show(self, ctx, copies, props):
282 '''show a single changeset or file revision'''
282 '''show a single changeset or file revision'''
283 changenode = ctx.node()
283 changenode = ctx.node()
284 graphwidth = props.get(b'graphwidth', 0)
284 graphwidth = props.get(b'graphwidth', 0)
285
285
286 if self.ui.quiet:
286 if self.ui.quiet:
287 self.ui.write(
287 self.ui.write(
288 b"%s\n" % scmutil.formatchangeid(ctx), label=b'log.node'
288 b"%s\n" % scmutil.formatchangeid(ctx), label=b'log.node'
289 )
289 )
290 return
290 return
291
291
292 columns = self._columns
292 columns = self._columns
293 self.ui.write(
293 self.ui.write(
294 columns[b'changeset'] % scmutil.formatchangeid(ctx),
294 columns[b'changeset'] % scmutil.formatchangeid(ctx),
295 label=changesetlabels(ctx),
295 label=changesetlabels(ctx),
296 )
296 )
297
297
298 # branches are shown first before any other names due to backwards
298 # branches are shown first before any other names due to backwards
299 # compatibility
299 # compatibility
300 branch = ctx.branch()
300 branch = ctx.branch()
301 # don't show the default branch name
301 # don't show the default branch name
302 if branch != b'default':
302 if branch != b'default':
303 self.ui.write(columns[b'branch'] % branch, label=b'log.branch')
303 self.ui.write(columns[b'branch'] % branch, label=b'log.branch')
304
304
305 for nsname, ns in pycompat.iteritems(self.repo.names):
305 for nsname, ns in pycompat.iteritems(self.repo.names):
306 # branches has special logic already handled above, so here we just
306 # branches has special logic already handled above, so here we just
307 # skip it
307 # skip it
308 if nsname == b'branches':
308 if nsname == b'branches':
309 continue
309 continue
310 # we will use the templatename as the color name since those two
310 # we will use the templatename as the color name since those two
311 # should be the same
311 # should be the same
312 for name in ns.names(self.repo, changenode):
312 for name in ns.names(self.repo, changenode):
313 self.ui.write(ns.logfmt % name, label=b'log.%s' % ns.colorname)
313 self.ui.write(ns.logfmt % name, label=b'log.%s' % ns.colorname)
314 if self.ui.debugflag:
314 if self.ui.debugflag:
315 self.ui.write(
315 self.ui.write(
316 columns[b'phase'] % ctx.phasestr(), label=b'log.phase'
316 columns[b'phase'] % ctx.phasestr(), label=b'log.phase'
317 )
317 )
318 for pctx in scmutil.meaningfulparents(self.repo, ctx):
318 for pctx in scmutil.meaningfulparents(self.repo, ctx):
319 label = b'log.parent changeset.%s' % pctx.phasestr()
319 label = b'log.parent changeset.%s' % pctx.phasestr()
320 self.ui.write(
320 self.ui.write(
321 columns[b'parent'] % scmutil.formatchangeid(pctx), label=label
321 columns[b'parent'] % scmutil.formatchangeid(pctx), label=label
322 )
322 )
323
323
324 if self.ui.debugflag:
324 if self.ui.debugflag:
325 mnode = ctx.manifestnode()
325 mnode = ctx.manifestnode()
326 if mnode is None:
326 if mnode is None:
327 mnode = wdirid
327 mnode = wdirid
328 mrev = wdirrev
328 mrev = wdirrev
329 else:
329 else:
330 mrev = self.repo.manifestlog.rev(mnode)
330 mrev = self.repo.manifestlog.rev(mnode)
331 self.ui.write(
331 self.ui.write(
332 columns[b'manifest']
332 columns[b'manifest']
333 % scmutil.formatrevnode(self.ui, mrev, mnode),
333 % scmutil.formatrevnode(self.ui, mrev, mnode),
334 label=b'ui.debug log.manifest',
334 label=b'ui.debug log.manifest',
335 )
335 )
336 self.ui.write(columns[b'user'] % ctx.user(), label=b'log.user')
336 self.ui.write(columns[b'user'] % ctx.user(), label=b'log.user')
337 self.ui.write(
337 self.ui.write(
338 columns[b'date'] % dateutil.datestr(ctx.date()), label=b'log.date'
338 columns[b'date'] % dateutil.datestr(ctx.date()), label=b'log.date'
339 )
339 )
340
340
341 if ctx.isunstable():
341 if ctx.isunstable():
342 instabilities = ctx.instabilities()
342 instabilities = ctx.instabilities()
343 self.ui.write(
343 self.ui.write(
344 columns[b'instability'] % b', '.join(instabilities),
344 columns[b'instability'] % b', '.join(instabilities),
345 label=b'log.instability',
345 label=b'log.instability',
346 )
346 )
347
347
348 elif ctx.obsolete():
348 elif ctx.obsolete():
349 self._showobsfate(ctx)
349 self._showobsfate(ctx)
350
350
351 self._exthook(ctx)
351 self._exthook(ctx)
352
352
353 if self.ui.debugflag:
353 if self.ui.debugflag:
354 files = ctx.p1().status(ctx)
354 files = ctx.p1().status(ctx)
355 for key, value in zip(
355 for key, value in zip(
356 [b'files', b'files+', b'files-'],
356 [b'files', b'files+', b'files-'],
357 [files.modified, files.added, files.removed],
357 [files.modified, files.added, files.removed],
358 ):
358 ):
359 if value:
359 if value:
360 self.ui.write(
360 self.ui.write(
361 columns[key] % b" ".join(value),
361 columns[key] % b" ".join(value),
362 label=b'ui.debug log.files',
362 label=b'ui.debug log.files',
363 )
363 )
364 elif ctx.files() and self.ui.verbose:
364 elif ctx.files() and self.ui.verbose:
365 self.ui.write(
365 self.ui.write(
366 columns[b'files'] % b" ".join(ctx.files()),
366 columns[b'files'] % b" ".join(ctx.files()),
367 label=b'ui.note log.files',
367 label=b'ui.note log.files',
368 )
368 )
369 if copies and self.ui.verbose:
369 if copies and self.ui.verbose:
370 copies = [b'%s (%s)' % c for c in copies]
370 copies = [b'%s (%s)' % c for c in copies]
371 self.ui.write(
371 self.ui.write(
372 columns[b'copies'] % b' '.join(copies),
372 columns[b'copies'] % b' '.join(copies),
373 label=b'ui.note log.copies',
373 label=b'ui.note log.copies',
374 )
374 )
375
375
376 extra = ctx.extra()
376 extra = ctx.extra()
377 if extra and self.ui.debugflag:
377 if extra and self.ui.debugflag:
378 for key, value in sorted(extra.items()):
378 for key, value in sorted(extra.items()):
379 self.ui.write(
379 self.ui.write(
380 columns[b'extra'] % (key, stringutil.escapestr(value)),
380 columns[b'extra'] % (key, stringutil.escapestr(value)),
381 label=b'ui.debug log.extra',
381 label=b'ui.debug log.extra',
382 )
382 )
383
383
384 description = ctx.description().strip()
384 description = ctx.description().strip()
385 if description:
385 if description:
386 if self.ui.verbose:
386 if self.ui.verbose:
387 self.ui.write(
387 self.ui.write(
388 _(b"description:\n"), label=b'ui.note log.description'
388 _(b"description:\n"), label=b'ui.note log.description'
389 )
389 )
390 self.ui.write(description, label=b'ui.note log.description')
390 self.ui.write(description, label=b'ui.note log.description')
391 self.ui.write(b"\n\n")
391 self.ui.write(b"\n\n")
392 else:
392 else:
393 self.ui.write(
393 self.ui.write(
394 columns[b'summary'] % description.splitlines()[0],
394 columns[b'summary'] % description.splitlines()[0],
395 label=b'log.summary',
395 label=b'log.summary',
396 )
396 )
397 self.ui.write(b"\n")
397 self.ui.write(b"\n")
398
398
399 self._showpatch(ctx, graphwidth)
399 self._showpatch(ctx, graphwidth)
400
400
401 def _showobsfate(self, ctx):
401 def _showobsfate(self, ctx):
402 # TODO: do not depend on templater
402 # TODO: do not depend on templater
403 tres = formatter.templateresources(self.repo.ui, self.repo)
403 tres = formatter.templateresources(self.repo.ui, self.repo)
404 t = formatter.maketemplater(
404 t = formatter.maketemplater(
405 self.repo.ui,
405 self.repo.ui,
406 b'{join(obsfate, "\n")}',
406 b'{join(obsfate, "\n")}',
407 defaults=templatekw.keywords,
407 defaults=templatekw.keywords,
408 resources=tres,
408 resources=tres,
409 )
409 )
410 obsfate = t.renderdefault({b'ctx': ctx}).splitlines()
410 obsfate = t.renderdefault({b'ctx': ctx}).splitlines()
411
411
412 if obsfate:
412 if obsfate:
413 for obsfateline in obsfate:
413 for obsfateline in obsfate:
414 self.ui.write(
414 self.ui.write(
415 self._columns[b'obsolete'] % obsfateline,
415 self._columns[b'obsolete'] % obsfateline,
416 label=b'log.obsfate',
416 label=b'log.obsfate',
417 )
417 )
418
418
419 def _exthook(self, ctx):
419 def _exthook(self, ctx):
420 """empty method used by extension as a hook point"""
420 """empty method used by extension as a hook point"""
421
421
422 def _showpatch(self, ctx, graphwidth=0):
422 def _showpatch(self, ctx, graphwidth=0):
423 if self._includestat:
423 if self._includestat:
424 self._differ.showdiff(
424 self._differ.showdiff(
425 self.ui, ctx, self._diffopts, graphwidth, stat=True
425 self.ui, ctx, self._diffopts, graphwidth, stat=True
426 )
426 )
427 if self._includestat and self._includediff:
427 if self._includestat and self._includediff:
428 self.ui.write(b"\n")
428 self.ui.write(b"\n")
429 if self._includediff:
429 if self._includediff:
430 self._differ.showdiff(
430 self._differ.showdiff(
431 self.ui, ctx, self._diffopts, graphwidth, stat=False
431 self.ui, ctx, self._diffopts, graphwidth, stat=False
432 )
432 )
433 if self._includestat or self._includediff:
433 if self._includestat or self._includediff:
434 self.ui.write(b"\n")
434 self.ui.write(b"\n")
435
435
436
436
437 class changesetformatter(changesetprinter):
437 class changesetformatter(changesetprinter):
438 """Format changeset information by generic formatter"""
438 """Format changeset information by generic formatter"""
439
439
440 def __init__(
440 def __init__(
441 self, ui, repo, fm, differ=None, diffopts=None, buffered=False
441 self, ui, repo, fm, differ=None, diffopts=None, buffered=False
442 ):
442 ):
443 changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
443 changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
444 self._diffopts = patch.difffeatureopts(ui, diffopts, git=True)
444 self._diffopts = patch.difffeatureopts(ui, diffopts, git=True)
445 self._fm = fm
445 self._fm = fm
446
446
447 def close(self):
447 def close(self):
448 self._fm.end()
448 self._fm.end()
449
449
450 def _show(self, ctx, copies, props):
450 def _show(self, ctx, copies, props):
451 '''show a single changeset or file revision'''
451 '''show a single changeset or file revision'''
452 fm = self._fm
452 fm = self._fm
453 fm.startitem()
453 fm.startitem()
454 fm.context(ctx=ctx)
454 fm.context(ctx=ctx)
455 fm.data(rev=scmutil.intrev(ctx), node=fm.hexfunc(scmutil.binnode(ctx)))
455 fm.data(rev=scmutil.intrev(ctx), node=fm.hexfunc(scmutil.binnode(ctx)))
456
456
457 datahint = fm.datahint()
457 datahint = fm.datahint()
458 if self.ui.quiet and not datahint:
458 if self.ui.quiet and not datahint:
459 return
459 return
460
460
461 fm.data(
461 fm.data(
462 branch=ctx.branch(),
462 branch=ctx.branch(),
463 phase=ctx.phasestr(),
463 phase=ctx.phasestr(),
464 user=ctx.user(),
464 user=ctx.user(),
465 date=fm.formatdate(ctx.date()),
465 date=fm.formatdate(ctx.date()),
466 desc=ctx.description(),
466 desc=ctx.description(),
467 bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'),
467 bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'),
468 tags=fm.formatlist(ctx.tags(), name=b'tag'),
468 tags=fm.formatlist(ctx.tags(), name=b'tag'),
469 parents=fm.formatlist(
469 parents=fm.formatlist(
470 [fm.hexfunc(c.node()) for c in ctx.parents()], name=b'node'
470 [fm.hexfunc(c.node()) for c in ctx.parents()], name=b'node'
471 ),
471 ),
472 )
472 )
473
473
474 if self.ui.debugflag or b'manifest' in datahint:
474 if self.ui.debugflag or b'manifest' in datahint:
475 fm.data(manifest=fm.hexfunc(ctx.manifestnode() or wdirid))
475 fm.data(manifest=fm.hexfunc(ctx.manifestnode() or wdirid))
476 if self.ui.debugflag or b'extra' in datahint:
476 if self.ui.debugflag or b'extra' in datahint:
477 fm.data(extra=fm.formatdict(ctx.extra()))
477 fm.data(extra=fm.formatdict(ctx.extra()))
478
478
479 if (
479 if (
480 self.ui.debugflag
480 self.ui.debugflag
481 or b'modified' in datahint
481 or b'modified' in datahint
482 or b'added' in datahint
482 or b'added' in datahint
483 or b'removed' in datahint
483 or b'removed' in datahint
484 ):
484 ):
485 files = ctx.p1().status(ctx)
485 files = ctx.p1().status(ctx)
486 fm.data(
486 fm.data(
487 modified=fm.formatlist(files.modified, name=b'file'),
487 modified=fm.formatlist(files.modified, name=b'file'),
488 added=fm.formatlist(files.added, name=b'file'),
488 added=fm.formatlist(files.added, name=b'file'),
489 removed=fm.formatlist(files.removed, name=b'file'),
489 removed=fm.formatlist(files.removed, name=b'file'),
490 )
490 )
491
491
492 verbose = not self.ui.debugflag and self.ui.verbose
492 verbose = not self.ui.debugflag and self.ui.verbose
493 if verbose or b'files' in datahint:
493 if verbose or b'files' in datahint:
494 fm.data(files=fm.formatlist(ctx.files(), name=b'file'))
494 fm.data(files=fm.formatlist(ctx.files(), name=b'file'))
495 if verbose and copies or b'copies' in datahint:
495 if verbose and copies or b'copies' in datahint:
496 fm.data(
496 fm.data(
497 copies=fm.formatdict(copies or {}, key=b'name', value=b'source')
497 copies=fm.formatdict(copies or {}, key=b'name', value=b'source')
498 )
498 )
499
499
500 if self._includestat or b'diffstat' in datahint:
500 if self._includestat or b'diffstat' in datahint:
501 self.ui.pushbuffer()
501 self.ui.pushbuffer()
502 self._differ.showdiff(self.ui, ctx, self._diffopts, stat=True)
502 self._differ.showdiff(self.ui, ctx, self._diffopts, stat=True)
503 fm.data(diffstat=self.ui.popbuffer())
503 fm.data(diffstat=self.ui.popbuffer())
504 if self._includediff or b'diff' in datahint:
504 if self._includediff or b'diff' in datahint:
505 self.ui.pushbuffer()
505 self.ui.pushbuffer()
506 self._differ.showdiff(self.ui, ctx, self._diffopts, stat=False)
506 self._differ.showdiff(self.ui, ctx, self._diffopts, stat=False)
507 fm.data(diff=self.ui.popbuffer())
507 fm.data(diff=self.ui.popbuffer())
508
508
509
509
510 class changesettemplater(changesetprinter):
510 class changesettemplater(changesetprinter):
511 """format changeset information.
511 """format changeset information.
512
512
513 Note: there are a variety of convenience functions to build a
513 Note: there are a variety of convenience functions to build a
514 changesettemplater for common cases. See functions such as:
514 changesettemplater for common cases. See functions such as:
515 maketemplater, changesetdisplayer, buildcommittemplate, or other
515 maketemplater, changesetdisplayer, buildcommittemplate, or other
516 functions that use changesest_templater.
516 functions that use changesest_templater.
517 """
517 """
518
518
519 # Arguments before "buffered" used to be positional. Consider not
519 # Arguments before "buffered" used to be positional. Consider not
520 # adding/removing arguments before "buffered" to not break callers.
520 # adding/removing arguments before "buffered" to not break callers.
521 def __init__(
521 def __init__(
522 self, ui, repo, tmplspec, differ=None, diffopts=None, buffered=False
522 self, ui, repo, tmplspec, differ=None, diffopts=None, buffered=False
523 ):
523 ):
524 changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
524 changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
525 # tres is shared with _graphnodeformatter()
525 # tres is shared with _graphnodeformatter()
526 self._tresources = tres = formatter.templateresources(ui, repo)
526 self._tresources = tres = formatter.templateresources(ui, repo)
527 self.t = formatter.loadtemplater(
527 self.t = formatter.loadtemplater(
528 ui,
528 ui,
529 tmplspec,
529 tmplspec,
530 defaults=templatekw.keywords,
530 defaults=templatekw.keywords,
531 resources=tres,
531 resources=tres,
532 cache=templatekw.defaulttempl,
532 cache=templatekw.defaulttempl,
533 )
533 )
534 self._counter = itertools.count()
534 self._counter = itertools.count()
535
535
536 self._tref = tmplspec.ref
536 self._tref = tmplspec.ref
537 self._parts = {
537 self._parts = {
538 b'header': b'',
538 b'header': b'',
539 b'footer': b'',
539 b'footer': b'',
540 tmplspec.ref: tmplspec.ref,
540 tmplspec.ref: tmplspec.ref,
541 b'docheader': b'',
541 b'docheader': b'',
542 b'docfooter': b'',
542 b'docfooter': b'',
543 b'separator': b'',
543 b'separator': b'',
544 }
544 }
545 if tmplspec.mapfile:
545 if tmplspec.mapfile:
546 # find correct templates for current mode, for backward
546 # find correct templates for current mode, for backward
547 # compatibility with 'log -v/-q/--debug' using a mapfile
547 # compatibility with 'log -v/-q/--debug' using a mapfile
548 tmplmodes = [
548 tmplmodes = [
549 (True, b''),
549 (True, b''),
550 (self.ui.verbose, b'_verbose'),
550 (self.ui.verbose, b'_verbose'),
551 (self.ui.quiet, b'_quiet'),
551 (self.ui.quiet, b'_quiet'),
552 (self.ui.debugflag, b'_debug'),
552 (self.ui.debugflag, b'_debug'),
553 ]
553 ]
554 for mode, postfix in tmplmodes:
554 for mode, postfix in tmplmodes:
555 for t in self._parts:
555 for t in self._parts:
556 cur = t + postfix
556 cur = t + postfix
557 if mode and cur in self.t:
557 if mode and cur in self.t:
558 self._parts[t] = cur
558 self._parts[t] = cur
559 else:
559 else:
560 partnames = [p for p in self._parts.keys() if p != tmplspec.ref]
560 partnames = [p for p in self._parts.keys() if p != tmplspec.ref]
561 m = formatter.templatepartsmap(tmplspec, self.t, partnames)
561 m = formatter.templatepartsmap(tmplspec, self.t, partnames)
562 self._parts.update(m)
562 self._parts.update(m)
563
563
564 if self._parts[b'docheader']:
564 if self._parts[b'docheader']:
565 self.ui.write(self.t.render(self._parts[b'docheader'], {}))
565 self.ui.write(self.t.render(self._parts[b'docheader'], {}))
566
566
567 def close(self):
567 def close(self):
568 if self._parts[b'docfooter']:
568 if self._parts[b'docfooter']:
569 if not self.footer:
569 if not self.footer:
570 self.footer = b""
570 self.footer = b""
571 self.footer += self.t.render(self._parts[b'docfooter'], {})
571 self.footer += self.t.render(self._parts[b'docfooter'], {})
572 return super(changesettemplater, self).close()
572 return super(changesettemplater, self).close()
573
573
574 def _show(self, ctx, copies, props):
574 def _show(self, ctx, copies, props):
575 '''show a single changeset or file revision'''
575 '''show a single changeset or file revision'''
576 props = props.copy()
576 props = props.copy()
577 props[b'ctx'] = ctx
577 props[b'ctx'] = ctx
578 props[b'index'] = index = next(self._counter)
578 props[b'index'] = index = next(self._counter)
579 props[b'revcache'] = {b'copies': copies}
579 props[b'revcache'] = {b'copies': copies}
580 graphwidth = props.get(b'graphwidth', 0)
580 graphwidth = props.get(b'graphwidth', 0)
581
581
582 # write separator, which wouldn't work well with the header part below
582 # write separator, which wouldn't work well with the header part below
583 # since there's inherently a conflict between header (across items) and
583 # since there's inherently a conflict between header (across items) and
584 # separator (per item)
584 # separator (per item)
585 if self._parts[b'separator'] and index > 0:
585 if self._parts[b'separator'] and index > 0:
586 self.ui.write(self.t.render(self._parts[b'separator'], {}))
586 self.ui.write(self.t.render(self._parts[b'separator'], {}))
587
587
588 # write header
588 # write header
589 if self._parts[b'header']:
589 if self._parts[b'header']:
590 h = self.t.render(self._parts[b'header'], props)
590 h = self.t.render(self._parts[b'header'], props)
591 if self.buffered:
591 if self.buffered:
592 self.header[ctx.rev()] = h
592 self.header[ctx.rev()] = h
593 else:
593 else:
594 if self.lastheader != h:
594 if self.lastheader != h:
595 self.lastheader = h
595 self.lastheader = h
596 self.ui.write(h)
596 self.ui.write(h)
597
597
598 # write changeset metadata, then patch if requested
598 # write changeset metadata, then patch if requested
599 key = self._parts[self._tref]
599 key = self._parts[self._tref]
600 self.ui.write(self.t.render(key, props))
600 self.ui.write(self.t.render(key, props))
601 self._exthook(ctx)
601 self._exthook(ctx)
602 self._showpatch(ctx, graphwidth)
602 self._showpatch(ctx, graphwidth)
603
603
604 if self._parts[b'footer']:
604 if self._parts[b'footer']:
605 if not self.footer:
605 if not self.footer:
606 self.footer = self.t.render(self._parts[b'footer'], props)
606 self.footer = self.t.render(self._parts[b'footer'], props)
607
607
608
608
609 def templatespec(tmpl, mapfile):
609 def templatespec(tmpl, mapfile):
610 assert not (tmpl and mapfile)
610 assert not (tmpl and mapfile)
611 if mapfile:
611 if mapfile:
612 return formatter.mapfile_templatespec(b'changeset', mapfile)
612 return formatter.mapfile_templatespec(b'changeset', mapfile)
613 else:
613 else:
614 return formatter.literal_templatespec(tmpl)
614 return formatter.literal_templatespec(tmpl)
615
615
616
616
617 def _lookuptemplate(ui, tmpl, style):
617 def _lookuptemplate(ui, tmpl, style):
618 """Find the template matching the given template spec or style
618 """Find the template matching the given template spec or style
619
619
620 See formatter.lookuptemplate() for details.
620 See formatter.lookuptemplate() for details.
621 """
621 """
622
622
623 # ui settings
623 # ui settings
624 if not tmpl and not style: # template are stronger than style
624 if not tmpl and not style: # template are stronger than style
625 tmpl = ui.config(b'command-templates', b'log')
625 tmpl = ui.config(b'command-templates', b'log')
626 if tmpl:
626 if tmpl:
627 return formatter.literal_templatespec(templater.unquotestring(tmpl))
627 return formatter.literal_templatespec(templater.unquotestring(tmpl))
628 else:
628 else:
629 style = util.expandpath(ui.config(b'ui', b'style'))
629 style = util.expandpath(ui.config(b'ui', b'style'))
630
630
631 if not tmpl and style:
631 if not tmpl and style:
632 mapfile = style
632 mapfile = style
633 fp = None
633 fp = None
634 if not os.path.split(mapfile)[0]:
634 if not os.path.split(mapfile)[0]:
635 (mapname, fp) = templater.try_open_template(
635 (mapname, fp) = templater.try_open_template(
636 b'map-cmdline.' + mapfile
636 b'map-cmdline.' + mapfile
637 ) or templater.try_open_template(mapfile)
637 ) or templater.try_open_template(mapfile)
638 if mapname:
638 if mapname:
639 mapfile = mapname
639 mapfile = mapname
640 return formatter.mapfile_templatespec(b'changeset', mapfile, fp)
640 return formatter.mapfile_templatespec(b'changeset', mapfile, fp)
641
641
642 return formatter.lookuptemplate(ui, b'changeset', tmpl)
642 return formatter.lookuptemplate(ui, b'changeset', tmpl)
643
643
644
644
645 def maketemplater(ui, repo, tmpl, buffered=False):
645 def maketemplater(ui, repo, tmpl, buffered=False):
646 """Create a changesettemplater from a literal template 'tmpl'
646 """Create a changesettemplater from a literal template 'tmpl'
647 byte-string."""
647 byte-string."""
648 spec = formatter.literal_templatespec(tmpl)
648 spec = formatter.literal_templatespec(tmpl)
649 return changesettemplater(ui, repo, spec, buffered=buffered)
649 return changesettemplater(ui, repo, spec, buffered=buffered)
650
650
651
651
652 def changesetdisplayer(ui, repo, opts, differ=None, buffered=False):
652 def changesetdisplayer(ui, repo, opts, differ=None, buffered=False):
653 """show one changeset using template or regular display.
653 """show one changeset using template or regular display.
654
654
655 Display format will be the first non-empty hit of:
655 Display format will be the first non-empty hit of:
656 1. option 'template'
656 1. option 'template'
657 2. option 'style'
657 2. option 'style'
658 3. [command-templates] setting 'log'
658 3. [command-templates] setting 'log'
659 4. [ui] setting 'style'
659 4. [ui] setting 'style'
660 If all of these values are either the unset or the empty string,
660 If all of these values are either the unset or the empty string,
661 regular display via changesetprinter() is done.
661 regular display via changesetprinter() is done.
662 """
662 """
663 postargs = (differ, opts, buffered)
663 postargs = (differ, opts, buffered)
664 spec = _lookuptemplate(ui, opts.get(b'template'), opts.get(b'style'))
664 spec = _lookuptemplate(ui, opts.get(b'template'), opts.get(b'style'))
665
665
666 # machine-readable formats have slightly different keyword set than
666 # machine-readable formats have slightly different keyword set than
667 # plain templates, which are handled by changesetformatter.
667 # plain templates, which are handled by changesetformatter.
668 # note that {b'pickle', b'debug'} can also be added to the list if needed.
668 # note that {b'pickle', b'debug'} can also be added to the list if needed.
669 if spec.ref in {b'cbor', b'json'}:
669 if spec.ref in {b'cbor', b'json'}:
670 fm = ui.formatter(b'log', opts)
670 fm = ui.formatter(b'log', opts)
671 return changesetformatter(ui, repo, fm, *postargs)
671 return changesetformatter(ui, repo, fm, *postargs)
672
672
673 if not spec.ref and not spec.tmpl and not spec.mapfile:
673 if not spec.ref and not spec.tmpl and not spec.mapfile:
674 return changesetprinter(ui, repo, *postargs)
674 return changesetprinter(ui, repo, *postargs)
675
675
676 return changesettemplater(ui, repo, spec, *postargs)
676 return changesettemplater(ui, repo, spec, *postargs)
677
677
678
678
679 @attr.s
679 @attr.s
680 class walkopts(object):
680 class walkopts(object):
681 """Options to configure a set of revisions and file matcher factory
681 """Options to configure a set of revisions and file matcher factory
682 to scan revision/file history
682 to scan revision/file history
683 """
683 """
684
684
685 # raw command-line parameters, which a matcher will be built from
685 # raw command-line parameters, which a matcher will be built from
686 pats = attr.ib() # type: List[bytes]
686 pats = attr.ib() # type: List[bytes]
687 opts = attr.ib() # type: Dict[bytes, Any]
687 opts = attr.ib() # type: Dict[bytes, Any]
688
688
689 # a list of revset expressions to be traversed; if follow, it specifies
689 # a list of revset expressions to be traversed; if follow, it specifies
690 # the start revisions
690 # the start revisions
691 revspec = attr.ib() # type: List[bytes]
691 revspec = attr.ib() # type: List[bytes]
692
692
693 # miscellaneous queries to filter revisions (see "hg help log" for details)
693 # miscellaneous queries to filter revisions (see "hg help log" for details)
694 bookmarks = attr.ib(default=attr.Factory(list)) # type: List[bytes]
694 bookmarks = attr.ib(default=attr.Factory(list)) # type: List[bytes]
695 branches = attr.ib(default=attr.Factory(list)) # type: List[bytes]
695 branches = attr.ib(default=attr.Factory(list)) # type: List[bytes]
696 date = attr.ib(default=None) # type: Optional[bytes]
696 date = attr.ib(default=None) # type: Optional[bytes]
697 keywords = attr.ib(default=attr.Factory(list)) # type: List[bytes]
697 keywords = attr.ib(default=attr.Factory(list)) # type: List[bytes]
698 no_merges = attr.ib(default=False) # type: bool
698 no_merges = attr.ib(default=False) # type: bool
699 only_merges = attr.ib(default=False) # type: bool
699 only_merges = attr.ib(default=False) # type: bool
700 prune_ancestors = attr.ib(default=attr.Factory(list)) # type: List[bytes]
700 prune_ancestors = attr.ib(default=attr.Factory(list)) # type: List[bytes]
701 users = attr.ib(default=attr.Factory(list)) # type: List[bytes]
701 users = attr.ib(default=attr.Factory(list)) # type: List[bytes]
702
702
703 # miscellaneous matcher arguments
703 # miscellaneous matcher arguments
704 include_pats = attr.ib(default=attr.Factory(list)) # type: List[bytes]
704 include_pats = attr.ib(default=attr.Factory(list)) # type: List[bytes]
705 exclude_pats = attr.ib(default=attr.Factory(list)) # type: List[bytes]
705 exclude_pats = attr.ib(default=attr.Factory(list)) # type: List[bytes]
706
706
707 # 0: no follow, 1: follow first, 2: follow both parents
707 # 0: no follow, 1: follow first, 2: follow both parents
708 follow = attr.ib(default=0) # type: int
708 follow = attr.ib(default=0) # type: int
709
709
710 # do not attempt filelog-based traversal, which may be fast but cannot
710 # do not attempt filelog-based traversal, which may be fast but cannot
711 # include revisions where files were removed
711 # include revisions where files were removed
712 force_changelog_traversal = attr.ib(default=False) # type: bool
712 force_changelog_traversal = attr.ib(default=False) # type: bool
713
713
714 # filter revisions by file patterns, which should be disabled only if
714 # filter revisions by file patterns, which should be disabled only if
715 # you want to include revisions where files were unmodified
715 # you want to include revisions where files were unmodified
716 filter_revisions_by_pats = attr.ib(default=True) # type: bool
716 filter_revisions_by_pats = attr.ib(default=True) # type: bool
717
717
718 # sort revisions prior to traversal: 'desc', 'topo', or None
718 # sort revisions prior to traversal: 'desc', 'topo', or None
719 sort_revisions = attr.ib(default=None) # type: Optional[bytes]
719 sort_revisions = attr.ib(default=None) # type: Optional[bytes]
720
720
721 # limit number of changes displayed; None means unlimited
721 # limit number of changes displayed; None means unlimited
722 limit = attr.ib(default=None) # type: Optional[int]
722 limit = attr.ib(default=None) # type: Optional[int]
723
723
724
724
725 def parseopts(ui, pats, opts):
725 def parseopts(ui, pats, opts):
726 # type: (Any, List[bytes], Dict[bytes, Any]) -> walkopts
726 # type: (Any, List[bytes], Dict[bytes, Any]) -> walkopts
727 """Parse log command options into walkopts
727 """Parse log command options into walkopts
728
728
729 The returned walkopts will be passed in to getrevs() or makewalker().
729 The returned walkopts will be passed in to getrevs() or makewalker().
730 """
730 """
731 if opts.get(b'follow_first'):
731 if opts.get(b'follow_first'):
732 follow = 1
732 follow = 1
733 elif opts.get(b'follow'):
733 elif opts.get(b'follow'):
734 follow = 2
734 follow = 2
735 else:
735 else:
736 follow = 0
736 follow = 0
737
737
738 if opts.get(b'graph'):
738 if opts.get(b'graph'):
739 if ui.configbool(b'experimental', b'log.topo'):
739 if ui.configbool(b'experimental', b'log.topo'):
740 sort_revisions = b'topo'
740 sort_revisions = b'topo'
741 else:
741 else:
742 sort_revisions = b'desc'
742 sort_revisions = b'desc'
743 else:
743 else:
744 sort_revisions = None
744 sort_revisions = None
745
745
746 return walkopts(
746 return walkopts(
747 pats=pats,
747 pats=pats,
748 opts=opts,
748 opts=opts,
749 revspec=opts.get(b'rev', []),
749 revspec=opts.get(b'rev', []),
750 bookmarks=opts.get(b'bookmark', []),
750 bookmarks=opts.get(b'bookmark', []),
751 # branch and only_branch are really aliases and must be handled at
751 # branch and only_branch are really aliases and must be handled at
752 # the same time
752 # the same time
753 branches=opts.get(b'branch', []) + opts.get(b'only_branch', []),
753 branches=opts.get(b'branch', []) + opts.get(b'only_branch', []),
754 date=opts.get(b'date'),
754 date=opts.get(b'date'),
755 keywords=opts.get(b'keyword', []),
755 keywords=opts.get(b'keyword', []),
756 no_merges=bool(opts.get(b'no_merges')),
756 no_merges=bool(opts.get(b'no_merges')),
757 only_merges=bool(opts.get(b'only_merges')),
757 only_merges=bool(opts.get(b'only_merges')),
758 prune_ancestors=opts.get(b'prune', []),
758 prune_ancestors=opts.get(b'prune', []),
759 users=opts.get(b'user', []),
759 users=opts.get(b'user', []),
760 include_pats=opts.get(b'include', []),
760 include_pats=opts.get(b'include', []),
761 exclude_pats=opts.get(b'exclude', []),
761 exclude_pats=opts.get(b'exclude', []),
762 follow=follow,
762 follow=follow,
763 force_changelog_traversal=bool(opts.get(b'removed')),
763 force_changelog_traversal=bool(opts.get(b'removed')),
764 sort_revisions=sort_revisions,
764 sort_revisions=sort_revisions,
765 limit=getlimit(opts),
765 limit=getlimit(opts),
766 )
766 )
767
767
768
768
769 def _makematcher(repo, revs, wopts):
769 def _makematcher(repo, revs, wopts):
770 """Build matcher and expanded patterns from log options
770 """Build matcher and expanded patterns from log options
771
771
772 If --follow, revs are the revisions to follow from.
772 If --follow, revs are the revisions to follow from.
773
773
774 Returns (match, pats, slowpath) where
774 Returns (match, pats, slowpath) where
775 - match: a matcher built from the given pats and -I/-X opts
775 - match: a matcher built from the given pats and -I/-X opts
776 - pats: patterns used (globs are expanded on Windows)
776 - pats: patterns used (globs are expanded on Windows)
777 - slowpath: True if patterns aren't as simple as scanning filelogs
777 - slowpath: True if patterns aren't as simple as scanning filelogs
778 """
778 """
779 # pats/include/exclude are passed to match.match() directly in
779 # pats/include/exclude are passed to match.match() directly in
780 # _matchfiles() revset, but a log-like command should build its matcher
780 # _matchfiles() revset, but a log-like command should build its matcher
781 # with scmutil.match(). The difference is input pats are globbed on
781 # with scmutil.match(). The difference is input pats are globbed on
782 # platforms without shell expansion (windows).
782 # platforms without shell expansion (windows).
783 wctx = repo[None]
783 wctx = repo[None]
784 match, pats = scmutil.matchandpats(wctx, wopts.pats, wopts.opts)
784 match, pats = scmutil.matchandpats(wctx, wopts.pats, wopts.opts)
785 slowpath = match.anypats() or (
785 slowpath = match.anypats() or (
786 not match.always() and wopts.force_changelog_traversal
786 not match.always() and wopts.force_changelog_traversal
787 )
787 )
788 if not slowpath:
788 if not slowpath:
789 if wopts.follow and wopts.revspec:
789 if wopts.follow and wopts.revspec:
790 # There may be the case that a path doesn't exist in some (but
790 # There may be the case that a path doesn't exist in some (but
791 # not all) of the specified start revisions, but let's consider
791 # not all) of the specified start revisions, but let's consider
792 # the path is valid. Missing files will be warned by the matcher.
792 # the path is valid. Missing files will be warned by the matcher.
793 startctxs = [repo[r] for r in revs]
793 startctxs = [repo[r] for r in revs]
794 for f in match.files():
794 for f in match.files():
795 found = False
795 found = False
796 for c in startctxs:
796 for c in startctxs:
797 if f in c:
797 if f in c:
798 found = True
798 found = True
799 elif c.hasdir(f):
799 elif c.hasdir(f):
800 # If a directory exists in any of the start revisions,
800 # If a directory exists in any of the start revisions,
801 # take the slow path.
801 # take the slow path.
802 found = slowpath = True
802 found = slowpath = True
803 if not found:
803 if not found:
804 raise error.Abort(
804 raise error.Abort(
805 _(
805 _(
806 b'cannot follow file not in any of the specified '
806 b'cannot follow file not in any of the specified '
807 b'revisions: "%s"'
807 b'revisions: "%s"'
808 )
808 )
809 % f
809 % f
810 )
810 )
811 elif wopts.follow:
811 elif wopts.follow:
812 for f in match.files():
812 for f in match.files():
813 if f not in wctx:
813 if f not in wctx:
814 # If the file exists, it may be a directory, so let it
814 # If the file exists, it may be a directory, so let it
815 # take the slow path.
815 # take the slow path.
816 if os.path.exists(repo.wjoin(f)):
816 if os.path.exists(repo.wjoin(f)):
817 slowpath = True
817 slowpath = True
818 continue
818 continue
819 else:
819 else:
820 raise error.Abort(
820 raise error.Abort(
821 _(
821 _(
822 b'cannot follow file not in parent '
822 b'cannot follow file not in parent '
823 b'revision: "%s"'
823 b'revision: "%s"'
824 )
824 )
825 % f
825 % f
826 )
826 )
827 filelog = repo.file(f)
827 filelog = repo.file(f)
828 if not filelog:
828 if not filelog:
829 # A file exists in wdir but not in history, which means
829 # A file exists in wdir but not in history, which means
830 # the file isn't committed yet.
830 # the file isn't committed yet.
831 raise error.Abort(
831 raise error.Abort(
832 _(b'cannot follow nonexistent file: "%s"') % f
832 _(b'cannot follow nonexistent file: "%s"') % f
833 )
833 )
834 else:
834 else:
835 for f in match.files():
835 for f in match.files():
836 filelog = repo.file(f)
836 filelog = repo.file(f)
837 if not filelog:
837 if not filelog:
838 # A zero count may be a directory or deleted file, so
838 # A zero count may be a directory or deleted file, so
839 # try to find matching entries on the slow path.
839 # try to find matching entries on the slow path.
840 slowpath = True
840 slowpath = True
841
841
842 # We decided to fall back to the slowpath because at least one
842 # We decided to fall back to the slowpath because at least one
843 # of the paths was not a file. Check to see if at least one of them
843 # of the paths was not a file. Check to see if at least one of them
844 # existed in history - in that case, we'll continue down the
844 # existed in history - in that case, we'll continue down the
845 # slowpath; otherwise, we can turn off the slowpath
845 # slowpath; otherwise, we can turn off the slowpath
846 if slowpath:
846 if slowpath:
847 for path in match.files():
847 for path in match.files():
848 if path == b'.' or path in repo.store:
848 if not path or path in repo.store:
849 break
849 break
850 else:
850 else:
851 slowpath = False
851 slowpath = False
852
852
853 return match, pats, slowpath
853 return match, pats, slowpath
854
854
855
855
856 def _fileancestors(repo, revs, match, followfirst):
856 def _fileancestors(repo, revs, match, followfirst):
857 fctxs = []
857 fctxs = []
858 for r in revs:
858 for r in revs:
859 ctx = repo[r]
859 ctx = repo[r]
860 fctxs.extend(ctx[f].introfilectx() for f in ctx.walk(match))
860 fctxs.extend(ctx[f].introfilectx() for f in ctx.walk(match))
861
861
862 # When displaying a revision with --patch --follow FILE, we have
862 # When displaying a revision with --patch --follow FILE, we have
863 # to know which file of the revision must be diffed. With
863 # to know which file of the revision must be diffed. With
864 # --follow, we want the names of the ancestors of FILE in the
864 # --follow, we want the names of the ancestors of FILE in the
865 # revision, stored in "fcache". "fcache" is populated as a side effect
865 # revision, stored in "fcache". "fcache" is populated as a side effect
866 # of the graph traversal.
866 # of the graph traversal.
867 fcache = {}
867 fcache = {}
868
868
869 def filematcher(ctx):
869 def filematcher(ctx):
870 return scmutil.matchfiles(repo, fcache.get(scmutil.intrev(ctx), []))
870 return scmutil.matchfiles(repo, fcache.get(scmutil.intrev(ctx), []))
871
871
872 def revgen():
872 def revgen():
873 for rev, cs in dagop.filectxancestors(fctxs, followfirst=followfirst):
873 for rev, cs in dagop.filectxancestors(fctxs, followfirst=followfirst):
874 fcache[rev] = [c.path() for c in cs]
874 fcache[rev] = [c.path() for c in cs]
875 yield rev
875 yield rev
876
876
877 return smartset.generatorset(revgen(), iterasc=False), filematcher
877 return smartset.generatorset(revgen(), iterasc=False), filematcher
878
878
879
879
880 def _makenofollowfilematcher(repo, pats, opts):
880 def _makenofollowfilematcher(repo, pats, opts):
881 '''hook for extensions to override the filematcher for non-follow cases'''
881 '''hook for extensions to override the filematcher for non-follow cases'''
882 return None
882 return None
883
883
884
884
885 _opt2logrevset = {
885 _opt2logrevset = {
886 b'no_merges': (b'not merge()', None),
886 b'no_merges': (b'not merge()', None),
887 b'only_merges': (b'merge()', None),
887 b'only_merges': (b'merge()', None),
888 b'_matchfiles': (None, b'_matchfiles(%ps)'),
888 b'_matchfiles': (None, b'_matchfiles(%ps)'),
889 b'date': (b'date(%s)', None),
889 b'date': (b'date(%s)', None),
890 b'branch': (b'branch(%s)', b'%lr'),
890 b'branch': (b'branch(%s)', b'%lr'),
891 b'_patslog': (b'filelog(%s)', b'%lr'),
891 b'_patslog': (b'filelog(%s)', b'%lr'),
892 b'keyword': (b'keyword(%s)', b'%lr'),
892 b'keyword': (b'keyword(%s)', b'%lr'),
893 b'prune': (b'ancestors(%s)', b'not %lr'),
893 b'prune': (b'ancestors(%s)', b'not %lr'),
894 b'user': (b'user(%s)', b'%lr'),
894 b'user': (b'user(%s)', b'%lr'),
895 }
895 }
896
896
897
897
898 def _makerevset(repo, wopts, slowpath):
898 def _makerevset(repo, wopts, slowpath):
899 """Return a revset string built from log options and file patterns"""
899 """Return a revset string built from log options and file patterns"""
900 opts = {
900 opts = {
901 b'branch': [b'literal:' + repo.lookupbranch(b) for b in wopts.branches],
901 b'branch': [b'literal:' + repo.lookupbranch(b) for b in wopts.branches],
902 b'date': wopts.date,
902 b'date': wopts.date,
903 b'keyword': wopts.keywords,
903 b'keyword': wopts.keywords,
904 b'no_merges': wopts.no_merges,
904 b'no_merges': wopts.no_merges,
905 b'only_merges': wopts.only_merges,
905 b'only_merges': wopts.only_merges,
906 b'prune': wopts.prune_ancestors,
906 b'prune': wopts.prune_ancestors,
907 b'user': [b'literal:' + v for v in wopts.users],
907 b'user': [b'literal:' + v for v in wopts.users],
908 }
908 }
909
909
910 if wopts.filter_revisions_by_pats and slowpath:
910 if wopts.filter_revisions_by_pats and slowpath:
911 # pats/include/exclude cannot be represented as separate
911 # pats/include/exclude cannot be represented as separate
912 # revset expressions as their filtering logic applies at file
912 # revset expressions as their filtering logic applies at file
913 # level. For instance "-I a -X b" matches a revision touching
913 # level. For instance "-I a -X b" matches a revision touching
914 # "a" and "b" while "file(a) and not file(b)" does
914 # "a" and "b" while "file(a) and not file(b)" does
915 # not. Besides, filesets are evaluated against the working
915 # not. Besides, filesets are evaluated against the working
916 # directory.
916 # directory.
917 matchargs = [b'r:', b'd:relpath']
917 matchargs = [b'r:', b'd:relpath']
918 for p in wopts.pats:
918 for p in wopts.pats:
919 matchargs.append(b'p:' + p)
919 matchargs.append(b'p:' + p)
920 for p in wopts.include_pats:
920 for p in wopts.include_pats:
921 matchargs.append(b'i:' + p)
921 matchargs.append(b'i:' + p)
922 for p in wopts.exclude_pats:
922 for p in wopts.exclude_pats:
923 matchargs.append(b'x:' + p)
923 matchargs.append(b'x:' + p)
924 opts[b'_matchfiles'] = matchargs
924 opts[b'_matchfiles'] = matchargs
925 elif wopts.filter_revisions_by_pats and not wopts.follow:
925 elif wopts.filter_revisions_by_pats and not wopts.follow:
926 opts[b'_patslog'] = list(wopts.pats)
926 opts[b'_patslog'] = list(wopts.pats)
927
927
928 expr = []
928 expr = []
929 for op, val in sorted(pycompat.iteritems(opts)):
929 for op, val in sorted(pycompat.iteritems(opts)):
930 if not val:
930 if not val:
931 continue
931 continue
932 revop, listop = _opt2logrevset[op]
932 revop, listop = _opt2logrevset[op]
933 if revop and b'%' not in revop:
933 if revop and b'%' not in revop:
934 expr.append(revop)
934 expr.append(revop)
935 elif not listop:
935 elif not listop:
936 expr.append(revsetlang.formatspec(revop, val))
936 expr.append(revsetlang.formatspec(revop, val))
937 else:
937 else:
938 if revop:
938 if revop:
939 val = [revsetlang.formatspec(revop, v) for v in val]
939 val = [revsetlang.formatspec(revop, v) for v in val]
940 expr.append(revsetlang.formatspec(listop, val))
940 expr.append(revsetlang.formatspec(listop, val))
941
941
942 if wopts.bookmarks:
942 if wopts.bookmarks:
943 expr.append(
943 expr.append(
944 revsetlang.formatspec(
944 revsetlang.formatspec(
945 b'%lr',
945 b'%lr',
946 [scmutil.format_bookmark_revspec(v) for v in wopts.bookmarks],
946 [scmutil.format_bookmark_revspec(v) for v in wopts.bookmarks],
947 )
947 )
948 )
948 )
949
949
950 if expr:
950 if expr:
951 expr = b'(' + b' and '.join(expr) + b')'
951 expr = b'(' + b' and '.join(expr) + b')'
952 else:
952 else:
953 expr = None
953 expr = None
954 return expr
954 return expr
955
955
956
956
957 def _initialrevs(repo, wopts):
957 def _initialrevs(repo, wopts):
958 """Return the initial set of revisions to be filtered or followed"""
958 """Return the initial set of revisions to be filtered or followed"""
959 if wopts.revspec:
959 if wopts.revspec:
960 revs = scmutil.revrange(repo, wopts.revspec)
960 revs = scmutil.revrange(repo, wopts.revspec)
961 elif wopts.follow and repo.dirstate.p1() == nullid:
961 elif wopts.follow and repo.dirstate.p1() == nullid:
962 revs = smartset.baseset()
962 revs = smartset.baseset()
963 elif wopts.follow:
963 elif wopts.follow:
964 revs = repo.revs(b'.')
964 revs = repo.revs(b'.')
965 else:
965 else:
966 revs = smartset.spanset(repo)
966 revs = smartset.spanset(repo)
967 revs.reverse()
967 revs.reverse()
968 return revs
968 return revs
969
969
970
970
971 def makewalker(repo, wopts):
971 def makewalker(repo, wopts):
972 # type: (Any, walkopts) -> Tuple[smartset.abstractsmartset, Optional[Callable[[Any], matchmod.basematcher]]]
972 # type: (Any, walkopts) -> Tuple[smartset.abstractsmartset, Optional[Callable[[Any], matchmod.basematcher]]]
973 """Build (revs, makefilematcher) to scan revision/file history
973 """Build (revs, makefilematcher) to scan revision/file history
974
974
975 - revs is the smartset to be traversed.
975 - revs is the smartset to be traversed.
976 - makefilematcher is a function to map ctx to a matcher for that revision
976 - makefilematcher is a function to map ctx to a matcher for that revision
977 """
977 """
978 revs = _initialrevs(repo, wopts)
978 revs = _initialrevs(repo, wopts)
979 if not revs:
979 if not revs:
980 return smartset.baseset(), None
980 return smartset.baseset(), None
981 # TODO: might want to merge slowpath with wopts.force_changelog_traversal
981 # TODO: might want to merge slowpath with wopts.force_changelog_traversal
982 match, pats, slowpath = _makematcher(repo, revs, wopts)
982 match, pats, slowpath = _makematcher(repo, revs, wopts)
983 wopts = attr.evolve(wopts, pats=pats)
983 wopts = attr.evolve(wopts, pats=pats)
984
984
985 filematcher = None
985 filematcher = None
986 if wopts.follow:
986 if wopts.follow:
987 if slowpath or match.always():
987 if slowpath or match.always():
988 revs = dagop.revancestors(repo, revs, followfirst=wopts.follow == 1)
988 revs = dagop.revancestors(repo, revs, followfirst=wopts.follow == 1)
989 else:
989 else:
990 assert not wopts.force_changelog_traversal
990 assert not wopts.force_changelog_traversal
991 revs, filematcher = _fileancestors(
991 revs, filematcher = _fileancestors(
992 repo, revs, match, followfirst=wopts.follow == 1
992 repo, revs, match, followfirst=wopts.follow == 1
993 )
993 )
994 revs.reverse()
994 revs.reverse()
995 if filematcher is None:
995 if filematcher is None:
996 filematcher = _makenofollowfilematcher(repo, wopts.pats, wopts.opts)
996 filematcher = _makenofollowfilematcher(repo, wopts.pats, wopts.opts)
997 if filematcher is None:
997 if filematcher is None:
998
998
999 def filematcher(ctx):
999 def filematcher(ctx):
1000 return match
1000 return match
1001
1001
1002 expr = _makerevset(repo, wopts, slowpath)
1002 expr = _makerevset(repo, wopts, slowpath)
1003 if wopts.sort_revisions:
1003 if wopts.sort_revisions:
1004 assert wopts.sort_revisions in {b'topo', b'desc'}
1004 assert wopts.sort_revisions in {b'topo', b'desc'}
1005 if wopts.sort_revisions == b'topo':
1005 if wopts.sort_revisions == b'topo':
1006 if not revs.istopo():
1006 if not revs.istopo():
1007 revs = dagop.toposort(revs, repo.changelog.parentrevs)
1007 revs = dagop.toposort(revs, repo.changelog.parentrevs)
1008 # TODO: try to iterate the set lazily
1008 # TODO: try to iterate the set lazily
1009 revs = revset.baseset(list(revs), istopo=True)
1009 revs = revset.baseset(list(revs), istopo=True)
1010 elif not (revs.isdescending() or revs.istopo()):
1010 elif not (revs.isdescending() or revs.istopo()):
1011 # User-specified revs might be unsorted
1011 # User-specified revs might be unsorted
1012 revs.sort(reverse=True)
1012 revs.sort(reverse=True)
1013 if expr:
1013 if expr:
1014 matcher = revset.match(None, expr)
1014 matcher = revset.match(None, expr)
1015 revs = matcher(repo, revs)
1015 revs = matcher(repo, revs)
1016 if wopts.limit is not None:
1016 if wopts.limit is not None:
1017 revs = revs.slice(0, wopts.limit)
1017 revs = revs.slice(0, wopts.limit)
1018
1018
1019 return revs, filematcher
1019 return revs, filematcher
1020
1020
1021
1021
1022 def getrevs(repo, wopts):
1022 def getrevs(repo, wopts):
1023 # type: (Any, walkopts) -> Tuple[smartset.abstractsmartset, Optional[changesetdiffer]]
1023 # type: (Any, walkopts) -> Tuple[smartset.abstractsmartset, Optional[changesetdiffer]]
1024 """Return (revs, differ) where revs is a smartset
1024 """Return (revs, differ) where revs is a smartset
1025
1025
1026 differ is a changesetdiffer with pre-configured file matcher.
1026 differ is a changesetdiffer with pre-configured file matcher.
1027 """
1027 """
1028 revs, filematcher = makewalker(repo, wopts)
1028 revs, filematcher = makewalker(repo, wopts)
1029 if not revs:
1029 if not revs:
1030 return revs, None
1030 return revs, None
1031 differ = changesetdiffer()
1031 differ = changesetdiffer()
1032 differ._makefilematcher = filematcher
1032 differ._makefilematcher = filematcher
1033 return revs, differ
1033 return revs, differ
1034
1034
1035
1035
1036 def _parselinerangeopt(repo, opts):
1036 def _parselinerangeopt(repo, opts):
1037 """Parse --line-range log option and return a list of tuples (filename,
1037 """Parse --line-range log option and return a list of tuples (filename,
1038 (fromline, toline)).
1038 (fromline, toline)).
1039 """
1039 """
1040 linerangebyfname = []
1040 linerangebyfname = []
1041 for pat in opts.get(b'line_range', []):
1041 for pat in opts.get(b'line_range', []):
1042 try:
1042 try:
1043 pat, linerange = pat.rsplit(b',', 1)
1043 pat, linerange = pat.rsplit(b',', 1)
1044 except ValueError:
1044 except ValueError:
1045 raise error.Abort(_(b'malformatted line-range pattern %s') % pat)
1045 raise error.Abort(_(b'malformatted line-range pattern %s') % pat)
1046 try:
1046 try:
1047 fromline, toline = map(int, linerange.split(b':'))
1047 fromline, toline = map(int, linerange.split(b':'))
1048 except ValueError:
1048 except ValueError:
1049 raise error.Abort(_(b"invalid line range for %s") % pat)
1049 raise error.Abort(_(b"invalid line range for %s") % pat)
1050 msg = _(b"line range pattern '%s' must match exactly one file") % pat
1050 msg = _(b"line range pattern '%s' must match exactly one file") % pat
1051 fname = scmutil.parsefollowlinespattern(repo, None, pat, msg)
1051 fname = scmutil.parsefollowlinespattern(repo, None, pat, msg)
1052 linerangebyfname.append(
1052 linerangebyfname.append(
1053 (fname, util.processlinerange(fromline, toline))
1053 (fname, util.processlinerange(fromline, toline))
1054 )
1054 )
1055 return linerangebyfname
1055 return linerangebyfname
1056
1056
1057
1057
1058 def getlinerangerevs(repo, userrevs, opts):
1058 def getlinerangerevs(repo, userrevs, opts):
1059 """Return (revs, differ).
1059 """Return (revs, differ).
1060
1060
1061 "revs" are revisions obtained by processing "line-range" log options and
1061 "revs" are revisions obtained by processing "line-range" log options and
1062 walking block ancestors of each specified file/line-range.
1062 walking block ancestors of each specified file/line-range.
1063
1063
1064 "differ" is a changesetdiffer with pre-configured file matcher and hunks
1064 "differ" is a changesetdiffer with pre-configured file matcher and hunks
1065 filter.
1065 filter.
1066 """
1066 """
1067 wctx = repo[None]
1067 wctx = repo[None]
1068
1068
1069 # Two-levels map of "rev -> file ctx -> [line range]".
1069 # Two-levels map of "rev -> file ctx -> [line range]".
1070 linerangesbyrev = {}
1070 linerangesbyrev = {}
1071 for fname, (fromline, toline) in _parselinerangeopt(repo, opts):
1071 for fname, (fromline, toline) in _parselinerangeopt(repo, opts):
1072 if fname not in wctx:
1072 if fname not in wctx:
1073 raise error.Abort(
1073 raise error.Abort(
1074 _(b'cannot follow file not in parent revision: "%s"') % fname
1074 _(b'cannot follow file not in parent revision: "%s"') % fname
1075 )
1075 )
1076 fctx = wctx.filectx(fname)
1076 fctx = wctx.filectx(fname)
1077 for fctx, linerange in dagop.blockancestors(fctx, fromline, toline):
1077 for fctx, linerange in dagop.blockancestors(fctx, fromline, toline):
1078 rev = fctx.introrev()
1078 rev = fctx.introrev()
1079 if rev is None:
1079 if rev is None:
1080 rev = wdirrev
1080 rev = wdirrev
1081 if rev not in userrevs:
1081 if rev not in userrevs:
1082 continue
1082 continue
1083 linerangesbyrev.setdefault(rev, {}).setdefault(
1083 linerangesbyrev.setdefault(rev, {}).setdefault(
1084 fctx.path(), []
1084 fctx.path(), []
1085 ).append(linerange)
1085 ).append(linerange)
1086
1086
1087 def nofilterhunksfn(fctx, hunks):
1087 def nofilterhunksfn(fctx, hunks):
1088 return hunks
1088 return hunks
1089
1089
1090 def hunksfilter(ctx):
1090 def hunksfilter(ctx):
1091 fctxlineranges = linerangesbyrev.get(scmutil.intrev(ctx))
1091 fctxlineranges = linerangesbyrev.get(scmutil.intrev(ctx))
1092 if fctxlineranges is None:
1092 if fctxlineranges is None:
1093 return nofilterhunksfn
1093 return nofilterhunksfn
1094
1094
1095 def filterfn(fctx, hunks):
1095 def filterfn(fctx, hunks):
1096 lineranges = fctxlineranges.get(fctx.path())
1096 lineranges = fctxlineranges.get(fctx.path())
1097 if lineranges is not None:
1097 if lineranges is not None:
1098 for hr, lines in hunks:
1098 for hr, lines in hunks:
1099 if hr is None: # binary
1099 if hr is None: # binary
1100 yield hr, lines
1100 yield hr, lines
1101 continue
1101 continue
1102 if any(mdiff.hunkinrange(hr[2:], lr) for lr in lineranges):
1102 if any(mdiff.hunkinrange(hr[2:], lr) for lr in lineranges):
1103 yield hr, lines
1103 yield hr, lines
1104 else:
1104 else:
1105 for hunk in hunks:
1105 for hunk in hunks:
1106 yield hunk
1106 yield hunk
1107
1107
1108 return filterfn
1108 return filterfn
1109
1109
1110 def filematcher(ctx):
1110 def filematcher(ctx):
1111 files = list(linerangesbyrev.get(scmutil.intrev(ctx), []))
1111 files = list(linerangesbyrev.get(scmutil.intrev(ctx), []))
1112 return scmutil.matchfiles(repo, files)
1112 return scmutil.matchfiles(repo, files)
1113
1113
1114 revs = sorted(linerangesbyrev, reverse=True)
1114 revs = sorted(linerangesbyrev, reverse=True)
1115
1115
1116 differ = changesetdiffer()
1116 differ = changesetdiffer()
1117 differ._makefilematcher = filematcher
1117 differ._makefilematcher = filematcher
1118 differ._makehunksfilter = hunksfilter
1118 differ._makehunksfilter = hunksfilter
1119 return smartset.baseset(revs), differ
1119 return smartset.baseset(revs), differ
1120
1120
1121
1121
1122 def _graphnodeformatter(ui, displayer):
1122 def _graphnodeformatter(ui, displayer):
1123 spec = ui.config(b'command-templates', b'graphnode')
1123 spec = ui.config(b'command-templates', b'graphnode')
1124 if not spec:
1124 if not spec:
1125 return templatekw.getgraphnode # fast path for "{graphnode}"
1125 return templatekw.getgraphnode # fast path for "{graphnode}"
1126
1126
1127 spec = templater.unquotestring(spec)
1127 spec = templater.unquotestring(spec)
1128 if isinstance(displayer, changesettemplater):
1128 if isinstance(displayer, changesettemplater):
1129 # reuse cache of slow templates
1129 # reuse cache of slow templates
1130 tres = displayer._tresources
1130 tres = displayer._tresources
1131 else:
1131 else:
1132 tres = formatter.templateresources(ui)
1132 tres = formatter.templateresources(ui)
1133 templ = formatter.maketemplater(
1133 templ = formatter.maketemplater(
1134 ui, spec, defaults=templatekw.keywords, resources=tres
1134 ui, spec, defaults=templatekw.keywords, resources=tres
1135 )
1135 )
1136
1136
1137 def formatnode(repo, ctx, cache):
1137 def formatnode(repo, ctx, cache):
1138 props = {b'ctx': ctx, b'repo': repo}
1138 props = {b'ctx': ctx, b'repo': repo}
1139 return templ.renderdefault(props)
1139 return templ.renderdefault(props)
1140
1140
1141 return formatnode
1141 return formatnode
1142
1142
1143
1143
1144 def displaygraph(ui, repo, dag, displayer, edgefn, getcopies=None, props=None):
1144 def displaygraph(ui, repo, dag, displayer, edgefn, getcopies=None, props=None):
1145 props = props or {}
1145 props = props or {}
1146 formatnode = _graphnodeformatter(ui, displayer)
1146 formatnode = _graphnodeformatter(ui, displayer)
1147 state = graphmod.asciistate()
1147 state = graphmod.asciistate()
1148 styles = state.styles
1148 styles = state.styles
1149
1149
1150 # only set graph styling if HGPLAIN is not set.
1150 # only set graph styling if HGPLAIN is not set.
1151 if ui.plain(b'graph'):
1151 if ui.plain(b'graph'):
1152 # set all edge styles to |, the default pre-3.8 behaviour
1152 # set all edge styles to |, the default pre-3.8 behaviour
1153 styles.update(dict.fromkeys(styles, b'|'))
1153 styles.update(dict.fromkeys(styles, b'|'))
1154 else:
1154 else:
1155 edgetypes = {
1155 edgetypes = {
1156 b'parent': graphmod.PARENT,
1156 b'parent': graphmod.PARENT,
1157 b'grandparent': graphmod.GRANDPARENT,
1157 b'grandparent': graphmod.GRANDPARENT,
1158 b'missing': graphmod.MISSINGPARENT,
1158 b'missing': graphmod.MISSINGPARENT,
1159 }
1159 }
1160 for name, key in edgetypes.items():
1160 for name, key in edgetypes.items():
1161 # experimental config: experimental.graphstyle.*
1161 # experimental config: experimental.graphstyle.*
1162 styles[key] = ui.config(
1162 styles[key] = ui.config(
1163 b'experimental', b'graphstyle.%s' % name, styles[key]
1163 b'experimental', b'graphstyle.%s' % name, styles[key]
1164 )
1164 )
1165 if not styles[key]:
1165 if not styles[key]:
1166 styles[key] = None
1166 styles[key] = None
1167
1167
1168 # experimental config: experimental.graphshorten
1168 # experimental config: experimental.graphshorten
1169 state.graphshorten = ui.configbool(b'experimental', b'graphshorten')
1169 state.graphshorten = ui.configbool(b'experimental', b'graphshorten')
1170
1170
1171 formatnode_cache = {}
1171 formatnode_cache = {}
1172 for rev, type, ctx, parents in dag:
1172 for rev, type, ctx, parents in dag:
1173 char = formatnode(repo, ctx, formatnode_cache)
1173 char = formatnode(repo, ctx, formatnode_cache)
1174 copies = getcopies(ctx) if getcopies else None
1174 copies = getcopies(ctx) if getcopies else None
1175 edges = edgefn(type, char, state, rev, parents)
1175 edges = edgefn(type, char, state, rev, parents)
1176 firstedge = next(edges)
1176 firstedge = next(edges)
1177 width = firstedge[2]
1177 width = firstedge[2]
1178 displayer.show(
1178 displayer.show(
1179 ctx, copies=copies, graphwidth=width, **pycompat.strkwargs(props)
1179 ctx, copies=copies, graphwidth=width, **pycompat.strkwargs(props)
1180 )
1180 )
1181 lines = displayer.hunk.pop(rev).split(b'\n')
1181 lines = displayer.hunk.pop(rev).split(b'\n')
1182 if not lines[-1]:
1182 if not lines[-1]:
1183 del lines[-1]
1183 del lines[-1]
1184 displayer.flush(ctx)
1184 displayer.flush(ctx)
1185 for type, char, width, coldata in itertools.chain([firstedge], edges):
1185 for type, char, width, coldata in itertools.chain([firstedge], edges):
1186 graphmod.ascii(ui, state, type, char, lines, coldata)
1186 graphmod.ascii(ui, state, type, char, lines, coldata)
1187 lines = []
1187 lines = []
1188 displayer.close()
1188 displayer.close()
1189
1189
1190
1190
1191 def displaygraphrevs(ui, repo, revs, displayer, getrenamed):
1191 def displaygraphrevs(ui, repo, revs, displayer, getrenamed):
1192 revdag = graphmod.dagwalker(repo, revs)
1192 revdag = graphmod.dagwalker(repo, revs)
1193 displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed)
1193 displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed)
1194
1194
1195
1195
1196 def displayrevs(ui, repo, revs, displayer, getcopies):
1196 def displayrevs(ui, repo, revs, displayer, getcopies):
1197 for rev in revs:
1197 for rev in revs:
1198 ctx = repo[rev]
1198 ctx = repo[rev]
1199 copies = getcopies(ctx) if getcopies else None
1199 copies = getcopies(ctx) if getcopies else None
1200 displayer.show(ctx, copies=copies)
1200 displayer.show(ctx, copies=copies)
1201 displayer.flush(ctx)
1201 displayer.flush(ctx)
1202 displayer.close()
1202 displayer.close()
1203
1203
1204
1204
1205 def checkunsupportedgraphflags(pats, opts):
1205 def checkunsupportedgraphflags(pats, opts):
1206 for op in [b"newest_first"]:
1206 for op in [b"newest_first"]:
1207 if op in opts and opts[op]:
1207 if op in opts and opts[op]:
1208 raise error.Abort(
1208 raise error.Abort(
1209 _(b"-G/--graph option is incompatible with --%s")
1209 _(b"-G/--graph option is incompatible with --%s")
1210 % op.replace(b"_", b"-")
1210 % op.replace(b"_", b"-")
1211 )
1211 )
1212
1212
1213
1213
1214 def graphrevs(repo, nodes, opts):
1214 def graphrevs(repo, nodes, opts):
1215 limit = getlimit(opts)
1215 limit = getlimit(opts)
1216 nodes.reverse()
1216 nodes.reverse()
1217 if limit is not None:
1217 if limit is not None:
1218 nodes = nodes[:limit]
1218 nodes = nodes[:limit]
1219 return graphmod.nodes(repo, nodes)
1219 return graphmod.nodes(repo, nodes)
@@ -1,2917 +1,2952 b''
1 Log on empty repository: checking consistency
1 Log on empty repository: checking consistency
2
2
3 $ hg init empty
3 $ hg init empty
4 $ cd empty
4 $ cd empty
5 $ hg log
5 $ hg log
6 $ hg log -r 1
6 $ hg log -r 1
7 abort: unknown revision '1'
7 abort: unknown revision '1'
8 [255]
8 [255]
9 $ hg log -r -1:0
9 $ hg log -r -1:0
10 abort: unknown revision '-1'
10 abort: unknown revision '-1'
11 [255]
11 [255]
12 $ hg log -r 'branch(name)'
12 $ hg log -r 'branch(name)'
13 abort: unknown revision 'name'
13 abort: unknown revision 'name'
14 [255]
14 [255]
15 $ hg log -r null -q
15 $ hg log -r null -q
16 -1:000000000000
16 -1:000000000000
17
17
18 $ cd ..
18 $ cd ..
19
19
20 The g is crafted to have 2 filelog topological heads in a linear
20 The g is crafted to have 2 filelog topological heads in a linear
21 changeset graph
21 changeset graph
22
22
23 $ hg init a
23 $ hg init a
24 $ cd a
24 $ cd a
25 $ echo a > a
25 $ echo a > a
26 $ echo f > f
26 $ echo f > f
27 $ hg ci -Ama -d '1 0'
27 $ hg ci -Ama -d '1 0'
28 adding a
28 adding a
29 adding f
29 adding f
30
30
31 $ hg cp a b
31 $ hg cp a b
32 $ hg cp f g
32 $ hg cp f g
33 $ hg ci -mb -d '2 0'
33 $ hg ci -mb -d '2 0'
34
34
35 $ mkdir dir
35 $ mkdir dir
36 $ hg mv b dir
36 $ hg mv b dir
37 $ echo g >> g
37 $ echo g >> g
38 $ echo f >> f
38 $ echo f >> f
39 $ hg ci -mc -d '3 0'
39 $ hg ci -mc -d '3 0'
40
40
41 $ hg mv a b
41 $ hg mv a b
42 $ hg cp -f f g
42 $ hg cp -f f g
43 $ echo a > d
43 $ echo a > d
44 $ hg add d
44 $ hg add d
45 $ hg ci -md -d '4 0'
45 $ hg ci -md -d '4 0'
46
46
47 $ hg mv dir/b e
47 $ hg mv dir/b e
48 $ hg ci -me -d '5 0'
48 $ hg ci -me -d '5 0'
49
49
50 Make sure largefiles doesn't interfere with logging a regular file
50 Make sure largefiles doesn't interfere with logging a regular file
51 $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles=
51 $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles=
52 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
52 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
53 updated patterns: .hglf/a, a
53 updated patterns: .hglf/a, a
54 0: a
54 0: a
55 $ hg log a
55 $ hg log a
56 changeset: 0:9161b9aeaf16
56 changeset: 0:9161b9aeaf16
57 user: test
57 user: test
58 date: Thu Jan 01 00:00:01 1970 +0000
58 date: Thu Jan 01 00:00:01 1970 +0000
59 summary: a
59 summary: a
60
60
61 $ hg log glob:a*
61 $ hg log glob:a*
62 changeset: 3:2ca5ba701980
62 changeset: 3:2ca5ba701980
63 user: test
63 user: test
64 date: Thu Jan 01 00:00:04 1970 +0000
64 date: Thu Jan 01 00:00:04 1970 +0000
65 summary: d
65 summary: d
66
66
67 changeset: 0:9161b9aeaf16
67 changeset: 0:9161b9aeaf16
68 user: test
68 user: test
69 date: Thu Jan 01 00:00:01 1970 +0000
69 date: Thu Jan 01 00:00:01 1970 +0000
70 summary: a
70 summary: a
71
71
72 $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles=
72 $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles=
73 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
73 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
74 updated patterns: glob:.hglf/a*, glob:a*
74 updated patterns: glob:.hglf/a*, glob:a*
75 3: d
75 3: d
76 0: a
76 0: a
77
77
78 log on directory
78 log on directory
79
79
80 $ hg log dir
80 $ hg log dir
81 changeset: 4:7e4639b4691b
81 changeset: 4:7e4639b4691b
82 tag: tip
82 tag: tip
83 user: test
83 user: test
84 date: Thu Jan 01 00:00:05 1970 +0000
84 date: Thu Jan 01 00:00:05 1970 +0000
85 summary: e
85 summary: e
86
86
87 changeset: 2:f8954cd4dc1f
87 changeset: 2:f8954cd4dc1f
88 user: test
88 user: test
89 date: Thu Jan 01 00:00:03 1970 +0000
89 date: Thu Jan 01 00:00:03 1970 +0000
90 summary: c
90 summary: c
91
91
92 $ hg log somethingthatdoesntexist dir
92 $ hg log somethingthatdoesntexist dir
93 changeset: 4:7e4639b4691b
93 changeset: 4:7e4639b4691b
94 tag: tip
94 tag: tip
95 user: test
95 user: test
96 date: Thu Jan 01 00:00:05 1970 +0000
96 date: Thu Jan 01 00:00:05 1970 +0000
97 summary: e
97 summary: e
98
98
99 changeset: 2:f8954cd4dc1f
99 changeset: 2:f8954cd4dc1f
100 user: test
100 user: test
101 date: Thu Jan 01 00:00:03 1970 +0000
101 date: Thu Jan 01 00:00:03 1970 +0000
102 summary: c
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 -X, with explicit path
140 -X, with explicit path
106
141
107 $ hg log a -X a
142 $ hg log a -X a
108
143
109 -f, non-existent directory
144 -f, non-existent directory
110
145
111 $ hg log -f dir
146 $ hg log -f dir
112 abort: cannot follow file not in parent revision: "dir"
147 abort: cannot follow file not in parent revision: "dir"
113 [255]
148 [255]
114
149
115 -f, directory
150 -f, directory
116
151
117 $ hg up -q 3
152 $ hg up -q 3
118 $ hg log -f dir
153 $ hg log -f dir
119 changeset: 2:f8954cd4dc1f
154 changeset: 2:f8954cd4dc1f
120 user: test
155 user: test
121 date: Thu Jan 01 00:00:03 1970 +0000
156 date: Thu Jan 01 00:00:03 1970 +0000
122 summary: c
157 summary: c
123
158
124 -f, directory with --patch
159 -f, directory with --patch
125
160
126 $ hg log -f dir -p
161 $ hg log -f dir -p
127 changeset: 2:f8954cd4dc1f
162 changeset: 2:f8954cd4dc1f
128 user: test
163 user: test
129 date: Thu Jan 01 00:00:03 1970 +0000
164 date: Thu Jan 01 00:00:03 1970 +0000
130 summary: c
165 summary: c
131
166
132 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
167 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
133 --- /dev/null* (glob)
168 --- /dev/null* (glob)
134 +++ b/dir/b* (glob)
169 +++ b/dir/b* (glob)
135 @@ -0,0 +1,1 @@
170 @@ -0,0 +1,1 @@
136 +a
171 +a
137
172
138
173
139 -f, pattern
174 -f, pattern
140
175
141 $ hg log -f -I 'dir**' -p
176 $ hg log -f -I 'dir**' -p
142 changeset: 2:f8954cd4dc1f
177 changeset: 2:f8954cd4dc1f
143 user: test
178 user: test
144 date: Thu Jan 01 00:00:03 1970 +0000
179 date: Thu Jan 01 00:00:03 1970 +0000
145 summary: c
180 summary: c
146
181
147 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
182 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
148 --- /dev/null* (glob)
183 --- /dev/null* (glob)
149 +++ b/dir/b* (glob)
184 +++ b/dir/b* (glob)
150 @@ -0,0 +1,1 @@
185 @@ -0,0 +1,1 @@
151 +a
186 +a
152
187
153 $ hg up -q 4
188 $ hg up -q 4
154
189
155 -f, a wrong style
190 -f, a wrong style
156
191
157 $ hg log -f -l1 --style something
192 $ hg log -f -l1 --style something
158 abort: style 'something' not found
193 abort: style 'something' not found
159 (available styles: bisect, changelog, compact, default, phases, show, status, xml)
194 (available styles: bisect, changelog, compact, default, phases, show, status, xml)
160 [255]
195 [255]
161
196
162 -f, phases style
197 -f, phases style
163
198
164
199
165 $ hg log -f -l1 --style phases
200 $ hg log -f -l1 --style phases
166 changeset: 4:7e4639b4691b
201 changeset: 4:7e4639b4691b
167 tag: tip
202 tag: tip
168 phase: draft
203 phase: draft
169 user: test
204 user: test
170 date: Thu Jan 01 00:00:05 1970 +0000
205 date: Thu Jan 01 00:00:05 1970 +0000
171 summary: e
206 summary: e
172
207
173
208
174 $ hg log -f -l1 --style phases -q
209 $ hg log -f -l1 --style phases -q
175 4:7e4639b4691b
210 4:7e4639b4691b
176
211
177 -f, but no args
212 -f, but no args
178
213
179 $ hg log -f
214 $ hg log -f
180 changeset: 4:7e4639b4691b
215 changeset: 4:7e4639b4691b
181 tag: tip
216 tag: tip
182 user: test
217 user: test
183 date: Thu Jan 01 00:00:05 1970 +0000
218 date: Thu Jan 01 00:00:05 1970 +0000
184 summary: e
219 summary: e
185
220
186 changeset: 3:2ca5ba701980
221 changeset: 3:2ca5ba701980
187 user: test
222 user: test
188 date: Thu Jan 01 00:00:04 1970 +0000
223 date: Thu Jan 01 00:00:04 1970 +0000
189 summary: d
224 summary: d
190
225
191 changeset: 2:f8954cd4dc1f
226 changeset: 2:f8954cd4dc1f
192 user: test
227 user: test
193 date: Thu Jan 01 00:00:03 1970 +0000
228 date: Thu Jan 01 00:00:03 1970 +0000
194 summary: c
229 summary: c
195
230
196 changeset: 1:d89b0a12d229
231 changeset: 1:d89b0a12d229
197 user: test
232 user: test
198 date: Thu Jan 01 00:00:02 1970 +0000
233 date: Thu Jan 01 00:00:02 1970 +0000
199 summary: b
234 summary: b
200
235
201 changeset: 0:9161b9aeaf16
236 changeset: 0:9161b9aeaf16
202 user: test
237 user: test
203 date: Thu Jan 01 00:00:01 1970 +0000
238 date: Thu Jan 01 00:00:01 1970 +0000
204 summary: a
239 summary: a
205
240
206
241
207 one rename
242 one rename
208
243
209 $ hg up -q 2
244 $ hg up -q 2
210 $ hg log -vf a
245 $ hg log -vf a
211 changeset: 0:9161b9aeaf16
246 changeset: 0:9161b9aeaf16
212 user: test
247 user: test
213 date: Thu Jan 01 00:00:01 1970 +0000
248 date: Thu Jan 01 00:00:01 1970 +0000
214 files: a f
249 files: a f
215 description:
250 description:
216 a
251 a
217
252
218
253
219
254
220 many renames
255 many renames
221
256
222 $ hg up -q tip
257 $ hg up -q tip
223 $ hg log -vf e
258 $ hg log -vf e
224 changeset: 4:7e4639b4691b
259 changeset: 4:7e4639b4691b
225 tag: tip
260 tag: tip
226 user: test
261 user: test
227 date: Thu Jan 01 00:00:05 1970 +0000
262 date: Thu Jan 01 00:00:05 1970 +0000
228 files: dir/b e
263 files: dir/b e
229 description:
264 description:
230 e
265 e
231
266
232
267
233 changeset: 2:f8954cd4dc1f
268 changeset: 2:f8954cd4dc1f
234 user: test
269 user: test
235 date: Thu Jan 01 00:00:03 1970 +0000
270 date: Thu Jan 01 00:00:03 1970 +0000
236 files: b dir/b f g
271 files: b dir/b f g
237 description:
272 description:
238 c
273 c
239
274
240
275
241 changeset: 1:d89b0a12d229
276 changeset: 1:d89b0a12d229
242 user: test
277 user: test
243 date: Thu Jan 01 00:00:02 1970 +0000
278 date: Thu Jan 01 00:00:02 1970 +0000
244 files: b g
279 files: b g
245 description:
280 description:
246 b
281 b
247
282
248
283
249 changeset: 0:9161b9aeaf16
284 changeset: 0:9161b9aeaf16
250 user: test
285 user: test
251 date: Thu Jan 01 00:00:01 1970 +0000
286 date: Thu Jan 01 00:00:01 1970 +0000
252 files: a f
287 files: a f
253 description:
288 description:
254 a
289 a
255
290
256
291
257
292
258
293
259 log -pf dir/b
294 log -pf dir/b
260
295
261 $ hg up -q 3
296 $ hg up -q 3
262 $ hg log -pf dir/b
297 $ hg log -pf dir/b
263 changeset: 2:f8954cd4dc1f
298 changeset: 2:f8954cd4dc1f
264 user: test
299 user: test
265 date: Thu Jan 01 00:00:03 1970 +0000
300 date: Thu Jan 01 00:00:03 1970 +0000
266 summary: c
301 summary: c
267
302
268 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
303 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
269 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
304 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
270 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
305 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
271 @@ -0,0 +1,1 @@
306 @@ -0,0 +1,1 @@
272 +a
307 +a
273
308
274 changeset: 1:d89b0a12d229
309 changeset: 1:d89b0a12d229
275 user: test
310 user: test
276 date: Thu Jan 01 00:00:02 1970 +0000
311 date: Thu Jan 01 00:00:02 1970 +0000
277 summary: b
312 summary: b
278
313
279 diff -r 9161b9aeaf16 -r d89b0a12d229 b
314 diff -r 9161b9aeaf16 -r d89b0a12d229 b
280 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
315 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
281 +++ b/b Thu Jan 01 00:00:02 1970 +0000
316 +++ b/b Thu Jan 01 00:00:02 1970 +0000
282 @@ -0,0 +1,1 @@
317 @@ -0,0 +1,1 @@
283 +a
318 +a
284
319
285 changeset: 0:9161b9aeaf16
320 changeset: 0:9161b9aeaf16
286 user: test
321 user: test
287 date: Thu Jan 01 00:00:01 1970 +0000
322 date: Thu Jan 01 00:00:01 1970 +0000
288 summary: a
323 summary: a
289
324
290 diff -r 000000000000 -r 9161b9aeaf16 a
325 diff -r 000000000000 -r 9161b9aeaf16 a
291 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
326 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
292 +++ b/a Thu Jan 01 00:00:01 1970 +0000
327 +++ b/a Thu Jan 01 00:00:01 1970 +0000
293 @@ -0,0 +1,1 @@
328 @@ -0,0 +1,1 @@
294 +a
329 +a
295
330
296
331
297 log -pf b inside dir
332 log -pf b inside dir
298
333
299 $ hg --cwd=dir log -pf b
334 $ hg --cwd=dir log -pf b
300 changeset: 2:f8954cd4dc1f
335 changeset: 2:f8954cd4dc1f
301 user: test
336 user: test
302 date: Thu Jan 01 00:00:03 1970 +0000
337 date: Thu Jan 01 00:00:03 1970 +0000
303 summary: c
338 summary: c
304
339
305 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
340 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
306 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
341 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
307 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
342 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
308 @@ -0,0 +1,1 @@
343 @@ -0,0 +1,1 @@
309 +a
344 +a
310
345
311 changeset: 1:d89b0a12d229
346 changeset: 1:d89b0a12d229
312 user: test
347 user: test
313 date: Thu Jan 01 00:00:02 1970 +0000
348 date: Thu Jan 01 00:00:02 1970 +0000
314 summary: b
349 summary: b
315
350
316 diff -r 9161b9aeaf16 -r d89b0a12d229 b
351 diff -r 9161b9aeaf16 -r d89b0a12d229 b
317 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
352 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
318 +++ b/b Thu Jan 01 00:00:02 1970 +0000
353 +++ b/b Thu Jan 01 00:00:02 1970 +0000
319 @@ -0,0 +1,1 @@
354 @@ -0,0 +1,1 @@
320 +a
355 +a
321
356
322 changeset: 0:9161b9aeaf16
357 changeset: 0:9161b9aeaf16
323 user: test
358 user: test
324 date: Thu Jan 01 00:00:01 1970 +0000
359 date: Thu Jan 01 00:00:01 1970 +0000
325 summary: a
360 summary: a
326
361
327 diff -r 000000000000 -r 9161b9aeaf16 a
362 diff -r 000000000000 -r 9161b9aeaf16 a
328 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
363 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
329 +++ b/a Thu Jan 01 00:00:01 1970 +0000
364 +++ b/a Thu Jan 01 00:00:01 1970 +0000
330 @@ -0,0 +1,1 @@
365 @@ -0,0 +1,1 @@
331 +a
366 +a
332
367
333
368
334 log -pf, but no args
369 log -pf, but no args
335
370
336 $ hg log -pf
371 $ hg log -pf
337 changeset: 3:2ca5ba701980
372 changeset: 3:2ca5ba701980
338 user: test
373 user: test
339 date: Thu Jan 01 00:00:04 1970 +0000
374 date: Thu Jan 01 00:00:04 1970 +0000
340 summary: d
375 summary: d
341
376
342 diff -r f8954cd4dc1f -r 2ca5ba701980 a
377 diff -r f8954cd4dc1f -r 2ca5ba701980 a
343 --- a/a Thu Jan 01 00:00:03 1970 +0000
378 --- a/a Thu Jan 01 00:00:03 1970 +0000
344 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
379 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
345 @@ -1,1 +0,0 @@
380 @@ -1,1 +0,0 @@
346 -a
381 -a
347 diff -r f8954cd4dc1f -r 2ca5ba701980 b
382 diff -r f8954cd4dc1f -r 2ca5ba701980 b
348 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
383 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
349 +++ b/b Thu Jan 01 00:00:04 1970 +0000
384 +++ b/b Thu Jan 01 00:00:04 1970 +0000
350 @@ -0,0 +1,1 @@
385 @@ -0,0 +1,1 @@
351 +a
386 +a
352 diff -r f8954cd4dc1f -r 2ca5ba701980 d
387 diff -r f8954cd4dc1f -r 2ca5ba701980 d
353 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
388 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
354 +++ b/d Thu Jan 01 00:00:04 1970 +0000
389 +++ b/d Thu Jan 01 00:00:04 1970 +0000
355 @@ -0,0 +1,1 @@
390 @@ -0,0 +1,1 @@
356 +a
391 +a
357 diff -r f8954cd4dc1f -r 2ca5ba701980 g
392 diff -r f8954cd4dc1f -r 2ca5ba701980 g
358 --- a/g Thu Jan 01 00:00:03 1970 +0000
393 --- a/g Thu Jan 01 00:00:03 1970 +0000
359 +++ b/g Thu Jan 01 00:00:04 1970 +0000
394 +++ b/g Thu Jan 01 00:00:04 1970 +0000
360 @@ -1,2 +1,2 @@
395 @@ -1,2 +1,2 @@
361 f
396 f
362 -g
397 -g
363 +f
398 +f
364
399
365 changeset: 2:f8954cd4dc1f
400 changeset: 2:f8954cd4dc1f
366 user: test
401 user: test
367 date: Thu Jan 01 00:00:03 1970 +0000
402 date: Thu Jan 01 00:00:03 1970 +0000
368 summary: c
403 summary: c
369
404
370 diff -r d89b0a12d229 -r f8954cd4dc1f b
405 diff -r d89b0a12d229 -r f8954cd4dc1f b
371 --- a/b Thu Jan 01 00:00:02 1970 +0000
406 --- a/b Thu Jan 01 00:00:02 1970 +0000
372 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
407 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
373 @@ -1,1 +0,0 @@
408 @@ -1,1 +0,0 @@
374 -a
409 -a
375 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
410 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
376 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
411 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
377 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
412 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
378 @@ -0,0 +1,1 @@
413 @@ -0,0 +1,1 @@
379 +a
414 +a
380 diff -r d89b0a12d229 -r f8954cd4dc1f f
415 diff -r d89b0a12d229 -r f8954cd4dc1f f
381 --- a/f Thu Jan 01 00:00:02 1970 +0000
416 --- a/f Thu Jan 01 00:00:02 1970 +0000
382 +++ b/f Thu Jan 01 00:00:03 1970 +0000
417 +++ b/f Thu Jan 01 00:00:03 1970 +0000
383 @@ -1,1 +1,2 @@
418 @@ -1,1 +1,2 @@
384 f
419 f
385 +f
420 +f
386 diff -r d89b0a12d229 -r f8954cd4dc1f g
421 diff -r d89b0a12d229 -r f8954cd4dc1f g
387 --- a/g Thu Jan 01 00:00:02 1970 +0000
422 --- a/g Thu Jan 01 00:00:02 1970 +0000
388 +++ b/g Thu Jan 01 00:00:03 1970 +0000
423 +++ b/g Thu Jan 01 00:00:03 1970 +0000
389 @@ -1,1 +1,2 @@
424 @@ -1,1 +1,2 @@
390 f
425 f
391 +g
426 +g
392
427
393 changeset: 1:d89b0a12d229
428 changeset: 1:d89b0a12d229
394 user: test
429 user: test
395 date: Thu Jan 01 00:00:02 1970 +0000
430 date: Thu Jan 01 00:00:02 1970 +0000
396 summary: b
431 summary: b
397
432
398 diff -r 9161b9aeaf16 -r d89b0a12d229 b
433 diff -r 9161b9aeaf16 -r d89b0a12d229 b
399 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
434 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
400 +++ b/b Thu Jan 01 00:00:02 1970 +0000
435 +++ b/b Thu Jan 01 00:00:02 1970 +0000
401 @@ -0,0 +1,1 @@
436 @@ -0,0 +1,1 @@
402 +a
437 +a
403 diff -r 9161b9aeaf16 -r d89b0a12d229 g
438 diff -r 9161b9aeaf16 -r d89b0a12d229 g
404 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
439 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
405 +++ b/g Thu Jan 01 00:00:02 1970 +0000
440 +++ b/g Thu Jan 01 00:00:02 1970 +0000
406 @@ -0,0 +1,1 @@
441 @@ -0,0 +1,1 @@
407 +f
442 +f
408
443
409 changeset: 0:9161b9aeaf16
444 changeset: 0:9161b9aeaf16
410 user: test
445 user: test
411 date: Thu Jan 01 00:00:01 1970 +0000
446 date: Thu Jan 01 00:00:01 1970 +0000
412 summary: a
447 summary: a
413
448
414 diff -r 000000000000 -r 9161b9aeaf16 a
449 diff -r 000000000000 -r 9161b9aeaf16 a
415 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
450 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
416 +++ b/a Thu Jan 01 00:00:01 1970 +0000
451 +++ b/a Thu Jan 01 00:00:01 1970 +0000
417 @@ -0,0 +1,1 @@
452 @@ -0,0 +1,1 @@
418 +a
453 +a
419 diff -r 000000000000 -r 9161b9aeaf16 f
454 diff -r 000000000000 -r 9161b9aeaf16 f
420 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
455 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
421 +++ b/f Thu Jan 01 00:00:01 1970 +0000
456 +++ b/f Thu Jan 01 00:00:01 1970 +0000
422 @@ -0,0 +1,1 @@
457 @@ -0,0 +1,1 @@
423 +f
458 +f
424
459
425
460
426 log -vf dir/b
461 log -vf dir/b
427
462
428 $ hg log -vf dir/b
463 $ hg log -vf dir/b
429 changeset: 2:f8954cd4dc1f
464 changeset: 2:f8954cd4dc1f
430 user: test
465 user: test
431 date: Thu Jan 01 00:00:03 1970 +0000
466 date: Thu Jan 01 00:00:03 1970 +0000
432 files: b dir/b f g
467 files: b dir/b f g
433 description:
468 description:
434 c
469 c
435
470
436
471
437 changeset: 1:d89b0a12d229
472 changeset: 1:d89b0a12d229
438 user: test
473 user: test
439 date: Thu Jan 01 00:00:02 1970 +0000
474 date: Thu Jan 01 00:00:02 1970 +0000
440 files: b g
475 files: b g
441 description:
476 description:
442 b
477 b
443
478
444
479
445 changeset: 0:9161b9aeaf16
480 changeset: 0:9161b9aeaf16
446 user: test
481 user: test
447 date: Thu Jan 01 00:00:01 1970 +0000
482 date: Thu Jan 01 00:00:01 1970 +0000
448 files: a f
483 files: a f
449 description:
484 description:
450 a
485 a
451
486
452
487
453 Respects ui.logtemplate and command-templates.log configs (the latter takes
488 Respects ui.logtemplate and command-templates.log configs (the latter takes
454 precedence)
489 precedence)
455
490
456 $ hg log -r 0 --config ui.logtemplate="foo {rev}\n"
491 $ hg log -r 0 --config ui.logtemplate="foo {rev}\n"
457 foo 0
492 foo 0
458 $ hg log -r 0 --config command-templates.log="bar {rev}\n"
493 $ hg log -r 0 --config command-templates.log="bar {rev}\n"
459 bar 0
494 bar 0
460 $ hg log -r 0 --config ui.logtemplate="foo {rev}\n" \
495 $ hg log -r 0 --config ui.logtemplate="foo {rev}\n" \
461 > --config command-templates.log="bar {rev}\n"
496 > --config command-templates.log="bar {rev}\n"
462 bar 0
497 bar 0
463
498
464
499
465 -f and multiple filelog heads
500 -f and multiple filelog heads
466
501
467 $ hg up -q 2
502 $ hg up -q 2
468 $ hg log -f g --template '{rev}\n'
503 $ hg log -f g --template '{rev}\n'
469 2
504 2
470 1
505 1
471 0
506 0
472 $ hg up -q tip
507 $ hg up -q tip
473 $ hg log -f g --template '{rev}\n'
508 $ hg log -f g --template '{rev}\n'
474 3
509 3
475 2
510 2
476 0
511 0
477
512
478 follow files from the specified revisions (issue4959)
513 follow files from the specified revisions (issue4959)
479
514
480 $ hg log -G -T '{rev} {files},{file_copies % " {source}->{name}"}\n'
515 $ hg log -G -T '{rev} {files},{file_copies % " {source}->{name}"}\n'
481 @ 4 dir/b e, dir/b->e
516 @ 4 dir/b e, dir/b->e
482 |
517 |
483 o 3 a b d g, a->b f->g
518 o 3 a b d g, a->b f->g
484 |
519 |
485 o 2 b dir/b f g, b->dir/b
520 o 2 b dir/b f g, b->dir/b
486 |
521 |
487 o 1 b g, a->b f->g
522 o 1 b g, a->b f->g
488 |
523 |
489 o 0 a f,
524 o 0 a f,
490
525
491
526
492 $ hg log -T '{rev}\n' -fr 4 e
527 $ hg log -T '{rev}\n' -fr 4 e
493 4
528 4
494 2
529 2
495 1
530 1
496 0
531 0
497 $ hg log -T '{rev}\n' -fr 2 g
532 $ hg log -T '{rev}\n' -fr 2 g
498 2
533 2
499 1
534 1
500 0
535 0
501 $ hg log -T '{rev}\n' -fr '2+3' g
536 $ hg log -T '{rev}\n' -fr '2+3' g
502 3
537 3
503 2
538 2
504 1
539 1
505 0
540 0
506
541
507 follow files from the specified revisions with glob patterns (issue5053)
542 follow files from the specified revisions with glob patterns (issue5053)
508 (BROKEN: should follow copies from e@4)
543 (BROKEN: should follow copies from e@4)
509
544
510 $ hg log -T '{rev}\n' -fr4 e -X '[abcdfg]'
545 $ hg log -T '{rev}\n' -fr4 e -X '[abcdfg]'
511 4
546 4
512 2 (false !)
547 2 (false !)
513 1 (false !)
548 1 (false !)
514 0 (false !)
549 0 (false !)
515
550
516 follow files from the specified revisions with missing patterns
551 follow files from the specified revisions with missing patterns
517
552
518 $ hg log -T '{rev}\n' -fr4 e x
553 $ hg log -T '{rev}\n' -fr4 e x
519 abort: cannot follow file not in any of the specified revisions: "x"
554 abort: cannot follow file not in any of the specified revisions: "x"
520 [255]
555 [255]
521
556
522 follow files from the specified revisions with directory patterns
557 follow files from the specified revisions with directory patterns
523 (BROKEN: should follow copies from dir/b@2)
558 (BROKEN: should follow copies from dir/b@2)
524
559
525 $ hg log -T '{rev}\n' -fr2 dir/b dir
560 $ hg log -T '{rev}\n' -fr2 dir/b dir
526 2
561 2
527 1 (false !)
562 1 (false !)
528 0 (false !)
563 0 (false !)
529
564
530 follow files from multiple revisions, but the pattern is missing in
565 follow files from multiple revisions, but the pattern is missing in
531 one of the specified revisions
566 one of the specified revisions
532
567
533 $ hg log -T '{rev}\n' -fr'2+4' dir/b e
568 $ hg log -T '{rev}\n' -fr'2+4' dir/b e
534 e: no such file in rev f8954cd4dc1f
569 e: no such file in rev f8954cd4dc1f
535 dir/b: no such file in rev 7e4639b4691b
570 dir/b: no such file in rev 7e4639b4691b
536 4
571 4
537 2
572 2
538 1
573 1
539 0
574 0
540
575
541 follow files from multiple revisions, and the pattern matches a file in
576 follow files from multiple revisions, and the pattern matches a file in
542 one revision but matches a directory in another:
577 one revision but matches a directory in another:
543 (BROKEN: should follow copies from dir/b@2 and dir/b/g@5)
578 (BROKEN: should follow copies from dir/b@2 and dir/b/g@5)
544 (BROKEN: the revision 4 should not be included since dir/b/g@5 is unchanged)
579 (BROKEN: the revision 4 should not be included since dir/b/g@5 is unchanged)
545
580
546 $ mkdir -p dir/b
581 $ mkdir -p dir/b
547 $ hg mv g dir/b
582 $ hg mv g dir/b
548 $ hg ci -m 'make dir/b a directory'
583 $ hg ci -m 'make dir/b a directory'
549
584
550 $ hg log -T '{rev}\n' -fr'2+5' dir/b
585 $ hg log -T '{rev}\n' -fr'2+5' dir/b
551 5
586 5
552 4
587 4
553 3 (false !)
588 3 (false !)
554 2
589 2
555 1 (false !)
590 1 (false !)
556 0 (false !)
591 0 (false !)
557
592
558 $ hg --config extensions.strip= strip -r. --no-backup
593 $ hg --config extensions.strip= strip -r. --no-backup
559 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
594 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
560
595
561 follow files from the specified revisions across copies with -p/--patch
596 follow files from the specified revisions across copies with -p/--patch
562
597
563 $ hg log -T '== rev: {rev},{file_copies % " {source}->{name}"} ==\n' -fpr 4 e g
598 $ hg log -T '== rev: {rev},{file_copies % " {source}->{name}"} ==\n' -fpr 4 e g
564 == rev: 4, dir/b->e ==
599 == rev: 4, dir/b->e ==
565 diff -r 2ca5ba701980 -r 7e4639b4691b e
600 diff -r 2ca5ba701980 -r 7e4639b4691b e
566 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
601 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
567 +++ b/e Thu Jan 01 00:00:05 1970 +0000
602 +++ b/e Thu Jan 01 00:00:05 1970 +0000
568 @@ -0,0 +1,1 @@
603 @@ -0,0 +1,1 @@
569 +a
604 +a
570
605
571 == rev: 3, a->b f->g ==
606 == rev: 3, a->b f->g ==
572 diff -r f8954cd4dc1f -r 2ca5ba701980 g
607 diff -r f8954cd4dc1f -r 2ca5ba701980 g
573 --- a/g Thu Jan 01 00:00:03 1970 +0000
608 --- a/g Thu Jan 01 00:00:03 1970 +0000
574 +++ b/g Thu Jan 01 00:00:04 1970 +0000
609 +++ b/g Thu Jan 01 00:00:04 1970 +0000
575 @@ -1,2 +1,2 @@
610 @@ -1,2 +1,2 @@
576 f
611 f
577 -g
612 -g
578 +f
613 +f
579
614
580 == rev: 2, b->dir/b ==
615 == rev: 2, b->dir/b ==
581 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
616 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
582 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
617 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
583 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
618 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
584 @@ -0,0 +1,1 @@
619 @@ -0,0 +1,1 @@
585 +a
620 +a
586 diff -r d89b0a12d229 -r f8954cd4dc1f f
621 diff -r d89b0a12d229 -r f8954cd4dc1f f
587 --- a/f Thu Jan 01 00:00:02 1970 +0000
622 --- a/f Thu Jan 01 00:00:02 1970 +0000
588 +++ b/f Thu Jan 01 00:00:03 1970 +0000
623 +++ b/f Thu Jan 01 00:00:03 1970 +0000
589 @@ -1,1 +1,2 @@
624 @@ -1,1 +1,2 @@
590 f
625 f
591 +f
626 +f
592
627
593 == rev: 1, a->b f->g ==
628 == rev: 1, a->b f->g ==
594 diff -r 9161b9aeaf16 -r d89b0a12d229 b
629 diff -r 9161b9aeaf16 -r d89b0a12d229 b
595 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
630 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
596 +++ b/b Thu Jan 01 00:00:02 1970 +0000
631 +++ b/b Thu Jan 01 00:00:02 1970 +0000
597 @@ -0,0 +1,1 @@
632 @@ -0,0 +1,1 @@
598 +a
633 +a
599
634
600 == rev: 0, ==
635 == rev: 0, ==
601 diff -r 000000000000 -r 9161b9aeaf16 a
636 diff -r 000000000000 -r 9161b9aeaf16 a
602 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
637 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
603 +++ b/a Thu Jan 01 00:00:01 1970 +0000
638 +++ b/a Thu Jan 01 00:00:01 1970 +0000
604 @@ -0,0 +1,1 @@
639 @@ -0,0 +1,1 @@
605 +a
640 +a
606 diff -r 000000000000 -r 9161b9aeaf16 f
641 diff -r 000000000000 -r 9161b9aeaf16 f
607 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
642 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
608 +++ b/f Thu Jan 01 00:00:01 1970 +0000
643 +++ b/f Thu Jan 01 00:00:01 1970 +0000
609 @@ -0,0 +1,1 @@
644 @@ -0,0 +1,1 @@
610 +f
645 +f
611
646
612
647
613 log copies with --copies
648 log copies with --copies
614
649
615 $ hg log -vC --template '{rev} {file_copies}\n'
650 $ hg log -vC --template '{rev} {file_copies}\n'
616 4 e (dir/b)
651 4 e (dir/b)
617 3 b (a)g (f)
652 3 b (a)g (f)
618 2 dir/b (b)
653 2 dir/b (b)
619 1 b (a)g (f)
654 1 b (a)g (f)
620 0
655 0
621
656
622 log copies switch without --copies, with old filecopy template
657 log copies switch without --copies, with old filecopy template
623
658
624 $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
659 $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
625 4
660 4
626 3
661 3
627 2
662 2
628 1
663 1
629 0
664 0
630
665
631 log copies switch with --copies
666 log copies switch with --copies
632
667
633 $ hg log -vC --template '{rev} {file_copies_switch}\n'
668 $ hg log -vC --template '{rev} {file_copies_switch}\n'
634 4 e (dir/b)
669 4 e (dir/b)
635 3 b (a)g (f)
670 3 b (a)g (f)
636 2 dir/b (b)
671 2 dir/b (b)
637 1 b (a)g (f)
672 1 b (a)g (f)
638 0
673 0
639
674
640
675
641 log copies with hardcoded style and with --style=default
676 log copies with hardcoded style and with --style=default
642
677
643 $ hg log -vC -r4
678 $ hg log -vC -r4
644 changeset: 4:7e4639b4691b
679 changeset: 4:7e4639b4691b
645 tag: tip
680 tag: tip
646 user: test
681 user: test
647 date: Thu Jan 01 00:00:05 1970 +0000
682 date: Thu Jan 01 00:00:05 1970 +0000
648 files: dir/b e
683 files: dir/b e
649 copies: e (dir/b)
684 copies: e (dir/b)
650 description:
685 description:
651 e
686 e
652
687
653
688
654 $ hg log -vC -r4 --style=default
689 $ hg log -vC -r4 --style=default
655 changeset: 4:7e4639b4691b
690 changeset: 4:7e4639b4691b
656 tag: tip
691 tag: tip
657 user: test
692 user: test
658 date: Thu Jan 01 00:00:05 1970 +0000
693 date: Thu Jan 01 00:00:05 1970 +0000
659 files: dir/b e
694 files: dir/b e
660 copies: e (dir/b)
695 copies: e (dir/b)
661 description:
696 description:
662 e
697 e
663
698
664
699
665 $ hg log -vC -r4 -Tjson
700 $ hg log -vC -r4 -Tjson
666 [
701 [
667 {
702 {
668 "bookmarks": [],
703 "bookmarks": [],
669 "branch": "default",
704 "branch": "default",
670 "copies": {"e": "dir/b"},
705 "copies": {"e": "dir/b"},
671 "date": [5, 0],
706 "date": [5, 0],
672 "desc": "e",
707 "desc": "e",
673 "files": ["dir/b", "e"],
708 "files": ["dir/b", "e"],
674 "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3",
709 "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3",
675 "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"],
710 "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"],
676 "phase": "draft",
711 "phase": "draft",
677 "rev": 4,
712 "rev": 4,
678 "tags": ["tip"],
713 "tags": ["tip"],
679 "user": "test"
714 "user": "test"
680 }
715 }
681 ]
716 ]
682
717
683 log copies, non-linear manifest
718 log copies, non-linear manifest
684
719
685 $ hg up -C 3
720 $ hg up -C 3
686 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
721 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
687 $ hg mv dir/b e
722 $ hg mv dir/b e
688 $ echo foo > foo
723 $ echo foo > foo
689 $ hg ci -Ame2 -d '6 0'
724 $ hg ci -Ame2 -d '6 0'
690 adding foo
725 adding foo
691 created new head
726 created new head
692 $ hg log -v --template '{rev} {file_copies}\n' -r 5
727 $ hg log -v --template '{rev} {file_copies}\n' -r 5
693 5 e (dir/b)
728 5 e (dir/b)
694
729
695
730
696 log copies, execute bit set
731 log copies, execute bit set
697
732
698 #if execbit
733 #if execbit
699 $ chmod +x e
734 $ chmod +x e
700 $ hg ci -me3 -d '7 0'
735 $ hg ci -me3 -d '7 0'
701 $ hg log -v --template '{rev} {file_copies}\n' -r 6
736 $ hg log -v --template '{rev} {file_copies}\n' -r 6
702 6
737 6
703 #endif
738 #endif
704
739
705 log copies, empty set
740 log copies, empty set
706
741
707 $ hg log --copies -r '0 and not 0'
742 $ hg log --copies -r '0 and not 0'
708
743
709 log -p d
744 log -p d
710
745
711 $ hg log -pv d
746 $ hg log -pv d
712 changeset: 3:2ca5ba701980
747 changeset: 3:2ca5ba701980
713 user: test
748 user: test
714 date: Thu Jan 01 00:00:04 1970 +0000
749 date: Thu Jan 01 00:00:04 1970 +0000
715 files: a b d g
750 files: a b d g
716 description:
751 description:
717 d
752 d
718
753
719
754
720 diff -r f8954cd4dc1f -r 2ca5ba701980 d
755 diff -r f8954cd4dc1f -r 2ca5ba701980 d
721 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
756 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
722 +++ b/d Thu Jan 01 00:00:04 1970 +0000
757 +++ b/d Thu Jan 01 00:00:04 1970 +0000
723 @@ -0,0 +1,1 @@
758 @@ -0,0 +1,1 @@
724 +a
759 +a
725
760
726
761
727
762
728 log --removed file
763 log --removed file
729
764
730 $ hg log --removed -v a
765 $ hg log --removed -v a
731 changeset: 3:2ca5ba701980
766 changeset: 3:2ca5ba701980
732 user: test
767 user: test
733 date: Thu Jan 01 00:00:04 1970 +0000
768 date: Thu Jan 01 00:00:04 1970 +0000
734 files: a b d g
769 files: a b d g
735 description:
770 description:
736 d
771 d
737
772
738
773
739 changeset: 0:9161b9aeaf16
774 changeset: 0:9161b9aeaf16
740 user: test
775 user: test
741 date: Thu Jan 01 00:00:01 1970 +0000
776 date: Thu Jan 01 00:00:01 1970 +0000
742 files: a f
777 files: a f
743 description:
778 description:
744 a
779 a
745
780
746
781
747
782
748 log --removed revrange file
783 log --removed revrange file
749
784
750 $ hg log --removed -v -r0:2 a
785 $ hg log --removed -v -r0:2 a
751 changeset: 0:9161b9aeaf16
786 changeset: 0:9161b9aeaf16
752 user: test
787 user: test
753 date: Thu Jan 01 00:00:01 1970 +0000
788 date: Thu Jan 01 00:00:01 1970 +0000
754 files: a f
789 files: a f
755 description:
790 description:
756 a
791 a
757
792
758
793
759 $ cd ..
794 $ cd ..
760
795
761 log --follow tests
796 log --follow tests
762
797
763 $ hg init follow
798 $ hg init follow
764 $ cd follow
799 $ cd follow
765
800
766 $ echo base > base
801 $ echo base > base
767 $ hg ci -Ambase -d '1 0'
802 $ hg ci -Ambase -d '1 0'
768 adding base
803 adding base
769
804
770 $ echo r1 >> base
805 $ echo r1 >> base
771 $ hg ci -Amr1 -d '1 0'
806 $ hg ci -Amr1 -d '1 0'
772 $ echo r2 >> base
807 $ echo r2 >> base
773 $ hg ci -Amr2 -d '1 0'
808 $ hg ci -Amr2 -d '1 0'
774
809
775 $ hg up -C 1
810 $ hg up -C 1
776 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
811 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
777 $ echo b1 > b1
812 $ echo b1 > b1
778
813
779 log -r "follow('set:clean()')"
814 log -r "follow('set:clean()')"
780
815
781 $ hg log -r "follow('set:clean()')"
816 $ hg log -r "follow('set:clean()')"
782 changeset: 0:67e992f2c4f3
817 changeset: 0:67e992f2c4f3
783 user: test
818 user: test
784 date: Thu Jan 01 00:00:01 1970 +0000
819 date: Thu Jan 01 00:00:01 1970 +0000
785 summary: base
820 summary: base
786
821
787 changeset: 1:3d5bf5654eda
822 changeset: 1:3d5bf5654eda
788 user: test
823 user: test
789 date: Thu Jan 01 00:00:01 1970 +0000
824 date: Thu Jan 01 00:00:01 1970 +0000
790 summary: r1
825 summary: r1
791
826
792
827
793 $ hg ci -Amb1 -d '1 0'
828 $ hg ci -Amb1 -d '1 0'
794 adding b1
829 adding b1
795 created new head
830 created new head
796
831
797
832
798 log -f
833 log -f
799
834
800 $ hg log -f
835 $ hg log -f
801 changeset: 3:e62f78d544b4
836 changeset: 3:e62f78d544b4
802 tag: tip
837 tag: tip
803 parent: 1:3d5bf5654eda
838 parent: 1:3d5bf5654eda
804 user: test
839 user: test
805 date: Thu Jan 01 00:00:01 1970 +0000
840 date: Thu Jan 01 00:00:01 1970 +0000
806 summary: b1
841 summary: b1
807
842
808 changeset: 1:3d5bf5654eda
843 changeset: 1:3d5bf5654eda
809 user: test
844 user: test
810 date: Thu Jan 01 00:00:01 1970 +0000
845 date: Thu Jan 01 00:00:01 1970 +0000
811 summary: r1
846 summary: r1
812
847
813 changeset: 0:67e992f2c4f3
848 changeset: 0:67e992f2c4f3
814 user: test
849 user: test
815 date: Thu Jan 01 00:00:01 1970 +0000
850 date: Thu Jan 01 00:00:01 1970 +0000
816 summary: base
851 summary: base
817
852
818
853
819 log -r follow('glob:b*')
854 log -r follow('glob:b*')
820
855
821 $ hg log -r "follow('glob:b*')"
856 $ hg log -r "follow('glob:b*')"
822 changeset: 0:67e992f2c4f3
857 changeset: 0:67e992f2c4f3
823 user: test
858 user: test
824 date: Thu Jan 01 00:00:01 1970 +0000
859 date: Thu Jan 01 00:00:01 1970 +0000
825 summary: base
860 summary: base
826
861
827 changeset: 1:3d5bf5654eda
862 changeset: 1:3d5bf5654eda
828 user: test
863 user: test
829 date: Thu Jan 01 00:00:01 1970 +0000
864 date: Thu Jan 01 00:00:01 1970 +0000
830 summary: r1
865 summary: r1
831
866
832 changeset: 3:e62f78d544b4
867 changeset: 3:e62f78d544b4
833 tag: tip
868 tag: tip
834 parent: 1:3d5bf5654eda
869 parent: 1:3d5bf5654eda
835 user: test
870 user: test
836 date: Thu Jan 01 00:00:01 1970 +0000
871 date: Thu Jan 01 00:00:01 1970 +0000
837 summary: b1
872 summary: b1
838
873
839 log -f -r '1 + 4'
874 log -f -r '1 + 4'
840
875
841 $ hg up -C 0
876 $ hg up -C 0
842 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
877 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
843 $ echo b2 > b2
878 $ echo b2 > b2
844 $ hg ci -Amb2 -d '1 0'
879 $ hg ci -Amb2 -d '1 0'
845 adding b2
880 adding b2
846 created new head
881 created new head
847 $ hg log -f -r '1 + 4'
882 $ hg log -f -r '1 + 4'
848 changeset: 4:ddb82e70d1a1
883 changeset: 4:ddb82e70d1a1
849 tag: tip
884 tag: tip
850 parent: 0:67e992f2c4f3
885 parent: 0:67e992f2c4f3
851 user: test
886 user: test
852 date: Thu Jan 01 00:00:01 1970 +0000
887 date: Thu Jan 01 00:00:01 1970 +0000
853 summary: b2
888 summary: b2
854
889
855 changeset: 1:3d5bf5654eda
890 changeset: 1:3d5bf5654eda
856 user: test
891 user: test
857 date: Thu Jan 01 00:00:01 1970 +0000
892 date: Thu Jan 01 00:00:01 1970 +0000
858 summary: r1
893 summary: r1
859
894
860 changeset: 0:67e992f2c4f3
895 changeset: 0:67e992f2c4f3
861 user: test
896 user: test
862 date: Thu Jan 01 00:00:01 1970 +0000
897 date: Thu Jan 01 00:00:01 1970 +0000
863 summary: base
898 summary: base
864
899
865
900
866 log -fr with aliases: 'A' should be expanded, but 'reverse()' should have no
901 log -fr with aliases: 'A' should be expanded, but 'reverse()' should have no
867 effect
902 effect
868
903
869 $ hg log --config 'revsetalias.reverse(x)=x' --config 'revsetalias.A=1+4' -qfrA
904 $ hg log --config 'revsetalias.reverse(x)=x' --config 'revsetalias.A=1+4' -qfrA
870 4:ddb82e70d1a1
905 4:ddb82e70d1a1
871 1:3d5bf5654eda
906 1:3d5bf5654eda
872 0:67e992f2c4f3
907 0:67e992f2c4f3
873
908
874 log -r "follow('set:grep(b2)')"
909 log -r "follow('set:grep(b2)')"
875
910
876 $ hg log -r "follow('set:grep(b2)')"
911 $ hg log -r "follow('set:grep(b2)')"
877 changeset: 4:ddb82e70d1a1
912 changeset: 4:ddb82e70d1a1
878 tag: tip
913 tag: tip
879 parent: 0:67e992f2c4f3
914 parent: 0:67e992f2c4f3
880 user: test
915 user: test
881 date: Thu Jan 01 00:00:01 1970 +0000
916 date: Thu Jan 01 00:00:01 1970 +0000
882 summary: b2
917 summary: b2
883
918
884 log -r "follow('set:grep(b2)', 4)"
919 log -r "follow('set:grep(b2)', 4)"
885
920
886 $ hg up -qC 0
921 $ hg up -qC 0
887 $ hg log -r "follow('set:grep(b2)', 4)"
922 $ hg log -r "follow('set:grep(b2)', 4)"
888 changeset: 4:ddb82e70d1a1
923 changeset: 4:ddb82e70d1a1
889 tag: tip
924 tag: tip
890 parent: 0:67e992f2c4f3
925 parent: 0:67e992f2c4f3
891 user: test
926 user: test
892 date: Thu Jan 01 00:00:01 1970 +0000
927 date: Thu Jan 01 00:00:01 1970 +0000
893 summary: b2
928 summary: b2
894
929
895
930
896 follow files starting from multiple revisions:
931 follow files starting from multiple revisions:
897
932
898 $ hg log -T '{rev}: {files}\n' -r "follow('glob:b?', startrev=2+3+4)"
933 $ hg log -T '{rev}: {files}\n' -r "follow('glob:b?', startrev=2+3+4)"
899 3: b1
934 3: b1
900 4: b2
935 4: b2
901
936
902 follow files starting from empty revision:
937 follow files starting from empty revision:
903
938
904 $ hg log -T '{rev}: {files}\n' -r "follow('glob:*', startrev=.-.)"
939 $ hg log -T '{rev}: {files}\n' -r "follow('glob:*', startrev=.-.)"
905
940
906 follow starting from revisions:
941 follow starting from revisions:
907
942
908 $ hg log -Gq -r "follow(startrev=2+4)"
943 $ hg log -Gq -r "follow(startrev=2+4)"
909 o 4:ddb82e70d1a1
944 o 4:ddb82e70d1a1
910 |
945 |
911 | o 2:60c670bf5b30
946 | o 2:60c670bf5b30
912 | |
947 | |
913 | o 1:3d5bf5654eda
948 | o 1:3d5bf5654eda
914 |/
949 |/
915 @ 0:67e992f2c4f3
950 @ 0:67e992f2c4f3
916
951
917
952
918 follow the current revision:
953 follow the current revision:
919
954
920 $ hg log -Gq -r "follow()"
955 $ hg log -Gq -r "follow()"
921 @ 0:67e992f2c4f3
956 @ 0:67e992f2c4f3
922
957
923
958
924 $ hg up -qC 4
959 $ hg up -qC 4
925
960
926 log -f -r null
961 log -f -r null
927
962
928 $ hg log -f -r null
963 $ hg log -f -r null
929 changeset: -1:000000000000
964 changeset: -1:000000000000
930 user:
965 user:
931 date: Thu Jan 01 00:00:00 1970 +0000
966 date: Thu Jan 01 00:00:00 1970 +0000
932
967
933 $ hg log -f -r null -G
968 $ hg log -f -r null -G
934 o changeset: -1:000000000000
969 o changeset: -1:000000000000
935 user:
970 user:
936 date: Thu Jan 01 00:00:00 1970 +0000
971 date: Thu Jan 01 00:00:00 1970 +0000
937
972
938
973
939
974
940 log -f with null parent
975 log -f with null parent
941
976
942 $ hg up -C null
977 $ hg up -C null
943 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
978 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
944 $ hg log -f
979 $ hg log -f
945
980
946
981
947 log -r . with two parents
982 log -r . with two parents
948
983
949 $ hg up -C 3
984 $ hg up -C 3
950 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
985 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
951 $ hg merge tip
986 $ hg merge tip
952 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
987 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
953 (branch merge, don't forget to commit)
988 (branch merge, don't forget to commit)
954 $ hg log -r .
989 $ hg log -r .
955 changeset: 3:e62f78d544b4
990 changeset: 3:e62f78d544b4
956 parent: 1:3d5bf5654eda
991 parent: 1:3d5bf5654eda
957 user: test
992 user: test
958 date: Thu Jan 01 00:00:01 1970 +0000
993 date: Thu Jan 01 00:00:01 1970 +0000
959 summary: b1
994 summary: b1
960
995
961
996
962
997
963 log -r . with one parent
998 log -r . with one parent
964
999
965 $ hg ci -mm12 -d '1 0'
1000 $ hg ci -mm12 -d '1 0'
966 $ hg log -r .
1001 $ hg log -r .
967 changeset: 5:302e9dd6890d
1002 changeset: 5:302e9dd6890d
968 tag: tip
1003 tag: tip
969 parent: 3:e62f78d544b4
1004 parent: 3:e62f78d544b4
970 parent: 4:ddb82e70d1a1
1005 parent: 4:ddb82e70d1a1
971 user: test
1006 user: test
972 date: Thu Jan 01 00:00:01 1970 +0000
1007 date: Thu Jan 01 00:00:01 1970 +0000
973 summary: m12
1008 summary: m12
974
1009
975
1010
976 $ echo postm >> b1
1011 $ echo postm >> b1
977 $ hg ci -Amb1.1 -d'1 0'
1012 $ hg ci -Amb1.1 -d'1 0'
978
1013
979
1014
980 log --follow-first
1015 log --follow-first
981
1016
982 $ hg log --follow-first
1017 $ hg log --follow-first
983 changeset: 6:2404bbcab562
1018 changeset: 6:2404bbcab562
984 tag: tip
1019 tag: tip
985 user: test
1020 user: test
986 date: Thu Jan 01 00:00:01 1970 +0000
1021 date: Thu Jan 01 00:00:01 1970 +0000
987 summary: b1.1
1022 summary: b1.1
988
1023
989 changeset: 5:302e9dd6890d
1024 changeset: 5:302e9dd6890d
990 parent: 3:e62f78d544b4
1025 parent: 3:e62f78d544b4
991 parent: 4:ddb82e70d1a1
1026 parent: 4:ddb82e70d1a1
992 user: test
1027 user: test
993 date: Thu Jan 01 00:00:01 1970 +0000
1028 date: Thu Jan 01 00:00:01 1970 +0000
994 summary: m12
1029 summary: m12
995
1030
996 changeset: 3:e62f78d544b4
1031 changeset: 3:e62f78d544b4
997 parent: 1:3d5bf5654eda
1032 parent: 1:3d5bf5654eda
998 user: test
1033 user: test
999 date: Thu Jan 01 00:00:01 1970 +0000
1034 date: Thu Jan 01 00:00:01 1970 +0000
1000 summary: b1
1035 summary: b1
1001
1036
1002 changeset: 1:3d5bf5654eda
1037 changeset: 1:3d5bf5654eda
1003 user: test
1038 user: test
1004 date: Thu Jan 01 00:00:01 1970 +0000
1039 date: Thu Jan 01 00:00:01 1970 +0000
1005 summary: r1
1040 summary: r1
1006
1041
1007 changeset: 0:67e992f2c4f3
1042 changeset: 0:67e992f2c4f3
1008 user: test
1043 user: test
1009 date: Thu Jan 01 00:00:01 1970 +0000
1044 date: Thu Jan 01 00:00:01 1970 +0000
1010 summary: base
1045 summary: base
1011
1046
1012
1047
1013
1048
1014 log -P 2
1049 log -P 2
1015
1050
1016 $ hg log -P 2
1051 $ hg log -P 2
1017 changeset: 6:2404bbcab562
1052 changeset: 6:2404bbcab562
1018 tag: tip
1053 tag: tip
1019 user: test
1054 user: test
1020 date: Thu Jan 01 00:00:01 1970 +0000
1055 date: Thu Jan 01 00:00:01 1970 +0000
1021 summary: b1.1
1056 summary: b1.1
1022
1057
1023 changeset: 5:302e9dd6890d
1058 changeset: 5:302e9dd6890d
1024 parent: 3:e62f78d544b4
1059 parent: 3:e62f78d544b4
1025 parent: 4:ddb82e70d1a1
1060 parent: 4:ddb82e70d1a1
1026 user: test
1061 user: test
1027 date: Thu Jan 01 00:00:01 1970 +0000
1062 date: Thu Jan 01 00:00:01 1970 +0000
1028 summary: m12
1063 summary: m12
1029
1064
1030 changeset: 4:ddb82e70d1a1
1065 changeset: 4:ddb82e70d1a1
1031 parent: 0:67e992f2c4f3
1066 parent: 0:67e992f2c4f3
1032 user: test
1067 user: test
1033 date: Thu Jan 01 00:00:01 1970 +0000
1068 date: Thu Jan 01 00:00:01 1970 +0000
1034 summary: b2
1069 summary: b2
1035
1070
1036 changeset: 3:e62f78d544b4
1071 changeset: 3:e62f78d544b4
1037 parent: 1:3d5bf5654eda
1072 parent: 1:3d5bf5654eda
1038 user: test
1073 user: test
1039 date: Thu Jan 01 00:00:01 1970 +0000
1074 date: Thu Jan 01 00:00:01 1970 +0000
1040 summary: b1
1075 summary: b1
1041
1076
1042
1077
1043
1078
1044 log -r tip -p --git
1079 log -r tip -p --git
1045
1080
1046 $ hg log -r tip -p --git
1081 $ hg log -r tip -p --git
1047 changeset: 6:2404bbcab562
1082 changeset: 6:2404bbcab562
1048 tag: tip
1083 tag: tip
1049 user: test
1084 user: test
1050 date: Thu Jan 01 00:00:01 1970 +0000
1085 date: Thu Jan 01 00:00:01 1970 +0000
1051 summary: b1.1
1086 summary: b1.1
1052
1087
1053 diff --git a/b1 b/b1
1088 diff --git a/b1 b/b1
1054 --- a/b1
1089 --- a/b1
1055 +++ b/b1
1090 +++ b/b1
1056 @@ -1,1 +1,2 @@
1091 @@ -1,1 +1,2 @@
1057 b1
1092 b1
1058 +postm
1093 +postm
1059
1094
1060
1095
1061
1096
1062 log -r ""
1097 log -r ""
1063
1098
1064 $ hg log -r ''
1099 $ hg log -r ''
1065 hg: parse error: empty query
1100 hg: parse error: empty query
1066 [10]
1101 [10]
1067
1102
1068 log -r <some unknown node id>
1103 log -r <some unknown node id>
1069
1104
1070 $ hg log -r 1000000000000000000000000000000000000000
1105 $ hg log -r 1000000000000000000000000000000000000000
1071 abort: unknown revision '1000000000000000000000000000000000000000'
1106 abort: unknown revision '1000000000000000000000000000000000000000'
1072 [255]
1107 [255]
1073
1108
1074 log -k r1
1109 log -k r1
1075
1110
1076 $ hg log -k r1
1111 $ hg log -k r1
1077 changeset: 1:3d5bf5654eda
1112 changeset: 1:3d5bf5654eda
1078 user: test
1113 user: test
1079 date: Thu Jan 01 00:00:01 1970 +0000
1114 date: Thu Jan 01 00:00:01 1970 +0000
1080 summary: r1
1115 summary: r1
1081
1116
1082 log -p -l2 --color=always
1117 log -p -l2 --color=always
1083
1118
1084 $ hg --config extensions.color= --config color.mode=ansi \
1119 $ hg --config extensions.color= --config color.mode=ansi \
1085 > log -p -l2 --color=always
1120 > log -p -l2 --color=always
1086 \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc)
1121 \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc)
1087 tag: tip
1122 tag: tip
1088 user: test
1123 user: test
1089 date: Thu Jan 01 00:00:01 1970 +0000
1124 date: Thu Jan 01 00:00:01 1970 +0000
1090 summary: b1.1
1125 summary: b1.1
1091
1126
1092 \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc)
1127 \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc)
1093 \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
1128 \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
1094 \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
1129 \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
1095 \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
1130 \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
1096 b1
1131 b1
1097 \x1b[0;32m+postm\x1b[0m (esc)
1132 \x1b[0;32m+postm\x1b[0m (esc)
1098
1133
1099 \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc)
1134 \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc)
1100 parent: 3:e62f78d544b4
1135 parent: 3:e62f78d544b4
1101 parent: 4:ddb82e70d1a1
1136 parent: 4:ddb82e70d1a1
1102 user: test
1137 user: test
1103 date: Thu Jan 01 00:00:01 1970 +0000
1138 date: Thu Jan 01 00:00:01 1970 +0000
1104 summary: m12
1139 summary: m12
1105
1140
1106 \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc)
1141 \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc)
1107 \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc)
1142 \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc)
1108 \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
1143 \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
1109 \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc)
1144 \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc)
1110 \x1b[0;32m+b2\x1b[0m (esc)
1145 \x1b[0;32m+b2\x1b[0m (esc)
1111
1146
1112
1147
1113
1148
1114 log -r tip --stat
1149 log -r tip --stat
1115
1150
1116 $ hg log -r tip --stat
1151 $ hg log -r tip --stat
1117 changeset: 6:2404bbcab562
1152 changeset: 6:2404bbcab562
1118 tag: tip
1153 tag: tip
1119 user: test
1154 user: test
1120 date: Thu Jan 01 00:00:01 1970 +0000
1155 date: Thu Jan 01 00:00:01 1970 +0000
1121 summary: b1.1
1156 summary: b1.1
1122
1157
1123 b1 | 1 +
1158 b1 | 1 +
1124 1 files changed, 1 insertions(+), 0 deletions(-)
1159 1 files changed, 1 insertions(+), 0 deletions(-)
1125
1160
1126
1161
1127 $ cd ..
1162 $ cd ..
1128
1163
1129 log --follow --patch FILE in repository where linkrev isn't trustworthy
1164 log --follow --patch FILE in repository where linkrev isn't trustworthy
1130 (issue5376, issue6124)
1165 (issue5376, issue6124)
1131
1166
1132 $ hg init follow-dup
1167 $ hg init follow-dup
1133 $ cd follow-dup
1168 $ cd follow-dup
1134 $ cat <<EOF >> .hg/hgrc
1169 $ cat <<EOF >> .hg/hgrc
1135 > [command-templates]
1170 > [command-templates]
1136 > log = '=== {rev}: {desc}\n'
1171 > log = '=== {rev}: {desc}\n'
1137 > [diff]
1172 > [diff]
1138 > nodates = True
1173 > nodates = True
1139 > EOF
1174 > EOF
1140 $ echo 0 >> a
1175 $ echo 0 >> a
1141 $ hg ci -qAm 'a0'
1176 $ hg ci -qAm 'a0'
1142 $ echo 1 >> a
1177 $ echo 1 >> a
1143 $ hg ci -m 'a1'
1178 $ hg ci -m 'a1'
1144 $ hg up -q 0
1179 $ hg up -q 0
1145 $ echo 1 >> a
1180 $ echo 1 >> a
1146 $ touch b
1181 $ touch b
1147 $ hg ci -qAm 'a1 with b'
1182 $ hg ci -qAm 'a1 with b'
1148 $ echo 3 >> a
1183 $ echo 3 >> a
1149 $ hg ci -m 'a3'
1184 $ hg ci -m 'a3'
1150
1185
1151 fctx.rev() == 2, but fctx.linkrev() == 1
1186 fctx.rev() == 2, but fctx.linkrev() == 1
1152
1187
1153 $ hg log -pf a
1188 $ hg log -pf a
1154 === 3: a3
1189 === 3: a3
1155 diff -r 4ea02ba94d66 -r e7a6331a34f0 a
1190 diff -r 4ea02ba94d66 -r e7a6331a34f0 a
1156 --- a/a
1191 --- a/a
1157 +++ b/a
1192 +++ b/a
1158 @@ -1,2 +1,3 @@
1193 @@ -1,2 +1,3 @@
1159 0
1194 0
1160 1
1195 1
1161 +3
1196 +3
1162
1197
1163 === 2: a1 with b
1198 === 2: a1 with b
1164 diff -r 49b5e81287e2 -r 4ea02ba94d66 a
1199 diff -r 49b5e81287e2 -r 4ea02ba94d66 a
1165 --- a/a
1200 --- a/a
1166 +++ b/a
1201 +++ b/a
1167 @@ -1,1 +1,2 @@
1202 @@ -1,1 +1,2 @@
1168 0
1203 0
1169 +1
1204 +1
1170
1205
1171 === 0: a0
1206 === 0: a0
1172 diff -r 000000000000 -r 49b5e81287e2 a
1207 diff -r 000000000000 -r 49b5e81287e2 a
1173 --- /dev/null
1208 --- /dev/null
1174 +++ b/a
1209 +++ b/a
1175 @@ -0,0 +1,1 @@
1210 @@ -0,0 +1,1 @@
1176 +0
1211 +0
1177
1212
1178 $ hg log -pr . a
1213 $ hg log -pr . a
1179 === 3: a3
1214 === 3: a3
1180 diff -r 4ea02ba94d66 -r e7a6331a34f0 a
1215 diff -r 4ea02ba94d66 -r e7a6331a34f0 a
1181 --- a/a
1216 --- a/a
1182 +++ b/a
1217 +++ b/a
1183 @@ -1,2 +1,3 @@
1218 @@ -1,2 +1,3 @@
1184 0
1219 0
1185 1
1220 1
1186 +3
1221 +3
1187
1222
1188
1223
1189 fctx.introrev() == 2, but fctx.linkrev() == 1
1224 fctx.introrev() == 2, but fctx.linkrev() == 1
1190
1225
1191 $ hg up -q 2
1226 $ hg up -q 2
1192 $ hg log -pf a
1227 $ hg log -pf a
1193 === 2: a1 with b
1228 === 2: a1 with b
1194 diff -r 49b5e81287e2 -r 4ea02ba94d66 a
1229 diff -r 49b5e81287e2 -r 4ea02ba94d66 a
1195 --- a/a
1230 --- a/a
1196 +++ b/a
1231 +++ b/a
1197 @@ -1,1 +1,2 @@
1232 @@ -1,1 +1,2 @@
1198 0
1233 0
1199 +1
1234 +1
1200
1235
1201 === 0: a0
1236 === 0: a0
1202 diff -r 000000000000 -r 49b5e81287e2 a
1237 diff -r 000000000000 -r 49b5e81287e2 a
1203 --- /dev/null
1238 --- /dev/null
1204 +++ b/a
1239 +++ b/a
1205 @@ -0,0 +1,1 @@
1240 @@ -0,0 +1,1 @@
1206 +0
1241 +0
1207
1242
1208
1243
1209 BROKEN: should show the same diff as for rev 2 above
1244 BROKEN: should show the same diff as for rev 2 above
1210 $ hg log -pr . a
1245 $ hg log -pr . a
1211
1246
1212 $ cd ..
1247 $ cd ..
1213
1248
1214 Multiple copy sources of a file:
1249 Multiple copy sources of a file:
1215
1250
1216 $ hg init follow-multi
1251 $ hg init follow-multi
1217 $ cd follow-multi
1252 $ cd follow-multi
1218 $ echo 0 >> a
1253 $ echo 0 >> a
1219 $ hg ci -qAm 'a'
1254 $ hg ci -qAm 'a'
1220 $ hg cp a b
1255 $ hg cp a b
1221 $ hg ci -m 'a->b'
1256 $ hg ci -m 'a->b'
1222 $ echo 2 >> a
1257 $ echo 2 >> a
1223 $ hg ci -m 'a'
1258 $ hg ci -m 'a'
1224 $ echo 3 >> b
1259 $ echo 3 >> b
1225 $ hg ci -m 'b'
1260 $ hg ci -m 'b'
1226 $ echo 4 >> a
1261 $ echo 4 >> a
1227 $ echo 4 >> b
1262 $ echo 4 >> b
1228 $ hg ci -m 'a,b'
1263 $ hg ci -m 'a,b'
1229 $ echo 5 >> a
1264 $ echo 5 >> a
1230 $ hg ci -m 'a0'
1265 $ hg ci -m 'a0'
1231 $ echo 6 >> b
1266 $ echo 6 >> b
1232 $ hg ci -m 'b0'
1267 $ hg ci -m 'b0'
1233 $ hg up -q 4
1268 $ hg up -q 4
1234 $ echo 7 >> b
1269 $ echo 7 >> b
1235 $ hg ci -m 'b1'
1270 $ hg ci -m 'b1'
1236 created new head
1271 created new head
1237 $ echo 8 >> a
1272 $ echo 8 >> a
1238 $ hg ci -m 'a1'
1273 $ hg ci -m 'a1'
1239 $ hg rm a
1274 $ hg rm a
1240 $ hg mv b a
1275 $ hg mv b a
1241 $ hg ci -m 'b1->a1'
1276 $ hg ci -m 'b1->a1'
1242 $ hg merge -qt :local
1277 $ hg merge -qt :local
1243 $ hg ci -m '(a0,b1->a1)->a'
1278 $ hg ci -m '(a0,b1->a1)->a'
1244
1279
1245 $ hg log -GT '{rev}: {desc}\n'
1280 $ hg log -GT '{rev}: {desc}\n'
1246 @ 10: (a0,b1->a1)->a
1281 @ 10: (a0,b1->a1)->a
1247 |\
1282 |\
1248 | o 9: b1->a1
1283 | o 9: b1->a1
1249 | |
1284 | |
1250 | o 8: a1
1285 | o 8: a1
1251 | |
1286 | |
1252 | o 7: b1
1287 | o 7: b1
1253 | |
1288 | |
1254 o | 6: b0
1289 o | 6: b0
1255 | |
1290 | |
1256 o | 5: a0
1291 o | 5: a0
1257 |/
1292 |/
1258 o 4: a,b
1293 o 4: a,b
1259 |
1294 |
1260 o 3: b
1295 o 3: b
1261 |
1296 |
1262 o 2: a
1297 o 2: a
1263 |
1298 |
1264 o 1: a->b
1299 o 1: a->b
1265 |
1300 |
1266 o 0: a
1301 o 0: a
1267
1302
1268
1303
1269 since file 'a' has multiple copy sources at the revision 4, ancestors can't
1304 since file 'a' has multiple copy sources at the revision 4, ancestors can't
1270 be indexed solely by fctx.linkrev().
1305 be indexed solely by fctx.linkrev().
1271
1306
1272 $ hg log -T '{rev}: {desc}\n' -f a
1307 $ hg log -T '{rev}: {desc}\n' -f a
1273 10: (a0,b1->a1)->a
1308 10: (a0,b1->a1)->a
1274 9: b1->a1
1309 9: b1->a1
1275 7: b1
1310 7: b1
1276 5: a0
1311 5: a0
1277 4: a,b
1312 4: a,b
1278 3: b
1313 3: b
1279 2: a
1314 2: a
1280 1: a->b
1315 1: a->b
1281 0: a
1316 0: a
1282
1317
1283 $ cd ..
1318 $ cd ..
1284
1319
1285 Test that log should respect the order of -rREV even if multiple OR conditions
1320 Test that log should respect the order of -rREV even if multiple OR conditions
1286 are specified (issue5100):
1321 are specified (issue5100):
1287
1322
1288 $ hg init revorder
1323 $ hg init revorder
1289 $ cd revorder
1324 $ cd revorder
1290
1325
1291 $ hg branch -q b0
1326 $ hg branch -q b0
1292 $ echo 0 >> f0
1327 $ echo 0 >> f0
1293 $ hg ci -qAm k0 -u u0
1328 $ hg ci -qAm k0 -u u0
1294 $ hg branch -q b1
1329 $ hg branch -q b1
1295 $ echo 1 >> f1
1330 $ echo 1 >> f1
1296 $ hg ci -qAm k1 -u u1
1331 $ hg ci -qAm k1 -u u1
1297 $ hg branch -q b2
1332 $ hg branch -q b2
1298 $ echo 2 >> f2
1333 $ echo 2 >> f2
1299 $ hg ci -qAm k2 -u u2
1334 $ hg ci -qAm k2 -u u2
1300
1335
1301 $ hg update -q b2
1336 $ hg update -q b2
1302 $ echo 3 >> f2
1337 $ echo 3 >> f2
1303 $ hg ci -qAm k2 -u u2
1338 $ hg ci -qAm k2 -u u2
1304 $ hg update -q b1
1339 $ hg update -q b1
1305 $ echo 4 >> f1
1340 $ echo 4 >> f1
1306 $ hg ci -qAm k1 -u u1
1341 $ hg ci -qAm k1 -u u1
1307 $ hg update -q b0
1342 $ hg update -q b0
1308 $ echo 5 >> f0
1343 $ echo 5 >> f0
1309 $ hg ci -qAm k0 -u u0
1344 $ hg ci -qAm k0 -u u0
1310
1345
1311 summary of revisions:
1346 summary of revisions:
1312
1347
1313 $ hg log -G -T '{rev} {branch} {author} {desc} {files}\n'
1348 $ hg log -G -T '{rev} {branch} {author} {desc} {files}\n'
1314 @ 5 b0 u0 k0 f0
1349 @ 5 b0 u0 k0 f0
1315 |
1350 |
1316 | o 4 b1 u1 k1 f1
1351 | o 4 b1 u1 k1 f1
1317 | |
1352 | |
1318 | | o 3 b2 u2 k2 f2
1353 | | o 3 b2 u2 k2 f2
1319 | | |
1354 | | |
1320 | | o 2 b2 u2 k2 f2
1355 | | o 2 b2 u2 k2 f2
1321 | |/
1356 | |/
1322 | o 1 b1 u1 k1 f1
1357 | o 1 b1 u1 k1 f1
1323 |/
1358 |/
1324 o 0 b0 u0 k0 f0
1359 o 0 b0 u0 k0 f0
1325
1360
1326
1361
1327 log -b BRANCH in ascending order:
1362 log -b BRANCH in ascending order:
1328
1363
1329 $ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1
1364 $ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1
1330 0 b0
1365 0 b0
1331 1 b1
1366 1 b1
1332 4 b1
1367 4 b1
1333 5 b0
1368 5 b0
1334 $ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0
1369 $ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0
1335 0 b0
1370 0 b0
1336 1 b1
1371 1 b1
1337 4 b1
1372 4 b1
1338 5 b0
1373 5 b0
1339
1374
1340 log --only-branch BRANCH in descending order:
1375 log --only-branch BRANCH in descending order:
1341
1376
1342 $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2
1377 $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2
1343 4 b1
1378 4 b1
1344 3 b2
1379 3 b2
1345 2 b2
1380 2 b2
1346 1 b1
1381 1 b1
1347 $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1
1382 $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1
1348 4 b1
1383 4 b1
1349 3 b2
1384 3 b2
1350 2 b2
1385 2 b2
1351 1 b1
1386 1 b1
1352
1387
1353 log -u USER in ascending order, against compound set:
1388 log -u USER in ascending order, against compound set:
1354
1389
1355 $ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2
1390 $ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2
1356 0 u0
1391 0 u0
1357 2 u2
1392 2 u2
1358 3 u2
1393 3 u2
1359 5 u0
1394 5 u0
1360 $ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0
1395 $ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0
1361 0 u0
1396 0 u0
1362 2 u2
1397 2 u2
1363 3 u2
1398 3 u2
1364 5 u0
1399 5 u0
1365
1400
1366 log -k TEXT in descending order, against compound set:
1401 log -k TEXT in descending order, against compound set:
1367
1402
1368 $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2
1403 $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2
1369 5 k0
1404 5 k0
1370 3 k2
1405 3 k2
1371 2 k2
1406 2 k2
1372 1 k1
1407 1 k1
1373 0 k0
1408 0 k0
1374 $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0
1409 $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0
1375 5 k0
1410 5 k0
1376 3 k2
1411 3 k2
1377 2 k2
1412 2 k2
1378 1 k1
1413 1 k1
1379 0 k0
1414 0 k0
1380
1415
1381 log -b/-u/-k shouldn't accept string-matcher syntax:
1416 log -b/-u/-k shouldn't accept string-matcher syntax:
1382
1417
1383 $ hg log -b 're:.*'
1418 $ hg log -b 're:.*'
1384 abort: unknown revision 're:.*'
1419 abort: unknown revision 're:.*'
1385 [255]
1420 [255]
1386 $ hg log -k 're:.*'
1421 $ hg log -k 're:.*'
1387 $ hg log -u 're:.*'
1422 $ hg log -u 're:.*'
1388
1423
1389 log FILE in ascending order, against dagrange:
1424 log FILE in ascending order, against dagrange:
1390
1425
1391 $ hg log -r1:: -T '{rev} {files}\n' f1 f2
1426 $ hg log -r1:: -T '{rev} {files}\n' f1 f2
1392 1 f1
1427 1 f1
1393 2 f2
1428 2 f2
1394 3 f2
1429 3 f2
1395 4 f1
1430 4 f1
1396 $ hg log -r1:: -T '{rev} {files}\n' f2 f1
1431 $ hg log -r1:: -T '{rev} {files}\n' f2 f1
1397 1 f1
1432 1 f1
1398 2 f2
1433 2 f2
1399 3 f2
1434 3 f2
1400 4 f1
1435 4 f1
1401
1436
1402 $ cd ..
1437 $ cd ..
1403
1438
1404 User
1439 User
1405
1440
1406 $ hg init usertest
1441 $ hg init usertest
1407 $ cd usertest
1442 $ cd usertest
1408
1443
1409 $ echo a > a
1444 $ echo a > a
1410 $ hg ci -A -m "a" -u "User One <user1@example.org>"
1445 $ hg ci -A -m "a" -u "User One <user1@example.org>"
1411 adding a
1446 adding a
1412 $ echo b > b
1447 $ echo b > b
1413 $ hg ci -A -m "b" -u "User Two <user2@example.org>"
1448 $ hg ci -A -m "b" -u "User Two <user2@example.org>"
1414 adding b
1449 adding b
1415
1450
1416 $ hg log -u "User One <user1@example.org>"
1451 $ hg log -u "User One <user1@example.org>"
1417 changeset: 0:29a4c94f1924
1452 changeset: 0:29a4c94f1924
1418 user: User One <user1@example.org>
1453 user: User One <user1@example.org>
1419 date: Thu Jan 01 00:00:00 1970 +0000
1454 date: Thu Jan 01 00:00:00 1970 +0000
1420 summary: a
1455 summary: a
1421
1456
1422 $ hg log -u "user1" -u "user2"
1457 $ hg log -u "user1" -u "user2"
1423 changeset: 1:e834b5e69c0e
1458 changeset: 1:e834b5e69c0e
1424 tag: tip
1459 tag: tip
1425 user: User Two <user2@example.org>
1460 user: User Two <user2@example.org>
1426 date: Thu Jan 01 00:00:00 1970 +0000
1461 date: Thu Jan 01 00:00:00 1970 +0000
1427 summary: b
1462 summary: b
1428
1463
1429 changeset: 0:29a4c94f1924
1464 changeset: 0:29a4c94f1924
1430 user: User One <user1@example.org>
1465 user: User One <user1@example.org>
1431 date: Thu Jan 01 00:00:00 1970 +0000
1466 date: Thu Jan 01 00:00:00 1970 +0000
1432 summary: a
1467 summary: a
1433
1468
1434 $ hg log -u "user3"
1469 $ hg log -u "user3"
1435
1470
1436 "-u USER" shouldn't be overridden by "user(USER)" alias
1471 "-u USER" shouldn't be overridden by "user(USER)" alias
1437
1472
1438 $ hg log --config 'revsetalias.user(x)=branch(x)' -u default
1473 $ hg log --config 'revsetalias.user(x)=branch(x)' -u default
1439 $ hg log --config 'revsetalias.user(x)=branch(x)' -u user1
1474 $ hg log --config 'revsetalias.user(x)=branch(x)' -u user1
1440 changeset: 0:29a4c94f1924
1475 changeset: 0:29a4c94f1924
1441 user: User One <user1@example.org>
1476 user: User One <user1@example.org>
1442 date: Thu Jan 01 00:00:00 1970 +0000
1477 date: Thu Jan 01 00:00:00 1970 +0000
1443 summary: a
1478 summary: a
1444
1479
1445
1480
1446 $ cd ..
1481 $ cd ..
1447
1482
1448 $ hg init branches
1483 $ hg init branches
1449 $ cd branches
1484 $ cd branches
1450
1485
1451 $ echo a > a
1486 $ echo a > a
1452 $ hg ci -A -m "commit on default"
1487 $ hg ci -A -m "commit on default"
1453 adding a
1488 adding a
1454 $ hg branch test
1489 $ hg branch test
1455 marked working directory as branch test
1490 marked working directory as branch test
1456 (branches are permanent and global, did you want a bookmark?)
1491 (branches are permanent and global, did you want a bookmark?)
1457 $ echo b > b
1492 $ echo b > b
1458 $ hg ci -A -m "commit on test"
1493 $ hg ci -A -m "commit on test"
1459 adding b
1494 adding b
1460
1495
1461 $ hg up default
1496 $ hg up default
1462 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1497 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1463 $ echo c > c
1498 $ echo c > c
1464 $ hg ci -A -m "commit on default"
1499 $ hg ci -A -m "commit on default"
1465 adding c
1500 adding c
1466 $ hg up test
1501 $ hg up test
1467 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1502 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1468 $ echo c > c
1503 $ echo c > c
1469 $ hg ci -A -m "commit on test"
1504 $ hg ci -A -m "commit on test"
1470 adding c
1505 adding c
1471
1506
1472
1507
1473 log -b default
1508 log -b default
1474
1509
1475 $ hg log -b default
1510 $ hg log -b default
1476 changeset: 2:c3a4f03cc9a7
1511 changeset: 2:c3a4f03cc9a7
1477 parent: 0:24427303d56f
1512 parent: 0:24427303d56f
1478 user: test
1513 user: test
1479 date: Thu Jan 01 00:00:00 1970 +0000
1514 date: Thu Jan 01 00:00:00 1970 +0000
1480 summary: commit on default
1515 summary: commit on default
1481
1516
1482 changeset: 0:24427303d56f
1517 changeset: 0:24427303d56f
1483 user: test
1518 user: test
1484 date: Thu Jan 01 00:00:00 1970 +0000
1519 date: Thu Jan 01 00:00:00 1970 +0000
1485 summary: commit on default
1520 summary: commit on default
1486
1521
1487
1522
1488
1523
1489 log -b test
1524 log -b test
1490
1525
1491 $ hg log -b test
1526 $ hg log -b test
1492 changeset: 3:f5d8de11c2e2
1527 changeset: 3:f5d8de11c2e2
1493 branch: test
1528 branch: test
1494 tag: tip
1529 tag: tip
1495 parent: 1:d32277701ccb
1530 parent: 1:d32277701ccb
1496 user: test
1531 user: test
1497 date: Thu Jan 01 00:00:00 1970 +0000
1532 date: Thu Jan 01 00:00:00 1970 +0000
1498 summary: commit on test
1533 summary: commit on test
1499
1534
1500 changeset: 1:d32277701ccb
1535 changeset: 1:d32277701ccb
1501 branch: test
1536 branch: test
1502 user: test
1537 user: test
1503 date: Thu Jan 01 00:00:00 1970 +0000
1538 date: Thu Jan 01 00:00:00 1970 +0000
1504 summary: commit on test
1539 summary: commit on test
1505
1540
1506
1541
1507
1542
1508 log -b dummy
1543 log -b dummy
1509
1544
1510 $ hg log -b dummy
1545 $ hg log -b dummy
1511 abort: unknown revision 'dummy'
1546 abort: unknown revision 'dummy'
1512 [255]
1547 [255]
1513
1548
1514
1549
1515 log -b .
1550 log -b .
1516
1551
1517 $ hg log -b .
1552 $ hg log -b .
1518 changeset: 3:f5d8de11c2e2
1553 changeset: 3:f5d8de11c2e2
1519 branch: test
1554 branch: test
1520 tag: tip
1555 tag: tip
1521 parent: 1:d32277701ccb
1556 parent: 1:d32277701ccb
1522 user: test
1557 user: test
1523 date: Thu Jan 01 00:00:00 1970 +0000
1558 date: Thu Jan 01 00:00:00 1970 +0000
1524 summary: commit on test
1559 summary: commit on test
1525
1560
1526 changeset: 1:d32277701ccb
1561 changeset: 1:d32277701ccb
1527 branch: test
1562 branch: test
1528 user: test
1563 user: test
1529 date: Thu Jan 01 00:00:00 1970 +0000
1564 date: Thu Jan 01 00:00:00 1970 +0000
1530 summary: commit on test
1565 summary: commit on test
1531
1566
1532
1567
1533
1568
1534 log -b default -b test
1569 log -b default -b test
1535
1570
1536 $ hg log -b default -b test
1571 $ hg log -b default -b test
1537 changeset: 3:f5d8de11c2e2
1572 changeset: 3:f5d8de11c2e2
1538 branch: test
1573 branch: test
1539 tag: tip
1574 tag: tip
1540 parent: 1:d32277701ccb
1575 parent: 1:d32277701ccb
1541 user: test
1576 user: test
1542 date: Thu Jan 01 00:00:00 1970 +0000
1577 date: Thu Jan 01 00:00:00 1970 +0000
1543 summary: commit on test
1578 summary: commit on test
1544
1579
1545 changeset: 2:c3a4f03cc9a7
1580 changeset: 2:c3a4f03cc9a7
1546 parent: 0:24427303d56f
1581 parent: 0:24427303d56f
1547 user: test
1582 user: test
1548 date: Thu Jan 01 00:00:00 1970 +0000
1583 date: Thu Jan 01 00:00:00 1970 +0000
1549 summary: commit on default
1584 summary: commit on default
1550
1585
1551 changeset: 1:d32277701ccb
1586 changeset: 1:d32277701ccb
1552 branch: test
1587 branch: test
1553 user: test
1588 user: test
1554 date: Thu Jan 01 00:00:00 1970 +0000
1589 date: Thu Jan 01 00:00:00 1970 +0000
1555 summary: commit on test
1590 summary: commit on test
1556
1591
1557 changeset: 0:24427303d56f
1592 changeset: 0:24427303d56f
1558 user: test
1593 user: test
1559 date: Thu Jan 01 00:00:00 1970 +0000
1594 date: Thu Jan 01 00:00:00 1970 +0000
1560 summary: commit on default
1595 summary: commit on default
1561
1596
1562
1597
1563
1598
1564 log -b default -b .
1599 log -b default -b .
1565
1600
1566 $ hg log -b default -b .
1601 $ hg log -b default -b .
1567 changeset: 3:f5d8de11c2e2
1602 changeset: 3:f5d8de11c2e2
1568 branch: test
1603 branch: test
1569 tag: tip
1604 tag: tip
1570 parent: 1:d32277701ccb
1605 parent: 1:d32277701ccb
1571 user: test
1606 user: test
1572 date: Thu Jan 01 00:00:00 1970 +0000
1607 date: Thu Jan 01 00:00:00 1970 +0000
1573 summary: commit on test
1608 summary: commit on test
1574
1609
1575 changeset: 2:c3a4f03cc9a7
1610 changeset: 2:c3a4f03cc9a7
1576 parent: 0:24427303d56f
1611 parent: 0:24427303d56f
1577 user: test
1612 user: test
1578 date: Thu Jan 01 00:00:00 1970 +0000
1613 date: Thu Jan 01 00:00:00 1970 +0000
1579 summary: commit on default
1614 summary: commit on default
1580
1615
1581 changeset: 1:d32277701ccb
1616 changeset: 1:d32277701ccb
1582 branch: test
1617 branch: test
1583 user: test
1618 user: test
1584 date: Thu Jan 01 00:00:00 1970 +0000
1619 date: Thu Jan 01 00:00:00 1970 +0000
1585 summary: commit on test
1620 summary: commit on test
1586
1621
1587 changeset: 0:24427303d56f
1622 changeset: 0:24427303d56f
1588 user: test
1623 user: test
1589 date: Thu Jan 01 00:00:00 1970 +0000
1624 date: Thu Jan 01 00:00:00 1970 +0000
1590 summary: commit on default
1625 summary: commit on default
1591
1626
1592
1627
1593
1628
1594 log -b . -b test
1629 log -b . -b test
1595
1630
1596 $ hg log -b . -b test
1631 $ hg log -b . -b test
1597 changeset: 3:f5d8de11c2e2
1632 changeset: 3:f5d8de11c2e2
1598 branch: test
1633 branch: test
1599 tag: tip
1634 tag: tip
1600 parent: 1:d32277701ccb
1635 parent: 1:d32277701ccb
1601 user: test
1636 user: test
1602 date: Thu Jan 01 00:00:00 1970 +0000
1637 date: Thu Jan 01 00:00:00 1970 +0000
1603 summary: commit on test
1638 summary: commit on test
1604
1639
1605 changeset: 1:d32277701ccb
1640 changeset: 1:d32277701ccb
1606 branch: test
1641 branch: test
1607 user: test
1642 user: test
1608 date: Thu Jan 01 00:00:00 1970 +0000
1643 date: Thu Jan 01 00:00:00 1970 +0000
1609 summary: commit on test
1644 summary: commit on test
1610
1645
1611
1646
1612
1647
1613 log -b 2
1648 log -b 2
1614
1649
1615 $ hg log -b 2
1650 $ hg log -b 2
1616 changeset: 2:c3a4f03cc9a7
1651 changeset: 2:c3a4f03cc9a7
1617 parent: 0:24427303d56f
1652 parent: 0:24427303d56f
1618 user: test
1653 user: test
1619 date: Thu Jan 01 00:00:00 1970 +0000
1654 date: Thu Jan 01 00:00:00 1970 +0000
1620 summary: commit on default
1655 summary: commit on default
1621
1656
1622 changeset: 0:24427303d56f
1657 changeset: 0:24427303d56f
1623 user: test
1658 user: test
1624 date: Thu Jan 01 00:00:00 1970 +0000
1659 date: Thu Jan 01 00:00:00 1970 +0000
1625 summary: commit on default
1660 summary: commit on default
1626
1661
1627 #if gettext
1662 #if gettext
1628
1663
1629 Test that all log names are translated (e.g. branches, bookmarks, tags):
1664 Test that all log names are translated (e.g. branches, bookmarks, tags):
1630
1665
1631 $ hg bookmark babar -r tip
1666 $ hg bookmark babar -r tip
1632
1667
1633 $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip
1668 $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip
1634 \xc3\x84nderung: 3:f5d8de11c2e2 (esc)
1669 \xc3\x84nderung: 3:f5d8de11c2e2 (esc)
1635 Zweig: test
1670 Zweig: test
1636 Lesezeichen: babar
1671 Lesezeichen: babar
1637 Marke: tip
1672 Marke: tip
1638 Vorg\xc3\xa4nger: 1:d32277701ccb (esc)
1673 Vorg\xc3\xa4nger: 1:d32277701ccb (esc)
1639 Nutzer: test
1674 Nutzer: test
1640 Datum: Thu Jan 01 00:00:00 1970 +0000
1675 Datum: Thu Jan 01 00:00:00 1970 +0000
1641 Zusammenfassung: commit on test
1676 Zusammenfassung: commit on test
1642
1677
1643 $ hg bookmark -d babar
1678 $ hg bookmark -d babar
1644
1679
1645 #endif
1680 #endif
1646
1681
1647 log -p --cwd dir (in subdir)
1682 log -p --cwd dir (in subdir)
1648
1683
1649 $ mkdir dir
1684 $ mkdir dir
1650 $ hg log -p --cwd dir
1685 $ hg log -p --cwd dir
1651 changeset: 3:f5d8de11c2e2
1686 changeset: 3:f5d8de11c2e2
1652 branch: test
1687 branch: test
1653 tag: tip
1688 tag: tip
1654 parent: 1:d32277701ccb
1689 parent: 1:d32277701ccb
1655 user: test
1690 user: test
1656 date: Thu Jan 01 00:00:00 1970 +0000
1691 date: Thu Jan 01 00:00:00 1970 +0000
1657 summary: commit on test
1692 summary: commit on test
1658
1693
1659 diff -r d32277701ccb -r f5d8de11c2e2 c
1694 diff -r d32277701ccb -r f5d8de11c2e2 c
1660 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1695 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1661 +++ b/c Thu Jan 01 00:00:00 1970 +0000
1696 +++ b/c Thu Jan 01 00:00:00 1970 +0000
1662 @@ -0,0 +1,1 @@
1697 @@ -0,0 +1,1 @@
1663 +c
1698 +c
1664
1699
1665 changeset: 2:c3a4f03cc9a7
1700 changeset: 2:c3a4f03cc9a7
1666 parent: 0:24427303d56f
1701 parent: 0:24427303d56f
1667 user: test
1702 user: test
1668 date: Thu Jan 01 00:00:00 1970 +0000
1703 date: Thu Jan 01 00:00:00 1970 +0000
1669 summary: commit on default
1704 summary: commit on default
1670
1705
1671 diff -r 24427303d56f -r c3a4f03cc9a7 c
1706 diff -r 24427303d56f -r c3a4f03cc9a7 c
1672 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1707 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1673 +++ b/c Thu Jan 01 00:00:00 1970 +0000
1708 +++ b/c Thu Jan 01 00:00:00 1970 +0000
1674 @@ -0,0 +1,1 @@
1709 @@ -0,0 +1,1 @@
1675 +c
1710 +c
1676
1711
1677 changeset: 1:d32277701ccb
1712 changeset: 1:d32277701ccb
1678 branch: test
1713 branch: test
1679 user: test
1714 user: test
1680 date: Thu Jan 01 00:00:00 1970 +0000
1715 date: Thu Jan 01 00:00:00 1970 +0000
1681 summary: commit on test
1716 summary: commit on test
1682
1717
1683 diff -r 24427303d56f -r d32277701ccb b
1718 diff -r 24427303d56f -r d32277701ccb b
1684 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1719 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1685 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1720 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1686 @@ -0,0 +1,1 @@
1721 @@ -0,0 +1,1 @@
1687 +b
1722 +b
1688
1723
1689 changeset: 0:24427303d56f
1724 changeset: 0:24427303d56f
1690 user: test
1725 user: test
1691 date: Thu Jan 01 00:00:00 1970 +0000
1726 date: Thu Jan 01 00:00:00 1970 +0000
1692 summary: commit on default
1727 summary: commit on default
1693
1728
1694 diff -r 000000000000 -r 24427303d56f a
1729 diff -r 000000000000 -r 24427303d56f a
1695 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1730 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1696 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1731 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1697 @@ -0,0 +1,1 @@
1732 @@ -0,0 +1,1 @@
1698 +a
1733 +a
1699
1734
1700
1735
1701
1736
1702 log -p -R repo
1737 log -p -R repo
1703
1738
1704 $ cd dir
1739 $ cd dir
1705 $ hg log -p -R .. ../a
1740 $ hg log -p -R .. ../a
1706 changeset: 0:24427303d56f
1741 changeset: 0:24427303d56f
1707 user: test
1742 user: test
1708 date: Thu Jan 01 00:00:00 1970 +0000
1743 date: Thu Jan 01 00:00:00 1970 +0000
1709 summary: commit on default
1744 summary: commit on default
1710
1745
1711 diff -r 000000000000 -r 24427303d56f a
1746 diff -r 000000000000 -r 24427303d56f a
1712 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1747 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1713 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1748 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1714 @@ -0,0 +1,1 @@
1749 @@ -0,0 +1,1 @@
1715 +a
1750 +a
1716
1751
1717
1752
1718 $ cd ../..
1753 $ cd ../..
1719
1754
1720 $ hg init follow2
1755 $ hg init follow2
1721 $ cd follow2
1756 $ cd follow2
1722
1757
1723 # Build the following history:
1758 # Build the following history:
1724 # tip - o - x - o - x - x
1759 # tip - o - x - o - x - x
1725 # \ /
1760 # \ /
1726 # o - o - o - x
1761 # o - o - o - x
1727 # \ /
1762 # \ /
1728 # o
1763 # o
1729 #
1764 #
1730 # Where "o" is a revision containing "foo" and
1765 # Where "o" is a revision containing "foo" and
1731 # "x" is a revision without "foo"
1766 # "x" is a revision without "foo"
1732
1767
1733 $ touch init
1768 $ touch init
1734 $ hg ci -A -m "init, unrelated"
1769 $ hg ci -A -m "init, unrelated"
1735 adding init
1770 adding init
1736 $ echo 'foo' > init
1771 $ echo 'foo' > init
1737 $ hg ci -m "change, unrelated"
1772 $ hg ci -m "change, unrelated"
1738 $ echo 'foo' > foo
1773 $ echo 'foo' > foo
1739 $ hg ci -A -m "add unrelated old foo"
1774 $ hg ci -A -m "add unrelated old foo"
1740 adding foo
1775 adding foo
1741 $ hg rm foo
1776 $ hg rm foo
1742 $ hg ci -m "delete foo, unrelated"
1777 $ hg ci -m "delete foo, unrelated"
1743 $ echo 'related' > foo
1778 $ echo 'related' > foo
1744 $ hg ci -A -m "add foo, related"
1779 $ hg ci -A -m "add foo, related"
1745 adding foo
1780 adding foo
1746
1781
1747 $ hg up 0
1782 $ hg up 0
1748 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1783 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1749 $ touch branch
1784 $ touch branch
1750 $ hg ci -A -m "first branch, unrelated"
1785 $ hg ci -A -m "first branch, unrelated"
1751 adding branch
1786 adding branch
1752 created new head
1787 created new head
1753 $ touch foo
1788 $ touch foo
1754 $ hg ci -A -m "create foo, related"
1789 $ hg ci -A -m "create foo, related"
1755 adding foo
1790 adding foo
1756 $ echo 'change' > foo
1791 $ echo 'change' > foo
1757 $ hg ci -m "change foo, related"
1792 $ hg ci -m "change foo, related"
1758
1793
1759 $ hg up 6
1794 $ hg up 6
1760 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1795 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1761 $ echo 'change foo in branch' > foo
1796 $ echo 'change foo in branch' > foo
1762 $ hg ci -m "change foo in branch, related"
1797 $ hg ci -m "change foo in branch, related"
1763 created new head
1798 created new head
1764 $ hg merge 7
1799 $ hg merge 7
1765 merging foo
1800 merging foo
1766 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
1801 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
1767 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
1802 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
1768 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
1803 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
1769 [1]
1804 [1]
1770 $ echo 'merge 1' > foo
1805 $ echo 'merge 1' > foo
1771 $ hg resolve -m foo
1806 $ hg resolve -m foo
1772 (no more unresolved files)
1807 (no more unresolved files)
1773 $ hg ci -m "First merge, related"
1808 $ hg ci -m "First merge, related"
1774
1809
1775 $ hg merge 4
1810 $ hg merge 4
1776 merging foo
1811 merging foo
1777 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
1812 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
1778 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
1813 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
1779 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
1814 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
1780 [1]
1815 [1]
1781 $ echo 'merge 2' > foo
1816 $ echo 'merge 2' > foo
1782 $ hg resolve -m foo
1817 $ hg resolve -m foo
1783 (no more unresolved files)
1818 (no more unresolved files)
1784 $ hg ci -m "Last merge, related"
1819 $ hg ci -m "Last merge, related"
1785
1820
1786 $ hg log --graph
1821 $ hg log --graph
1787 @ changeset: 10:4dae8563d2c5
1822 @ changeset: 10:4dae8563d2c5
1788 |\ tag: tip
1823 |\ tag: tip
1789 | | parent: 9:7b35701b003e
1824 | | parent: 9:7b35701b003e
1790 | | parent: 4:88176d361b69
1825 | | parent: 4:88176d361b69
1791 | | user: test
1826 | | user: test
1792 | | date: Thu Jan 01 00:00:00 1970 +0000
1827 | | date: Thu Jan 01 00:00:00 1970 +0000
1793 | | summary: Last merge, related
1828 | | summary: Last merge, related
1794 | |
1829 | |
1795 | o changeset: 9:7b35701b003e
1830 | o changeset: 9:7b35701b003e
1796 | |\ parent: 8:e5416ad8a855
1831 | |\ parent: 8:e5416ad8a855
1797 | | | parent: 7:87fe3144dcfa
1832 | | | parent: 7:87fe3144dcfa
1798 | | | user: test
1833 | | | user: test
1799 | | | date: Thu Jan 01 00:00:00 1970 +0000
1834 | | | date: Thu Jan 01 00:00:00 1970 +0000
1800 | | | summary: First merge, related
1835 | | | summary: First merge, related
1801 | | |
1836 | | |
1802 | | o changeset: 8:e5416ad8a855
1837 | | o changeset: 8:e5416ad8a855
1803 | | | parent: 6:dc6c325fe5ee
1838 | | | parent: 6:dc6c325fe5ee
1804 | | | user: test
1839 | | | user: test
1805 | | | date: Thu Jan 01 00:00:00 1970 +0000
1840 | | | date: Thu Jan 01 00:00:00 1970 +0000
1806 | | | summary: change foo in branch, related
1841 | | | summary: change foo in branch, related
1807 | | |
1842 | | |
1808 | o | changeset: 7:87fe3144dcfa
1843 | o | changeset: 7:87fe3144dcfa
1809 | |/ user: test
1844 | |/ user: test
1810 | | date: Thu Jan 01 00:00:00 1970 +0000
1845 | | date: Thu Jan 01 00:00:00 1970 +0000
1811 | | summary: change foo, related
1846 | | summary: change foo, related
1812 | |
1847 | |
1813 | o changeset: 6:dc6c325fe5ee
1848 | o changeset: 6:dc6c325fe5ee
1814 | | user: test
1849 | | user: test
1815 | | date: Thu Jan 01 00:00:00 1970 +0000
1850 | | date: Thu Jan 01 00:00:00 1970 +0000
1816 | | summary: create foo, related
1851 | | summary: create foo, related
1817 | |
1852 | |
1818 | o changeset: 5:73db34516eb9
1853 | o changeset: 5:73db34516eb9
1819 | | parent: 0:e87515fd044a
1854 | | parent: 0:e87515fd044a
1820 | | user: test
1855 | | user: test
1821 | | date: Thu Jan 01 00:00:00 1970 +0000
1856 | | date: Thu Jan 01 00:00:00 1970 +0000
1822 | | summary: first branch, unrelated
1857 | | summary: first branch, unrelated
1823 | |
1858 | |
1824 o | changeset: 4:88176d361b69
1859 o | changeset: 4:88176d361b69
1825 | | user: test
1860 | | user: test
1826 | | date: Thu Jan 01 00:00:00 1970 +0000
1861 | | date: Thu Jan 01 00:00:00 1970 +0000
1827 | | summary: add foo, related
1862 | | summary: add foo, related
1828 | |
1863 | |
1829 o | changeset: 3:dd78ae4afb56
1864 o | changeset: 3:dd78ae4afb56
1830 | | user: test
1865 | | user: test
1831 | | date: Thu Jan 01 00:00:00 1970 +0000
1866 | | date: Thu Jan 01 00:00:00 1970 +0000
1832 | | summary: delete foo, unrelated
1867 | | summary: delete foo, unrelated
1833 | |
1868 | |
1834 o | changeset: 2:c4c64aedf0f7
1869 o | changeset: 2:c4c64aedf0f7
1835 | | user: test
1870 | | user: test
1836 | | date: Thu Jan 01 00:00:00 1970 +0000
1871 | | date: Thu Jan 01 00:00:00 1970 +0000
1837 | | summary: add unrelated old foo
1872 | | summary: add unrelated old foo
1838 | |
1873 | |
1839 o | changeset: 1:e5faa7440653
1874 o | changeset: 1:e5faa7440653
1840 |/ user: test
1875 |/ user: test
1841 | date: Thu Jan 01 00:00:00 1970 +0000
1876 | date: Thu Jan 01 00:00:00 1970 +0000
1842 | summary: change, unrelated
1877 | summary: change, unrelated
1843 |
1878 |
1844 o changeset: 0:e87515fd044a
1879 o changeset: 0:e87515fd044a
1845 user: test
1880 user: test
1846 date: Thu Jan 01 00:00:00 1970 +0000
1881 date: Thu Jan 01 00:00:00 1970 +0000
1847 summary: init, unrelated
1882 summary: init, unrelated
1848
1883
1849
1884
1850 $ hg --traceback log -f foo
1885 $ hg --traceback log -f foo
1851 changeset: 10:4dae8563d2c5
1886 changeset: 10:4dae8563d2c5
1852 tag: tip
1887 tag: tip
1853 parent: 9:7b35701b003e
1888 parent: 9:7b35701b003e
1854 parent: 4:88176d361b69
1889 parent: 4:88176d361b69
1855 user: test
1890 user: test
1856 date: Thu Jan 01 00:00:00 1970 +0000
1891 date: Thu Jan 01 00:00:00 1970 +0000
1857 summary: Last merge, related
1892 summary: Last merge, related
1858
1893
1859 changeset: 9:7b35701b003e
1894 changeset: 9:7b35701b003e
1860 parent: 8:e5416ad8a855
1895 parent: 8:e5416ad8a855
1861 parent: 7:87fe3144dcfa
1896 parent: 7:87fe3144dcfa
1862 user: test
1897 user: test
1863 date: Thu Jan 01 00:00:00 1970 +0000
1898 date: Thu Jan 01 00:00:00 1970 +0000
1864 summary: First merge, related
1899 summary: First merge, related
1865
1900
1866 changeset: 8:e5416ad8a855
1901 changeset: 8:e5416ad8a855
1867 parent: 6:dc6c325fe5ee
1902 parent: 6:dc6c325fe5ee
1868 user: test
1903 user: test
1869 date: Thu Jan 01 00:00:00 1970 +0000
1904 date: Thu Jan 01 00:00:00 1970 +0000
1870 summary: change foo in branch, related
1905 summary: change foo in branch, related
1871
1906
1872 changeset: 7:87fe3144dcfa
1907 changeset: 7:87fe3144dcfa
1873 user: test
1908 user: test
1874 date: Thu Jan 01 00:00:00 1970 +0000
1909 date: Thu Jan 01 00:00:00 1970 +0000
1875 summary: change foo, related
1910 summary: change foo, related
1876
1911
1877 changeset: 6:dc6c325fe5ee
1912 changeset: 6:dc6c325fe5ee
1878 user: test
1913 user: test
1879 date: Thu Jan 01 00:00:00 1970 +0000
1914 date: Thu Jan 01 00:00:00 1970 +0000
1880 summary: create foo, related
1915 summary: create foo, related
1881
1916
1882 changeset: 4:88176d361b69
1917 changeset: 4:88176d361b69
1883 user: test
1918 user: test
1884 date: Thu Jan 01 00:00:00 1970 +0000
1919 date: Thu Jan 01 00:00:00 1970 +0000
1885 summary: add foo, related
1920 summary: add foo, related
1886
1921
1887
1922
1888 Also check when maxrev < lastrevfilelog
1923 Also check when maxrev < lastrevfilelog
1889
1924
1890 $ hg --traceback log -f -r4 foo
1925 $ hg --traceback log -f -r4 foo
1891 changeset: 4:88176d361b69
1926 changeset: 4:88176d361b69
1892 user: test
1927 user: test
1893 date: Thu Jan 01 00:00:00 1970 +0000
1928 date: Thu Jan 01 00:00:00 1970 +0000
1894 summary: add foo, related
1929 summary: add foo, related
1895
1930
1896 $ cd ..
1931 $ cd ..
1897
1932
1898 Issue2383: hg log showing _less_ differences than hg diff
1933 Issue2383: hg log showing _less_ differences than hg diff
1899
1934
1900 $ hg init issue2383
1935 $ hg init issue2383
1901 $ cd issue2383
1936 $ cd issue2383
1902
1937
1903 Create a test repo:
1938 Create a test repo:
1904
1939
1905 $ echo a > a
1940 $ echo a > a
1906 $ hg ci -Am0
1941 $ hg ci -Am0
1907 adding a
1942 adding a
1908 $ echo b > b
1943 $ echo b > b
1909 $ hg ci -Am1
1944 $ hg ci -Am1
1910 adding b
1945 adding b
1911 $ hg co 0
1946 $ hg co 0
1912 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1947 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1913 $ echo b > a
1948 $ echo b > a
1914 $ hg ci -m2
1949 $ hg ci -m2
1915 created new head
1950 created new head
1916
1951
1917 Merge:
1952 Merge:
1918
1953
1919 $ hg merge
1954 $ hg merge
1920 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1955 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1921 (branch merge, don't forget to commit)
1956 (branch merge, don't forget to commit)
1922
1957
1923 Make sure there's a file listed in the merge to trigger the bug:
1958 Make sure there's a file listed in the merge to trigger the bug:
1924
1959
1925 $ echo c > a
1960 $ echo c > a
1926 $ hg ci -m3
1961 $ hg ci -m3
1927
1962
1928 Two files shown here in diff:
1963 Two files shown here in diff:
1929
1964
1930 $ hg diff --rev 2:3
1965 $ hg diff --rev 2:3
1931 diff -r b09be438c43a -r 8e07aafe1edc a
1966 diff -r b09be438c43a -r 8e07aafe1edc a
1932 --- a/a Thu Jan 01 00:00:00 1970 +0000
1967 --- a/a Thu Jan 01 00:00:00 1970 +0000
1933 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1968 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1934 @@ -1,1 +1,1 @@
1969 @@ -1,1 +1,1 @@
1935 -b
1970 -b
1936 +c
1971 +c
1937 diff -r b09be438c43a -r 8e07aafe1edc b
1972 diff -r b09be438c43a -r 8e07aafe1edc b
1938 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1973 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1939 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1974 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1940 @@ -0,0 +1,1 @@
1975 @@ -0,0 +1,1 @@
1941 +b
1976 +b
1942
1977
1943 Diff here should be the same:
1978 Diff here should be the same:
1944
1979
1945 $ hg log -vpr 3
1980 $ hg log -vpr 3
1946 changeset: 3:8e07aafe1edc
1981 changeset: 3:8e07aafe1edc
1947 tag: tip
1982 tag: tip
1948 parent: 2:b09be438c43a
1983 parent: 2:b09be438c43a
1949 parent: 1:925d80f479bb
1984 parent: 1:925d80f479bb
1950 user: test
1985 user: test
1951 date: Thu Jan 01 00:00:00 1970 +0000
1986 date: Thu Jan 01 00:00:00 1970 +0000
1952 files: a
1987 files: a
1953 description:
1988 description:
1954 3
1989 3
1955
1990
1956
1991
1957 diff -r b09be438c43a -r 8e07aafe1edc a
1992 diff -r b09be438c43a -r 8e07aafe1edc a
1958 --- a/a Thu Jan 01 00:00:00 1970 +0000
1993 --- a/a Thu Jan 01 00:00:00 1970 +0000
1959 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1994 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1960 @@ -1,1 +1,1 @@
1995 @@ -1,1 +1,1 @@
1961 -b
1996 -b
1962 +c
1997 +c
1963 diff -r b09be438c43a -r 8e07aafe1edc b
1998 diff -r b09be438c43a -r 8e07aafe1edc b
1964 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1999 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1965 +++ b/b Thu Jan 01 00:00:00 1970 +0000
2000 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1966 @@ -0,0 +1,1 @@
2001 @@ -0,0 +1,1 @@
1967 +b
2002 +b
1968
2003
1969 $ cd ..
2004 $ cd ..
1970
2005
1971 'hg log -r rev fn' when last(filelog(fn)) != rev
2006 'hg log -r rev fn' when last(filelog(fn)) != rev
1972
2007
1973 $ hg init simplelog
2008 $ hg init simplelog
1974 $ cd simplelog
2009 $ cd simplelog
1975 $ echo f > a
2010 $ echo f > a
1976 $ hg ci -Am'a' -d '0 0'
2011 $ hg ci -Am'a' -d '0 0'
1977 adding a
2012 adding a
1978 $ echo f >> a
2013 $ echo f >> a
1979 $ hg ci -Am'a bis' -d '1 0'
2014 $ hg ci -Am'a bis' -d '1 0'
1980
2015
1981 $ hg log -r0 a
2016 $ hg log -r0 a
1982 changeset: 0:9f758d63dcde
2017 changeset: 0:9f758d63dcde
1983 user: test
2018 user: test
1984 date: Thu Jan 01 00:00:00 1970 +0000
2019 date: Thu Jan 01 00:00:00 1970 +0000
1985 summary: a
2020 summary: a
1986
2021
1987 enable obsolete to test hidden feature
2022 enable obsolete to test hidden feature
1988
2023
1989 $ cat >> $HGRCPATH << EOF
2024 $ cat >> $HGRCPATH << EOF
1990 > [experimental]
2025 > [experimental]
1991 > evolution.createmarkers=True
2026 > evolution.createmarkers=True
1992 > EOF
2027 > EOF
1993
2028
1994 $ hg log --template='{rev}:{node}\n'
2029 $ hg log --template='{rev}:{node}\n'
1995 1:a765632148dc55d38c35c4f247c618701886cb2f
2030 1:a765632148dc55d38c35c4f247c618701886cb2f
1996 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2031 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1997 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
2032 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
1998 1 new obsolescence markers
2033 1 new obsolescence markers
1999 obsoleted 1 changesets
2034 obsoleted 1 changesets
2000 $ hg up null -q
2035 $ hg up null -q
2001 $ hg log --template='{rev}:{node}\n'
2036 $ hg log --template='{rev}:{node}\n'
2002 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2037 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2003 $ hg log --template='{rev}:{node}\n' --hidden
2038 $ hg log --template='{rev}:{node}\n' --hidden
2004 1:a765632148dc55d38c35c4f247c618701886cb2f
2039 1:a765632148dc55d38c35c4f247c618701886cb2f
2005 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2040 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2006 $ hg log -r a
2041 $ hg log -r a
2007 abort: hidden revision 'a' is pruned
2042 abort: hidden revision 'a' is pruned
2008 (use --hidden to access hidden revisions)
2043 (use --hidden to access hidden revisions)
2009 [255]
2044 [255]
2010
2045
2011 test that parent prevent a changeset to be hidden
2046 test that parent prevent a changeset to be hidden
2012
2047
2013 $ hg up 1 -q --hidden
2048 $ hg up 1 -q --hidden
2014 updated to hidden changeset a765632148dc
2049 updated to hidden changeset a765632148dc
2015 (hidden revision 'a765632148dc' is pruned)
2050 (hidden revision 'a765632148dc' is pruned)
2016 $ hg log --template='{rev}:{node}\n'
2051 $ hg log --template='{rev}:{node}\n'
2017 1:a765632148dc55d38c35c4f247c618701886cb2f
2052 1:a765632148dc55d38c35c4f247c618701886cb2f
2018 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2053 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2019
2054
2020 test that second parent prevent a changeset to be hidden too
2055 test that second parent prevent a changeset to be hidden too
2021
2056
2022 $ hg debugsetparents 0 1 # nothing suitable to merge here
2057 $ hg debugsetparents 0 1 # nothing suitable to merge here
2023 $ hg log --template='{rev}:{node}\n'
2058 $ hg log --template='{rev}:{node}\n'
2024 1:a765632148dc55d38c35c4f247c618701886cb2f
2059 1:a765632148dc55d38c35c4f247c618701886cb2f
2025 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2060 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2026 $ hg debugsetparents 1
2061 $ hg debugsetparents 1
2027 $ hg up -q null
2062 $ hg up -q null
2028
2063
2029 bookmarks prevent a changeset being hidden
2064 bookmarks prevent a changeset being hidden
2030
2065
2031 $ hg bookmark --hidden -r 1 X
2066 $ hg bookmark --hidden -r 1 X
2032 bookmarking hidden changeset a765632148dc
2067 bookmarking hidden changeset a765632148dc
2033 (hidden revision 'a765632148dc' is pruned)
2068 (hidden revision 'a765632148dc' is pruned)
2034 $ hg log --template '{rev}:{node}\n'
2069 $ hg log --template '{rev}:{node}\n'
2035 1:a765632148dc55d38c35c4f247c618701886cb2f
2070 1:a765632148dc55d38c35c4f247c618701886cb2f
2036 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2071 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2037 $ hg bookmark -d X
2072 $ hg bookmark -d X
2038
2073
2039 divergent bookmarks are not hidden
2074 divergent bookmarks are not hidden
2040
2075
2041 $ hg bookmark --hidden -r 1 X@foo
2076 $ hg bookmark --hidden -r 1 X@foo
2042 bookmarking hidden changeset a765632148dc
2077 bookmarking hidden changeset a765632148dc
2043 (hidden revision 'a765632148dc' is pruned)
2078 (hidden revision 'a765632148dc' is pruned)
2044 $ hg log --template '{rev}:{node}\n'
2079 $ hg log --template '{rev}:{node}\n'
2045 1:a765632148dc55d38c35c4f247c618701886cb2f
2080 1:a765632148dc55d38c35c4f247c618701886cb2f
2046 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2081 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2047
2082
2048 test hidden revision 0 (issue5385)
2083 test hidden revision 0 (issue5385)
2049
2084
2050 $ hg bookmark -d X@foo
2085 $ hg bookmark -d X@foo
2051 $ hg up null -q
2086 $ hg up null -q
2052 $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2087 $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05
2053 1 new obsolescence markers
2088 1 new obsolescence markers
2054 obsoleted 1 changesets
2089 obsoleted 1 changesets
2055 $ echo f > b
2090 $ echo f > b
2056 $ hg ci -Am'b' -d '2 0'
2091 $ hg ci -Am'b' -d '2 0'
2057 adding b
2092 adding b
2058 $ echo f >> b
2093 $ echo f >> b
2059 $ hg ci -m'b bis' -d '3 0'
2094 $ hg ci -m'b bis' -d '3 0'
2060 $ hg log -T'{rev}:{node}\n'
2095 $ hg log -T'{rev}:{node}\n'
2061 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
2096 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
2062 2:94375ec45bddd2a824535fc04855bd058c926ec0
2097 2:94375ec45bddd2a824535fc04855bd058c926ec0
2063
2098
2064 $ hg log -T'{rev}:{node}\n' -r:
2099 $ hg log -T'{rev}:{node}\n' -r:
2065 2:94375ec45bddd2a824535fc04855bd058c926ec0
2100 2:94375ec45bddd2a824535fc04855bd058c926ec0
2066 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
2101 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
2067 $ hg log -T'{rev}:{node}\n' -r:tip
2102 $ hg log -T'{rev}:{node}\n' -r:tip
2068 2:94375ec45bddd2a824535fc04855bd058c926ec0
2103 2:94375ec45bddd2a824535fc04855bd058c926ec0
2069 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
2104 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
2070 $ hg log -T'{rev}:{node}\n' -r:0
2105 $ hg log -T'{rev}:{node}\n' -r:0
2071 abort: hidden revision '0' is pruned
2106 abort: hidden revision '0' is pruned
2072 (use --hidden to access hidden revisions)
2107 (use --hidden to access hidden revisions)
2073 [255]
2108 [255]
2074 $ hg log -T'{rev}:{node}\n' -f
2109 $ hg log -T'{rev}:{node}\n' -f
2075 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
2110 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
2076 2:94375ec45bddd2a824535fc04855bd058c926ec0
2111 2:94375ec45bddd2a824535fc04855bd058c926ec0
2077
2112
2078 clear extensions configuration
2113 clear extensions configuration
2079 $ echo '[extensions]' >> $HGRCPATH
2114 $ echo '[extensions]' >> $HGRCPATH
2080 $ echo "obs=!" >> $HGRCPATH
2115 $ echo "obs=!" >> $HGRCPATH
2081 $ cd ..
2116 $ cd ..
2082
2117
2083 test -u/-k for problematic encoding
2118 test -u/-k for problematic encoding
2084 # unicode: cp932:
2119 # unicode: cp932:
2085 # u30A2 0x83 0x41(= 'A')
2120 # u30A2 0x83 0x41(= 'A')
2086 # u30C2 0x83 0x61(= 'a')
2121 # u30C2 0x83 0x61(= 'a')
2087
2122
2088 $ hg init problematicencoding
2123 $ hg init problematicencoding
2089 $ cd problematicencoding
2124 $ cd problematicencoding
2090
2125
2091 >>> with open('setup.sh', 'wb') as f:
2126 >>> with open('setup.sh', 'wb') as f:
2092 ... f.write(u'''
2127 ... f.write(u'''
2093 ... echo a > text
2128 ... echo a > text
2094 ... hg add text
2129 ... hg add text
2095 ... hg --encoding utf-8 commit -u '\u30A2' -m none
2130 ... hg --encoding utf-8 commit -u '\u30A2' -m none
2096 ... echo b > text
2131 ... echo b > text
2097 ... hg --encoding utf-8 commit -u '\u30C2' -m none
2132 ... hg --encoding utf-8 commit -u '\u30C2' -m none
2098 ... echo c > text
2133 ... echo c > text
2099 ... hg --encoding utf-8 commit -u none -m '\u30A2'
2134 ... hg --encoding utf-8 commit -u none -m '\u30A2'
2100 ... echo d > text
2135 ... echo d > text
2101 ... hg --encoding utf-8 commit -u none -m '\u30C2'
2136 ... hg --encoding utf-8 commit -u none -m '\u30C2'
2102 ... '''.encode('utf-8')) and None
2137 ... '''.encode('utf-8')) and None
2103 $ sh < setup.sh
2138 $ sh < setup.sh
2104
2139
2105 test in problematic encoding
2140 test in problematic encoding
2106 >>> with open('test.sh', 'wb') as f:
2141 >>> with open('test.sh', 'wb') as f:
2107 ... f.write(u'''
2142 ... f.write(u'''
2108 ... hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2'
2143 ... hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2'
2109 ... echo ====
2144 ... echo ====
2110 ... hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2'
2145 ... hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2'
2111 ... echo ====
2146 ... echo ====
2112 ... hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2'
2147 ... hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2'
2113 ... echo ====
2148 ... echo ====
2114 ... hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
2149 ... hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
2115 ... '''.encode('cp932')) and None
2150 ... '''.encode('cp932')) and None
2116 $ sh < test.sh
2151 $ sh < test.sh
2117 0
2152 0
2118 ====
2153 ====
2119 1
2154 1
2120 ====
2155 ====
2121 2
2156 2
2122 0
2157 0
2123 ====
2158 ====
2124 3
2159 3
2125 1
2160 1
2126
2161
2127 $ cd ..
2162 $ cd ..
2128
2163
2129 test hg log on non-existent files and on directories
2164 test hg log on non-existent files and on directories
2130 $ hg init issue1340
2165 $ hg init issue1340
2131 $ cd issue1340
2166 $ cd issue1340
2132 $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6
2167 $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6
2133 $ echo 1 > d1/f1
2168 $ echo 1 > d1/f1
2134 $ echo 1 > D2/f1
2169 $ echo 1 > D2/f1
2135 $ echo 1 > D3.i/f1
2170 $ echo 1 > D3.i/f1
2136 $ echo 1 > d4.hg/f1
2171 $ echo 1 > d4.hg/f1
2137 $ echo 1 > d5.d/f1
2172 $ echo 1 > d5.d/f1
2138 $ echo 1 > .d6/f1
2173 $ echo 1 > .d6/f1
2139 $ hg -q add .
2174 $ hg -q add .
2140 $ hg commit -m "a bunch of weird directories"
2175 $ hg commit -m "a bunch of weird directories"
2141 $ hg log -l1 d1/f1 | grep changeset
2176 $ hg log -l1 d1/f1 | grep changeset
2142 changeset: 0:65624cd9070a
2177 changeset: 0:65624cd9070a
2143 $ hg log -l1 f1
2178 $ hg log -l1 f1
2144 $ hg log -l1 . | grep changeset
2179 $ hg log -l1 . | grep changeset
2145 changeset: 0:65624cd9070a
2180 changeset: 0:65624cd9070a
2146 $ hg log -l1 ./ | grep changeset
2181 $ hg log -l1 ./ | grep changeset
2147 changeset: 0:65624cd9070a
2182 changeset: 0:65624cd9070a
2148 $ hg log -l1 d1 | grep changeset
2183 $ hg log -l1 d1 | grep changeset
2149 changeset: 0:65624cd9070a
2184 changeset: 0:65624cd9070a
2150 $ hg log -l1 D2 | grep changeset
2185 $ hg log -l1 D2 | grep changeset
2151 changeset: 0:65624cd9070a
2186 changeset: 0:65624cd9070a
2152 $ hg log -l1 D2/f1 | grep changeset
2187 $ hg log -l1 D2/f1 | grep changeset
2153 changeset: 0:65624cd9070a
2188 changeset: 0:65624cd9070a
2154 $ hg log -l1 D3.i | grep changeset
2189 $ hg log -l1 D3.i | grep changeset
2155 changeset: 0:65624cd9070a
2190 changeset: 0:65624cd9070a
2156 $ hg log -l1 D3.i/f1 | grep changeset
2191 $ hg log -l1 D3.i/f1 | grep changeset
2157 changeset: 0:65624cd9070a
2192 changeset: 0:65624cd9070a
2158 $ hg log -l1 d4.hg | grep changeset
2193 $ hg log -l1 d4.hg | grep changeset
2159 changeset: 0:65624cd9070a
2194 changeset: 0:65624cd9070a
2160 $ hg log -l1 d4.hg/f1 | grep changeset
2195 $ hg log -l1 d4.hg/f1 | grep changeset
2161 changeset: 0:65624cd9070a
2196 changeset: 0:65624cd9070a
2162 $ hg log -l1 d5.d | grep changeset
2197 $ hg log -l1 d5.d | grep changeset
2163 changeset: 0:65624cd9070a
2198 changeset: 0:65624cd9070a
2164 $ hg log -l1 d5.d/f1 | grep changeset
2199 $ hg log -l1 d5.d/f1 | grep changeset
2165 changeset: 0:65624cd9070a
2200 changeset: 0:65624cd9070a
2166 $ hg log -l1 .d6 | grep changeset
2201 $ hg log -l1 .d6 | grep changeset
2167 changeset: 0:65624cd9070a
2202 changeset: 0:65624cd9070a
2168 $ hg log -l1 .d6/f1 | grep changeset
2203 $ hg log -l1 .d6/f1 | grep changeset
2169 changeset: 0:65624cd9070a
2204 changeset: 0:65624cd9070a
2170
2205
2171 issue3772: hg log -r :null showing revision 0 as well
2206 issue3772: hg log -r :null showing revision 0 as well
2172
2207
2173 $ hg log -r :null
2208 $ hg log -r :null
2174 changeset: 0:65624cd9070a
2209 changeset: 0:65624cd9070a
2175 tag: tip
2210 tag: tip
2176 user: test
2211 user: test
2177 date: Thu Jan 01 00:00:00 1970 +0000
2212 date: Thu Jan 01 00:00:00 1970 +0000
2178 summary: a bunch of weird directories
2213 summary: a bunch of weird directories
2179
2214
2180 changeset: -1:000000000000
2215 changeset: -1:000000000000
2181 user:
2216 user:
2182 date: Thu Jan 01 00:00:00 1970 +0000
2217 date: Thu Jan 01 00:00:00 1970 +0000
2183
2218
2184 $ hg log -r null:null
2219 $ hg log -r null:null
2185 changeset: -1:000000000000
2220 changeset: -1:000000000000
2186 user:
2221 user:
2187 date: Thu Jan 01 00:00:00 1970 +0000
2222 date: Thu Jan 01 00:00:00 1970 +0000
2188
2223
2189 working-directory revision requires special treatment
2224 working-directory revision requires special treatment
2190
2225
2191 clean:
2226 clean:
2192
2227
2193 $ hg log -r 'wdir()' --debug
2228 $ hg log -r 'wdir()' --debug
2194 changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff
2229 changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff
2195 phase: draft
2230 phase: draft
2196 parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08
2231 parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08
2197 parent: -1:0000000000000000000000000000000000000000
2232 parent: -1:0000000000000000000000000000000000000000
2198 manifest: 2147483647:ffffffffffffffffffffffffffffffffffffffff
2233 manifest: 2147483647:ffffffffffffffffffffffffffffffffffffffff
2199 user: test
2234 user: test
2200 date: [A-Za-z0-9:+ ]+ (re)
2235 date: [A-Za-z0-9:+ ]+ (re)
2201 extra: branch=default
2236 extra: branch=default
2202
2237
2203 $ hg log -r 'wdir()' -p --stat
2238 $ hg log -r 'wdir()' -p --stat
2204 changeset: 2147483647:ffffffffffff
2239 changeset: 2147483647:ffffffffffff
2205 parent: 0:65624cd9070a
2240 parent: 0:65624cd9070a
2206 user: test
2241 user: test
2207 date: [A-Za-z0-9:+ ]+ (re)
2242 date: [A-Za-z0-9:+ ]+ (re)
2208
2243
2209
2244
2210
2245
2211
2246
2212 dirty:
2247 dirty:
2213
2248
2214 $ echo 2 >> d1/f1
2249 $ echo 2 >> d1/f1
2215 $ echo 2 > d1/f2
2250 $ echo 2 > d1/f2
2216 $ hg add d1/f2
2251 $ hg add d1/f2
2217 $ hg remove .d6/f1
2252 $ hg remove .d6/f1
2218 $ hg status
2253 $ hg status
2219 M d1/f1
2254 M d1/f1
2220 A d1/f2
2255 A d1/f2
2221 R .d6/f1
2256 R .d6/f1
2222
2257
2223 $ hg log -r 'wdir()'
2258 $ hg log -r 'wdir()'
2224 changeset: 2147483647:ffffffffffff
2259 changeset: 2147483647:ffffffffffff
2225 parent: 0:65624cd9070a
2260 parent: 0:65624cd9070a
2226 user: test
2261 user: test
2227 date: [A-Za-z0-9:+ ]+ (re)
2262 date: [A-Za-z0-9:+ ]+ (re)
2228
2263
2229 $ hg log -r 'wdir()' -q
2264 $ hg log -r 'wdir()' -q
2230 2147483647:ffffffffffff
2265 2147483647:ffffffffffff
2231
2266
2232 $ hg log -r 'wdir()' --debug
2267 $ hg log -r 'wdir()' --debug
2233 changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff
2268 changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff
2234 phase: draft
2269 phase: draft
2235 parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08
2270 parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08
2236 parent: -1:0000000000000000000000000000000000000000
2271 parent: -1:0000000000000000000000000000000000000000
2237 manifest: 2147483647:ffffffffffffffffffffffffffffffffffffffff
2272 manifest: 2147483647:ffffffffffffffffffffffffffffffffffffffff
2238 user: test
2273 user: test
2239 date: [A-Za-z0-9:+ ]+ (re)
2274 date: [A-Za-z0-9:+ ]+ (re)
2240 files: d1/f1
2275 files: d1/f1
2241 files+: d1/f2
2276 files+: d1/f2
2242 files-: .d6/f1
2277 files-: .d6/f1
2243 extra: branch=default
2278 extra: branch=default
2244
2279
2245 $ hg log -r 'wdir()' -p --stat --git
2280 $ hg log -r 'wdir()' -p --stat --git
2246 changeset: 2147483647:ffffffffffff
2281 changeset: 2147483647:ffffffffffff
2247 parent: 0:65624cd9070a
2282 parent: 0:65624cd9070a
2248 user: test
2283 user: test
2249 date: [A-Za-z0-9:+ ]+ (re)
2284 date: [A-Za-z0-9:+ ]+ (re)
2250
2285
2251 .d6/f1 | 1 -
2286 .d6/f1 | 1 -
2252 d1/f1 | 1 +
2287 d1/f1 | 1 +
2253 d1/f2 | 1 +
2288 d1/f2 | 1 +
2254 3 files changed, 2 insertions(+), 1 deletions(-)
2289 3 files changed, 2 insertions(+), 1 deletions(-)
2255
2290
2256 diff --git a/.d6/f1 b/.d6/f1
2291 diff --git a/.d6/f1 b/.d6/f1
2257 deleted file mode 100644
2292 deleted file mode 100644
2258 --- a/.d6/f1
2293 --- a/.d6/f1
2259 +++ /dev/null
2294 +++ /dev/null
2260 @@ -1,1 +0,0 @@
2295 @@ -1,1 +0,0 @@
2261 -1
2296 -1
2262 diff --git a/d1/f1 b/d1/f1
2297 diff --git a/d1/f1 b/d1/f1
2263 --- a/d1/f1
2298 --- a/d1/f1
2264 +++ b/d1/f1
2299 +++ b/d1/f1
2265 @@ -1,1 +1,2 @@
2300 @@ -1,1 +1,2 @@
2266 1
2301 1
2267 +2
2302 +2
2268 diff --git a/d1/f2 b/d1/f2
2303 diff --git a/d1/f2 b/d1/f2
2269 new file mode 100644
2304 new file mode 100644
2270 --- /dev/null
2305 --- /dev/null
2271 +++ b/d1/f2
2306 +++ b/d1/f2
2272 @@ -0,0 +1,1 @@
2307 @@ -0,0 +1,1 @@
2273 +2
2308 +2
2274
2309
2275 $ hg log -r 'wdir()' -Tjson
2310 $ hg log -r 'wdir()' -Tjson
2276 [
2311 [
2277 {
2312 {
2278 "bookmarks": [],
2313 "bookmarks": [],
2279 "branch": "default",
2314 "branch": "default",
2280 "date": [*, 0], (glob)
2315 "date": [*, 0], (glob)
2281 "desc": "",
2316 "desc": "",
2282 "node": "ffffffffffffffffffffffffffffffffffffffff",
2317 "node": "ffffffffffffffffffffffffffffffffffffffff",
2283 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
2318 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
2284 "phase": "draft",
2319 "phase": "draft",
2285 "rev": 2147483647,
2320 "rev": 2147483647,
2286 "tags": [],
2321 "tags": [],
2287 "user": "test"
2322 "user": "test"
2288 }
2323 }
2289 ]
2324 ]
2290
2325
2291 $ hg log -r 'wdir()' -Tjson -q
2326 $ hg log -r 'wdir()' -Tjson -q
2292 [
2327 [
2293 {
2328 {
2294 "node": "ffffffffffffffffffffffffffffffffffffffff",
2329 "node": "ffffffffffffffffffffffffffffffffffffffff",
2295 "rev": 2147483647
2330 "rev": 2147483647
2296 }
2331 }
2297 ]
2332 ]
2298
2333
2299 $ hg log -r 'wdir()' -Tjson --debug
2334 $ hg log -r 'wdir()' -Tjson --debug
2300 [
2335 [
2301 {
2336 {
2302 "added": ["d1/f2"],
2337 "added": ["d1/f2"],
2303 "bookmarks": [],
2338 "bookmarks": [],
2304 "branch": "default",
2339 "branch": "default",
2305 "date": [*, 0], (glob)
2340 "date": [*, 0], (glob)
2306 "desc": "",
2341 "desc": "",
2307 "extra": {"branch": "default"},
2342 "extra": {"branch": "default"},
2308 "manifest": "ffffffffffffffffffffffffffffffffffffffff",
2343 "manifest": "ffffffffffffffffffffffffffffffffffffffff",
2309 "modified": ["d1/f1"],
2344 "modified": ["d1/f1"],
2310 "node": "ffffffffffffffffffffffffffffffffffffffff",
2345 "node": "ffffffffffffffffffffffffffffffffffffffff",
2311 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
2346 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
2312 "phase": "draft",
2347 "phase": "draft",
2313 "removed": [".d6/f1"],
2348 "removed": [".d6/f1"],
2314 "rev": 2147483647,
2349 "rev": 2147483647,
2315 "tags": [],
2350 "tags": [],
2316 "user": "test"
2351 "user": "test"
2317 }
2352 }
2318 ]
2353 ]
2319
2354
2320 follow files from wdir
2355 follow files from wdir
2321
2356
2322 $ hg cp d1/f1 f1-copy
2357 $ hg cp d1/f1 f1-copy
2323 $ hg stat --all
2358 $ hg stat --all
2324 M d1/f1
2359 M d1/f1
2325 A d1/f2
2360 A d1/f2
2326 A f1-copy
2361 A f1-copy
2327 d1/f1
2362 d1/f1
2328 R .d6/f1
2363 R .d6/f1
2329 C D2/f1
2364 C D2/f1
2330 C D3.i/f1
2365 C D3.i/f1
2331 C d4.hg/f1
2366 C d4.hg/f1
2332 C d5.d/f1
2367 C d5.d/f1
2333
2368
2334 $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat d5.d/f1
2369 $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat d5.d/f1
2335 == 2147483647 ==
2370 == 2147483647 ==
2336
2371
2337 == 0 ==
2372 == 0 ==
2338 d5.d/f1 | 1 +
2373 d5.d/f1 | 1 +
2339 1 files changed, 1 insertions(+), 0 deletions(-)
2374 1 files changed, 1 insertions(+), 0 deletions(-)
2340
2375
2341
2376
2342 $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat d1/f1
2377 $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat d1/f1
2343 == 2147483647 ==
2378 == 2147483647 ==
2344 d1/f1 | 1 +
2379 d1/f1 | 1 +
2345 1 files changed, 1 insertions(+), 0 deletions(-)
2380 1 files changed, 1 insertions(+), 0 deletions(-)
2346
2381
2347 == 0 ==
2382 == 0 ==
2348 d1/f1 | 1 +
2383 d1/f1 | 1 +
2349 1 files changed, 1 insertions(+), 0 deletions(-)
2384 1 files changed, 1 insertions(+), 0 deletions(-)
2350
2385
2351
2386
2352 $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat d1/f2
2387 $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat d1/f2
2353 == 2147483647 ==
2388 == 2147483647 ==
2354 d1/f2 | 1 +
2389 d1/f2 | 1 +
2355 1 files changed, 1 insertions(+), 0 deletions(-)
2390 1 files changed, 1 insertions(+), 0 deletions(-)
2356
2391
2357
2392
2358 $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat f1-copy
2393 $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat f1-copy
2359 == 2147483647 ==
2394 == 2147483647 ==
2360 f1-copy | 1 +
2395 f1-copy | 1 +
2361 1 files changed, 1 insertions(+), 0 deletions(-)
2396 1 files changed, 1 insertions(+), 0 deletions(-)
2362
2397
2363 == 0 ==
2398 == 0 ==
2364 d1/f1 | 1 +
2399 d1/f1 | 1 +
2365 1 files changed, 1 insertions(+), 0 deletions(-)
2400 1 files changed, 1 insertions(+), 0 deletions(-)
2366
2401
2367
2402
2368 $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat notfound
2403 $ hg log -T '== {rev} ==\n' -fr'wdir()' --git --stat notfound
2369 abort: cannot follow file not in any of the specified revisions: "notfound"
2404 abort: cannot follow file not in any of the specified revisions: "notfound"
2370 [255]
2405 [255]
2371
2406
2372 follow files from wdir and non-wdir revision:
2407 follow files from wdir and non-wdir revision:
2373
2408
2374 $ hg log -T '{rev}\n' -fr'wdir()+.' f1-copy
2409 $ hg log -T '{rev}\n' -fr'wdir()+.' f1-copy
2375 f1-copy: no such file in rev 65624cd9070a
2410 f1-copy: no such file in rev 65624cd9070a
2376 2147483647
2411 2147483647
2377 0
2412 0
2378
2413
2379 follow added/removed files from wdir parent
2414 follow added/removed files from wdir parent
2380
2415
2381 $ hg log -T '{rev}\n' -f d1/f2
2416 $ hg log -T '{rev}\n' -f d1/f2
2382 abort: cannot follow nonexistent file: "d1/f2"
2417 abort: cannot follow nonexistent file: "d1/f2"
2383 [255]
2418 [255]
2384
2419
2385 $ hg log -T '{rev}\n' -f f1-copy
2420 $ hg log -T '{rev}\n' -f f1-copy
2386 abort: cannot follow nonexistent file: "f1-copy"
2421 abort: cannot follow nonexistent file: "f1-copy"
2387 [255]
2422 [255]
2388
2423
2389 $ hg log -T '{rev}\n' -f .d6/f1
2424 $ hg log -T '{rev}\n' -f .d6/f1
2390 abort: cannot follow file not in parent revision: ".d6/f1"
2425 abort: cannot follow file not in parent revision: ".d6/f1"
2391 [255]
2426 [255]
2392
2427
2393 $ hg revert -aqC
2428 $ hg revert -aqC
2394
2429
2395 Check that adding an arbitrary name shows up in log automatically
2430 Check that adding an arbitrary name shows up in log automatically
2396
2431
2397 $ cat > ../names.py <<EOF
2432 $ cat > ../names.py <<EOF
2398 > """A small extension to test adding arbitrary names to a repo"""
2433 > """A small extension to test adding arbitrary names to a repo"""
2399 > from __future__ import absolute_import
2434 > from __future__ import absolute_import
2400 > from mercurial import namespaces
2435 > from mercurial import namespaces
2401 >
2436 >
2402 > def reposetup(ui, repo):
2437 > def reposetup(ui, repo):
2403 > if not repo.local():
2438 > if not repo.local():
2404 > return
2439 > return
2405 > foo = {b'foo': repo[0].node()}
2440 > foo = {b'foo': repo[0].node()}
2406 > names = lambda r: foo.keys()
2441 > names = lambda r: foo.keys()
2407 > namemap = lambda r, name: foo.get(name)
2442 > namemap = lambda r, name: foo.get(name)
2408 > nodemap = lambda r, node: [name for name, n in foo.items()
2443 > nodemap = lambda r, node: [name for name, n in foo.items()
2409 > if n == node]
2444 > if n == node]
2410 > ns = namespaces.namespace(
2445 > ns = namespaces.namespace(
2411 > b"bars", templatename=b"bar", logname=b"barlog",
2446 > b"bars", templatename=b"bar", logname=b"barlog",
2412 > colorname=b"barcolor", listnames=names, namemap=namemap,
2447 > colorname=b"barcolor", listnames=names, namemap=namemap,
2413 > nodemap=nodemap)
2448 > nodemap=nodemap)
2414 >
2449 >
2415 > repo.names.addnamespace(ns)
2450 > repo.names.addnamespace(ns)
2416 > EOF
2451 > EOF
2417
2452
2418 $ hg --config extensions.names=../names.py log -r 0
2453 $ hg --config extensions.names=../names.py log -r 0
2419 changeset: 0:65624cd9070a
2454 changeset: 0:65624cd9070a
2420 tag: tip
2455 tag: tip
2421 barlog: foo
2456 barlog: foo
2422 user: test
2457 user: test
2423 date: Thu Jan 01 00:00:00 1970 +0000
2458 date: Thu Jan 01 00:00:00 1970 +0000
2424 summary: a bunch of weird directories
2459 summary: a bunch of weird directories
2425
2460
2426 $ hg --config extensions.names=../names.py \
2461 $ hg --config extensions.names=../names.py \
2427 > --config extensions.color= --config color.log.barcolor=red \
2462 > --config extensions.color= --config color.log.barcolor=red \
2428 > --color=always log -r 0
2463 > --color=always log -r 0
2429 \x1b[0;33mchangeset: 0:65624cd9070a\x1b[0m (esc)
2464 \x1b[0;33mchangeset: 0:65624cd9070a\x1b[0m (esc)
2430 tag: tip
2465 tag: tip
2431 \x1b[0;31mbarlog: foo\x1b[0m (esc)
2466 \x1b[0;31mbarlog: foo\x1b[0m (esc)
2432 user: test
2467 user: test
2433 date: Thu Jan 01 00:00:00 1970 +0000
2468 date: Thu Jan 01 00:00:00 1970 +0000
2434 summary: a bunch of weird directories
2469 summary: a bunch of weird directories
2435
2470
2436 $ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n'
2471 $ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n'
2437 foo
2472 foo
2438
2473
2439 Templater parse errors:
2474 Templater parse errors:
2440
2475
2441 simple error
2476 simple error
2442 $ hg log -r . -T '{shortest(node}'
2477 $ hg log -r . -T '{shortest(node}'
2443 hg: parse error at 14: unexpected token: end
2478 hg: parse error at 14: unexpected token: end
2444 ({shortest(node}
2479 ({shortest(node}
2445 ^ here)
2480 ^ here)
2446 [10]
2481 [10]
2447
2482
2448 multi-line template with error
2483 multi-line template with error
2449 $ hg log -r . -T 'line 1
2484 $ hg log -r . -T 'line 1
2450 > line2
2485 > line2
2451 > {shortest(node}
2486 > {shortest(node}
2452 > line4\nline5'
2487 > line4\nline5'
2453 hg: parse error at 27: unexpected token: end
2488 hg: parse error at 27: unexpected token: end
2454 (line 1\nline2\n{shortest(node}\nline4\nline5
2489 (line 1\nline2\n{shortest(node}\nline4\nline5
2455 ^ here)
2490 ^ here)
2456 [10]
2491 [10]
2457
2492
2458 $ cd ..
2493 $ cd ..
2459
2494
2460 New namespace is registered per repo instance, but the template keyword
2495 New namespace is registered per repo instance, but the template keyword
2461 is global. So we shouldn't expect the namespace always exists. Using
2496 is global. So we shouldn't expect the namespace always exists. Using
2462 ssh:// makes sure a bundle repository is created from scratch. (issue6301)
2497 ssh:// makes sure a bundle repository is created from scratch. (issue6301)
2463
2498
2464 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" \
2499 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" \
2465 > -qr0 "ssh://user@dummy/`pwd`/a" a-clone
2500 > -qr0 "ssh://user@dummy/`pwd`/a" a-clone
2466 $ hg incoming --config extensions.names=names.py -R a-clone \
2501 $ hg incoming --config extensions.names=names.py -R a-clone \
2467 > -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -T '{bars}\n' -l1
2502 > -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -T '{bars}\n' -l1
2468 comparing with ssh://user@dummy/$TESTTMP/a
2503 comparing with ssh://user@dummy/$TESTTMP/a
2469 searching for changes
2504 searching for changes
2470
2505
2471
2506
2472 hg log -f dir across branches
2507 hg log -f dir across branches
2473
2508
2474 $ hg init acrossbranches
2509 $ hg init acrossbranches
2475 $ cd acrossbranches
2510 $ cd acrossbranches
2476 $ mkdir d
2511 $ mkdir d
2477 $ echo a > d/a && hg ci -Aqm a
2512 $ echo a > d/a && hg ci -Aqm a
2478 $ echo b > d/a && hg ci -Aqm b
2513 $ echo b > d/a && hg ci -Aqm b
2479 $ hg up -q 0
2514 $ hg up -q 0
2480 $ echo b > d/a && hg ci -Aqm c
2515 $ echo b > d/a && hg ci -Aqm c
2481 $ hg log -f d -T '{desc}' -G
2516 $ hg log -f d -T '{desc}' -G
2482 @ c
2517 @ c
2483 |
2518 |
2484 o a
2519 o a
2485
2520
2486 Ensure that largefiles doesn't interfere with following a normal file
2521 Ensure that largefiles doesn't interfere with following a normal file
2487 $ hg --config extensions.largefiles= log -f d -T '{desc}' -G
2522 $ hg --config extensions.largefiles= log -f d -T '{desc}' -G
2488 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
2523 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
2489 @ c
2524 @ c
2490 |
2525 |
2491 o a
2526 o a
2492
2527
2493 $ hg log -f d/a -T '{desc}' -G
2528 $ hg log -f d/a -T '{desc}' -G
2494 @ c
2529 @ c
2495 |
2530 |
2496 o a
2531 o a
2497
2532
2498 $ cd ..
2533 $ cd ..
2499
2534
2500 hg log -f with linkrev pointing to another branch
2535 hg log -f with linkrev pointing to another branch
2501 -------------------------------------------------
2536 -------------------------------------------------
2502
2537
2503 create history with a filerev whose linkrev points to another branch
2538 create history with a filerev whose linkrev points to another branch
2504
2539
2505 $ hg init branchedlinkrev
2540 $ hg init branchedlinkrev
2506 $ cd branchedlinkrev
2541 $ cd branchedlinkrev
2507 $ echo 1 > a
2542 $ echo 1 > a
2508 $ hg commit -Am 'content1'
2543 $ hg commit -Am 'content1'
2509 adding a
2544 adding a
2510 $ echo 2 > a
2545 $ echo 2 > a
2511 $ hg commit -m 'content2'
2546 $ hg commit -m 'content2'
2512 $ hg up --rev 'desc(content1)'
2547 $ hg up --rev 'desc(content1)'
2513 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2548 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2514 $ echo unrelated > unrelated
2549 $ echo unrelated > unrelated
2515 $ hg commit -Am 'unrelated'
2550 $ hg commit -Am 'unrelated'
2516 adding unrelated
2551 adding unrelated
2517 created new head
2552 created new head
2518 $ hg graft -r 'desc(content2)'
2553 $ hg graft -r 'desc(content2)'
2519 grafting 1:2294ae80ad84 "content2"
2554 grafting 1:2294ae80ad84 "content2"
2520 $ echo 3 > a
2555 $ echo 3 > a
2521 $ hg commit -m 'content3'
2556 $ hg commit -m 'content3'
2522 $ hg log -G
2557 $ hg log -G
2523 @ changeset: 4:50b9b36e9c5d
2558 @ changeset: 4:50b9b36e9c5d
2524 | tag: tip
2559 | tag: tip
2525 | user: test
2560 | user: test
2526 | date: Thu Jan 01 00:00:00 1970 +0000
2561 | date: Thu Jan 01 00:00:00 1970 +0000
2527 | summary: content3
2562 | summary: content3
2528 |
2563 |
2529 o changeset: 3:15b2327059e5
2564 o changeset: 3:15b2327059e5
2530 | user: test
2565 | user: test
2531 | date: Thu Jan 01 00:00:00 1970 +0000
2566 | date: Thu Jan 01 00:00:00 1970 +0000
2532 | summary: content2
2567 | summary: content2
2533 |
2568 |
2534 o changeset: 2:2029acd1168c
2569 o changeset: 2:2029acd1168c
2535 | parent: 0:ae0a3c9f9e95
2570 | parent: 0:ae0a3c9f9e95
2536 | user: test
2571 | user: test
2537 | date: Thu Jan 01 00:00:00 1970 +0000
2572 | date: Thu Jan 01 00:00:00 1970 +0000
2538 | summary: unrelated
2573 | summary: unrelated
2539 |
2574 |
2540 | o changeset: 1:2294ae80ad84
2575 | o changeset: 1:2294ae80ad84
2541 |/ user: test
2576 |/ user: test
2542 | date: Thu Jan 01 00:00:00 1970 +0000
2577 | date: Thu Jan 01 00:00:00 1970 +0000
2543 | summary: content2
2578 | summary: content2
2544 |
2579 |
2545 o changeset: 0:ae0a3c9f9e95
2580 o changeset: 0:ae0a3c9f9e95
2546 user: test
2581 user: test
2547 date: Thu Jan 01 00:00:00 1970 +0000
2582 date: Thu Jan 01 00:00:00 1970 +0000
2548 summary: content1
2583 summary: content1
2549
2584
2550
2585
2551 log -f on the file should list the graft result.
2586 log -f on the file should list the graft result.
2552
2587
2553 $ hg log -Gf a
2588 $ hg log -Gf a
2554 @ changeset: 4:50b9b36e9c5d
2589 @ changeset: 4:50b9b36e9c5d
2555 | tag: tip
2590 | tag: tip
2556 | user: test
2591 | user: test
2557 | date: Thu Jan 01 00:00:00 1970 +0000
2592 | date: Thu Jan 01 00:00:00 1970 +0000
2558 | summary: content3
2593 | summary: content3
2559 |
2594 |
2560 o changeset: 3:15b2327059e5
2595 o changeset: 3:15b2327059e5
2561 : user: test
2596 : user: test
2562 : date: Thu Jan 01 00:00:00 1970 +0000
2597 : date: Thu Jan 01 00:00:00 1970 +0000
2563 : summary: content2
2598 : summary: content2
2564 :
2599 :
2565 o changeset: 0:ae0a3c9f9e95
2600 o changeset: 0:ae0a3c9f9e95
2566 user: test
2601 user: test
2567 date: Thu Jan 01 00:00:00 1970 +0000
2602 date: Thu Jan 01 00:00:00 1970 +0000
2568 summary: content1
2603 summary: content1
2569
2604
2570
2605
2571 plain log lists the original version
2606 plain log lists the original version
2572 (XXX we should probably list both)
2607 (XXX we should probably list both)
2573
2608
2574 $ hg log -G a
2609 $ hg log -G a
2575 @ changeset: 4:50b9b36e9c5d
2610 @ changeset: 4:50b9b36e9c5d
2576 : tag: tip
2611 : tag: tip
2577 : user: test
2612 : user: test
2578 : date: Thu Jan 01 00:00:00 1970 +0000
2613 : date: Thu Jan 01 00:00:00 1970 +0000
2579 : summary: content3
2614 : summary: content3
2580 :
2615 :
2581 : o changeset: 1:2294ae80ad84
2616 : o changeset: 1:2294ae80ad84
2582 :/ user: test
2617 :/ user: test
2583 : date: Thu Jan 01 00:00:00 1970 +0000
2618 : date: Thu Jan 01 00:00:00 1970 +0000
2584 : summary: content2
2619 : summary: content2
2585 :
2620 :
2586 o changeset: 0:ae0a3c9f9e95
2621 o changeset: 0:ae0a3c9f9e95
2587 user: test
2622 user: test
2588 date: Thu Jan 01 00:00:00 1970 +0000
2623 date: Thu Jan 01 00:00:00 1970 +0000
2589 summary: content1
2624 summary: content1
2590
2625
2591
2626
2592 hg log -f from the grafted changeset
2627 hg log -f from the grafted changeset
2593 (The bootstrap should properly take the topology in account)
2628 (The bootstrap should properly take the topology in account)
2594
2629
2595 $ hg up 'desc(content3)^'
2630 $ hg up 'desc(content3)^'
2596 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2631 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2597 $ hg log -Gf a
2632 $ hg log -Gf a
2598 @ changeset: 3:15b2327059e5
2633 @ changeset: 3:15b2327059e5
2599 : user: test
2634 : user: test
2600 : date: Thu Jan 01 00:00:00 1970 +0000
2635 : date: Thu Jan 01 00:00:00 1970 +0000
2601 : summary: content2
2636 : summary: content2
2602 :
2637 :
2603 o changeset: 0:ae0a3c9f9e95
2638 o changeset: 0:ae0a3c9f9e95
2604 user: test
2639 user: test
2605 date: Thu Jan 01 00:00:00 1970 +0000
2640 date: Thu Jan 01 00:00:00 1970 +0000
2606 summary: content1
2641 summary: content1
2607
2642
2608
2643
2609 Test that we use the first non-hidden changeset in that case.
2644 Test that we use the first non-hidden changeset in that case.
2610
2645
2611 (hide the changeset)
2646 (hide the changeset)
2612
2647
2613 $ hg log -T '{node}\n' -r 1
2648 $ hg log -T '{node}\n' -r 1
2614 2294ae80ad8447bc78383182eeac50cb049df623
2649 2294ae80ad8447bc78383182eeac50cb049df623
2615 $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
2650 $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
2616 1 new obsolescence markers
2651 1 new obsolescence markers
2617 obsoleted 1 changesets
2652 obsoleted 1 changesets
2618 $ hg log -G
2653 $ hg log -G
2619 o changeset: 4:50b9b36e9c5d
2654 o changeset: 4:50b9b36e9c5d
2620 | tag: tip
2655 | tag: tip
2621 | user: test
2656 | user: test
2622 | date: Thu Jan 01 00:00:00 1970 +0000
2657 | date: Thu Jan 01 00:00:00 1970 +0000
2623 | summary: content3
2658 | summary: content3
2624 |
2659 |
2625 @ changeset: 3:15b2327059e5
2660 @ changeset: 3:15b2327059e5
2626 | user: test
2661 | user: test
2627 | date: Thu Jan 01 00:00:00 1970 +0000
2662 | date: Thu Jan 01 00:00:00 1970 +0000
2628 | summary: content2
2663 | summary: content2
2629 |
2664 |
2630 o changeset: 2:2029acd1168c
2665 o changeset: 2:2029acd1168c
2631 | parent: 0:ae0a3c9f9e95
2666 | parent: 0:ae0a3c9f9e95
2632 | user: test
2667 | user: test
2633 | date: Thu Jan 01 00:00:00 1970 +0000
2668 | date: Thu Jan 01 00:00:00 1970 +0000
2634 | summary: unrelated
2669 | summary: unrelated
2635 |
2670 |
2636 o changeset: 0:ae0a3c9f9e95
2671 o changeset: 0:ae0a3c9f9e95
2637 user: test
2672 user: test
2638 date: Thu Jan 01 00:00:00 1970 +0000
2673 date: Thu Jan 01 00:00:00 1970 +0000
2639 summary: content1
2674 summary: content1
2640
2675
2641
2676
2642 Check that log on the file does not drop the file revision.
2677 Check that log on the file does not drop the file revision.
2643
2678
2644 $ hg log -G a
2679 $ hg log -G a
2645 o changeset: 4:50b9b36e9c5d
2680 o changeset: 4:50b9b36e9c5d
2646 | tag: tip
2681 | tag: tip
2647 | user: test
2682 | user: test
2648 | date: Thu Jan 01 00:00:00 1970 +0000
2683 | date: Thu Jan 01 00:00:00 1970 +0000
2649 | summary: content3
2684 | summary: content3
2650 |
2685 |
2651 @ changeset: 3:15b2327059e5
2686 @ changeset: 3:15b2327059e5
2652 : user: test
2687 : user: test
2653 : date: Thu Jan 01 00:00:00 1970 +0000
2688 : date: Thu Jan 01 00:00:00 1970 +0000
2654 : summary: content2
2689 : summary: content2
2655 :
2690 :
2656 o changeset: 0:ae0a3c9f9e95
2691 o changeset: 0:ae0a3c9f9e95
2657 user: test
2692 user: test
2658 date: Thu Jan 01 00:00:00 1970 +0000
2693 date: Thu Jan 01 00:00:00 1970 +0000
2659 summary: content1
2694 summary: content1
2660
2695
2661
2696
2662 Even when a head revision is linkrev-shadowed.
2697 Even when a head revision is linkrev-shadowed.
2663
2698
2664 $ hg log -T '{node}\n' -r 4
2699 $ hg log -T '{node}\n' -r 4
2665 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
2700 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
2666 $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
2701 $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
2667 1 new obsolescence markers
2702 1 new obsolescence markers
2668 obsoleted 1 changesets
2703 obsoleted 1 changesets
2669 $ hg log -G a
2704 $ hg log -G a
2670 @ changeset: 3:15b2327059e5
2705 @ changeset: 3:15b2327059e5
2671 : tag: tip
2706 : tag: tip
2672 : user: test
2707 : user: test
2673 : date: Thu Jan 01 00:00:00 1970 +0000
2708 : date: Thu Jan 01 00:00:00 1970 +0000
2674 : summary: content2
2709 : summary: content2
2675 :
2710 :
2676 o changeset: 0:ae0a3c9f9e95
2711 o changeset: 0:ae0a3c9f9e95
2677 user: test
2712 user: test
2678 date: Thu Jan 01 00:00:00 1970 +0000
2713 date: Thu Jan 01 00:00:00 1970 +0000
2679 summary: content1
2714 summary: content1
2680
2715
2681
2716
2682 $ cd ..
2717 $ cd ..
2683
2718
2684 Even when the file revision is missing from some head:
2719 Even when the file revision is missing from some head:
2685
2720
2686 $ hg init issue4490
2721 $ hg init issue4490
2687 $ cd issue4490
2722 $ cd issue4490
2688 $ echo '[experimental]' >> .hg/hgrc
2723 $ echo '[experimental]' >> .hg/hgrc
2689 $ echo 'evolution.createmarkers=True' >> .hg/hgrc
2724 $ echo 'evolution.createmarkers=True' >> .hg/hgrc
2690 $ echo a > a
2725 $ echo a > a
2691 $ hg ci -Am0
2726 $ hg ci -Am0
2692 adding a
2727 adding a
2693 $ echo b > b
2728 $ echo b > b
2694 $ hg ci -Am1
2729 $ hg ci -Am1
2695 adding b
2730 adding b
2696 $ echo B > b
2731 $ echo B > b
2697 $ hg ci --amend -m 1
2732 $ hg ci --amend -m 1
2698 $ hg up 0
2733 $ hg up 0
2699 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
2734 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
2700 $ echo c > c
2735 $ echo c > c
2701 $ hg ci -Am2
2736 $ hg ci -Am2
2702 adding c
2737 adding c
2703 created new head
2738 created new head
2704 $ hg up 'head() and not .'
2739 $ hg up 'head() and not .'
2705 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
2740 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
2706 $ hg log -G
2741 $ hg log -G
2707 o changeset: 3:db815d6d32e6
2742 o changeset: 3:db815d6d32e6
2708 | tag: tip
2743 | tag: tip
2709 | parent: 0:f7b1eb17ad24
2744 | parent: 0:f7b1eb17ad24
2710 | user: test
2745 | user: test
2711 | date: Thu Jan 01 00:00:00 1970 +0000
2746 | date: Thu Jan 01 00:00:00 1970 +0000
2712 | summary: 2
2747 | summary: 2
2713 |
2748 |
2714 | @ changeset: 2:9bc8ce7f9356
2749 | @ changeset: 2:9bc8ce7f9356
2715 |/ parent: 0:f7b1eb17ad24
2750 |/ parent: 0:f7b1eb17ad24
2716 | user: test
2751 | user: test
2717 | date: Thu Jan 01 00:00:00 1970 +0000
2752 | date: Thu Jan 01 00:00:00 1970 +0000
2718 | summary: 1
2753 | summary: 1
2719 |
2754 |
2720 o changeset: 0:f7b1eb17ad24
2755 o changeset: 0:f7b1eb17ad24
2721 user: test
2756 user: test
2722 date: Thu Jan 01 00:00:00 1970 +0000
2757 date: Thu Jan 01 00:00:00 1970 +0000
2723 summary: 0
2758 summary: 0
2724
2759
2725 $ hg log -f -G b
2760 $ hg log -f -G b
2726 @ changeset: 2:9bc8ce7f9356
2761 @ changeset: 2:9bc8ce7f9356
2727 | parent: 0:f7b1eb17ad24
2762 | parent: 0:f7b1eb17ad24
2728 ~ user: test
2763 ~ user: test
2729 date: Thu Jan 01 00:00:00 1970 +0000
2764 date: Thu Jan 01 00:00:00 1970 +0000
2730 summary: 1
2765 summary: 1
2731
2766
2732 $ hg log -G b
2767 $ hg log -G b
2733 @ changeset: 2:9bc8ce7f9356
2768 @ changeset: 2:9bc8ce7f9356
2734 | parent: 0:f7b1eb17ad24
2769 | parent: 0:f7b1eb17ad24
2735 ~ user: test
2770 ~ user: test
2736 date: Thu Jan 01 00:00:00 1970 +0000
2771 date: Thu Jan 01 00:00:00 1970 +0000
2737 summary: 1
2772 summary: 1
2738
2773
2739 $ cd ..
2774 $ cd ..
2740
2775
2741 Check proper report when the manifest changes but not the file issue4499
2776 Check proper report when the manifest changes but not the file issue4499
2742 ------------------------------------------------------------------------
2777 ------------------------------------------------------------------------
2743
2778
2744 $ hg init issue4499
2779 $ hg init issue4499
2745 $ cd issue4499
2780 $ cd issue4499
2746 $ 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
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 > echo 1 > $f;
2782 > echo 1 > $f;
2748 > hg add $f;
2783 > hg add $f;
2749 > done
2784 > done
2750 $ hg commit -m 'A1B1C1'
2785 $ hg commit -m 'A1B1C1'
2751 $ echo 2 > A
2786 $ echo 2 > A
2752 $ echo 2 > B
2787 $ echo 2 > B
2753 $ echo 2 > C
2788 $ echo 2 > C
2754 $ hg commit -m 'A2B2C2'
2789 $ hg commit -m 'A2B2C2'
2755 $ hg up 0
2790 $ hg up 0
2756 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
2791 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
2757 $ echo 3 > A
2792 $ echo 3 > A
2758 $ echo 2 > B
2793 $ echo 2 > B
2759 $ echo 2 > C
2794 $ echo 2 > C
2760 $ hg commit -m 'A3B2C2'
2795 $ hg commit -m 'A3B2C2'
2761 created new head
2796 created new head
2762
2797
2763 $ hg log -G
2798 $ hg log -G
2764 @ changeset: 2:fe5fc3d0eb17
2799 @ changeset: 2:fe5fc3d0eb17
2765 | tag: tip
2800 | tag: tip
2766 | parent: 0:abf4f0e38563
2801 | parent: 0:abf4f0e38563
2767 | user: test
2802 | user: test
2768 | date: Thu Jan 01 00:00:00 1970 +0000
2803 | date: Thu Jan 01 00:00:00 1970 +0000
2769 | summary: A3B2C2
2804 | summary: A3B2C2
2770 |
2805 |
2771 | o changeset: 1:07dcc6b312c0
2806 | o changeset: 1:07dcc6b312c0
2772 |/ user: test
2807 |/ user: test
2773 | date: Thu Jan 01 00:00:00 1970 +0000
2808 | date: Thu Jan 01 00:00:00 1970 +0000
2774 | summary: A2B2C2
2809 | summary: A2B2C2
2775 |
2810 |
2776 o changeset: 0:abf4f0e38563
2811 o changeset: 0:abf4f0e38563
2777 user: test
2812 user: test
2778 date: Thu Jan 01 00:00:00 1970 +0000
2813 date: Thu Jan 01 00:00:00 1970 +0000
2779 summary: A1B1C1
2814 summary: A1B1C1
2780
2815
2781
2816
2782 Log -f on B should reports current changesets
2817 Log -f on B should reports current changesets
2783
2818
2784 $ hg log -fG B
2819 $ hg log -fG B
2785 @ changeset: 2:fe5fc3d0eb17
2820 @ changeset: 2:fe5fc3d0eb17
2786 | tag: tip
2821 | tag: tip
2787 | parent: 0:abf4f0e38563
2822 | parent: 0:abf4f0e38563
2788 | user: test
2823 | user: test
2789 | date: Thu Jan 01 00:00:00 1970 +0000
2824 | date: Thu Jan 01 00:00:00 1970 +0000
2790 | summary: A3B2C2
2825 | summary: A3B2C2
2791 |
2826 |
2792 o changeset: 0:abf4f0e38563
2827 o changeset: 0:abf4f0e38563
2793 user: test
2828 user: test
2794 date: Thu Jan 01 00:00:00 1970 +0000
2829 date: Thu Jan 01 00:00:00 1970 +0000
2795 summary: A1B1C1
2830 summary: A1B1C1
2796
2831
2797 $ cd ..
2832 $ cd ..
2798
2833
2799 --- going to test line wrap fix on using both --stat and -G (issue5800)
2834 --- going to test line wrap fix on using both --stat and -G (issue5800)
2800 $ hg init issue5800
2835 $ hg init issue5800
2801 $ cd issue5800
2836 $ cd issue5800
2802 $ touch a
2837 $ touch a
2803 $ hg ci -Am 'add a'
2838 $ hg ci -Am 'add a'
2804 adding a
2839 adding a
2805 ---- now we are going to add 300 lines to a
2840 ---- now we are going to add 300 lines to a
2806 $ for i in `$TESTDIR/seq.py 1 300`; do echo $i >> a; done
2841 $ for i in `$TESTDIR/seq.py 1 300`; do echo $i >> a; done
2807 $ hg ci -m 'modify a'
2842 $ hg ci -m 'modify a'
2808 $ hg log
2843 $ hg log
2809 changeset: 1:a98683e6a834
2844 changeset: 1:a98683e6a834
2810 tag: tip
2845 tag: tip
2811 user: test
2846 user: test
2812 date: Thu Jan 01 00:00:00 1970 +0000
2847 date: Thu Jan 01 00:00:00 1970 +0000
2813 summary: modify a
2848 summary: modify a
2814
2849
2815 changeset: 0:ac82d8b1f7c4
2850 changeset: 0:ac82d8b1f7c4
2816 user: test
2851 user: test
2817 date: Thu Jan 01 00:00:00 1970 +0000
2852 date: Thu Jan 01 00:00:00 1970 +0000
2818 summary: add a
2853 summary: add a
2819
2854
2820 ---- now visualise the changes we made without template
2855 ---- now visualise the changes we made without template
2821 $ hg log -l1 -r a98683e6a834 --stat -G
2856 $ hg log -l1 -r a98683e6a834 --stat -G
2822 @ changeset: 1:a98683e6a834
2857 @ changeset: 1:a98683e6a834
2823 | tag: tip
2858 | tag: tip
2824 ~ user: test
2859 ~ user: test
2825 date: Thu Jan 01 00:00:00 1970 +0000
2860 date: Thu Jan 01 00:00:00 1970 +0000
2826 summary: modify a
2861 summary: modify a
2827
2862
2828 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2863 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2829 1 files changed, 300 insertions(+), 0 deletions(-)
2864 1 files changed, 300 insertions(+), 0 deletions(-)
2830
2865
2831 ---- with template
2866 ---- with template
2832 $ hg log -l1 -r a98683e6a834 --stat -G -T bisect
2867 $ hg log -l1 -r a98683e6a834 --stat -G -T bisect
2833 @ changeset: 1:a98683e6a834
2868 @ changeset: 1:a98683e6a834
2834 | bisect:
2869 | bisect:
2835 ~ tag: tip
2870 ~ tag: tip
2836 user: test
2871 user: test
2837 date: Thu Jan 01 00:00:00 1970 +0000
2872 date: Thu Jan 01 00:00:00 1970 +0000
2838 summary: modify a
2873 summary: modify a
2839
2874
2840 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2875 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2841 1 files changed, 300 insertions(+), 0 deletions(-)
2876 1 files changed, 300 insertions(+), 0 deletions(-)
2842
2877
2843 $ hg log -l1 -r a98683e6a834 --stat -G -T changelog
2878 $ hg log -l1 -r a98683e6a834 --stat -G -T changelog
2844 1970-01-01 test <test>
2879 1970-01-01 test <test>
2845
2880
2846 @ * a:
2881 @ * a:
2847 | modify a
2882 | modify a
2848 ~ [a98683e6a834] [tip]
2883 ~ [a98683e6a834] [tip]
2849
2884
2850 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2885 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2851 1 files changed, 300 insertions(+), 0 deletions(-)
2886 1 files changed, 300 insertions(+), 0 deletions(-)
2852
2887
2853 $ hg log -l1 -r a98683e6a834 --stat -G -T compact
2888 $ hg log -l1 -r a98683e6a834 --stat -G -T compact
2854 @ 1[tip] a98683e6a834 1970-01-01 00:00 +0000 test
2889 @ 1[tip] a98683e6a834 1970-01-01 00:00 +0000 test
2855 | modify a
2890 | modify a
2856 ~
2891 ~
2857 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2892 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2858 1 files changed, 300 insertions(+), 0 deletions(-)
2893 1 files changed, 300 insertions(+), 0 deletions(-)
2859
2894
2860 $ hg log -l1 -r a98683e6a834 --stat -G -T default
2895 $ hg log -l1 -r a98683e6a834 --stat -G -T default
2861 @ changeset: 1:a98683e6a834
2896 @ changeset: 1:a98683e6a834
2862 | tag: tip
2897 | tag: tip
2863 ~ user: test
2898 ~ user: test
2864 date: Thu Jan 01 00:00:00 1970 +0000
2899 date: Thu Jan 01 00:00:00 1970 +0000
2865 summary: modify a
2900 summary: modify a
2866
2901
2867 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2902 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2868 1 files changed, 300 insertions(+), 0 deletions(-)
2903 1 files changed, 300 insertions(+), 0 deletions(-)
2869
2904
2870 $ hg log -l1 -r a98683e6a834 --stat -G -T phases
2905 $ hg log -l1 -r a98683e6a834 --stat -G -T phases
2871 @ changeset: 1:a98683e6a834
2906 @ changeset: 1:a98683e6a834
2872 | tag: tip
2907 | tag: tip
2873 ~ phase: draft
2908 ~ phase: draft
2874 user: test
2909 user: test
2875 date: Thu Jan 01 00:00:00 1970 +0000
2910 date: Thu Jan 01 00:00:00 1970 +0000
2876 summary: modify a
2911 summary: modify a
2877
2912
2878 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2913 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2879 1 files changed, 300 insertions(+), 0 deletions(-)
2914 1 files changed, 300 insertions(+), 0 deletions(-)
2880
2915
2881 $ hg log -l1 -r a98683e6a834 --stat -G -T show
2916 $ hg log -l1 -r a98683e6a834 --stat -G -T show
2882 @ changeset: 1:a98683e6a834
2917 @ changeset: 1:a98683e6a834
2883 | tag: tip
2918 | tag: tip
2884 ~ user: test
2919 ~ user: test
2885 date: Thu Jan 01 00:00:00 1970 +0000
2920 date: Thu Jan 01 00:00:00 1970 +0000
2886 summary: modify a
2921 summary: modify a
2887
2922
2888 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2923 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2889 1 files changed, 300 insertions(+), 0 deletions(-)
2924 1 files changed, 300 insertions(+), 0 deletions(-)
2890
2925
2891 $ hg log -l1 -r a98683e6a834 --stat -G -T status
2926 $ hg log -l1 -r a98683e6a834 --stat -G -T status
2892 @ changeset: 1:a98683e6a834
2927 @ changeset: 1:a98683e6a834
2893 | tag: tip
2928 | tag: tip
2894 ~ user: test
2929 ~ user: test
2895 date: Thu Jan 01 00:00:00 1970 +0000
2930 date: Thu Jan 01 00:00:00 1970 +0000
2896 summary: modify a
2931 summary: modify a
2897 files:
2932 files:
2898 M a
2933 M a
2899
2934
2900 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2935 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2901 1 files changed, 300 insertions(+), 0 deletions(-)
2936 1 files changed, 300 insertions(+), 0 deletions(-)
2902
2937
2903 $ hg log -l1 -r a98683e6a834 --stat -G -T xml
2938 $ hg log -l1 -r a98683e6a834 --stat -G -T xml
2904 <?xml version="1.0"?>
2939 <?xml version="1.0"?>
2905 <log>
2940 <log>
2906 @ <logentry revision="1" node="a98683e6a8340830a7683909768b62871e84bc9d">
2941 @ <logentry revision="1" node="a98683e6a8340830a7683909768b62871e84bc9d">
2907 | <tag>tip</tag>
2942 | <tag>tip</tag>
2908 ~ <author email="test">test</author>
2943 ~ <author email="test">test</author>
2909 <date>1970-01-01T00:00:00+00:00</date>
2944 <date>1970-01-01T00:00:00+00:00</date>
2910 <msg xml:space="preserve">modify a</msg>
2945 <msg xml:space="preserve">modify a</msg>
2911 </logentry>
2946 </logentry>
2912 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2947 a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2913 1 files changed, 300 insertions(+), 0 deletions(-)
2948 1 files changed, 300 insertions(+), 0 deletions(-)
2914
2949
2915 </log>
2950 </log>
2916
2951
2917 $ cd ..
2952 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now