mercurial-scm/hg-stable: mercurial/branchmap.py annotate

annotate mercurial/branchmap.py @ 51561:ec640dc9cebd

branchcache: use an explicit class for the v2 version This prepare the introduction of an experimental v3 format version. In the process, we move the description of the format in that new class.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Tue, 27 Feb 2024 14:04:29 +0100
parents	0239ebdd0740
children	fe8347b984f3

rev	line source
18116 bcee63733aad branchmap: create a mercurial.branchmap module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1 # branchmap.py - logic to computes, maintain and stores branchmap for local repo
bcee63733aad branchmap: create a mercurial.branchmap module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	2 #
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 46796 diff changeset	3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
18116 bcee63733aad branchmap: create a mercurial.branchmap module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	4 #
bcee63733aad branchmap: create a mercurial.branchmap module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
bcee63733aad branchmap: create a mercurial.branchmap module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
18117 526e7ec5c96e branchmap: extract write logic from localrepo Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18116 diff changeset	7
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	8
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	9 import struct
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	10
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	11 from .node import (
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	12 bin,
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	13 hex,
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	14 nullrev,
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	15 )
51302 9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	16
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	17 from typing import (
51528 87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	18 Any,
51302 9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	19 Callable,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	20 Dict,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	21 Iterable,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	22 List,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	23 Optional,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	24 Set,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	25 TYPE_CHECKING,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	26 Tuple,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	27 Union,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	28 )
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	29
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	30 from . import (
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	31 encoding,
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26460 diff changeset	32 error,
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	33 obsolete,
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	34 scmutil,
30995 22fbca1d11ed mercurial: switch to util.timer for all interval timings Simon Farnsworth <simonfar@fb.com> parents: 29758 diff changeset	35 util,
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	36 )
51302 9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	37
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36968 diff changeset	38 from .utils import (
42138 caebe5e7f4bd repoview: move subsettable in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42134 diff changeset	39 repoviewutil,
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36968 diff changeset	40 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36968 diff changeset	41 )
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	42
51302 9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	43 if TYPE_CHECKING:
46796 e2f7b2695ba1 merge with stable Matt Harbison <matt_harbison@yahoo.com> parents: 46793 46392 diff changeset	44 from . import localrepo
43680 9c1eccdd7ed8 branchmap: annotate constructor type for branchcache Augie Fackler <augie@google.com> parents: 43678 diff changeset	45
51302 9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	46 assert [localrepo]
43680 9c1eccdd7ed8 branchmap: annotate constructor type for branchcache Augie Fackler <augie@google.com> parents: 43678 diff changeset	47
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	48 subsettable = repoviewutil.subsettable
42138 caebe5e7f4bd repoview: move subsettable in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42134 diff changeset	49
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	50 calcsize = struct.calcsize
31379 906be86990c4 rbc: use struct unpack_from and pack_into instead of unpack and pack Mads Kiilerich <madski@unity3d.com> parents: 31369 diff changeset	51 pack_into = struct.pack_into
906be86990c4 rbc: use struct unpack_from and pack_into instead of unpack and pack Mads Kiilerich <madski@unity3d.com> parents: 31369 diff changeset	52 unpack_from = struct.unpack_from
18117 526e7ec5c96e branchmap: extract write logic from localrepo Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18116 diff changeset	53
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	54
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 49026 diff changeset	55 class BranchMapCache:
41729 a87ca1d7e61d branchmap: improve doc about BranchMapCache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41689 diff changeset	56 """mapping of filtered views of repo with their branchcache"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	57
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	58 def __init__(self):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	59 self._per_filter = {}
41581 c795c462b1d6 branchmap: add some clarifications and clean up flow Martijn Pieters <mj@octobus.net> parents: 41580 diff changeset	60
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	61 def __getitem__(self, repo):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	62 self.updatecache(repo)
51514 7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	63 bcache = self._per_filter[repo.filtername]
51516 fd30c4301929 branchcache: stop storing a repository instance on the cache altogether Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51515 diff changeset	64 assert bcache._filtername == repo.filtername, (
fd30c4301929 branchcache: stop storing a repository instance on the cache altogether Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51515 diff changeset	65 bcache._filtername,
51515 3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	66 repo.filtername,
3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	67 )
51514 7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	68 return bcache
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	69
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	70 def update_disk(self, repo):
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	71 """ensure and up-to-date cache is (or will be) written on disk
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	72
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	73 The cache for this repository view is updated if needed and written on
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	74 disk.
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	75
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	76 If a transaction is in progress, the writing is schedule to transaction
51549 94f821490645 branchcache: change the _delayed flag to an explicit `_dirty` flag Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51548 diff changeset	77 close. See the `BranchMapCache.write_dirty` method.
51514 7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	78
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	79 This method exist independently of __getitem__ as it is sometime useful
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	80 to signal that we have no intend to use the data in memory yet.
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	81 """
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	82 self.updatecache(repo)
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	83 bcache = self._per_filter[repo.filtername]
51516 fd30c4301929 branchcache: stop storing a repository instance on the cache altogether Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51515 diff changeset	84 assert bcache._filtername == repo.filtername, (
fd30c4301929 branchcache: stop storing a repository instance on the cache altogether Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51515 diff changeset	85 bcache._filtername,
51515 3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	86 repo.filtername,
3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	87 )
51556 0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	88 tr = repo.currenttransaction()
0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	89 if getattr(tr, 'finalized', True):
0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	90 bcache.sync_disk(repo)
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	91
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	92 def updatecache(self, repo):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	93 """Update the cache for the given filtered view on a repository"""
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	94 # This can trigger updates for the caches for subsets of the filtered
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	95 # view, e.g. when there is no cache for this filtered view or the cache
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	96 # is stale.
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	97
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	98 cl = repo.changelog
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	99 filtername = repo.filtername
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	100 bcache = self._per_filter.get(filtername)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	101 if bcache is None or not bcache.validfor(repo):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	102 # cache object missing or cache object stale? Read from disk
51561 ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	103 bcache = branch_cache_from_file(repo)
41581 c795c462b1d6 branchmap: add some clarifications and clean up flow Martijn Pieters <mj@octobus.net> parents: 41580 diff changeset	104
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	105 revs = []
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	106 if bcache is None:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	107 # no (fresh) cache available anymore, perhaps we can re-use
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	108 # the cache for a subset, then extend that to add info on missing
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	109 # revisions.
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	110 subsetname = subsettable.get(filtername)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	111 if subsetname is not None:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	112 subset = repo.filtered(subsetname)
51555 54f0dd798346 branchcache: do not use `__getitem__` in updatecache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51554 diff changeset	113 self.updatecache(subset)
54f0dd798346 branchcache: do not use `__getitem__` in updatecache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51554 diff changeset	114 bcache = self._per_filter[subset.filtername].inherit_for(repo)
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	115 extrarevs = subset.changelog.filteredrevs - cl.filteredrevs
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	116 revs.extend(r for r in extrarevs if r <= bcache.tiprev)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	117 else:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	118 # nothing to fall back on, start empty.
51561 ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	119 bcache = new_branch_cache(repo)
24373 59cc09240afb revbranchcache: move out of branchmap onto localrepo Durham Goode <durham@fb.com> parents: 24163 diff changeset	120
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	121 revs.extend(cl.revs(start=bcache.tiprev + 1))
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	122 if revs:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	123 bcache.update(repo, revs)
18124 79db6d40bced branchmap: store branchcache in a dedicated object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18121 diff changeset	124
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	125 assert bcache.validfor(repo), filtername
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	126 self._per_filter[repo.filtername] = bcache
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	127
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	128 def replace(self, repo, remotebranchmap):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	129 """Replace the branchmap cache for a repo with a branch mapping.
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	130
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	131 This is likely only called during clone with a branch map from a
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	132 remote.
26460 79ef867538ea branchmap: move branch cache code out of streamclone.py Gregory Szorc <gregory.szorc@gmail.com> parents: 25918 diff changeset	133
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	134 """
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	135 cl = repo.changelog
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	136 clrev = cl.rev
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	137 clbranchinfo = cl.branchinfo
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	138 rbheads = []
43728 5cdc3c1292f6 branchmap: make "closed" a set from beginning instead of converting from list Martin von Zweigbergk <martinvonz@google.com> parents: 43680 diff changeset	139 closed = set()
49026 2cce2fa5bcf7 py3: replace pycompat.itervalues(x) with x.values() Gregory Szorc <gregory.szorc@gmail.com> parents: 49004 diff changeset	140 for bheads in remotebranchmap.values():
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	141 rbheads += bheads
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	142 for h in bheads:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	143 r = clrev(h)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	144 b, c = clbranchinfo(r)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	145 if c:
43728 5cdc3c1292f6 branchmap: make "closed" a set from beginning instead of converting from list Martin von Zweigbergk <martinvonz@google.com> parents: 43680 diff changeset	146 closed.add(h)
26460 79ef867538ea branchmap: move branch cache code out of streamclone.py Gregory Szorc <gregory.szorc@gmail.com> parents: 25918 diff changeset	147
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	148 if rbheads:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	149 rtiprev = max((int(clrev(node)) for node in rbheads))
51561 ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	150 cache = new_branch_cache(
46793 6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46444 diff changeset	151 repo,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	152 remotebranchmap,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	153 repo[rtiprev].node(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	154 rtiprev,
43728 5cdc3c1292f6 branchmap: make "closed" a set from beginning instead of converting from list Martin von Zweigbergk <martinvonz@google.com> parents: 43680 diff changeset	155 closednodes=closed,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	156 )
26460 79ef867538ea branchmap: move branch cache code out of streamclone.py Gregory Szorc <gregory.szorc@gmail.com> parents: 25918 diff changeset	157
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	158 # Try to stick it as low as possible
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	159 # filter above served are unlikely to be fetch from a clone
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	160 for candidate in (b'base', b'immutable', b'served'):
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	161 rview = repo.filtered(candidate)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	162 if cache.validfor(rview):
51550 659f766629c8 branchcache: stop using `copy(?)` in `replace(?)` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51549 diff changeset	163 cache._filtername = candidate
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	164 self._per_filter[candidate] = cache
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	165 cache._state = STATE_DIRTY
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	166 cache.write(rview)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	167 return
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	168
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	169 def clear(self):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	170 self._per_filter.clear()
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	171
51549 94f821490645 branchcache: change the _delayed flag to an explicit `_dirty` flag Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51548 diff changeset	172 def write_dirty(self, repo):
48363 8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	173 unfi = repo.unfiltered()
51548 1a9bdd0e1c44 branchcache: write branchmap in subset inheritance order Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51547 diff changeset	174 for filtername in repoviewutil.get_ordered_subset():
1a9bdd0e1c44 branchcache: write branchmap in subset inheritance order Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51547 diff changeset	175 cache = self._per_filter.get(filtername)
1a9bdd0e1c44 branchcache: write branchmap in subset inheritance order Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51547 diff changeset	176 if cache is None:
1a9bdd0e1c44 branchcache: write branchmap in subset inheritance order Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51547 diff changeset	177 continue
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	178 if filtername is None:
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	179 repo = unfi
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	180 else:
48363 8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	181 repo = unfi.filtered(filtername)
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	182 cache.sync_disk(repo)
48363 8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	183
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	184
42120 2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	185 def _unknownnode(node):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	186 """raises ValueError when branchcache found a node which does not exists"""
49308 227124098e14 py3: use `x.hex()` instead of `pycompat.sysstr(node.hex(x))` Manuel Jacob <me@manueljacob.de> parents: 49233 diff changeset	187 raise ValueError('node %s does not exist' % node.hex())
26460 79ef867538ea branchmap: move branch cache code out of streamclone.py Gregory Szorc <gregory.szorc@gmail.com> parents: 25918 diff changeset	188
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	189
42602 c7d236b55a3e py3: fix formatting of branchmap log messages with repo.filtername=None Martin von Zweigbergk <martinvonz@google.com> parents: 42247 diff changeset	190 def _branchcachedesc(repo):
c7d236b55a3e py3: fix formatting of branchmap log messages with repo.filtername=None Martin von Zweigbergk <martinvonz@google.com> parents: 42247 diff changeset	191 if repo.filtername is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	192 return b'branch cache (%s)' % repo.filtername
42602 c7d236b55a3e py3: fix formatting of branchmap log messages with repo.filtername=None Martin von Zweigbergk <martinvonz@google.com> parents: 42247 diff changeset	193 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	194 return b'branch cache'
42602 c7d236b55a3e py3: fix formatting of branchmap log messages with repo.filtername=None Martin von Zweigbergk <martinvonz@google.com> parents: 42247 diff changeset	195
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	196
51519 84fca6d79e25 branchcache: introduce a base class for branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51518 diff changeset	197 class _BaseBranchCache:
20181 b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	198 """A dict like object that hold branches heads cache.
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	199
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	200 This cache is used to avoid costly computations to determine all the
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	201 branch heads of a repo.
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	202 """
41688 bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41626 diff changeset	203
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	204 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	205 self,
51304 f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	206 repo: "localrepo.localrepository",
f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	207 entries: Union[
f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	208 Dict[bytes, List[bytes]], Iterable[Tuple[bytes, List[bytes]]]
f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	209 ] = (),
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	210 closed_nodes: Optional[Set[bytes]] = None,
51304 f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	211 ) -> None:
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	212 """hasnode is a function which can be used to verify whether changelog
42007 b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	213 has a given node or not. If it's not provided, we assume that every node
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	214 we have exists in changelog"""
41688 bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41626 diff changeset	215 # closednodes is a set of nodes that close their branch. If the branch
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41626 diff changeset	216 # cache has been updated, it may contain nodes that are no longer
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41626 diff changeset	217 # heads.
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	218 if closed_nodes is None:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	219 closed_nodes = set()
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	220 self._closednodes = set(closed_nodes)
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	221 self._entries = dict(entries)
42120 2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	222
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	223 def __iter__(self):
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	224 return iter(self._entries)
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	225
624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	226 def __setitem__(self, key, value):
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	227 self._entries[key] = value
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	228
624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	229 def __getitem__(self, key):
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	230 return self._entries[key]
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	231
42113 f0def07fa82f branchmap: implement __contains__() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42112 diff changeset	232 def __contains__(self, key):
f0def07fa82f branchmap: implement __contains__() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42112 diff changeset	233 return key in self._entries
f0def07fa82f branchmap: implement __contains__() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42112 diff changeset	234
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	235 def iteritems(self):
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	236 return self._entries.items()
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	237
42603 3018749a71bb py3: source-transform only call-sites of iteritems(), not definitions Martin von Zweigbergk <martinvonz@google.com> parents: 42602 diff changeset	238 items = iteritems
3018749a71bb py3: source-transform only call-sites of iteritems(), not definitions Martin von Zweigbergk <martinvonz@google.com> parents: 42602 diff changeset	239
42004 0bd730fbcc2b branchcache: introduce hasbranch() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42003 diff changeset	240 def hasbranch(self, label):
47031 f38bf44e077f black: make codebase compatible with black v21.4b2 and v20.8b1 Kyle Lippincott <spectral@google.com> parents: 46819 diff changeset	241 """checks whether a branch of this name exists or not"""
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	242 return label in self._entries
42004 0bd730fbcc2b branchcache: introduce hasbranch() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42003 diff changeset	243
20186 f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	244 def _branchtip(self, heads):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	245 """Return tuple with last open head in heads and false,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	246 otherwise return last closed head and true."""
20186 f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	247 tip = heads[-1]
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	248 closed = True
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	249 for h in reversed(heads):
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	250 if h not in self._closednodes:
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	251 tip = h
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	252 closed = False
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	253 break
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	254 return tip, closed
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	255
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	256 def branchtip(self, branch):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	257 """Return the tipmost open head on branch head, otherwise return the
20245 4edd179fefb8 help: branch names primarily denote the tipmost unclosed branch head Mads Kiilerich <madski@unity3d.com> parents: 20190 diff changeset	258 tipmost closed head on branch.
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	259 Raise KeyError for unknown branch."""
20186 f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	260 return self._branchtip(self[branch])[0]
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	261
34091 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 33661 diff changeset	262 def iteropen(self, nodes):
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 33661 diff changeset	263 return (n for n in nodes if n not in self._closednodes)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 33661 diff changeset	264
20188 3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	265 def branchheads(self, branch, closed=False):
42112 29c22496dd97 branchmap: prevent using __getitem__() in branchheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42111 diff changeset	266 heads = self._entries[branch]
20188 3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	267 if not closed:
34091 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 33661 diff changeset	268 heads = list(self.iteropen(heads))
20188 3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	269 return heads
3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	270
20190 d5d25e541637 branchmap: introduce iterbranches() method Brodie Rao <brodie@sf.io> parents: 20188 diff changeset	271 def iterbranches(self):
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	272 for bn, heads in self.items():
20190 d5d25e541637 branchmap: introduce iterbranches() method Brodie Rao <brodie@sf.io> parents: 20188 diff changeset	273 yield (bn, heads) + self._branchtip(heads)
d5d25e541637 branchmap: introduce iterbranches() method Brodie Rao <brodie@sf.io> parents: 20188 diff changeset	274
42002 662ffdde5adf branchcache: rename itervalues() to iterheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42001 diff changeset	275 def iterheads(self):
47031 f38bf44e077f black: make codebase compatible with black v21.4b2 and v20.8b1 Kyle Lippincott <spectral@google.com> parents: 46819 diff changeset	276 """returns all the heads"""
49026 2cce2fa5bcf7 py3: replace pycompat.itervalues(x) with x.values() Gregory Szorc <gregory.szorc@gmail.com> parents: 49004 diff changeset	277 return self._entries.values()
42002 662ffdde5adf branchcache: rename itervalues() to iterheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42001 diff changeset	278
18305 2502a15e033d branchmap: pass revision insteads of changectx to the update function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18234 diff changeset	279 def update(self, repo, revgen):
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	280 """Given a branchhead cache, self, that may have extra nodes or be
20263 ea4996754d91 branchmap: simplify update code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20262 diff changeset	281 missing heads, and a generator of nodes that are strictly a superset of
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	282 heads missing, this function updates self to be correct.
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	283 """
30995 22fbca1d11ed mercurial: switch to util.timer for all interval timings Simon Farnsworth <simonfar@fb.com> parents: 29758 diff changeset	284 starttime = util.timer()
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	285 cl = repo.changelog
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	286 # collect new branch entries
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	287 newbranches = {}
24373 59cc09240afb revbranchcache: move out of branchmap onto localrepo Durham Goode <durham@fb.com> parents: 24163 diff changeset	288 getbranchinfo = repo.revbranchcache().branchinfo
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	289 max_rev = -1
18307 0eed2546118a branchmap: Save changectx creation during update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18305 diff changeset	290 for r in revgen:
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	291 branch, closesbranch = getbranchinfo(r)
20262 cf450ee3f8f7 branchmap: stop useless rev -> node -> rev round trip Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20261 diff changeset	292 newbranches.setdefault(branch, []).append(r)
20185 7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	293 if closesbranch:
20262 cf450ee3f8f7 branchmap: stop useless rev -> node -> rev round trip Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20261 diff changeset	294 self._closednodes.add(cl.node(r))
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	295 max_rev = max(max_rev, r)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	296 if max_rev < 0:
51547 0ddc34330d41 branchcache: do not accept "empty update" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51531 diff changeset	297 msg = "running branchcache.update without revision to update"
0ddc34330d41 branchcache: do not accept "empty update" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51531 diff changeset	298 raise error.ProgrammingError(msg)
42247 9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	299
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	300 # Delay fetching the topological heads until they are needed.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	301 # A repository without non-continous branches can skip this part.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	302 topoheads = None
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	303
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	304 # If a changeset is visible, its parents must be visible too, so
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	305 # use the faster unfiltered parent accessor.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	306 parentrevs = repo.unfiltered().changelog.parentrevs
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	307
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	308 # Faster than using ctx.obsolete()
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	309 obsrevs = obsolete.getrevs(repo, b'obsolete')
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	310
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	311 for branch, newheadrevs in newbranches.items():
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	312 # For every branch, compute the new branchheads.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	313 # A branchhead is a revision such that no descendant is on
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	314 # the same branch.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	315 #
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	316 # The branchheads are computed iteratively in revision order.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	317 # This ensures topological order, i.e. parents are processed
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	318 # before their children. Ancestors are inclusive here, i.e.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	319 # any revision is an ancestor of itself.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	320 #
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	321 # Core observations:
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	322 # - The current revision is always a branchhead for the
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	323 # repository up to that point.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	324 # - It is the first revision of the branch if and only if
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	325 # there was no branchhead before. In that case, it is the
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	326 # only branchhead as there are no possible ancestors on
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	327 # the same branch.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	328 # - If a parent is on the same branch, a branchhead can
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	329 # only be an ancestor of that parent, if it is parent
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	330 # itself. Otherwise it would have been removed as ancestor
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	331 # of that parent before.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	332 # - Therefore, if all parents are on the same branch, they
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	333 # can just be removed from the branchhead set.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	334 # - If one parent is on the same branch and the other is not
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	335 # and there was exactly one branchhead known, the existing
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	336 # branchhead can only be an ancestor if it is the parent.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	337 # Otherwise it would have been removed as ancestor of
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	338 # the parent before. The other parent therefore can't have
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	339 # a branchhead as ancestor.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	340 # - In all other cases, the parents on different branches
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	341 # could have a branchhead as ancestor. Those parents are
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	342 # kept in the "uncertain" set. If all branchheads are also
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	343 # topological heads, they can't have descendants and further
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	344 # checks can be skipped. Otherwise, the ancestors of the
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	345 # "uncertain" set are removed from branchheads.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	346 # This computation is heavy and avoided if at all possible.
48732 8b393f40a5e6 branchmap: don't add branch entries if there are no heads Anton Shestakov <av6@dwimlabs.net> parents: 48701 diff changeset	347 bheads = self._entries.get(branch, [])
44470 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44349 diff changeset	348 bheadset = {cl.rev(node) for node in bheads}
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	349 uncertain = set()
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	350 for newrev in sorted(newheadrevs):
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	351 if newrev in obsrevs:
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	352 # We ignore obsolete changesets as they shouldn't be
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	353 # considered heads.
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	354 continue
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	355
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	356 if not bheadset:
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	357 bheadset.add(newrev)
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	358 continue
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	359
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	360 parents = [p for p in parentrevs(newrev) if p != nullrev]
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	361 samebranch = set()
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	362 otherbranch = set()
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	363 obsparents = set()
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	364 for p in parents:
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	365 if p in obsrevs:
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	366 # We ignored this obsolete changeset earlier, but now
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	367 # that it has non-ignored children, we need to make
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	368 # sure their ancestors are not considered heads. To
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	369 # achieve that, we will simply treat this obsolete
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	370 # changeset as a parent from other branch.
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	371 obsparents.add(p)
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	372 elif p in bheadset or getbranchinfo(p)[0] == branch:
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	373 samebranch.add(p)
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	374 else:
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	375 otherbranch.add(p)
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	376 if not (len(bheadset) == len(samebranch) == 1):
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	377 uncertain.update(otherbranch)
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	378 uncertain.update(obsparents)
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	379 bheadset.difference_update(samebranch)
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	380 bheadset.add(newrev)
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	381
22357 9c3c3dc14a65 branchmap: pre-filter topological heads before ancestors based filtering Pierre-Yves David <pierre-yves.david@fb.com> parents: 22356 diff changeset	382 if uncertain:
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	383 if topoheads is None:
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	384 topoheads = set(cl.headrevs())
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	385 if bheadset - topoheads:
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	386 floorrev = min(bheadset)
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	387 if floorrev <= max(uncertain):
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	388 ancestors = set(cl.ancestors(uncertain, floorrev))
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	389 bheadset -= ancestors
48732 8b393f40a5e6 branchmap: don't add branch entries if there are no heads Anton Shestakov <av6@dwimlabs.net> parents: 48701 diff changeset	390 if bheadset:
8b393f40a5e6 branchmap: don't add branch entries if there are no heads Anton Shestakov <av6@dwimlabs.net> parents: 48701 diff changeset	391 self[branch] = [cl.node(rev) for rev in sorted(bheadset)]
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	392
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	393 duration = util.timer() - starttime
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	394 repo.ui.log(
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	395 b'branchcache',
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	396 b'updated %s in %.4f seconds\n',
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	397 _branchcachedesc(repo),
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	398 duration,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	399 )
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	400 return max_rev
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	401
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	402
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	403 STATE_CLEAN = 1
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	404 STATE_INHERITED = 2
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	405 STATE_DIRTY = 3
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	406
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	407
51561 ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	408 class _LocalBranchCache(_BaseBranchCache):
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	409 """base class of branch-map info for a local repo or repoview"""
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	410
51561 ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	411 _base_filename = None
51525 cebd96dee99a branchcache: move the filename to a class attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51521 diff changeset	412
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	413 def __init__(
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	414 self,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	415 repo: "localrepo.localrepository",
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	416 entries: Union[
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	417 Dict[bytes, List[bytes]], Iterable[Tuple[bytes, List[bytes]]]
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	418 ] = (),
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	419 tipnode: Optional[bytes] = None,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	420 tiprev: Optional[int] = nullrev,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	421 filteredhash: Optional[bytes] = None,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	422 closednodes: Optional[Set[bytes]] = None,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	423 hasnode: Optional[Callable[[bytes], bool]] = None,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	424 verify_node: bool = False,
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	425 inherited: bool = False,
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	426 ) -> None:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	427 """hasnode is a function which can be used to verify whether changelog
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	428 has a given node or not. If it's not provided, we assume that every node
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	429 we have exists in changelog"""
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	430 self._filtername = repo.filtername
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	431 if tipnode is None:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	432 self.tipnode = repo.nullid
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	433 else:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	434 self.tipnode = tipnode
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	435 self.tiprev = tiprev
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	436 self.filteredhash = filteredhash
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	437 self._state = STATE_CLEAN
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	438 if inherited:
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	439 self._state = STATE_INHERITED
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	440
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	441 super().__init__(repo=repo, entries=entries, closed_nodes=closednodes)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	442 # closednodes is a set of nodes that close their branch. If the branch
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	443 # cache has been updated, it may contain nodes that are no longer
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	444 # heads.
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	445
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	446 # Do we need to verify branch at all ?
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	447 self._verify_node = verify_node
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	448 # branches for which nodes are verified
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	449 self._verifiedbranches = set()
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	450 self._hasnode = None
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	451 if self._verify_node:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	452 self._hasnode = repo.changelog.hasnode
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	453
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	454 def validfor(self, repo):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	455 """check that cache contents are valid for (a subset of) this repo
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	456
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	457 - False when the order of changesets changed or if we detect a strip.
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	458 - True when cache is up-to-date for the current repo or its subset."""
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	459 try:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	460 node = repo.changelog.node(self.tiprev)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	461 except IndexError:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	462 # changesets were stripped and now we don't even have enough to
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	463 # find tiprev
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	464 return False
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	465 if self.tipnode != node:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	466 # tiprev doesn't correspond to tipnode: repo was stripped, or this
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	467 # repo has a different order of changesets
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	468 return False
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	469 tiphash = scmutil.filteredhash(repo, self.tiprev, needobsolete=True)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	470 # hashes don't match if this repo view has a different set of filtered
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	471 # revisions (e.g. due to phase changes) or obsolete revisions (e.g.
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	472 # history was rewritten)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	473 return self.filteredhash == tiphash
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	474
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	475 @classmethod
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	476 def fromfile(cls, repo):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	477 f = None
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	478 try:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	479 f = repo.cachevfs(cls._filename(repo))
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	480 lineiter = iter(f)
51528 87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	481 init_kwargs = cls._load_header(repo, lineiter)
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	482 bcache = cls(
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	483 repo,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	484 verify_node=True,
51528 87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	485 **init_kwargs,
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	486 )
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	487 if not bcache.validfor(repo):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	488 # invalidate the cache
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	489 raise ValueError('tip differs')
51526 47752632b4fc branchcache: rename `load` to `_load_heads` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51525 diff changeset	490 bcache._load_heads(repo, lineiter)
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	491 except (IOError, OSError):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	492 return None
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	493
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	494 except Exception as inst:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	495 if repo.ui.debugflag:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	496 msg = b'invalid %s: %s\n'
51527 de1bc7db9f61 branchcache: simplify a long line Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51526 diff changeset	497 msg %= (
de1bc7db9f61 branchcache: simplify a long line Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51526 diff changeset	498 _branchcachedesc(repo),
de1bc7db9f61 branchcache: simplify a long line Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51526 diff changeset	499 stringutil.forcebytestr(inst),
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	500 )
51527 de1bc7db9f61 branchcache: simplify a long line Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51526 diff changeset	501 repo.ui.debug(msg)
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	502 bcache = None
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	503
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	504 finally:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	505 if f:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	506 f.close()
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	507
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	508 return bcache
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	509
51528 87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	510 @classmethod
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	511 def _load_header(cls, repo, lineiter) -> "dict[str, Any]":
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	512 """parse the head of a branchmap file
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	513
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	514 return parameters to pass to a newly created class instance.
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	515 """
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	516 cachekey = next(lineiter).rstrip(b'\n').split(b" ", 2)
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	517 last, lrev = cachekey[:2]
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	518 last, lrev = bin(last), int(lrev)
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	519 filteredhash = None
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	520 if len(cachekey) > 2:
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	521 filteredhash = bin(cachekey[2])
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	522 return {
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	523 "tipnode": last,
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	524 "tiprev": lrev,
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	525 "filteredhash": filteredhash,
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	526 }
87b830e4de35 branchcache: move the header loading in a `_load_header` class method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51527 diff changeset	527
51526 47752632b4fc branchcache: rename `load` to `_load_heads` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51525 diff changeset	528 def _load_heads(self, repo, lineiter):
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	529 """fully loads the branchcache by reading from the file using the line
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	530 iterator passed"""
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	531 for line in lineiter:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	532 line = line.rstrip(b'\n')
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	533 if not line:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	534 continue
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	535 node, state, label = line.split(b" ", 2)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	536 if state not in b'oc':
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	537 raise ValueError('invalid branch state')
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	538 label = encoding.tolocal(label.strip())
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	539 node = bin(node)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	540 self._entries.setdefault(label, []).append(node)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	541 if state == b'c':
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	542 self._closednodes.add(node)
42247 9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	543
51525 cebd96dee99a branchcache: move the filename to a class attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51521 diff changeset	544 @classmethod
cebd96dee99a branchcache: move the filename to a class attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51521 diff changeset	545 def _filename(cls, repo):
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	546 """name of a branchcache file for a given repo or repoview"""
51525 cebd96dee99a branchcache: move the filename to a class attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51521 diff changeset	547 filename = cls._base_filename
51561 ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	548 assert filename is not None
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	549 if repo.filtername:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	550 filename = b'%s-%s' % (filename, repo.filtername)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	551 return filename
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	552
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	553 def inherit_for(self, repo):
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	554 """return a deep copy of the branchcache object"""
51551 18c2753434f2 branchcache: explicitly assert that copy is always about inheritance Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51550 diff changeset	555 assert repo.filtername != self._filtername
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	556 other = type(self)(
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	557 repo=repo,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	558 # we always do a shally copy of self._entries, and the values is
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	559 # always replaced, so no need to deepcopy until the above remains
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	560 # true.
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	561 entries=self._entries,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	562 tipnode=self.tipnode,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	563 tiprev=self.tiprev,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	564 filteredhash=self.filteredhash,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	565 closednodes=set(self._closednodes),
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	566 verify_node=self._verify_node,
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	567 inherited=True,
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	568 )
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	569 # also copy information about the current verification state
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	570 other._verifiedbranches = set(self._verifiedbranches)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	571 return other
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	572
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	573 def sync_disk(self, repo):
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	574 """synchronise the on disk file with the cache state
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	575
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	576 If new value specific to this filter level need to be written, the file
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	577 will be updated, if the state of the branchcache is inherited from a
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	578 subset, any stalled on disk file will be deleted.
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	579
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	580 That method does nothing if there is nothing to do.
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	581 """
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	582 if self._state == STATE_DIRTY:
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	583 self.write(repo)
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	584 elif self._state == STATE_INHERITED:
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	585 filename = self._filename(repo)
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	586 repo.cachevfs.tryunlink(filename)
82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	587
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	588 def write(self, repo):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	589 assert self._filtername == repo.filtername, (
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	590 self._filtername,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	591 repo.filtername,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	592 )
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	593 assert self._state == STATE_DIRTY, self._state
51556 0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	594 # This method should not be called during an open transaction
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	595 tr = repo.currenttransaction()
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	596 if not getattr(tr, 'finalized', True):
51556 0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	597 msg = "writing branchcache in the middle of a transaction"
0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	598 raise error.ProgrammingError(msg)
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	599 try:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	600 filename = self._filename(repo)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	601 with repo.cachevfs(filename, b"w", atomictemp=True) as f:
51530 9007387a227c branchcache: move head writing in a `_write_headers` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51529 diff changeset	602 self._write_header(f)
51529 09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	603 nodecount = self._write_heads(f)
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	604 repo.ui.log(
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	605 b'branchcache',
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	606 b'wrote %s with %d labels and %d nodes\n',
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	607 _branchcachedesc(repo),
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	608 len(self._entries),
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	609 nodecount,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	610 )
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	611 self._state = STATE_CLEAN
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	612 except (IOError, OSError, error.Abort) as inst:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	613 # Abort may be raised by read only opener, so log and continue
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	614 repo.ui.debug(
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	615 b"couldn't write branch cache: %s\n"
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	616 % stringutil.forcebytestr(inst)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	617 )
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	618
51530 9007387a227c branchcache: move head writing in a `_write_headers` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51529 diff changeset	619 def _write_header(self, fp) -> None:
9007387a227c branchcache: move head writing in a `_write_headers` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51529 diff changeset	620 """write the branch cache header to a file"""
9007387a227c branchcache: move head writing in a `_write_headers` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51529 diff changeset	621 cachekey = [hex(self.tipnode), b'%d' % self.tiprev]
9007387a227c branchcache: move head writing in a `_write_headers` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51529 diff changeset	622 if self.filteredhash is not None:
9007387a227c branchcache: move head writing in a `_write_headers` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51529 diff changeset	623 cachekey.append(hex(self.filteredhash))
9007387a227c branchcache: move head writing in a `_write_headers` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51529 diff changeset	624 fp.write(b" ".join(cachekey) + b'\n')
9007387a227c branchcache: move head writing in a `_write_headers` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51529 diff changeset	625
51529 09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	626 def _write_heads(self, fp) -> int:
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	627 """write list of heads to a file
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	628
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	629 Return the number of heads written."""
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	630 nodecount = 0
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	631 for label, nodes in sorted(self._entries.items()):
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	632 label = encoding.fromlocal(label)
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	633 for node in nodes:
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	634 nodecount += 1
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	635 if node in self._closednodes:
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	636 state = b'c'
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	637 else:
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	638 state = b'o'
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	639 fp.write(b"%s %s %s\n" % (hex(node), state, label))
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	640 return nodecount
09782c097035 branchcache: move head writing in a `_write_heads` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51528 diff changeset	641
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	642 def _verifybranch(self, branch):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	643 """verify head nodes for the given branch."""
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	644 if not self._verify_node:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	645 return
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	646 if branch not in self._entries or branch in self._verifiedbranches:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	647 return
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	648 assert self._hasnode is not None
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	649 for n in self._entries[branch]:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	650 if not self._hasnode(n):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	651 _unknownnode(n)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	652
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	653 self._verifiedbranches.add(branch)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	654
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	655 def _verifyall(self):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	656 """verifies nodes of all the branches"""
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	657 for b in self._entries.keys():
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	658 if b not in self._verifiedbranches:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	659 self._verifybranch(b)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	660
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	661 def __getitem__(self, key):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	662 self._verifybranch(key)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	663 return super().__getitem__(key)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	664
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	665 def __contains__(self, key):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	666 self._verifybranch(key)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	667 return super().__contains__(key)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	668
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	669 def iteritems(self):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	670 self._verifyall()
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	671 return super().iteritems()
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	672
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	673 items = iteritems
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	674
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	675 def iterheads(self):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	676 """returns all the heads"""
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	677 self._verifyall()
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	678 return super().iterheads()
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	679
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	680 def hasbranch(self, label):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	681 """checks whether a branch of this name exists or not"""
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	682 self._verifybranch(label)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	683 return super().hasbranch(label)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	684
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	685 def branchheads(self, branch, closed=False):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	686 self._verifybranch(branch)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	687 return super().branchheads(branch, closed=closed)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	688
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	689 def update(self, repo, revgen):
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	690 assert self._filtername == repo.filtername, (
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	691 self._filtername,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	692 repo.filtername,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	693 )
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	694 cl = repo.changelog
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	695 max_rev = super().update(repo, revgen)
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	696 # new tip revision which we found after iterating items from new
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	697 # branches
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	698 if max_rev is not None and max_rev > self.tiprev:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	699 self.tiprev = max_rev
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	700 self.tipnode = cl.node(max_rev)
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	701
19838 23386881abeb branchmap: remove the droppednodes logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19837 diff changeset	702 if not self.validfor(repo):
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	703 # old cache key is now invalid for the repo, but we've just updated
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	704 # the cache and we assume it's valid, so let's make the cache key
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	705 # valid as well by recomputing it from the cached data
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	706 self.tipnode = repo.nullid
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	707 self.tiprev = nullrev
42002 662ffdde5adf branchcache: rename itervalues() to iterheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42001 diff changeset	708 for heads in self.iterheads():
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	709 if not heads:
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	710 # all revisions on a branch are obsolete
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	711 continue
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	712 # note: tiprev is not necessarily the tip revision of repo,
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	713 # because the tip could be obsolete (i.e. not a head)
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	714 tiprev = max(cl.rev(node) for node in heads)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	715 if tiprev > self.tiprev:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	716 self.tipnode = cl.node(tiprev)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	717 self.tiprev = tiprev
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	718 self.filteredhash = scmutil.filteredhash(
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	719 repo, self.tiprev, needobsolete=True
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	720 )
51554 82c1a388e86a branchcache: explicitly track inheritence "state" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51553 diff changeset	721 self._state = STATE_DIRTY
51556 0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	722 tr = repo.currenttransaction()
0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	723 if getattr(tr, 'finalized', True):
0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	724 # Avoid premature writing.
0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	725 #
0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	726 # (The cache warming setup by localrepo will update the file later.)
0c684ca692a4 branchcache: explictly update disk state only if no transaction exist Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51555 diff changeset	727 self.write(repo)
41580 eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	728
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	729
51561 ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	730 def branch_cache_from_file(repo) -> Optional[_LocalBranchCache]:
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	731 """Build a branch cache from on-disk data if possible"""
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	732 return BranchCacheV2.fromfile(repo)
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	733
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	734
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	735 def new_branch_cache(repo, args, *kwargs):
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	736 """Build a new branch cache from argument"""
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	737 return BranchCacheV2(repo, args, *kwargs)
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	738
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	739
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	740 class BranchCacheV2(_LocalBranchCache):
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	741 """a branch cache using version 2 of the format on disk
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	742
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	743 The cache is serialized on disk in the following format:
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	744
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	745 <tip hex node> <tip rev number> [optional filtered repo hex hash]
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	746 <branch head hex node> <open/closed state> <branch name>
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	747 <branch head hex node> <open/closed state> <branch name>
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	748 ...
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	749
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	750 The first line is used to check if the cache is still valid. If the
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	751 branch cache is for a filtered repo view, an optional third hash is
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	752 included that hashes the hashes of all filtered and obsolete revisions.
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	753
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	754 The open/closed state is represented by a single letter 'o' or 'c'.
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	755 This field can be used to avoid changelog reads when determining if a
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	756 branch head closes a branch or not.
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	757 """
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	758
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	759 _base_filename = b"branch2"
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	760
ec640dc9cebd branchcache: use an explicit class for the v2 version Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51558 diff changeset	761
51519 84fca6d79e25 branchcache: introduce a base class for branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51518 diff changeset	762 class remotebranchcache(_BaseBranchCache):
41580 eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	763 """Branchmap info for a remote connection, should not write locally"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	764
51520 7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	765 def __init__(
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	766 self,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	767 repo: "localrepo.localrepository",
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	768 entries: Union[
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	769 Dict[bytes, List[bytes]], Iterable[Tuple[bytes, List[bytes]]]
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	770 ] = (),
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	771 closednodes: Optional[Set[bytes]] = None,
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	772 ) -> None:
7a063dd9d64e branchcache: dispatch the code into the dedicated subclass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51519 diff changeset	773 super().__init__(repo=repo, entries=entries, closed_nodes=closednodes)
41580 eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	774
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	775
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	776 # Revision branch info cache
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	777
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	778 _rbcversion = b'-v1'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	779 _rbcnames = b'rbc-names' + _rbcversion
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	780 _rbcrevs = b'rbc-revs' + _rbcversion
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	781 # [4 byte hash prefix][4 byte branch name number with sign bit indicating open]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	782 _rbcrecfmt = b'>4sI'
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	783 _rbcrecsize = calcsize(_rbcrecfmt)
46434 1726a53a8494 reverse-branch-cache: switch to doubling allocating scheme Joerg Sonnenberger <joerg@bec.de> parents: 46254 diff changeset	784 _rbcmininc = 64 * _rbcrecsize
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	785 _rbcnodelen = 4
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	786 _rbcbranchidxmask = 0x7FFFFFFF
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	787 _rbccloseflag = 0x80000000
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	788
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	789
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	790 class rbcrevs:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	791 """a byte string consisting of an immutable prefix followed by a mutable suffix"""
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	792
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	793 def __init__(self, revs):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	794 self._prefix = revs
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	795 self._rest = bytearray()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	796
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	797 def __len__(self):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	798 return len(self._prefix) + len(self._rest)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	799
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	800 def unpack_record(self, rbcrevidx):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	801 if rbcrevidx < len(self._prefix):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	802 return unpack_from(_rbcrecfmt, util.buffer(self._prefix), rbcrevidx)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	803 else:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	804 return unpack_from(
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	805 _rbcrecfmt,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	806 util.buffer(self._rest),
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	807 rbcrevidx - len(self._prefix),
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	808 )
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	809
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	810 def make_mutable(self):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	811 if len(self._prefix) > 0:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	812 entirety = bytearray()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	813 entirety[:] = self._prefix
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	814 entirety.extend(self._rest)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	815 self._rest = entirety
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	816 self._prefix = bytearray()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	817
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	818 def truncate(self, pos):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	819 self.make_mutable()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	820 del self._rest[pos:]
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	821
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	822 def pack_into(self, rbcrevidx, node, branchidx):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	823 if rbcrevidx < len(self._prefix):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	824 self.make_mutable()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	825 buf = self._rest
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	826 start_offset = rbcrevidx - len(self._prefix)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	827 end_offset = start_offset + _rbcrecsize
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	828
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	829 if len(self._rest) < end_offset:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	830 # bytearray doesn't allocate extra space at least in Python 3.7.
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	831 # When multiple changesets are added in a row, precise resize would
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	832 # result in quadratic complexity. Overallocate to compensate by
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	833 # using the classic doubling technique for dynamic arrays instead.
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	834 # If there was a gap in the map before, less space will be reserved.
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	835 self._rest.extend(b'\0' * end_offset)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	836 return pack_into(
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	837 _rbcrecfmt,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	838 buf,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	839 start_offset,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	840 node,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	841 branchidx,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	842 )
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	843
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	844 def extend(self, extension):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	845 return self._rest.extend(extension)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	846
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	847 def slice(self, begin, end):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	848 if begin < len(self._prefix):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	849 acc = bytearray()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	850 acc[:] = self._prefix[begin:end]
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	851 acc.extend(
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	852 self._rest[begin - len(self._prefix) : end - len(self._prefix)]
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	853 )
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	854 return acc
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	855 return self._rest[begin - len(self._prefix) : end - len(self._prefix)]
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	856
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	857
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 49026 diff changeset	858 class revbranchcache:
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	859 """Persistent cache, mapping from revision number to branch name and close.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	860 This is a low level cache, independent of filtering.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	861
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	862 Branch names are stored in rbc-names in internal encoding separated by 0.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	863 rbc-names is append-only, and each branch name is only stored once and will
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	864 thus have a unique index.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	865
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	866 The branch info for each revision is stored in rbc-revs as constant size
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	867 records. The whole file is read into memory, but it is only 'parsed' on
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	868 demand. The file is usually append-only but will be truncated if repo
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	869 modification is detected.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	870 The record for each revision contains the first 4 bytes of the
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	871 corresponding node hash, and the record is only used if it still matches.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	872 Even a completely trashed rbc-revs fill thus still give the right result
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	873 while converging towards full recovery ... assuming no incorrectly matching
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	874 node hashes.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	875 The record also contains 4 bytes where 31 bits contains the index of the
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	876 branch and the last bit indicate that it is a branch close commit.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	877 The usage pattern for rbc-revs is thus somewhat similar to 00changelog.i
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	878 and will grow with it but be 1/8th of its size.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	879 """
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	880
24159 5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	881 def __init__(self, repo, readonly=True):
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	882 assert repo.filtername is None
24374 77fd1fb538cd revbranchcache: store repo on the object Durham Goode <durham@fb.com> parents: 24373 diff changeset	883 self._repo = repo
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	884 self._names = [] # branch names in local encoding with static index
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	885 self._rbcrevs = rbcrevs(bytearray())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	886 self._rbcsnameslen = 0 # length of names read at _rbcsnameslen
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	887 try:
33535 755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	888 bndata = repo.cachevfs.read(_rbcnames)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	889 self._rbcsnameslen = len(bndata) # for verification before writing
31380 7dd2f51f38ac rbc: empty (and invalid) rbc-names file should give an empty name list Mads Kiilerich <mads@kiilerich.com> parents: 31379 diff changeset	890 if bndata:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	891 self._names = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	892 encoding.tolocal(bn) for bn in bndata.split(b'\0')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	893 ]
29423 d2c6f3a948fa branchmap: remove unused exception variable Gregory Szorc <gregory.szorc@gmail.com> parents: 28558 diff changeset	894 except (IOError, OSError):
24159 5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	895 if readonly:
5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	896 # don't try to use cache - fall back to the slow path
5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	897 self.branchinfo = self._branchinfo
5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	898
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	899 if self._names:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	900 try:
51442 40943970b7ae config: move the option to mmap rev branch cache in the storage section Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	901 if repo.ui.configbool(b'storage', b'revbranchcache.mmap'):
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	902 with repo.cachevfs(_rbcrevs) as fp:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	903 data = util.buffer(util.mmapread(fp))
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	904 else:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	905 data = repo.cachevfs.read(_rbcrevs)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	906 self._rbcrevs = rbcrevs(data)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25266 diff changeset	907 except (IOError, OSError) as inst:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	908 repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	909 b"couldn't read revision branch cache: %s\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	910 % stringutil.forcebytestr(inst)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	911 )
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	912 # remember number of good records on disk
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	913 self._rbcrevslen = min(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	914 len(self._rbcrevs) // _rbcrecsize, len(repo.changelog)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	915 )
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	916 if self._rbcrevslen == 0:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	917 self._names = []
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	918 self._rbcnamescount = len(self._names) # number of names read at
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	919 # _rbcsnameslen
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	920
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	921 def _clear(self):
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	922 self._rbcsnameslen = 0
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	923 del self._names[:]
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	924 self._rbcnamescount = 0
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	925 self._rbcrevslen = len(self._repo.changelog)
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	926 self._rbcrevs = rbcrevs(bytearray(self._rbcrevslen * _rbcrecsize))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	927 util.clearcachedproperty(self, b'_namesreverse')
40749 50a64c321c1e branchmap: build the revbranchcache._namesreverse() only when required Pulkit Goyal <pulkit@yandex-team.ru> parents: 40494 diff changeset	928
50a64c321c1e branchmap: build the revbranchcache._namesreverse() only when required Pulkit Goyal <pulkit@yandex-team.ru> parents: 40494 diff changeset	929 @util.propertycache
50a64c321c1e branchmap: build the revbranchcache._namesreverse() only when required Pulkit Goyal <pulkit@yandex-team.ru> parents: 40494 diff changeset	930 def _namesreverse(self):
44470 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44349 diff changeset	931 return {b: r for r, b in enumerate(self._names)}
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	932
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	933 def branchinfo(self, rev):
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	934 """Return branch name and close flag for rev, using and updating
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	935 persistent cache."""
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	936 changelog = self._repo.changelog
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	937 rbcrevidx = rev * _rbcrecsize
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	938
25266 38117278f295 revbranchcache: return uncached branchinfo for nullrev (issue4683) Yuya Nishihara <yuya@tcha.org> parents: 24728 diff changeset	939 # avoid negative index, changelog.read(nullrev) is fast without cache
38117278f295 revbranchcache: return uncached branchinfo for nullrev (issue4683) Yuya Nishihara <yuya@tcha.org> parents: 24728 diff changeset	940 if rev == nullrev:
38117278f295 revbranchcache: return uncached branchinfo for nullrev (issue4683) Yuya Nishihara <yuya@tcha.org> parents: 24728 diff changeset	941 return changelog.branchinfo(rev)
38117278f295 revbranchcache: return uncached branchinfo for nullrev (issue4683) Yuya Nishihara <yuya@tcha.org> parents: 24728 diff changeset	942
29604 db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29423 diff changeset	943 # if requested rev isn't allocated, grow and cache the rev info
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	944 if len(self._rbcrevs) < rbcrevidx + _rbcrecsize:
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	945 return self._branchinfo(rev)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	946
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	947 # fast path: extract data from cache, use it if node is matching
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	948 reponode = changelog.node(rev)[:_rbcnodelen]
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	949 cachenode, branchidx = self._rbcrevs.unpack_record(rbcrevidx)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	950 close = bool(branchidx & _rbccloseflag)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	951 if close:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	952 branchidx &= _rbcbranchidxmask
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	953 if cachenode == b'\0\0\0\0':
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	954 pass
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	955 elif cachenode == reponode:
29615 a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	956 try:
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	957 return self._names[branchidx], close
29615 a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	958 except IndexError:
a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	959 # recover from invalid reference to unknown branch
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	960 self._repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	961 b"referenced branch names not found"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	962 b" - rebuilding revision branch cache from scratch\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	963 )
29615 a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	964 self._clear()
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	965 else:
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	966 # rev/node map has changed, invalidate the cache from here up
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	967 self._repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	968 b"history modification detected - truncating "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	969 b"revision branch cache to revision %d\n" % rev
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	970 )
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	971 truncate = rbcrevidx + _rbcrecsize
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	972 self._rbcrevs.truncate(truncate)
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	973 self._rbcrevslen = min(self._rbcrevslen, truncate)
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	974
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	975 # fall back to slow path and make sure it will be written to disk
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	976 return self._branchinfo(rev)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	977
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	978 def _branchinfo(self, rev):
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	979 """Retrieve branch info from changelog and update _rbcrevs"""
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	980 changelog = self._repo.changelog
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	981 b, close = changelog.branchinfo(rev)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	982 if b in self._namesreverse:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	983 branchidx = self._namesreverse[b]
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	984 else:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	985 branchidx = len(self._names)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	986 self._names.append(b)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	987 self._namesreverse[b] = branchidx
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	988 reponode = changelog.node(rev)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	989 if close:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	990 branchidx \|= _rbccloseflag
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	991 self._setcachedata(rev, reponode, branchidx)
24375 fe255b2525d5 revbranchcache: move entry writing to a separate function Durham Goode <durham@fb.com> parents: 24374 diff changeset	992 return b, close
fe255b2525d5 revbranchcache: move entry writing to a separate function Durham Goode <durham@fb.com> parents: 24374 diff changeset	993
46444 3e91d9978bec branchmap: update rev-branch-cache incrementally Joerg Sonnenberger <joerg@bec.de> parents: 46434 diff changeset	994 def setdata(self, rev, changelogrevision):
36968 95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	995 """add new data information to the cache"""
46444 3e91d9978bec branchmap: update rev-branch-cache incrementally Joerg Sonnenberger <joerg@bec.de> parents: 46434 diff changeset	996 branch, close = changelogrevision.branchinfo
3e91d9978bec branchmap: update rev-branch-cache incrementally Joerg Sonnenberger <joerg@bec.de> parents: 46434 diff changeset	997
36968 95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	998 if branch in self._namesreverse:
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	999 branchidx = self._namesreverse[branch]
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1000 else:
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1001 branchidx = len(self._names)
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1002 self._names.append(branch)
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1003 self._namesreverse[branch] = branchidx
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1004 if close:
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1005 branchidx \|= _rbccloseflag
46444 3e91d9978bec branchmap: update rev-branch-cache incrementally Joerg Sonnenberger <joerg@bec.de> parents: 46434 diff changeset	1006 self._setcachedata(rev, self._repo.changelog.node(rev), branchidx)
36968 95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1007 # If no cache data were readable (non exists, bad permission, etc)
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1008 # the cache was bypassing itself by setting:
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1009 #
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1010 # self.branchinfo = self._branchinfo
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1011 #
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1012 # Since we now have data in the cache, we need to drop this bypassing.
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43547 diff changeset	1013 if 'branchinfo' in vars(self):
36968 95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1014 del self.branchinfo
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	1015
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	1016 def _setcachedata(self, rev, node, branchidx):
24375 fe255b2525d5 revbranchcache: move entry writing to a separate function Durham Goode <durham@fb.com> parents: 24374 diff changeset	1017 """Writes the node's branch data to the in-memory cache data."""
31463 a5bad127128d branchmap: handle nullrev in setcachedata Durham Goode <durham@fb.com> parents: 31390 diff changeset	1018 if rev == nullrev:
a5bad127128d branchmap: handle nullrev in setcachedata Durham Goode <durham@fb.com> parents: 31390 diff changeset	1019 return
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	1020 rbcrevidx = rev * _rbcrecsize
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	1021 self._rbcrevs.pack_into(rbcrevidx, node, branchidx)
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	1022 self._rbcrevslen = min(self._rbcrevslen, rev)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	1023
24377 656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	1024 tr = self._repo.currenttransaction()
656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	1025 if tr:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1026 tr.addfinalize(b'write-revbranchcache', self.write)
24377 656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	1027
656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	1028 def write(self, tr=None):
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	1029 """Save branch cache if it is dirty."""
24374 77fd1fb538cd revbranchcache: store repo on the object Durham Goode <durham@fb.com> parents: 24373 diff changeset	1030 repo = self._repo
29756 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29755 diff changeset	1031 wlock = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1032 step = b''
29756 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29755 diff changeset	1033 try:
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1034 # write the new names
29755 9f3c49ee4486 branchmap: preparatory indent of indent the branch rev writing code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	1035 if self._rbcnamescount < len(self._names):
29756 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29755 diff changeset	1036 wlock = repo.wlock(wait=False)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1037 step = b' names'
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1038 self._writenames(repo)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	1039
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1040 # write the new revs
29755 9f3c49ee4486 branchmap: preparatory indent of indent the branch rev writing code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	1041 start = self._rbcrevslen * _rbcrecsize
9f3c49ee4486 branchmap: preparatory indent of indent the branch rev writing code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	1042 if start != len(self._rbcrevs):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1043 step = b''
29756 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29755 diff changeset	1044 if wlock is None:
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29755 diff changeset	1045 wlock = repo.wlock(wait=False)
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1046 self._writerevs(repo, start)
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1047
29757 3b184adfb5be branchmap: simplify error handlind when writing rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29756 diff changeset	1048 except (IOError, OSError, error.Abort, error.LockError) as inst:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	1049 repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1050 b"couldn't write revision branch cache%s: %s\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	1051 % (step, stringutil.forcebytestr(inst))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	1052 )
29756 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29755 diff changeset	1053 finally:
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29755 diff changeset	1054 if wlock is not None:
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29755 diff changeset	1055 wlock.release()
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1056
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1057 def _writenames(self, repo):
47031 f38bf44e077f black: make codebase compatible with black v21.4b2 and v20.8b1 Kyle Lippincott <spectral@google.com> parents: 46819 diff changeset	1058 """write the new branch names to revbranchcache"""
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1059 if self._rbcnamescount != 0:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1060 f = repo.cachevfs.open(_rbcnames, b'ab')
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1061 if f.tell() == self._rbcsnameslen:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1062 f.write(b'\0')
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1063 else:
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1064 f.close()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1065 repo.ui.debug(b"%s changed - rewriting it\n" % _rbcnames)
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1066 self._rbcnamescount = 0
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1067 self._rbcrevslen = 0
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1068 if self._rbcnamescount == 0:
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1069 # before rewriting names, make sure references are removed
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1070 repo.cachevfs.unlinkpath(_rbcrevs, ignoremissing=True)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1071 f = repo.cachevfs.open(_rbcnames, b'wb')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	1072 f.write(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1073 b'\0'.join(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	1074 encoding.fromlocal(b)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	1075 for b in self._names[self._rbcnamescount :]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	1076 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	1077 )
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1078 self._rbcsnameslen = f.tell()
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1079 f.close()
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1080 self._rbcnamescount = len(self._names)
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1081
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1082 def _writerevs(self, repo, start):
47031 f38bf44e077f black: make codebase compatible with black v21.4b2 and v20.8b1 Kyle Lippincott <spectral@google.com> parents: 46819 diff changeset	1083 """write the new revs to revbranchcache"""
42223 ececa45c80d8 revbranchcache: use context manager in _writerevs() to write to file Pulkit Goyal <pulkit@yandex-team.ru> parents: 42222 diff changeset	1084 revs = min(len(repo.changelog), len(self._rbcrevs) // _rbcrecsize)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1085 with repo.cachevfs.open(_rbcrevs, b'ab') as f:
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1086 if f.tell() != start:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1087 repo.ui.debug(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1088 b"truncating cache/%s to %d\n" % (_rbcrevs, start)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1089 )
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1090 f.seek(start)
42223 ececa45c80d8 revbranchcache: use context manager in _writerevs() to write to file Pulkit Goyal <pulkit@yandex-team.ru> parents: 42222 diff changeset	1091 if f.tell() != start:
ececa45c80d8 revbranchcache: use context manager in _writerevs() to write to file Pulkit Goyal <pulkit@yandex-team.ru> parents: 42222 diff changeset	1092 start = 0
ececa45c80d8 revbranchcache: use context manager in _writerevs() to write to file Pulkit Goyal <pulkit@yandex-team.ru> parents: 42222 diff changeset	1093 f.seek(start)
ececa45c80d8 revbranchcache: use context manager in _writerevs() to write to file Pulkit Goyal <pulkit@yandex-team.ru> parents: 42222 diff changeset	1094 f.truncate()
ececa45c80d8 revbranchcache: use context manager in _writerevs() to write to file Pulkit Goyal <pulkit@yandex-team.ru> parents: 42222 diff changeset	1095 end = revs * _rbcrecsize
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	1096 f.write(self._rbcrevs.slice(start, end))
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	1097 self._rbcrevslen = revs

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/branchmap.py @ 51561:ec640dc9cebd