##// END OF EJS Templates
localrepo: make filterpats private (API)...
Gregory Szorc -
r37155:db90a579 default
parent child Browse files
Show More
@@ -1,2332 +1,2332 b''
1 1 # localrepo.py - read/write repository class for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from __future__ import absolute_import
9 9
10 10 import errno
11 11 import hashlib
12 12 import os
13 13 import random
14 14 import time
15 15 import weakref
16 16
17 17 from .i18n import _
18 18 from .node import (
19 19 hex,
20 20 nullid,
21 21 short,
22 22 )
23 23 from . import (
24 24 bookmarks,
25 25 branchmap,
26 26 bundle2,
27 27 changegroup,
28 28 changelog,
29 29 color,
30 30 context,
31 31 dirstate,
32 32 dirstateguard,
33 33 discovery,
34 34 encoding,
35 35 error,
36 36 exchange,
37 37 extensions,
38 38 filelog,
39 39 hook,
40 40 lock as lockmod,
41 41 manifest,
42 42 match as matchmod,
43 43 merge as mergemod,
44 44 mergeutil,
45 45 namespaces,
46 46 narrowspec,
47 47 obsolete,
48 48 pathutil,
49 49 peer,
50 50 phases,
51 51 pushkey,
52 52 pycompat,
53 53 repository,
54 54 repoview,
55 55 revset,
56 56 revsetlang,
57 57 scmutil,
58 58 sparse,
59 59 store,
60 60 subrepoutil,
61 61 tags as tagsmod,
62 62 transaction,
63 63 txnutil,
64 64 util,
65 65 vfs as vfsmod,
66 66 )
67 67 from .utils import (
68 68 procutil,
69 69 stringutil,
70 70 )
71 71
72 72 release = lockmod.release
73 73 urlerr = util.urlerr
74 74 urlreq = util.urlreq
75 75
76 76 # set of (path, vfs-location) tuples. vfs-location is:
77 77 # - 'plain for vfs relative paths
78 78 # - '' for svfs relative paths
79 79 _cachedfiles = set()
80 80
81 81 class _basefilecache(scmutil.filecache):
82 82 """All filecache usage on repo are done for logic that should be unfiltered
83 83 """
84 84 def __get__(self, repo, type=None):
85 85 if repo is None:
86 86 return self
87 87 return super(_basefilecache, self).__get__(repo.unfiltered(), type)
88 88 def __set__(self, repo, value):
89 89 return super(_basefilecache, self).__set__(repo.unfiltered(), value)
90 90 def __delete__(self, repo):
91 91 return super(_basefilecache, self).__delete__(repo.unfiltered())
92 92
93 93 class repofilecache(_basefilecache):
94 94 """filecache for files in .hg but outside of .hg/store"""
95 95 def __init__(self, *paths):
96 96 super(repofilecache, self).__init__(*paths)
97 97 for path in paths:
98 98 _cachedfiles.add((path, 'plain'))
99 99
100 100 def join(self, obj, fname):
101 101 return obj.vfs.join(fname)
102 102
103 103 class storecache(_basefilecache):
104 104 """filecache for files in the store"""
105 105 def __init__(self, *paths):
106 106 super(storecache, self).__init__(*paths)
107 107 for path in paths:
108 108 _cachedfiles.add((path, ''))
109 109
110 110 def join(self, obj, fname):
111 111 return obj.sjoin(fname)
112 112
113 113 def isfilecached(repo, name):
114 114 """check if a repo has already cached "name" filecache-ed property
115 115
116 116 This returns (cachedobj-or-None, iscached) tuple.
117 117 """
118 118 cacheentry = repo.unfiltered()._filecache.get(name, None)
119 119 if not cacheentry:
120 120 return None, False
121 121 return cacheentry.obj, True
122 122
123 123 class unfilteredpropertycache(util.propertycache):
124 124 """propertycache that apply to unfiltered repo only"""
125 125
126 126 def __get__(self, repo, type=None):
127 127 unfi = repo.unfiltered()
128 128 if unfi is repo:
129 129 return super(unfilteredpropertycache, self).__get__(unfi)
130 130 return getattr(unfi, self.name)
131 131
132 132 class filteredpropertycache(util.propertycache):
133 133 """propertycache that must take filtering in account"""
134 134
135 135 def cachevalue(self, obj, value):
136 136 object.__setattr__(obj, self.name, value)
137 137
138 138
139 139 def hasunfilteredcache(repo, name):
140 140 """check if a repo has an unfilteredpropertycache value for <name>"""
141 141 return name in vars(repo.unfiltered())
142 142
143 143 def unfilteredmethod(orig):
144 144 """decorate method that always need to be run on unfiltered version"""
145 145 def wrapper(repo, *args, **kwargs):
146 146 return orig(repo.unfiltered(), *args, **kwargs)
147 147 return wrapper
148 148
149 149 moderncaps = {'lookup', 'branchmap', 'pushkey', 'known', 'getbundle',
150 150 'unbundle'}
151 151 legacycaps = moderncaps.union({'changegroupsubset'})
152 152
153 153 class localpeer(repository.peer):
154 154 '''peer for a local repo; reflects only the most recent API'''
155 155
156 156 def __init__(self, repo, caps=None):
157 157 super(localpeer, self).__init__()
158 158
159 159 if caps is None:
160 160 caps = moderncaps.copy()
161 161 self._repo = repo.filtered('served')
162 162 self._ui = repo.ui
163 163 self._caps = repo._restrictcapabilities(caps)
164 164
165 165 # Begin of _basepeer interface.
166 166
167 167 @util.propertycache
168 168 def ui(self):
169 169 return self._ui
170 170
171 171 def url(self):
172 172 return self._repo.url()
173 173
174 174 def local(self):
175 175 return self._repo
176 176
177 177 def peer(self):
178 178 return self
179 179
180 180 def canpush(self):
181 181 return True
182 182
183 183 def close(self):
184 184 self._repo.close()
185 185
186 186 # End of _basepeer interface.
187 187
188 188 # Begin of _basewirecommands interface.
189 189
190 190 def branchmap(self):
191 191 return self._repo.branchmap()
192 192
193 193 def capabilities(self):
194 194 return self._caps
195 195
196 196 def debugwireargs(self, one, two, three=None, four=None, five=None):
197 197 """Used to test argument passing over the wire"""
198 198 return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three),
199 199 pycompat.bytestr(four),
200 200 pycompat.bytestr(five))
201 201
202 202 def getbundle(self, source, heads=None, common=None, bundlecaps=None,
203 203 **kwargs):
204 204 chunks = exchange.getbundlechunks(self._repo, source, heads=heads,
205 205 common=common, bundlecaps=bundlecaps,
206 206 **kwargs)[1]
207 207 cb = util.chunkbuffer(chunks)
208 208
209 209 if exchange.bundle2requested(bundlecaps):
210 210 # When requesting a bundle2, getbundle returns a stream to make the
211 211 # wire level function happier. We need to build a proper object
212 212 # from it in local peer.
213 213 return bundle2.getunbundler(self.ui, cb)
214 214 else:
215 215 return changegroup.getunbundler('01', cb, None)
216 216
217 217 def heads(self):
218 218 return self._repo.heads()
219 219
220 220 def known(self, nodes):
221 221 return self._repo.known(nodes)
222 222
223 223 def listkeys(self, namespace):
224 224 return self._repo.listkeys(namespace)
225 225
226 226 def lookup(self, key):
227 227 return self._repo.lookup(key)
228 228
229 229 def pushkey(self, namespace, key, old, new):
230 230 return self._repo.pushkey(namespace, key, old, new)
231 231
232 232 def stream_out(self):
233 233 raise error.Abort(_('cannot perform stream clone against local '
234 234 'peer'))
235 235
236 236 def unbundle(self, cg, heads, url):
237 237 """apply a bundle on a repo
238 238
239 239 This function handles the repo locking itself."""
240 240 try:
241 241 try:
242 242 cg = exchange.readbundle(self.ui, cg, None)
243 243 ret = exchange.unbundle(self._repo, cg, heads, 'push', url)
244 244 if util.safehasattr(ret, 'getchunks'):
245 245 # This is a bundle20 object, turn it into an unbundler.
246 246 # This little dance should be dropped eventually when the
247 247 # API is finally improved.
248 248 stream = util.chunkbuffer(ret.getchunks())
249 249 ret = bundle2.getunbundler(self.ui, stream)
250 250 return ret
251 251 except Exception as exc:
252 252 # If the exception contains output salvaged from a bundle2
253 253 # reply, we need to make sure it is printed before continuing
254 254 # to fail. So we build a bundle2 with such output and consume
255 255 # it directly.
256 256 #
257 257 # This is not very elegant but allows a "simple" solution for
258 258 # issue4594
259 259 output = getattr(exc, '_bundle2salvagedoutput', ())
260 260 if output:
261 261 bundler = bundle2.bundle20(self._repo.ui)
262 262 for out in output:
263 263 bundler.addpart(out)
264 264 stream = util.chunkbuffer(bundler.getchunks())
265 265 b = bundle2.getunbundler(self.ui, stream)
266 266 bundle2.processbundle(self._repo, b)
267 267 raise
268 268 except error.PushRaced as exc:
269 269 raise error.ResponseError(_('push failed:'),
270 270 stringutil.forcebytestr(exc))
271 271
272 272 # End of _basewirecommands interface.
273 273
274 274 # Begin of peer interface.
275 275
276 276 def iterbatch(self):
277 277 return peer.localiterbatcher(self)
278 278
279 279 # End of peer interface.
280 280
281 281 class locallegacypeer(repository.legacypeer, localpeer):
282 282 '''peer extension which implements legacy methods too; used for tests with
283 283 restricted capabilities'''
284 284
285 285 def __init__(self, repo):
286 286 super(locallegacypeer, self).__init__(repo, caps=legacycaps)
287 287
288 288 # Begin of baselegacywirecommands interface.
289 289
290 290 def between(self, pairs):
291 291 return self._repo.between(pairs)
292 292
293 293 def branches(self, nodes):
294 294 return self._repo.branches(nodes)
295 295
296 296 def changegroup(self, basenodes, source):
297 297 outgoing = discovery.outgoing(self._repo, missingroots=basenodes,
298 298 missingheads=self._repo.heads())
299 299 return changegroup.makechangegroup(self._repo, outgoing, '01', source)
300 300
301 301 def changegroupsubset(self, bases, heads, source):
302 302 outgoing = discovery.outgoing(self._repo, missingroots=bases,
303 303 missingheads=heads)
304 304 return changegroup.makechangegroup(self._repo, outgoing, '01', source)
305 305
306 306 # End of baselegacywirecommands interface.
307 307
308 308 # Increment the sub-version when the revlog v2 format changes to lock out old
309 309 # clients.
310 310 REVLOGV2_REQUIREMENT = 'exp-revlogv2.0'
311 311
312 312 # Functions receiving (ui, features) that extensions can register to impact
313 313 # the ability to load repositories with custom requirements. Only
314 314 # functions defined in loaded extensions are called.
315 315 #
316 316 # The function receives a set of requirement strings that the repository
317 317 # is capable of opening. Functions will typically add elements to the
318 318 # set to reflect that the extension knows how to handle that requirements.
319 319 featuresetupfuncs = set()
320 320
321 321 class localrepository(object):
322 322
323 323 # obsolete experimental requirements:
324 324 # - manifestv2: An experimental new manifest format that allowed
325 325 # for stem compression of long paths. Experiment ended up not
326 326 # being successful (repository sizes went up due to worse delta
327 327 # chains), and the code was deleted in 4.6.
328 328 supportedformats = {
329 329 'revlogv1',
330 330 'generaldelta',
331 331 'treemanifest',
332 332 REVLOGV2_REQUIREMENT,
333 333 }
334 334 _basesupported = supportedformats | {
335 335 'store',
336 336 'fncache',
337 337 'shared',
338 338 'relshared',
339 339 'dotencode',
340 340 'exp-sparse',
341 341 }
342 342 openerreqs = {
343 343 'revlogv1',
344 344 'generaldelta',
345 345 'treemanifest',
346 346 }
347 347
348 348 # list of prefix for file which can be written without 'wlock'
349 349 # Extensions should extend this list when needed
350 350 _wlockfreeprefix = {
351 351 # We migh consider requiring 'wlock' for the next
352 352 # two, but pretty much all the existing code assume
353 353 # wlock is not needed so we keep them excluded for
354 354 # now.
355 355 'hgrc',
356 356 'requires',
357 357 # XXX cache is a complicatged business someone
358 358 # should investigate this in depth at some point
359 359 'cache/',
360 360 # XXX shouldn't be dirstate covered by the wlock?
361 361 'dirstate',
362 362 # XXX bisect was still a bit too messy at the time
363 363 # this changeset was introduced. Someone should fix
364 364 # the remainig bit and drop this line
365 365 'bisect.state',
366 366 }
367 367
368 368 def __init__(self, baseui, path, create=False):
369 369 self.requirements = set()
370 370 self.filtername = None
371 371 # wvfs: rooted at the repository root, used to access the working copy
372 372 self.wvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
373 373 # vfs: rooted at .hg, used to access repo files outside of .hg/store
374 374 self.vfs = None
375 375 # svfs: usually rooted at .hg/store, used to access repository history
376 376 # If this is a shared repository, this vfs may point to another
377 377 # repository's .hg/store directory.
378 378 self.svfs = None
379 379 self.root = self.wvfs.base
380 380 self.path = self.wvfs.join(".hg")
381 381 self.origroot = path
382 382 # This is only used by context.workingctx.match in order to
383 383 # detect files in subrepos.
384 384 self.auditor = pathutil.pathauditor(
385 385 self.root, callback=self._checknested)
386 386 # This is only used by context.basectx.match in order to detect
387 387 # files in subrepos.
388 388 self.nofsauditor = pathutil.pathauditor(
389 389 self.root, callback=self._checknested, realfs=False, cached=True)
390 390 self.baseui = baseui
391 391 self.ui = baseui.copy()
392 392 self.ui.copy = baseui.copy # prevent copying repo configuration
393 393 self.vfs = vfsmod.vfs(self.path, cacheaudited=True)
394 394 if (self.ui.configbool('devel', 'all-warnings') or
395 395 self.ui.configbool('devel', 'check-locks')):
396 396 self.vfs.audit = self._getvfsward(self.vfs.audit)
397 397 # A list of callback to shape the phase if no data were found.
398 398 # Callback are in the form: func(repo, roots) --> processed root.
399 399 # This list it to be filled by extension during repo setup
400 400 self._phasedefaults = []
401 401 try:
402 402 self.ui.readconfig(self.vfs.join("hgrc"), self.root)
403 403 self._loadextensions()
404 404 except IOError:
405 405 pass
406 406
407 407 if featuresetupfuncs:
408 408 self.supported = set(self._basesupported) # use private copy
409 409 extmods = set(m.__name__ for n, m
410 410 in extensions.extensions(self.ui))
411 411 for setupfunc in featuresetupfuncs:
412 412 if setupfunc.__module__ in extmods:
413 413 setupfunc(self.ui, self.supported)
414 414 else:
415 415 self.supported = self._basesupported
416 416 color.setup(self.ui)
417 417
418 418 # Add compression engines.
419 419 for name in util.compengines:
420 420 engine = util.compengines[name]
421 421 if engine.revlogheader():
422 422 self.supported.add('exp-compression-%s' % name)
423 423
424 424 if not self.vfs.isdir():
425 425 if create:
426 426 self.requirements = newreporequirements(self)
427 427
428 428 if not self.wvfs.exists():
429 429 self.wvfs.makedirs()
430 430 self.vfs.makedir(notindexed=True)
431 431
432 432 if 'store' in self.requirements:
433 433 self.vfs.mkdir("store")
434 434
435 435 # create an invalid changelog
436 436 self.vfs.append(
437 437 "00changelog.i",
438 438 '\0\0\0\2' # represents revlogv2
439 439 ' dummy changelog to prevent using the old repo layout'
440 440 )
441 441 else:
442 442 raise error.RepoError(_("repository %s not found") % path)
443 443 elif create:
444 444 raise error.RepoError(_("repository %s already exists") % path)
445 445 else:
446 446 try:
447 447 self.requirements = scmutil.readrequires(
448 448 self.vfs, self.supported)
449 449 except IOError as inst:
450 450 if inst.errno != errno.ENOENT:
451 451 raise
452 452
453 453 cachepath = self.vfs.join('cache')
454 454 self.sharedpath = self.path
455 455 try:
456 456 sharedpath = self.vfs.read("sharedpath").rstrip('\n')
457 457 if 'relshared' in self.requirements:
458 458 sharedpath = self.vfs.join(sharedpath)
459 459 vfs = vfsmod.vfs(sharedpath, realpath=True)
460 460 cachepath = vfs.join('cache')
461 461 s = vfs.base
462 462 if not vfs.exists():
463 463 raise error.RepoError(
464 464 _('.hg/sharedpath points to nonexistent directory %s') % s)
465 465 self.sharedpath = s
466 466 except IOError as inst:
467 467 if inst.errno != errno.ENOENT:
468 468 raise
469 469
470 470 if 'exp-sparse' in self.requirements and not sparse.enabled:
471 471 raise error.RepoError(_('repository is using sparse feature but '
472 472 'sparse is not enabled; enable the '
473 473 '"sparse" extensions to access'))
474 474
475 475 self.store = store.store(
476 476 self.requirements, self.sharedpath,
477 477 lambda base: vfsmod.vfs(base, cacheaudited=True))
478 478 self.spath = self.store.path
479 479 self.svfs = self.store.vfs
480 480 self.sjoin = self.store.join
481 481 self.vfs.createmode = self.store.createmode
482 482 self.cachevfs = vfsmod.vfs(cachepath, cacheaudited=True)
483 483 self.cachevfs.createmode = self.store.createmode
484 484 if (self.ui.configbool('devel', 'all-warnings') or
485 485 self.ui.configbool('devel', 'check-locks')):
486 486 if util.safehasattr(self.svfs, 'vfs'): # this is filtervfs
487 487 self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit)
488 488 else: # standard vfs
489 489 self.svfs.audit = self._getsvfsward(self.svfs.audit)
490 490 self._applyopenerreqs()
491 491 if create:
492 492 self._writerequirements()
493 493
494 494 self._dirstatevalidatewarned = False
495 495
496 496 self._branchcaches = {}
497 497 self._revbranchcache = None
498 self.filterpats = {}
498 self._filterpats = {}
499 499 self._datafilters = {}
500 500 self._transref = self._lockref = self._wlockref = None
501 501
502 502 # A cache for various files under .hg/ that tracks file changes,
503 503 # (used by the filecache decorator)
504 504 #
505 505 # Maps a property name to its util.filecacheentry
506 506 self._filecache = {}
507 507
508 508 # hold sets of revision to be filtered
509 509 # should be cleared when something might have changed the filter value:
510 510 # - new changesets,
511 511 # - phase change,
512 512 # - new obsolescence marker,
513 513 # - working directory parent change,
514 514 # - bookmark changes
515 515 self.filteredrevcache = {}
516 516
517 517 # post-dirstate-status hooks
518 518 self._postdsstatus = []
519 519
520 520 # generic mapping between names and nodes
521 521 self.names = namespaces.namespaces()
522 522
523 523 # Key to signature value.
524 524 self._sparsesignaturecache = {}
525 525 # Signature to cached matcher instance.
526 526 self._sparsematchercache = {}
527 527
528 528 def _getvfsward(self, origfunc):
529 529 """build a ward for self.vfs"""
530 530 rref = weakref.ref(self)
531 531 def checkvfs(path, mode=None):
532 532 ret = origfunc(path, mode=mode)
533 533 repo = rref()
534 534 if (repo is None
535 535 or not util.safehasattr(repo, '_wlockref')
536 536 or not util.safehasattr(repo, '_lockref')):
537 537 return
538 538 if mode in (None, 'r', 'rb'):
539 539 return
540 540 if path.startswith(repo.path):
541 541 # truncate name relative to the repository (.hg)
542 542 path = path[len(repo.path) + 1:]
543 543 if path.startswith('cache/'):
544 544 msg = 'accessing cache with vfs instead of cachevfs: "%s"'
545 545 repo.ui.develwarn(msg % path, stacklevel=2, config="cache-vfs")
546 546 if path.startswith('journal.'):
547 547 # journal is covered by 'lock'
548 548 if repo._currentlock(repo._lockref) is None:
549 549 repo.ui.develwarn('write with no lock: "%s"' % path,
550 550 stacklevel=2, config='check-locks')
551 551 elif repo._currentlock(repo._wlockref) is None:
552 552 # rest of vfs files are covered by 'wlock'
553 553 #
554 554 # exclude special files
555 555 for prefix in self._wlockfreeprefix:
556 556 if path.startswith(prefix):
557 557 return
558 558 repo.ui.develwarn('write with no wlock: "%s"' % path,
559 559 stacklevel=2, config='check-locks')
560 560 return ret
561 561 return checkvfs
562 562
563 563 def _getsvfsward(self, origfunc):
564 564 """build a ward for self.svfs"""
565 565 rref = weakref.ref(self)
566 566 def checksvfs(path, mode=None):
567 567 ret = origfunc(path, mode=mode)
568 568 repo = rref()
569 569 if repo is None or not util.safehasattr(repo, '_lockref'):
570 570 return
571 571 if mode in (None, 'r', 'rb'):
572 572 return
573 573 if path.startswith(repo.sharedpath):
574 574 # truncate name relative to the repository (.hg)
575 575 path = path[len(repo.sharedpath) + 1:]
576 576 if repo._currentlock(repo._lockref) is None:
577 577 repo.ui.develwarn('write with no lock: "%s"' % path,
578 578 stacklevel=3)
579 579 return ret
580 580 return checksvfs
581 581
582 582 def close(self):
583 583 self._writecaches()
584 584
585 585 def _loadextensions(self):
586 586 extensions.loadall(self.ui)
587 587
588 588 def _writecaches(self):
589 589 if self._revbranchcache:
590 590 self._revbranchcache.write()
591 591
592 592 def _restrictcapabilities(self, caps):
593 593 if self.ui.configbool('experimental', 'bundle2-advertise'):
594 594 caps = set(caps)
595 595 capsblob = bundle2.encodecaps(bundle2.getrepocaps(self,
596 596 role='client'))
597 597 caps.add('bundle2=' + urlreq.quote(capsblob))
598 598 return caps
599 599
600 600 def _applyopenerreqs(self):
601 601 self.svfs.options = dict((r, 1) for r in self.requirements
602 602 if r in self.openerreqs)
603 603 # experimental config: format.chunkcachesize
604 604 chunkcachesize = self.ui.configint('format', 'chunkcachesize')
605 605 if chunkcachesize is not None:
606 606 self.svfs.options['chunkcachesize'] = chunkcachesize
607 607 # experimental config: format.maxchainlen
608 608 maxchainlen = self.ui.configint('format', 'maxchainlen')
609 609 if maxchainlen is not None:
610 610 self.svfs.options['maxchainlen'] = maxchainlen
611 611 # experimental config: format.manifestcachesize
612 612 manifestcachesize = self.ui.configint('format', 'manifestcachesize')
613 613 if manifestcachesize is not None:
614 614 self.svfs.options['manifestcachesize'] = manifestcachesize
615 615 # experimental config: format.aggressivemergedeltas
616 616 aggressivemergedeltas = self.ui.configbool('format',
617 617 'aggressivemergedeltas')
618 618 self.svfs.options['aggressivemergedeltas'] = aggressivemergedeltas
619 619 self.svfs.options['lazydeltabase'] = not scmutil.gddeltaconfig(self.ui)
620 620 chainspan = self.ui.configbytes('experimental', 'maxdeltachainspan')
621 621 if 0 <= chainspan:
622 622 self.svfs.options['maxdeltachainspan'] = chainspan
623 623 mmapindexthreshold = self.ui.configbytes('experimental',
624 624 'mmapindexthreshold')
625 625 if mmapindexthreshold is not None:
626 626 self.svfs.options['mmapindexthreshold'] = mmapindexthreshold
627 627 withsparseread = self.ui.configbool('experimental', 'sparse-read')
628 628 srdensitythres = float(self.ui.config('experimental',
629 629 'sparse-read.density-threshold'))
630 630 srmingapsize = self.ui.configbytes('experimental',
631 631 'sparse-read.min-gap-size')
632 632 self.svfs.options['with-sparse-read'] = withsparseread
633 633 self.svfs.options['sparse-read-density-threshold'] = srdensitythres
634 634 self.svfs.options['sparse-read-min-gap-size'] = srmingapsize
635 635
636 636 for r in self.requirements:
637 637 if r.startswith('exp-compression-'):
638 638 self.svfs.options['compengine'] = r[len('exp-compression-'):]
639 639
640 640 # TODO move "revlogv2" to openerreqs once finalized.
641 641 if REVLOGV2_REQUIREMENT in self.requirements:
642 642 self.svfs.options['revlogv2'] = True
643 643
644 644 def _writerequirements(self):
645 645 scmutil.writerequires(self.vfs, self.requirements)
646 646
647 647 def _checknested(self, path):
648 648 """Determine if path is a legal nested repository."""
649 649 if not path.startswith(self.root):
650 650 return False
651 651 subpath = path[len(self.root) + 1:]
652 652 normsubpath = util.pconvert(subpath)
653 653
654 654 # XXX: Checking against the current working copy is wrong in
655 655 # the sense that it can reject things like
656 656 #
657 657 # $ hg cat -r 10 sub/x.txt
658 658 #
659 659 # if sub/ is no longer a subrepository in the working copy
660 660 # parent revision.
661 661 #
662 662 # However, it can of course also allow things that would have
663 663 # been rejected before, such as the above cat command if sub/
664 664 # is a subrepository now, but was a normal directory before.
665 665 # The old path auditor would have rejected by mistake since it
666 666 # panics when it sees sub/.hg/.
667 667 #
668 668 # All in all, checking against the working copy seems sensible
669 669 # since we want to prevent access to nested repositories on
670 670 # the filesystem *now*.
671 671 ctx = self[None]
672 672 parts = util.splitpath(subpath)
673 673 while parts:
674 674 prefix = '/'.join(parts)
675 675 if prefix in ctx.substate:
676 676 if prefix == normsubpath:
677 677 return True
678 678 else:
679 679 sub = ctx.sub(prefix)
680 680 return sub.checknested(subpath[len(prefix) + 1:])
681 681 else:
682 682 parts.pop()
683 683 return False
684 684
685 685 def peer(self):
686 686 return localpeer(self) # not cached to avoid reference cycle
687 687
688 688 def unfiltered(self):
689 689 """Return unfiltered version of the repository
690 690
691 691 Intended to be overwritten by filtered repo."""
692 692 return self
693 693
694 694 def filtered(self, name, visibilityexceptions=None):
695 695 """Return a filtered version of a repository"""
696 696 cls = repoview.newtype(self.unfiltered().__class__)
697 697 return cls(self, name, visibilityexceptions)
698 698
699 699 @repofilecache('bookmarks', 'bookmarks.current')
700 700 def _bookmarks(self):
701 701 return bookmarks.bmstore(self)
702 702
703 703 @property
704 704 def _activebookmark(self):
705 705 return self._bookmarks.active
706 706
707 707 # _phasesets depend on changelog. what we need is to call
708 708 # _phasecache.invalidate() if '00changelog.i' was changed, but it
709 709 # can't be easily expressed in filecache mechanism.
710 710 @storecache('phaseroots', '00changelog.i')
711 711 def _phasecache(self):
712 712 return phases.phasecache(self, self._phasedefaults)
713 713
714 714 @storecache('obsstore')
715 715 def obsstore(self):
716 716 return obsolete.makestore(self.ui, self)
717 717
718 718 @storecache('00changelog.i')
719 719 def changelog(self):
720 720 return changelog.changelog(self.svfs,
721 721 trypending=txnutil.mayhavepending(self.root))
722 722
723 723 def _constructmanifest(self):
724 724 # This is a temporary function while we migrate from manifest to
725 725 # manifestlog. It allows bundlerepo and unionrepo to intercept the
726 726 # manifest creation.
727 727 return manifest.manifestrevlog(self.svfs)
728 728
729 729 @storecache('00manifest.i')
730 730 def manifestlog(self):
731 731 return manifest.manifestlog(self.svfs, self)
732 732
733 733 @repofilecache('dirstate')
734 734 def dirstate(self):
735 735 sparsematchfn = lambda: sparse.matcher(self)
736 736
737 737 return dirstate.dirstate(self.vfs, self.ui, self.root,
738 738 self._dirstatevalidate, sparsematchfn)
739 739
740 740 def _dirstatevalidate(self, node):
741 741 try:
742 742 self.changelog.rev(node)
743 743 return node
744 744 except error.LookupError:
745 745 if not self._dirstatevalidatewarned:
746 746 self._dirstatevalidatewarned = True
747 747 self.ui.warn(_("warning: ignoring unknown"
748 748 " working parent %s!\n") % short(node))
749 749 return nullid
750 750
751 751 @repofilecache(narrowspec.FILENAME)
752 752 def narrowpats(self):
753 753 """matcher patterns for this repository's narrowspec
754 754
755 755 A tuple of (includes, excludes).
756 756 """
757 757 source = self
758 758 if self.shared():
759 759 from . import hg
760 760 source = hg.sharedreposource(self)
761 761 return narrowspec.load(source)
762 762
763 763 @repofilecache(narrowspec.FILENAME)
764 764 def _narrowmatch(self):
765 765 if changegroup.NARROW_REQUIREMENT not in self.requirements:
766 766 return matchmod.always(self.root, '')
767 767 include, exclude = self.narrowpats
768 768 return narrowspec.match(self.root, include=include, exclude=exclude)
769 769
770 770 # TODO(martinvonz): make this property-like instead?
771 771 def narrowmatch(self):
772 772 return self._narrowmatch
773 773
774 774 def setnarrowpats(self, newincludes, newexcludes):
775 775 target = self
776 776 if self.shared():
777 777 from . import hg
778 778 target = hg.sharedreposource(self)
779 779 narrowspec.save(target, newincludes, newexcludes)
780 780 self.invalidate(clearfilecache=True)
781 781
782 782 def __getitem__(self, changeid):
783 783 if changeid is None:
784 784 return context.workingctx(self)
785 785 if isinstance(changeid, slice):
786 786 # wdirrev isn't contiguous so the slice shouldn't include it
787 787 return [context.changectx(self, i)
788 788 for i in xrange(*changeid.indices(len(self)))
789 789 if i not in self.changelog.filteredrevs]
790 790 try:
791 791 return context.changectx(self, changeid)
792 792 except error.WdirUnsupported:
793 793 return context.workingctx(self)
794 794
795 795 def __contains__(self, changeid):
796 796 """True if the given changeid exists
797 797
798 798 error.LookupError is raised if an ambiguous node specified.
799 799 """
800 800 try:
801 801 self[changeid]
802 802 return True
803 803 except error.RepoLookupError:
804 804 return False
805 805
806 806 def __nonzero__(self):
807 807 return True
808 808
809 809 __bool__ = __nonzero__
810 810
811 811 def __len__(self):
812 812 # no need to pay the cost of repoview.changelog
813 813 unfi = self.unfiltered()
814 814 return len(unfi.changelog)
815 815
816 816 def __iter__(self):
817 817 return iter(self.changelog)
818 818
819 819 def revs(self, expr, *args):
820 820 '''Find revisions matching a revset.
821 821
822 822 The revset is specified as a string ``expr`` that may contain
823 823 %-formatting to escape certain types. See ``revsetlang.formatspec``.
824 824
825 825 Revset aliases from the configuration are not expanded. To expand
826 826 user aliases, consider calling ``scmutil.revrange()`` or
827 827 ``repo.anyrevs([expr], user=True)``.
828 828
829 829 Returns a revset.abstractsmartset, which is a list-like interface
830 830 that contains integer revisions.
831 831 '''
832 832 expr = revsetlang.formatspec(expr, *args)
833 833 m = revset.match(None, expr)
834 834 return m(self)
835 835
836 836 def set(self, expr, *args):
837 837 '''Find revisions matching a revset and emit changectx instances.
838 838
839 839 This is a convenience wrapper around ``revs()`` that iterates the
840 840 result and is a generator of changectx instances.
841 841
842 842 Revset aliases from the configuration are not expanded. To expand
843 843 user aliases, consider calling ``scmutil.revrange()``.
844 844 '''
845 845 for r in self.revs(expr, *args):
846 846 yield self[r]
847 847
848 848 def anyrevs(self, specs, user=False, localalias=None):
849 849 '''Find revisions matching one of the given revsets.
850 850
851 851 Revset aliases from the configuration are not expanded by default. To
852 852 expand user aliases, specify ``user=True``. To provide some local
853 853 definitions overriding user aliases, set ``localalias`` to
854 854 ``{name: definitionstring}``.
855 855 '''
856 856 if user:
857 857 m = revset.matchany(self.ui, specs, repo=self,
858 858 localalias=localalias)
859 859 else:
860 860 m = revset.matchany(None, specs, localalias=localalias)
861 861 return m(self)
862 862
863 863 def url(self):
864 864 return 'file:' + self.root
865 865
866 866 def hook(self, name, throw=False, **args):
867 867 """Call a hook, passing this repo instance.
868 868
869 869 This a convenience method to aid invoking hooks. Extensions likely
870 870 won't call this unless they have registered a custom hook or are
871 871 replacing code that is expected to call a hook.
872 872 """
873 873 return hook.hook(self.ui, self, name, throw, **args)
874 874
875 875 @filteredpropertycache
876 876 def _tagscache(self):
877 877 '''Returns a tagscache object that contains various tags related
878 878 caches.'''
879 879
880 880 # This simplifies its cache management by having one decorated
881 881 # function (this one) and the rest simply fetch things from it.
882 882 class tagscache(object):
883 883 def __init__(self):
884 884 # These two define the set of tags for this repository. tags
885 885 # maps tag name to node; tagtypes maps tag name to 'global' or
886 886 # 'local'. (Global tags are defined by .hgtags across all
887 887 # heads, and local tags are defined in .hg/localtags.)
888 888 # They constitute the in-memory cache of tags.
889 889 self.tags = self.tagtypes = None
890 890
891 891 self.nodetagscache = self.tagslist = None
892 892
893 893 cache = tagscache()
894 894 cache.tags, cache.tagtypes = self._findtags()
895 895
896 896 return cache
897 897
898 898 def tags(self):
899 899 '''return a mapping of tag to node'''
900 900 t = {}
901 901 if self.changelog.filteredrevs:
902 902 tags, tt = self._findtags()
903 903 else:
904 904 tags = self._tagscache.tags
905 905 for k, v in tags.iteritems():
906 906 try:
907 907 # ignore tags to unknown nodes
908 908 self.changelog.rev(v)
909 909 t[k] = v
910 910 except (error.LookupError, ValueError):
911 911 pass
912 912 return t
913 913
914 914 def _findtags(self):
915 915 '''Do the hard work of finding tags. Return a pair of dicts
916 916 (tags, tagtypes) where tags maps tag name to node, and tagtypes
917 917 maps tag name to a string like \'global\' or \'local\'.
918 918 Subclasses or extensions are free to add their own tags, but
919 919 should be aware that the returned dicts will be retained for the
920 920 duration of the localrepo object.'''
921 921
922 922 # XXX what tagtype should subclasses/extensions use? Currently
923 923 # mq and bookmarks add tags, but do not set the tagtype at all.
924 924 # Should each extension invent its own tag type? Should there
925 925 # be one tagtype for all such "virtual" tags? Or is the status
926 926 # quo fine?
927 927
928 928
929 929 # map tag name to (node, hist)
930 930 alltags = tagsmod.findglobaltags(self.ui, self)
931 931 # map tag name to tag type
932 932 tagtypes = dict((tag, 'global') for tag in alltags)
933 933
934 934 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
935 935
936 936 # Build the return dicts. Have to re-encode tag names because
937 937 # the tags module always uses UTF-8 (in order not to lose info
938 938 # writing to the cache), but the rest of Mercurial wants them in
939 939 # local encoding.
940 940 tags = {}
941 941 for (name, (node, hist)) in alltags.iteritems():
942 942 if node != nullid:
943 943 tags[encoding.tolocal(name)] = node
944 944 tags['tip'] = self.changelog.tip()
945 945 tagtypes = dict([(encoding.tolocal(name), value)
946 946 for (name, value) in tagtypes.iteritems()])
947 947 return (tags, tagtypes)
948 948
949 949 def tagtype(self, tagname):
950 950 '''
951 951 return the type of the given tag. result can be:
952 952
953 953 'local' : a local tag
954 954 'global' : a global tag
955 955 None : tag does not exist
956 956 '''
957 957
958 958 return self._tagscache.tagtypes.get(tagname)
959 959
960 960 def tagslist(self):
961 961 '''return a list of tags ordered by revision'''
962 962 if not self._tagscache.tagslist:
963 963 l = []
964 964 for t, n in self.tags().iteritems():
965 965 l.append((self.changelog.rev(n), t, n))
966 966 self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)]
967 967
968 968 return self._tagscache.tagslist
969 969
970 970 def nodetags(self, node):
971 971 '''return the tags associated with a node'''
972 972 if not self._tagscache.nodetagscache:
973 973 nodetagscache = {}
974 974 for t, n in self._tagscache.tags.iteritems():
975 975 nodetagscache.setdefault(n, []).append(t)
976 976 for tags in nodetagscache.itervalues():
977 977 tags.sort()
978 978 self._tagscache.nodetagscache = nodetagscache
979 979 return self._tagscache.nodetagscache.get(node, [])
980 980
981 981 def nodebookmarks(self, node):
982 982 """return the list of bookmarks pointing to the specified node"""
983 983 marks = []
984 984 for bookmark, n in self._bookmarks.iteritems():
985 985 if n == node:
986 986 marks.append(bookmark)
987 987 return sorted(marks)
988 988
989 989 def branchmap(self):
990 990 '''returns a dictionary {branch: [branchheads]} with branchheads
991 991 ordered by increasing revision number'''
992 992 branchmap.updatecache(self)
993 993 return self._branchcaches[self.filtername]
994 994
995 995 @unfilteredmethod
996 996 def revbranchcache(self):
997 997 if not self._revbranchcache:
998 998 self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
999 999 return self._revbranchcache
1000 1000
1001 1001 def branchtip(self, branch, ignoremissing=False):
1002 1002 '''return the tip node for a given branch
1003 1003
1004 1004 If ignoremissing is True, then this method will not raise an error.
1005 1005 This is helpful for callers that only expect None for a missing branch
1006 1006 (e.g. namespace).
1007 1007
1008 1008 '''
1009 1009 try:
1010 1010 return self.branchmap().branchtip(branch)
1011 1011 except KeyError:
1012 1012 if not ignoremissing:
1013 1013 raise error.RepoLookupError(_("unknown branch '%s'") % branch)
1014 1014 else:
1015 1015 pass
1016 1016
1017 1017 def lookup(self, key):
1018 1018 return self[key].node()
1019 1019
1020 1020 def lookupbranch(self, key, remote=None):
1021 1021 repo = remote or self
1022 1022 if key in repo.branchmap():
1023 1023 return key
1024 1024
1025 1025 repo = (remote and remote.local()) and remote or self
1026 1026 return repo[key].branch()
1027 1027
1028 1028 def known(self, nodes):
1029 1029 cl = self.changelog
1030 1030 nm = cl.nodemap
1031 1031 filtered = cl.filteredrevs
1032 1032 result = []
1033 1033 for n in nodes:
1034 1034 r = nm.get(n)
1035 1035 resp = not (r is None or r in filtered)
1036 1036 result.append(resp)
1037 1037 return result
1038 1038
1039 1039 def local(self):
1040 1040 return self
1041 1041
1042 1042 def publishing(self):
1043 1043 # it's safe (and desirable) to trust the publish flag unconditionally
1044 1044 # so that we don't finalize changes shared between users via ssh or nfs
1045 1045 return self.ui.configbool('phases', 'publish', untrusted=True)
1046 1046
1047 1047 def cancopy(self):
1048 1048 # so statichttprepo's override of local() works
1049 1049 if not self.local():
1050 1050 return False
1051 1051 if not self.publishing():
1052 1052 return True
1053 1053 # if publishing we can't copy if there is filtered content
1054 1054 return not self.filtered('visible').changelog.filteredrevs
1055 1055
1056 1056 def shared(self):
1057 1057 '''the type of shared repository (None if not shared)'''
1058 1058 if self.sharedpath != self.path:
1059 1059 return 'store'
1060 1060 return None
1061 1061
1062 1062 def wjoin(self, f, *insidef):
1063 1063 return self.vfs.reljoin(self.root, f, *insidef)
1064 1064
1065 1065 def file(self, f):
1066 1066 if f[0] == '/':
1067 1067 f = f[1:]
1068 1068 return filelog.filelog(self.svfs, f)
1069 1069
1070 1070 def changectx(self, changeid):
1071 1071 return self[changeid]
1072 1072
1073 1073 def setparents(self, p1, p2=nullid):
1074 1074 with self.dirstate.parentchange():
1075 1075 copies = self.dirstate.setparents(p1, p2)
1076 1076 pctx = self[p1]
1077 1077 if copies:
1078 1078 # Adjust copy records, the dirstate cannot do it, it
1079 1079 # requires access to parents manifests. Preserve them
1080 1080 # only for entries added to first parent.
1081 1081 for f in copies:
1082 1082 if f not in pctx and copies[f] in pctx:
1083 1083 self.dirstate.copy(copies[f], f)
1084 1084 if p2 == nullid:
1085 1085 for f, s in sorted(self.dirstate.copies().items()):
1086 1086 if f not in pctx and s not in pctx:
1087 1087 self.dirstate.copy(None, f)
1088 1088
1089 1089 def filectx(self, path, changeid=None, fileid=None):
1090 1090 """changeid can be a changeset revision, node, or tag.
1091 1091 fileid can be a file revision or node."""
1092 1092 return context.filectx(self, path, changeid, fileid)
1093 1093
1094 1094 def getcwd(self):
1095 1095 return self.dirstate.getcwd()
1096 1096
1097 1097 def pathto(self, f, cwd=None):
1098 1098 return self.dirstate.pathto(f, cwd)
1099 1099
1100 1100 def _loadfilter(self, filter):
1101 if filter not in self.filterpats:
1101 if filter not in self._filterpats:
1102 1102 l = []
1103 1103 for pat, cmd in self.ui.configitems(filter):
1104 1104 if cmd == '!':
1105 1105 continue
1106 1106 mf = matchmod.match(self.root, '', [pat])
1107 1107 fn = None
1108 1108 params = cmd
1109 1109 for name, filterfn in self._datafilters.iteritems():
1110 1110 if cmd.startswith(name):
1111 1111 fn = filterfn
1112 1112 params = cmd[len(name):].lstrip()
1113 1113 break
1114 1114 if not fn:
1115 1115 fn = lambda s, c, **kwargs: procutil.filter(s, c)
1116 1116 # Wrap old filters not supporting keyword arguments
1117 1117 if not pycompat.getargspec(fn)[2]:
1118 1118 oldfn = fn
1119 1119 fn = lambda s, c, **kwargs: oldfn(s, c)
1120 1120 l.append((mf, fn, params))
1121 self.filterpats[filter] = l
1122 return self.filterpats[filter]
1121 self._filterpats[filter] = l
1122 return self._filterpats[filter]
1123 1123
1124 1124 def _filter(self, filterpats, filename, data):
1125 1125 for mf, fn, cmd in filterpats:
1126 1126 if mf(filename):
1127 1127 self.ui.debug("filtering %s through %s\n" % (filename, cmd))
1128 1128 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
1129 1129 break
1130 1130
1131 1131 return data
1132 1132
1133 1133 @unfilteredpropertycache
1134 1134 def _encodefilterpats(self):
1135 1135 return self._loadfilter('encode')
1136 1136
1137 1137 @unfilteredpropertycache
1138 1138 def _decodefilterpats(self):
1139 1139 return self._loadfilter('decode')
1140 1140
1141 1141 def adddatafilter(self, name, filter):
1142 1142 self._datafilters[name] = filter
1143 1143
1144 1144 def wread(self, filename):
1145 1145 if self.wvfs.islink(filename):
1146 1146 data = self.wvfs.readlink(filename)
1147 1147 else:
1148 1148 data = self.wvfs.read(filename)
1149 1149 return self._filter(self._encodefilterpats, filename, data)
1150 1150
1151 1151 def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs):
1152 1152 """write ``data`` into ``filename`` in the working directory
1153 1153
1154 1154 This returns length of written (maybe decoded) data.
1155 1155 """
1156 1156 data = self._filter(self._decodefilterpats, filename, data)
1157 1157 if 'l' in flags:
1158 1158 self.wvfs.symlink(data, filename)
1159 1159 else:
1160 1160 self.wvfs.write(filename, data, backgroundclose=backgroundclose,
1161 1161 **kwargs)
1162 1162 if 'x' in flags:
1163 1163 self.wvfs.setflags(filename, False, True)
1164 1164 else:
1165 1165 self.wvfs.setflags(filename, False, False)
1166 1166 return len(data)
1167 1167
1168 1168 def wwritedata(self, filename, data):
1169 1169 return self._filter(self._decodefilterpats, filename, data)
1170 1170
1171 1171 def currenttransaction(self):
1172 1172 """return the current transaction or None if non exists"""
1173 1173 if self._transref:
1174 1174 tr = self._transref()
1175 1175 else:
1176 1176 tr = None
1177 1177
1178 1178 if tr and tr.running():
1179 1179 return tr
1180 1180 return None
1181 1181
1182 1182 def transaction(self, desc, report=None):
1183 1183 if (self.ui.configbool('devel', 'all-warnings')
1184 1184 or self.ui.configbool('devel', 'check-locks')):
1185 1185 if self._currentlock(self._lockref) is None:
1186 1186 raise error.ProgrammingError('transaction requires locking')
1187 1187 tr = self.currenttransaction()
1188 1188 if tr is not None:
1189 1189 return tr.nest(name=desc)
1190 1190
1191 1191 # abort here if the journal already exists
1192 1192 if self.svfs.exists("journal"):
1193 1193 raise error.RepoError(
1194 1194 _("abandoned transaction found"),
1195 1195 hint=_("run 'hg recover' to clean up transaction"))
1196 1196
1197 1197 idbase = "%.40f#%f" % (random.random(), time.time())
1198 1198 ha = hex(hashlib.sha1(idbase).digest())
1199 1199 txnid = 'TXN:' + ha
1200 1200 self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid)
1201 1201
1202 1202 self._writejournal(desc)
1203 1203 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
1204 1204 if report:
1205 1205 rp = report
1206 1206 else:
1207 1207 rp = self.ui.warn
1208 1208 vfsmap = {'plain': self.vfs} # root of .hg/
1209 1209 # we must avoid cyclic reference between repo and transaction.
1210 1210 reporef = weakref.ref(self)
1211 1211 # Code to track tag movement
1212 1212 #
1213 1213 # Since tags are all handled as file content, it is actually quite hard
1214 1214 # to track these movement from a code perspective. So we fallback to a
1215 1215 # tracking at the repository level. One could envision to track changes
1216 1216 # to the '.hgtags' file through changegroup apply but that fails to
1217 1217 # cope with case where transaction expose new heads without changegroup
1218 1218 # being involved (eg: phase movement).
1219 1219 #
1220 1220 # For now, We gate the feature behind a flag since this likely comes
1221 1221 # with performance impacts. The current code run more often than needed
1222 1222 # and do not use caches as much as it could. The current focus is on
1223 1223 # the behavior of the feature so we disable it by default. The flag
1224 1224 # will be removed when we are happy with the performance impact.
1225 1225 #
1226 1226 # Once this feature is no longer experimental move the following
1227 1227 # documentation to the appropriate help section:
1228 1228 #
1229 1229 # The ``HG_TAG_MOVED`` variable will be set if the transaction touched
1230 1230 # tags (new or changed or deleted tags). In addition the details of
1231 1231 # these changes are made available in a file at:
1232 1232 # ``REPOROOT/.hg/changes/tags.changes``.
1233 1233 # Make sure you check for HG_TAG_MOVED before reading that file as it
1234 1234 # might exist from a previous transaction even if no tag were touched
1235 1235 # in this one. Changes are recorded in a line base format::
1236 1236 #
1237 1237 # <action> <hex-node> <tag-name>\n
1238 1238 #
1239 1239 # Actions are defined as follow:
1240 1240 # "-R": tag is removed,
1241 1241 # "+A": tag is added,
1242 1242 # "-M": tag is moved (old value),
1243 1243 # "+M": tag is moved (new value),
1244 1244 tracktags = lambda x: None
1245 1245 # experimental config: experimental.hook-track-tags
1246 1246 shouldtracktags = self.ui.configbool('experimental', 'hook-track-tags')
1247 1247 if desc != 'strip' and shouldtracktags:
1248 1248 oldheads = self.changelog.headrevs()
1249 1249 def tracktags(tr2):
1250 1250 repo = reporef()
1251 1251 oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads)
1252 1252 newheads = repo.changelog.headrevs()
1253 1253 newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads)
1254 1254 # notes: we compare lists here.
1255 1255 # As we do it only once buiding set would not be cheaper
1256 1256 changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes)
1257 1257 if changes:
1258 1258 tr2.hookargs['tag_moved'] = '1'
1259 1259 with repo.vfs('changes/tags.changes', 'w',
1260 1260 atomictemp=True) as changesfile:
1261 1261 # note: we do not register the file to the transaction
1262 1262 # because we needs it to still exist on the transaction
1263 1263 # is close (for txnclose hooks)
1264 1264 tagsmod.writediff(changesfile, changes)
1265 1265 def validate(tr2):
1266 1266 """will run pre-closing hooks"""
1267 1267 # XXX the transaction API is a bit lacking here so we take a hacky
1268 1268 # path for now
1269 1269 #
1270 1270 # We cannot add this as a "pending" hooks since the 'tr.hookargs'
1271 1271 # dict is copied before these run. In addition we needs the data
1272 1272 # available to in memory hooks too.
1273 1273 #
1274 1274 # Moreover, we also need to make sure this runs before txnclose
1275 1275 # hooks and there is no "pending" mechanism that would execute
1276 1276 # logic only if hooks are about to run.
1277 1277 #
1278 1278 # Fixing this limitation of the transaction is also needed to track
1279 1279 # other families of changes (bookmarks, phases, obsolescence).
1280 1280 #
1281 1281 # This will have to be fixed before we remove the experimental
1282 1282 # gating.
1283 1283 tracktags(tr2)
1284 1284 repo = reporef()
1285 1285 if repo.ui.configbool('experimental', 'single-head-per-branch'):
1286 1286 scmutil.enforcesinglehead(repo, tr2, desc)
1287 1287 if hook.hashook(repo.ui, 'pretxnclose-bookmark'):
1288 1288 for name, (old, new) in sorted(tr.changes['bookmarks'].items()):
1289 1289 args = tr.hookargs.copy()
1290 1290 args.update(bookmarks.preparehookargs(name, old, new))
1291 1291 repo.hook('pretxnclose-bookmark', throw=True,
1292 1292 txnname=desc,
1293 1293 **pycompat.strkwargs(args))
1294 1294 if hook.hashook(repo.ui, 'pretxnclose-phase'):
1295 1295 cl = repo.unfiltered().changelog
1296 1296 for rev, (old, new) in tr.changes['phases'].items():
1297 1297 args = tr.hookargs.copy()
1298 1298 node = hex(cl.node(rev))
1299 1299 args.update(phases.preparehookargs(node, old, new))
1300 1300 repo.hook('pretxnclose-phase', throw=True, txnname=desc,
1301 1301 **pycompat.strkwargs(args))
1302 1302
1303 1303 repo.hook('pretxnclose', throw=True,
1304 1304 txnname=desc, **pycompat.strkwargs(tr.hookargs))
1305 1305 def releasefn(tr, success):
1306 1306 repo = reporef()
1307 1307 if success:
1308 1308 # this should be explicitly invoked here, because
1309 1309 # in-memory changes aren't written out at closing
1310 1310 # transaction, if tr.addfilegenerator (via
1311 1311 # dirstate.write or so) isn't invoked while
1312 1312 # transaction running
1313 1313 repo.dirstate.write(None)
1314 1314 else:
1315 1315 # discard all changes (including ones already written
1316 1316 # out) in this transaction
1317 1317 repo.dirstate.restorebackup(None, 'journal.dirstate')
1318 1318
1319 1319 repo.invalidate(clearfilecache=True)
1320 1320
1321 1321 tr = transaction.transaction(rp, self.svfs, vfsmap,
1322 1322 "journal",
1323 1323 "undo",
1324 1324 aftertrans(renames),
1325 1325 self.store.createmode,
1326 1326 validator=validate,
1327 1327 releasefn=releasefn,
1328 1328 checkambigfiles=_cachedfiles,
1329 1329 name=desc)
1330 1330 tr.changes['revs'] = xrange(0, 0)
1331 1331 tr.changes['obsmarkers'] = set()
1332 1332 tr.changes['phases'] = {}
1333 1333 tr.changes['bookmarks'] = {}
1334 1334
1335 1335 tr.hookargs['txnid'] = txnid
1336 1336 # note: writing the fncache only during finalize mean that the file is
1337 1337 # outdated when running hooks. As fncache is used for streaming clone,
1338 1338 # this is not expected to break anything that happen during the hooks.
1339 1339 tr.addfinalize('flush-fncache', self.store.write)
1340 1340 def txnclosehook(tr2):
1341 1341 """To be run if transaction is successful, will schedule a hook run
1342 1342 """
1343 1343 # Don't reference tr2 in hook() so we don't hold a reference.
1344 1344 # This reduces memory consumption when there are multiple
1345 1345 # transactions per lock. This can likely go away if issue5045
1346 1346 # fixes the function accumulation.
1347 1347 hookargs = tr2.hookargs
1348 1348
1349 1349 def hookfunc():
1350 1350 repo = reporef()
1351 1351 if hook.hashook(repo.ui, 'txnclose-bookmark'):
1352 1352 bmchanges = sorted(tr.changes['bookmarks'].items())
1353 1353 for name, (old, new) in bmchanges:
1354 1354 args = tr.hookargs.copy()
1355 1355 args.update(bookmarks.preparehookargs(name, old, new))
1356 1356 repo.hook('txnclose-bookmark', throw=False,
1357 1357 txnname=desc, **pycompat.strkwargs(args))
1358 1358
1359 1359 if hook.hashook(repo.ui, 'txnclose-phase'):
1360 1360 cl = repo.unfiltered().changelog
1361 1361 phasemv = sorted(tr.changes['phases'].items())
1362 1362 for rev, (old, new) in phasemv:
1363 1363 args = tr.hookargs.copy()
1364 1364 node = hex(cl.node(rev))
1365 1365 args.update(phases.preparehookargs(node, old, new))
1366 1366 repo.hook('txnclose-phase', throw=False, txnname=desc,
1367 1367 **pycompat.strkwargs(args))
1368 1368
1369 1369 repo.hook('txnclose', throw=False, txnname=desc,
1370 1370 **pycompat.strkwargs(hookargs))
1371 1371 reporef()._afterlock(hookfunc)
1372 1372 tr.addfinalize('txnclose-hook', txnclosehook)
1373 1373 # Include a leading "-" to make it happen before the transaction summary
1374 1374 # reports registered via scmutil.registersummarycallback() whose names
1375 1375 # are 00-txnreport etc. That way, the caches will be warm when the
1376 1376 # callbacks run.
1377 1377 tr.addpostclose('-warm-cache', self._buildcacheupdater(tr))
1378 1378 def txnaborthook(tr2):
1379 1379 """To be run if transaction is aborted
1380 1380 """
1381 1381 reporef().hook('txnabort', throw=False, txnname=desc,
1382 1382 **pycompat.strkwargs(tr2.hookargs))
1383 1383 tr.addabort('txnabort-hook', txnaborthook)
1384 1384 # avoid eager cache invalidation. in-memory data should be identical
1385 1385 # to stored data if transaction has no error.
1386 1386 tr.addpostclose('refresh-filecachestats', self._refreshfilecachestats)
1387 1387 self._transref = weakref.ref(tr)
1388 1388 scmutil.registersummarycallback(self, tr, desc)
1389 1389 return tr
1390 1390
1391 1391 def _journalfiles(self):
1392 1392 return ((self.svfs, 'journal'),
1393 1393 (self.vfs, 'journal.dirstate'),
1394 1394 (self.vfs, 'journal.branch'),
1395 1395 (self.vfs, 'journal.desc'),
1396 1396 (self.vfs, 'journal.bookmarks'),
1397 1397 (self.svfs, 'journal.phaseroots'))
1398 1398
1399 1399 def undofiles(self):
1400 1400 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
1401 1401
1402 1402 @unfilteredmethod
1403 1403 def _writejournal(self, desc):
1404 1404 self.dirstate.savebackup(None, 'journal.dirstate')
1405 1405 self.vfs.write("journal.branch",
1406 1406 encoding.fromlocal(self.dirstate.branch()))
1407 1407 self.vfs.write("journal.desc",
1408 1408 "%d\n%s\n" % (len(self), desc))
1409 1409 self.vfs.write("journal.bookmarks",
1410 1410 self.vfs.tryread("bookmarks"))
1411 1411 self.svfs.write("journal.phaseroots",
1412 1412 self.svfs.tryread("phaseroots"))
1413 1413
1414 1414 def recover(self):
1415 1415 with self.lock():
1416 1416 if self.svfs.exists("journal"):
1417 1417 self.ui.status(_("rolling back interrupted transaction\n"))
1418 1418 vfsmap = {'': self.svfs,
1419 1419 'plain': self.vfs,}
1420 1420 transaction.rollback(self.svfs, vfsmap, "journal",
1421 1421 self.ui.warn,
1422 1422 checkambigfiles=_cachedfiles)
1423 1423 self.invalidate()
1424 1424 return True
1425 1425 else:
1426 1426 self.ui.warn(_("no interrupted transaction available\n"))
1427 1427 return False
1428 1428
1429 1429 def rollback(self, dryrun=False, force=False):
1430 1430 wlock = lock = dsguard = None
1431 1431 try:
1432 1432 wlock = self.wlock()
1433 1433 lock = self.lock()
1434 1434 if self.svfs.exists("undo"):
1435 1435 dsguard = dirstateguard.dirstateguard(self, 'rollback')
1436 1436
1437 1437 return self._rollback(dryrun, force, dsguard)
1438 1438 else:
1439 1439 self.ui.warn(_("no rollback information available\n"))
1440 1440 return 1
1441 1441 finally:
1442 1442 release(dsguard, lock, wlock)
1443 1443
1444 1444 @unfilteredmethod # Until we get smarter cache management
1445 1445 def _rollback(self, dryrun, force, dsguard):
1446 1446 ui = self.ui
1447 1447 try:
1448 1448 args = self.vfs.read('undo.desc').splitlines()
1449 1449 (oldlen, desc, detail) = (int(args[0]), args[1], None)
1450 1450 if len(args) >= 3:
1451 1451 detail = args[2]
1452 1452 oldtip = oldlen - 1
1453 1453
1454 1454 if detail and ui.verbose:
1455 1455 msg = (_('repository tip rolled back to revision %d'
1456 1456 ' (undo %s: %s)\n')
1457 1457 % (oldtip, desc, detail))
1458 1458 else:
1459 1459 msg = (_('repository tip rolled back to revision %d'
1460 1460 ' (undo %s)\n')
1461 1461 % (oldtip, desc))
1462 1462 except IOError:
1463 1463 msg = _('rolling back unknown transaction\n')
1464 1464 desc = None
1465 1465
1466 1466 if not force and self['.'] != self['tip'] and desc == 'commit':
1467 1467 raise error.Abort(
1468 1468 _('rollback of last commit while not checked out '
1469 1469 'may lose data'), hint=_('use -f to force'))
1470 1470
1471 1471 ui.status(msg)
1472 1472 if dryrun:
1473 1473 return 0
1474 1474
1475 1475 parents = self.dirstate.parents()
1476 1476 self.destroying()
1477 1477 vfsmap = {'plain': self.vfs, '': self.svfs}
1478 1478 transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn,
1479 1479 checkambigfiles=_cachedfiles)
1480 1480 if self.vfs.exists('undo.bookmarks'):
1481 1481 self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True)
1482 1482 if self.svfs.exists('undo.phaseroots'):
1483 1483 self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True)
1484 1484 self.invalidate()
1485 1485
1486 1486 parentgone = (parents[0] not in self.changelog.nodemap or
1487 1487 parents[1] not in self.changelog.nodemap)
1488 1488 if parentgone:
1489 1489 # prevent dirstateguard from overwriting already restored one
1490 1490 dsguard.close()
1491 1491
1492 1492 self.dirstate.restorebackup(None, 'undo.dirstate')
1493 1493 try:
1494 1494 branch = self.vfs.read('undo.branch')
1495 1495 self.dirstate.setbranch(encoding.tolocal(branch))
1496 1496 except IOError:
1497 1497 ui.warn(_('named branch could not be reset: '
1498 1498 'current branch is still \'%s\'\n')
1499 1499 % self.dirstate.branch())
1500 1500
1501 1501 parents = tuple([p.rev() for p in self[None].parents()])
1502 1502 if len(parents) > 1:
1503 1503 ui.status(_('working directory now based on '
1504 1504 'revisions %d and %d\n') % parents)
1505 1505 else:
1506 1506 ui.status(_('working directory now based on '
1507 1507 'revision %d\n') % parents)
1508 1508 mergemod.mergestate.clean(self, self['.'].node())
1509 1509
1510 1510 # TODO: if we know which new heads may result from this rollback, pass
1511 1511 # them to destroy(), which will prevent the branchhead cache from being
1512 1512 # invalidated.
1513 1513 self.destroyed()
1514 1514 return 0
1515 1515
1516 1516 def _buildcacheupdater(self, newtransaction):
1517 1517 """called during transaction to build the callback updating cache
1518 1518
1519 1519 Lives on the repository to help extension who might want to augment
1520 1520 this logic. For this purpose, the created transaction is passed to the
1521 1521 method.
1522 1522 """
1523 1523 # we must avoid cyclic reference between repo and transaction.
1524 1524 reporef = weakref.ref(self)
1525 1525 def updater(tr):
1526 1526 repo = reporef()
1527 1527 repo.updatecaches(tr)
1528 1528 return updater
1529 1529
1530 1530 @unfilteredmethod
1531 1531 def updatecaches(self, tr=None, full=False):
1532 1532 """warm appropriate caches
1533 1533
1534 1534 If this function is called after a transaction closed. The transaction
1535 1535 will be available in the 'tr' argument. This can be used to selectively
1536 1536 update caches relevant to the changes in that transaction.
1537 1537
1538 1538 If 'full' is set, make sure all caches the function knows about have
1539 1539 up-to-date data. Even the ones usually loaded more lazily.
1540 1540 """
1541 1541 if tr is not None and tr.hookargs.get('source') == 'strip':
1542 1542 # During strip, many caches are invalid but
1543 1543 # later call to `destroyed` will refresh them.
1544 1544 return
1545 1545
1546 1546 if tr is None or tr.changes['revs']:
1547 1547 # updating the unfiltered branchmap should refresh all the others,
1548 1548 self.ui.debug('updating the branch cache\n')
1549 1549 branchmap.updatecache(self.filtered('served'))
1550 1550
1551 1551 if full:
1552 1552 rbc = self.revbranchcache()
1553 1553 for r in self.changelog:
1554 1554 rbc.branchinfo(r)
1555 1555 rbc.write()
1556 1556
1557 1557 def invalidatecaches(self):
1558 1558
1559 1559 if '_tagscache' in vars(self):
1560 1560 # can't use delattr on proxy
1561 1561 del self.__dict__['_tagscache']
1562 1562
1563 1563 self.unfiltered()._branchcaches.clear()
1564 1564 self.invalidatevolatilesets()
1565 1565 self._sparsesignaturecache.clear()
1566 1566
1567 1567 def invalidatevolatilesets(self):
1568 1568 self.filteredrevcache.clear()
1569 1569 obsolete.clearobscaches(self)
1570 1570
1571 1571 def invalidatedirstate(self):
1572 1572 '''Invalidates the dirstate, causing the next call to dirstate
1573 1573 to check if it was modified since the last time it was read,
1574 1574 rereading it if it has.
1575 1575
1576 1576 This is different to dirstate.invalidate() that it doesn't always
1577 1577 rereads the dirstate. Use dirstate.invalidate() if you want to
1578 1578 explicitly read the dirstate again (i.e. restoring it to a previous
1579 1579 known good state).'''
1580 1580 if hasunfilteredcache(self, 'dirstate'):
1581 1581 for k in self.dirstate._filecache:
1582 1582 try:
1583 1583 delattr(self.dirstate, k)
1584 1584 except AttributeError:
1585 1585 pass
1586 1586 delattr(self.unfiltered(), 'dirstate')
1587 1587
1588 1588 def invalidate(self, clearfilecache=False):
1589 1589 '''Invalidates both store and non-store parts other than dirstate
1590 1590
1591 1591 If a transaction is running, invalidation of store is omitted,
1592 1592 because discarding in-memory changes might cause inconsistency
1593 1593 (e.g. incomplete fncache causes unintentional failure, but
1594 1594 redundant one doesn't).
1595 1595 '''
1596 1596 unfiltered = self.unfiltered() # all file caches are stored unfiltered
1597 1597 for k in list(self._filecache.keys()):
1598 1598 # dirstate is invalidated separately in invalidatedirstate()
1599 1599 if k == 'dirstate':
1600 1600 continue
1601 1601 if (k == 'changelog' and
1602 1602 self.currenttransaction() and
1603 1603 self.changelog._delayed):
1604 1604 # The changelog object may store unwritten revisions. We don't
1605 1605 # want to lose them.
1606 1606 # TODO: Solve the problem instead of working around it.
1607 1607 continue
1608 1608
1609 1609 if clearfilecache:
1610 1610 del self._filecache[k]
1611 1611 try:
1612 1612 delattr(unfiltered, k)
1613 1613 except AttributeError:
1614 1614 pass
1615 1615 self.invalidatecaches()
1616 1616 if not self.currenttransaction():
1617 1617 # TODO: Changing contents of store outside transaction
1618 1618 # causes inconsistency. We should make in-memory store
1619 1619 # changes detectable, and abort if changed.
1620 1620 self.store.invalidatecaches()
1621 1621
1622 1622 def invalidateall(self):
1623 1623 '''Fully invalidates both store and non-store parts, causing the
1624 1624 subsequent operation to reread any outside changes.'''
1625 1625 # extension should hook this to invalidate its caches
1626 1626 self.invalidate()
1627 1627 self.invalidatedirstate()
1628 1628
1629 1629 @unfilteredmethod
1630 1630 def _refreshfilecachestats(self, tr):
1631 1631 """Reload stats of cached files so that they are flagged as valid"""
1632 1632 for k, ce in self._filecache.items():
1633 1633 k = pycompat.sysstr(k)
1634 1634 if k == r'dirstate' or k not in self.__dict__:
1635 1635 continue
1636 1636 ce.refresh()
1637 1637
1638 1638 def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc,
1639 1639 inheritchecker=None, parentenvvar=None):
1640 1640 parentlock = None
1641 1641 # the contents of parentenvvar are used by the underlying lock to
1642 1642 # determine whether it can be inherited
1643 1643 if parentenvvar is not None:
1644 1644 parentlock = encoding.environ.get(parentenvvar)
1645 1645
1646 1646 timeout = 0
1647 1647 warntimeout = 0
1648 1648 if wait:
1649 1649 timeout = self.ui.configint("ui", "timeout")
1650 1650 warntimeout = self.ui.configint("ui", "timeout.warn")
1651 1651
1652 1652 l = lockmod.trylock(self.ui, vfs, lockname, timeout, warntimeout,
1653 1653 releasefn=releasefn,
1654 1654 acquirefn=acquirefn, desc=desc,
1655 1655 inheritchecker=inheritchecker,
1656 1656 parentlock=parentlock)
1657 1657 return l
1658 1658
1659 1659 def _afterlock(self, callback):
1660 1660 """add a callback to be run when the repository is fully unlocked
1661 1661
1662 1662 The callback will be executed when the outermost lock is released
1663 1663 (with wlock being higher level than 'lock')."""
1664 1664 for ref in (self._wlockref, self._lockref):
1665 1665 l = ref and ref()
1666 1666 if l and l.held:
1667 1667 l.postrelease.append(callback)
1668 1668 break
1669 1669 else: # no lock have been found.
1670 1670 callback()
1671 1671
1672 1672 def lock(self, wait=True):
1673 1673 '''Lock the repository store (.hg/store) and return a weak reference
1674 1674 to the lock. Use this before modifying the store (e.g. committing or
1675 1675 stripping). If you are opening a transaction, get a lock as well.)
1676 1676
1677 1677 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
1678 1678 'wlock' first to avoid a dead-lock hazard.'''
1679 1679 l = self._currentlock(self._lockref)
1680 1680 if l is not None:
1681 1681 l.lock()
1682 1682 return l
1683 1683
1684 1684 l = self._lock(self.svfs, "lock", wait, None,
1685 1685 self.invalidate, _('repository %s') % self.origroot)
1686 1686 self._lockref = weakref.ref(l)
1687 1687 return l
1688 1688
1689 1689 def _wlockchecktransaction(self):
1690 1690 if self.currenttransaction() is not None:
1691 1691 raise error.LockInheritanceContractViolation(
1692 1692 'wlock cannot be inherited in the middle of a transaction')
1693 1693
1694 1694 def wlock(self, wait=True):
1695 1695 '''Lock the non-store parts of the repository (everything under
1696 1696 .hg except .hg/store) and return a weak reference to the lock.
1697 1697
1698 1698 Use this before modifying files in .hg.
1699 1699
1700 1700 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
1701 1701 'wlock' first to avoid a dead-lock hazard.'''
1702 1702 l = self._wlockref and self._wlockref()
1703 1703 if l is not None and l.held:
1704 1704 l.lock()
1705 1705 return l
1706 1706
1707 1707 # We do not need to check for non-waiting lock acquisition. Such
1708 1708 # acquisition would not cause dead-lock as they would just fail.
1709 1709 if wait and (self.ui.configbool('devel', 'all-warnings')
1710 1710 or self.ui.configbool('devel', 'check-locks')):
1711 1711 if self._currentlock(self._lockref) is not None:
1712 1712 self.ui.develwarn('"wlock" acquired after "lock"')
1713 1713
1714 1714 def unlock():
1715 1715 if self.dirstate.pendingparentchange():
1716 1716 self.dirstate.invalidate()
1717 1717 else:
1718 1718 self.dirstate.write(None)
1719 1719
1720 1720 self._filecache['dirstate'].refresh()
1721 1721
1722 1722 l = self._lock(self.vfs, "wlock", wait, unlock,
1723 1723 self.invalidatedirstate, _('working directory of %s') %
1724 1724 self.origroot,
1725 1725 inheritchecker=self._wlockchecktransaction,
1726 1726 parentenvvar='HG_WLOCK_LOCKER')
1727 1727 self._wlockref = weakref.ref(l)
1728 1728 return l
1729 1729
1730 1730 def _currentlock(self, lockref):
1731 1731 """Returns the lock if it's held, or None if it's not."""
1732 1732 if lockref is None:
1733 1733 return None
1734 1734 l = lockref()
1735 1735 if l is None or not l.held:
1736 1736 return None
1737 1737 return l
1738 1738
1739 1739 def currentwlock(self):
1740 1740 """Returns the wlock if it's held, or None if it's not."""
1741 1741 return self._currentlock(self._wlockref)
1742 1742
1743 1743 def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist):
1744 1744 """
1745 1745 commit an individual file as part of a larger transaction
1746 1746 """
1747 1747
1748 1748 fname = fctx.path()
1749 1749 fparent1 = manifest1.get(fname, nullid)
1750 1750 fparent2 = manifest2.get(fname, nullid)
1751 1751 if isinstance(fctx, context.filectx):
1752 1752 node = fctx.filenode()
1753 1753 if node in [fparent1, fparent2]:
1754 1754 self.ui.debug('reusing %s filelog entry\n' % fname)
1755 1755 if manifest1.flags(fname) != fctx.flags():
1756 1756 changelist.append(fname)
1757 1757 return node
1758 1758
1759 1759 flog = self.file(fname)
1760 1760 meta = {}
1761 1761 copy = fctx.renamed()
1762 1762 if copy and copy[0] != fname:
1763 1763 # Mark the new revision of this file as a copy of another
1764 1764 # file. This copy data will effectively act as a parent
1765 1765 # of this new revision. If this is a merge, the first
1766 1766 # parent will be the nullid (meaning "look up the copy data")
1767 1767 # and the second one will be the other parent. For example:
1768 1768 #
1769 1769 # 0 --- 1 --- 3 rev1 changes file foo
1770 1770 # \ / rev2 renames foo to bar and changes it
1771 1771 # \- 2 -/ rev3 should have bar with all changes and
1772 1772 # should record that bar descends from
1773 1773 # bar in rev2 and foo in rev1
1774 1774 #
1775 1775 # this allows this merge to succeed:
1776 1776 #
1777 1777 # 0 --- 1 --- 3 rev4 reverts the content change from rev2
1778 1778 # \ / merging rev3 and rev4 should use bar@rev2
1779 1779 # \- 2 --- 4 as the merge base
1780 1780 #
1781 1781
1782 1782 cfname = copy[0]
1783 1783 crev = manifest1.get(cfname)
1784 1784 newfparent = fparent2
1785 1785
1786 1786 if manifest2: # branch merge
1787 1787 if fparent2 == nullid or crev is None: # copied on remote side
1788 1788 if cfname in manifest2:
1789 1789 crev = manifest2[cfname]
1790 1790 newfparent = fparent1
1791 1791
1792 1792 # Here, we used to search backwards through history to try to find
1793 1793 # where the file copy came from if the source of a copy was not in
1794 1794 # the parent directory. However, this doesn't actually make sense to
1795 1795 # do (what does a copy from something not in your working copy even
1796 1796 # mean?) and it causes bugs (eg, issue4476). Instead, we will warn
1797 1797 # the user that copy information was dropped, so if they didn't
1798 1798 # expect this outcome it can be fixed, but this is the correct
1799 1799 # behavior in this circumstance.
1800 1800
1801 1801 if crev:
1802 1802 self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
1803 1803 meta["copy"] = cfname
1804 1804 meta["copyrev"] = hex(crev)
1805 1805 fparent1, fparent2 = nullid, newfparent
1806 1806 else:
1807 1807 self.ui.warn(_("warning: can't find ancestor for '%s' "
1808 1808 "copied from '%s'!\n") % (fname, cfname))
1809 1809
1810 1810 elif fparent1 == nullid:
1811 1811 fparent1, fparent2 = fparent2, nullid
1812 1812 elif fparent2 != nullid:
1813 1813 # is one parent an ancestor of the other?
1814 1814 fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
1815 1815 if fparent1 in fparentancestors:
1816 1816 fparent1, fparent2 = fparent2, nullid
1817 1817 elif fparent2 in fparentancestors:
1818 1818 fparent2 = nullid
1819 1819
1820 1820 # is the file changed?
1821 1821 text = fctx.data()
1822 1822 if fparent2 != nullid or flog.cmp(fparent1, text) or meta:
1823 1823 changelist.append(fname)
1824 1824 return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
1825 1825 # are just the flags changed during merge?
1826 1826 elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
1827 1827 changelist.append(fname)
1828 1828
1829 1829 return fparent1
1830 1830
1831 1831 def checkcommitpatterns(self, wctx, vdirs, match, status, fail):
1832 1832 """check for commit arguments that aren't committable"""
1833 1833 if match.isexact() or match.prefix():
1834 1834 matched = set(status.modified + status.added + status.removed)
1835 1835
1836 1836 for f in match.files():
1837 1837 f = self.dirstate.normalize(f)
1838 1838 if f == '.' or f in matched or f in wctx.substate:
1839 1839 continue
1840 1840 if f in status.deleted:
1841 1841 fail(f, _('file not found!'))
1842 1842 if f in vdirs: # visited directory
1843 1843 d = f + '/'
1844 1844 for mf in matched:
1845 1845 if mf.startswith(d):
1846 1846 break
1847 1847 else:
1848 1848 fail(f, _("no match under directory!"))
1849 1849 elif f not in self.dirstate:
1850 1850 fail(f, _("file not tracked!"))
1851 1851
1852 1852 @unfilteredmethod
1853 1853 def commit(self, text="", user=None, date=None, match=None, force=False,
1854 1854 editor=False, extra=None):
1855 1855 """Add a new revision to current repository.
1856 1856
1857 1857 Revision information is gathered from the working directory,
1858 1858 match can be used to filter the committed files. If editor is
1859 1859 supplied, it is called to get a commit message.
1860 1860 """
1861 1861 if extra is None:
1862 1862 extra = {}
1863 1863
1864 1864 def fail(f, msg):
1865 1865 raise error.Abort('%s: %s' % (f, msg))
1866 1866
1867 1867 if not match:
1868 1868 match = matchmod.always(self.root, '')
1869 1869
1870 1870 if not force:
1871 1871 vdirs = []
1872 1872 match.explicitdir = vdirs.append
1873 1873 match.bad = fail
1874 1874
1875 1875 wlock = lock = tr = None
1876 1876 try:
1877 1877 wlock = self.wlock()
1878 1878 lock = self.lock() # for recent changelog (see issue4368)
1879 1879
1880 1880 wctx = self[None]
1881 1881 merge = len(wctx.parents()) > 1
1882 1882
1883 1883 if not force and merge and not match.always():
1884 1884 raise error.Abort(_('cannot partially commit a merge '
1885 1885 '(do not specify files or patterns)'))
1886 1886
1887 1887 status = self.status(match=match, clean=force)
1888 1888 if force:
1889 1889 status.modified.extend(status.clean) # mq may commit clean files
1890 1890
1891 1891 # check subrepos
1892 1892 subs, commitsubs, newstate = subrepoutil.precommit(
1893 1893 self.ui, wctx, status, match, force=force)
1894 1894
1895 1895 # make sure all explicit patterns are matched
1896 1896 if not force:
1897 1897 self.checkcommitpatterns(wctx, vdirs, match, status, fail)
1898 1898
1899 1899 cctx = context.workingcommitctx(self, status,
1900 1900 text, user, date, extra)
1901 1901
1902 1902 # internal config: ui.allowemptycommit
1903 1903 allowemptycommit = (wctx.branch() != wctx.p1().branch()
1904 1904 or extra.get('close') or merge or cctx.files()
1905 1905 or self.ui.configbool('ui', 'allowemptycommit'))
1906 1906 if not allowemptycommit:
1907 1907 return None
1908 1908
1909 1909 if merge and cctx.deleted():
1910 1910 raise error.Abort(_("cannot commit merge with missing files"))
1911 1911
1912 1912 ms = mergemod.mergestate.read(self)
1913 1913 mergeutil.checkunresolved(ms)
1914 1914
1915 1915 if editor:
1916 1916 cctx._text = editor(self, cctx, subs)
1917 1917 edited = (text != cctx._text)
1918 1918
1919 1919 # Save commit message in case this transaction gets rolled back
1920 1920 # (e.g. by a pretxncommit hook). Leave the content alone on
1921 1921 # the assumption that the user will use the same editor again.
1922 1922 msgfn = self.savecommitmessage(cctx._text)
1923 1923
1924 1924 # commit subs and write new state
1925 1925 if subs:
1926 1926 for s in sorted(commitsubs):
1927 1927 sub = wctx.sub(s)
1928 1928 self.ui.status(_('committing subrepository %s\n') %
1929 1929 subrepoutil.subrelpath(sub))
1930 1930 sr = sub.commit(cctx._text, user, date)
1931 1931 newstate[s] = (newstate[s][0], sr)
1932 1932 subrepoutil.writestate(self, newstate)
1933 1933
1934 1934 p1, p2 = self.dirstate.parents()
1935 1935 hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '')
1936 1936 try:
1937 1937 self.hook("precommit", throw=True, parent1=hookp1,
1938 1938 parent2=hookp2)
1939 1939 tr = self.transaction('commit')
1940 1940 ret = self.commitctx(cctx, True)
1941 1941 except: # re-raises
1942 1942 if edited:
1943 1943 self.ui.write(
1944 1944 _('note: commit message saved in %s\n') % msgfn)
1945 1945 raise
1946 1946 # update bookmarks, dirstate and mergestate
1947 1947 bookmarks.update(self, [p1, p2], ret)
1948 1948 cctx.markcommitted(ret)
1949 1949 ms.reset()
1950 1950 tr.close()
1951 1951
1952 1952 finally:
1953 1953 lockmod.release(tr, lock, wlock)
1954 1954
1955 1955 def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2):
1956 1956 # hack for command that use a temporary commit (eg: histedit)
1957 1957 # temporary commit got stripped before hook release
1958 1958 if self.changelog.hasnode(ret):
1959 1959 self.hook("commit", node=node, parent1=parent1,
1960 1960 parent2=parent2)
1961 1961 self._afterlock(commithook)
1962 1962 return ret
1963 1963
1964 1964 @unfilteredmethod
1965 1965 def commitctx(self, ctx, error=False):
1966 1966 """Add a new revision to current repository.
1967 1967 Revision information is passed via the context argument.
1968 1968 """
1969 1969
1970 1970 tr = None
1971 1971 p1, p2 = ctx.p1(), ctx.p2()
1972 1972 user = ctx.user()
1973 1973
1974 1974 lock = self.lock()
1975 1975 try:
1976 1976 tr = self.transaction("commit")
1977 1977 trp = weakref.proxy(tr)
1978 1978
1979 1979 if ctx.manifestnode():
1980 1980 # reuse an existing manifest revision
1981 1981 mn = ctx.manifestnode()
1982 1982 files = ctx.files()
1983 1983 elif ctx.files():
1984 1984 m1ctx = p1.manifestctx()
1985 1985 m2ctx = p2.manifestctx()
1986 1986 mctx = m1ctx.copy()
1987 1987
1988 1988 m = mctx.read()
1989 1989 m1 = m1ctx.read()
1990 1990 m2 = m2ctx.read()
1991 1991
1992 1992 # check in files
1993 1993 added = []
1994 1994 changed = []
1995 1995 removed = list(ctx.removed())
1996 1996 linkrev = len(self)
1997 1997 self.ui.note(_("committing files:\n"))
1998 1998 for f in sorted(ctx.modified() + ctx.added()):
1999 1999 self.ui.note(f + "\n")
2000 2000 try:
2001 2001 fctx = ctx[f]
2002 2002 if fctx is None:
2003 2003 removed.append(f)
2004 2004 else:
2005 2005 added.append(f)
2006 2006 m[f] = self._filecommit(fctx, m1, m2, linkrev,
2007 2007 trp, changed)
2008 2008 m.setflag(f, fctx.flags())
2009 2009 except OSError as inst:
2010 2010 self.ui.warn(_("trouble committing %s!\n") % f)
2011 2011 raise
2012 2012 except IOError as inst:
2013 2013 errcode = getattr(inst, 'errno', errno.ENOENT)
2014 2014 if error or errcode and errcode != errno.ENOENT:
2015 2015 self.ui.warn(_("trouble committing %s!\n") % f)
2016 2016 raise
2017 2017
2018 2018 # update manifest
2019 2019 self.ui.note(_("committing manifest\n"))
2020 2020 removed = [f for f in sorted(removed) if f in m1 or f in m2]
2021 2021 drop = [f for f in removed if f in m]
2022 2022 for f in drop:
2023 2023 del m[f]
2024 2024 mn = mctx.write(trp, linkrev,
2025 2025 p1.manifestnode(), p2.manifestnode(),
2026 2026 added, drop)
2027 2027 files = changed + removed
2028 2028 else:
2029 2029 mn = p1.manifestnode()
2030 2030 files = []
2031 2031
2032 2032 # update changelog
2033 2033 self.ui.note(_("committing changelog\n"))
2034 2034 self.changelog.delayupdate(tr)
2035 2035 n = self.changelog.add(mn, files, ctx.description(),
2036 2036 trp, p1.node(), p2.node(),
2037 2037 user, ctx.date(), ctx.extra().copy())
2038 2038 xp1, xp2 = p1.hex(), p2 and p2.hex() or ''
2039 2039 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
2040 2040 parent2=xp2)
2041 2041 # set the new commit is proper phase
2042 2042 targetphase = subrepoutil.newcommitphase(self.ui, ctx)
2043 2043 if targetphase:
2044 2044 # retract boundary do not alter parent changeset.
2045 2045 # if a parent have higher the resulting phase will
2046 2046 # be compliant anyway
2047 2047 #
2048 2048 # if minimal phase was 0 we don't need to retract anything
2049 2049 phases.registernew(self, tr, targetphase, [n])
2050 2050 tr.close()
2051 2051 return n
2052 2052 finally:
2053 2053 if tr:
2054 2054 tr.release()
2055 2055 lock.release()
2056 2056
2057 2057 @unfilteredmethod
2058 2058 def destroying(self):
2059 2059 '''Inform the repository that nodes are about to be destroyed.
2060 2060 Intended for use by strip and rollback, so there's a common
2061 2061 place for anything that has to be done before destroying history.
2062 2062
2063 2063 This is mostly useful for saving state that is in memory and waiting
2064 2064 to be flushed when the current lock is released. Because a call to
2065 2065 destroyed is imminent, the repo will be invalidated causing those
2066 2066 changes to stay in memory (waiting for the next unlock), or vanish
2067 2067 completely.
2068 2068 '''
2069 2069 # When using the same lock to commit and strip, the phasecache is left
2070 2070 # dirty after committing. Then when we strip, the repo is invalidated,
2071 2071 # causing those changes to disappear.
2072 2072 if '_phasecache' in vars(self):
2073 2073 self._phasecache.write()
2074 2074
2075 2075 @unfilteredmethod
2076 2076 def destroyed(self):
2077 2077 '''Inform the repository that nodes have been destroyed.
2078 2078 Intended for use by strip and rollback, so there's a common
2079 2079 place for anything that has to be done after destroying history.
2080 2080 '''
2081 2081 # When one tries to:
2082 2082 # 1) destroy nodes thus calling this method (e.g. strip)
2083 2083 # 2) use phasecache somewhere (e.g. commit)
2084 2084 #
2085 2085 # then 2) will fail because the phasecache contains nodes that were
2086 2086 # removed. We can either remove phasecache from the filecache,
2087 2087 # causing it to reload next time it is accessed, or simply filter
2088 2088 # the removed nodes now and write the updated cache.
2089 2089 self._phasecache.filterunknown(self)
2090 2090 self._phasecache.write()
2091 2091
2092 2092 # refresh all repository caches
2093 2093 self.updatecaches()
2094 2094
2095 2095 # Ensure the persistent tag cache is updated. Doing it now
2096 2096 # means that the tag cache only has to worry about destroyed
2097 2097 # heads immediately after a strip/rollback. That in turn
2098 2098 # guarantees that "cachetip == currenttip" (comparing both rev
2099 2099 # and node) always means no nodes have been added or destroyed.
2100 2100
2101 2101 # XXX this is suboptimal when qrefresh'ing: we strip the current
2102 2102 # head, refresh the tag cache, then immediately add a new head.
2103 2103 # But I think doing it this way is necessary for the "instant
2104 2104 # tag cache retrieval" case to work.
2105 2105 self.invalidate()
2106 2106
2107 2107 def status(self, node1='.', node2=None, match=None,
2108 2108 ignored=False, clean=False, unknown=False,
2109 2109 listsubrepos=False):
2110 2110 '''a convenience method that calls node1.status(node2)'''
2111 2111 return self[node1].status(node2, match, ignored, clean, unknown,
2112 2112 listsubrepos)
2113 2113
2114 2114 def addpostdsstatus(self, ps):
2115 2115 """Add a callback to run within the wlock, at the point at which status
2116 2116 fixups happen.
2117 2117
2118 2118 On status completion, callback(wctx, status) will be called with the
2119 2119 wlock held, unless the dirstate has changed from underneath or the wlock
2120 2120 couldn't be grabbed.
2121 2121
2122 2122 Callbacks should not capture and use a cached copy of the dirstate --
2123 2123 it might change in the meanwhile. Instead, they should access the
2124 2124 dirstate via wctx.repo().dirstate.
2125 2125
2126 2126 This list is emptied out after each status run -- extensions should
2127 2127 make sure it adds to this list each time dirstate.status is called.
2128 2128 Extensions should also make sure they don't call this for statuses
2129 2129 that don't involve the dirstate.
2130 2130 """
2131 2131
2132 2132 # The list is located here for uniqueness reasons -- it is actually
2133 2133 # managed by the workingctx, but that isn't unique per-repo.
2134 2134 self._postdsstatus.append(ps)
2135 2135
2136 2136 def postdsstatus(self):
2137 2137 """Used by workingctx to get the list of post-dirstate-status hooks."""
2138 2138 return self._postdsstatus
2139 2139
2140 2140 def clearpostdsstatus(self):
2141 2141 """Used by workingctx to clear post-dirstate-status hooks."""
2142 2142 del self._postdsstatus[:]
2143 2143
2144 2144 def heads(self, start=None):
2145 2145 if start is None:
2146 2146 cl = self.changelog
2147 2147 headrevs = reversed(cl.headrevs())
2148 2148 return [cl.node(rev) for rev in headrevs]
2149 2149
2150 2150 heads = self.changelog.heads(start)
2151 2151 # sort the output in rev descending order
2152 2152 return sorted(heads, key=self.changelog.rev, reverse=True)
2153 2153
2154 2154 def branchheads(self, branch=None, start=None, closed=False):
2155 2155 '''return a (possibly filtered) list of heads for the given branch
2156 2156
2157 2157 Heads are returned in topological order, from newest to oldest.
2158 2158 If branch is None, use the dirstate branch.
2159 2159 If start is not None, return only heads reachable from start.
2160 2160 If closed is True, return heads that are marked as closed as well.
2161 2161 '''
2162 2162 if branch is None:
2163 2163 branch = self[None].branch()
2164 2164 branches = self.branchmap()
2165 2165 if branch not in branches:
2166 2166 return []
2167 2167 # the cache returns heads ordered lowest to highest
2168 2168 bheads = list(reversed(branches.branchheads(branch, closed=closed)))
2169 2169 if start is not None:
2170 2170 # filter out the heads that cannot be reached from startrev
2171 2171 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
2172 2172 bheads = [h for h in bheads if h in fbheads]
2173 2173 return bheads
2174 2174
2175 2175 def branches(self, nodes):
2176 2176 if not nodes:
2177 2177 nodes = [self.changelog.tip()]
2178 2178 b = []
2179 2179 for n in nodes:
2180 2180 t = n
2181 2181 while True:
2182 2182 p = self.changelog.parents(n)
2183 2183 if p[1] != nullid or p[0] == nullid:
2184 2184 b.append((t, n, p[0], p[1]))
2185 2185 break
2186 2186 n = p[0]
2187 2187 return b
2188 2188
2189 2189 def between(self, pairs):
2190 2190 r = []
2191 2191
2192 2192 for top, bottom in pairs:
2193 2193 n, l, i = top, [], 0
2194 2194 f = 1
2195 2195
2196 2196 while n != bottom and n != nullid:
2197 2197 p = self.changelog.parents(n)[0]
2198 2198 if i == f:
2199 2199 l.append(n)
2200 2200 f = f * 2
2201 2201 n = p
2202 2202 i += 1
2203 2203
2204 2204 r.append(l)
2205 2205
2206 2206 return r
2207 2207
2208 2208 def checkpush(self, pushop):
2209 2209 """Extensions can override this function if additional checks have
2210 2210 to be performed before pushing, or call it if they override push
2211 2211 command.
2212 2212 """
2213 2213
2214 2214 @unfilteredpropertycache
2215 2215 def prepushoutgoinghooks(self):
2216 2216 """Return util.hooks consists of a pushop with repo, remote, outgoing
2217 2217 methods, which are called before pushing changesets.
2218 2218 """
2219 2219 return util.hooks()
2220 2220
2221 2221 def pushkey(self, namespace, key, old, new):
2222 2222 try:
2223 2223 tr = self.currenttransaction()
2224 2224 hookargs = {}
2225 2225 if tr is not None:
2226 2226 hookargs.update(tr.hookargs)
2227 2227 hookargs = pycompat.strkwargs(hookargs)
2228 2228 hookargs[r'namespace'] = namespace
2229 2229 hookargs[r'key'] = key
2230 2230 hookargs[r'old'] = old
2231 2231 hookargs[r'new'] = new
2232 2232 self.hook('prepushkey', throw=True, **hookargs)
2233 2233 except error.HookAbort as exc:
2234 2234 self.ui.write_err(_("pushkey-abort: %s\n") % exc)
2235 2235 if exc.hint:
2236 2236 self.ui.write_err(_("(%s)\n") % exc.hint)
2237 2237 return False
2238 2238 self.ui.debug('pushing key for "%s:%s"\n' % (namespace, key))
2239 2239 ret = pushkey.push(self, namespace, key, old, new)
2240 2240 def runhook():
2241 2241 self.hook('pushkey', namespace=namespace, key=key, old=old, new=new,
2242 2242 ret=ret)
2243 2243 self._afterlock(runhook)
2244 2244 return ret
2245 2245
2246 2246 def listkeys(self, namespace):
2247 2247 self.hook('prelistkeys', throw=True, namespace=namespace)
2248 2248 self.ui.debug('listing keys for "%s"\n' % namespace)
2249 2249 values = pushkey.list(self, namespace)
2250 2250 self.hook('listkeys', namespace=namespace, values=values)
2251 2251 return values
2252 2252
2253 2253 def debugwireargs(self, one, two, three=None, four=None, five=None):
2254 2254 '''used to test argument passing over the wire'''
2255 2255 return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three),
2256 2256 pycompat.bytestr(four),
2257 2257 pycompat.bytestr(five))
2258 2258
2259 2259 def savecommitmessage(self, text):
2260 2260 fp = self.vfs('last-message.txt', 'wb')
2261 2261 try:
2262 2262 fp.write(text)
2263 2263 finally:
2264 2264 fp.close()
2265 2265 return self.pathto(fp.name[len(self.root) + 1:])
2266 2266
2267 2267 # used to avoid circular references so destructors work
2268 2268 def aftertrans(files):
2269 2269 renamefiles = [tuple(t) for t in files]
2270 2270 def a():
2271 2271 for vfs, src, dest in renamefiles:
2272 2272 # if src and dest refer to a same file, vfs.rename is a no-op,
2273 2273 # leaving both src and dest on disk. delete dest to make sure
2274 2274 # the rename couldn't be such a no-op.
2275 2275 vfs.tryunlink(dest)
2276 2276 try:
2277 2277 vfs.rename(src, dest)
2278 2278 except OSError: # journal file does not yet exist
2279 2279 pass
2280 2280 return a
2281 2281
2282 2282 def undoname(fn):
2283 2283 base, name = os.path.split(fn)
2284 2284 assert name.startswith('journal')
2285 2285 return os.path.join(base, name.replace('journal', 'undo', 1))
2286 2286
2287 2287 def instance(ui, path, create):
2288 2288 return localrepository(ui, util.urllocalpath(path), create)
2289 2289
2290 2290 def islocal(path):
2291 2291 return True
2292 2292
2293 2293 def newreporequirements(repo):
2294 2294 """Determine the set of requirements for a new local repository.
2295 2295
2296 2296 Extensions can wrap this function to specify custom requirements for
2297 2297 new repositories.
2298 2298 """
2299 2299 ui = repo.ui
2300 2300 requirements = {'revlogv1'}
2301 2301 if ui.configbool('format', 'usestore'):
2302 2302 requirements.add('store')
2303 2303 if ui.configbool('format', 'usefncache'):
2304 2304 requirements.add('fncache')
2305 2305 if ui.configbool('format', 'dotencode'):
2306 2306 requirements.add('dotencode')
2307 2307
2308 2308 compengine = ui.config('experimental', 'format.compression')
2309 2309 if compengine not in util.compengines:
2310 2310 raise error.Abort(_('compression engine %s defined by '
2311 2311 'experimental.format.compression not available') %
2312 2312 compengine,
2313 2313 hint=_('run "hg debuginstall" to list available '
2314 2314 'compression engines'))
2315 2315
2316 2316 # zlib is the historical default and doesn't need an explicit requirement.
2317 2317 if compengine != 'zlib':
2318 2318 requirements.add('exp-compression-%s' % compengine)
2319 2319
2320 2320 if scmutil.gdinitconfig(ui):
2321 2321 requirements.add('generaldelta')
2322 2322 if ui.configbool('experimental', 'treemanifest'):
2323 2323 requirements.add('treemanifest')
2324 2324
2325 2325 revlogv2 = ui.config('experimental', 'revlogv2')
2326 2326 if revlogv2 == 'enable-unstable-format-and-corrupt-my-data':
2327 2327 requirements.remove('revlogv1')
2328 2328 # generaldelta is implied by revlogv2.
2329 2329 requirements.discard('generaldelta')
2330 2330 requirements.add(REVLOGV2_REQUIREMENT)
2331 2331
2332 2332 return requirements
General Comments 0
You need to be logged in to leave comments. Login now