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

annotate mercurial/branchmap.py @ 51516:fd30c4301929

branchcache: stop storing a repository instance on the cache altogether We did not really needed it and we do not needs it anymore at all. So lets make things simpler for consistency and garbage collecting and stop storing it altogether.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Mon, 19 Feb 2024 11:59:56 +0100
parents	3aba79ce52a9
children	5515876173ba

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 (
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	18 Callable,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	19 Dict,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	20 Iterable,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	21 List,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	22 Optional,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	23 Set,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	24 TYPE_CHECKING,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	25 Tuple,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	26 Union,
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	27 )
9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	28
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	29 from . import (
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	30 encoding,
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26460 diff changeset	31 error,
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	32 obsolete,
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	33 scmutil,
30995 22fbca1d11ed mercurial: switch to util.timer for all interval timings Simon Farnsworth <simonfar@fb.com> parents: 29758 diff changeset	34 util,
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	35 )
51302 9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	36
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36968 diff changeset	37 from .utils import (
42138 caebe5e7f4bd repoview: move subsettable in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42134 diff changeset	38 repoviewutil,
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36968 diff changeset	39 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36968 diff changeset	40 )
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	41
51302 9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	42 if TYPE_CHECKING:
46796 e2f7b2695ba1 merge with stable Matt Harbison <matt_harbison@yahoo.com> parents: 46793 46392 diff changeset	43 from . import localrepo
43680 9c1eccdd7ed8 branchmap: annotate constructor type for branchcache Augie Fackler <augie@google.com> parents: 43678 diff changeset	44
51302 9d3721552b6c pytype: import typing directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49308 diff changeset	45 assert [localrepo]
43680 9c1eccdd7ed8 branchmap: annotate constructor type for branchcache Augie Fackler <augie@google.com> parents: 43678 diff changeset	46
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	47 subsettable = repoviewutil.subsettable
42138 caebe5e7f4bd repoview: move subsettable in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42134 diff changeset	48
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	49 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	50 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	51 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	52
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	53
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 49026 diff changeset	54 class BranchMapCache:
41729 a87ca1d7e61d branchmap: improve doc about BranchMapCache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41689 diff changeset	55 """mapping of filtered views of repo with their branchcache"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	56
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	57 def __init__(self):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	58 self._per_filter = {}
41581 c795c462b1d6 branchmap: add some clarifications and clean up flow Martijn Pieters <mj@octobus.net> parents: 41580 diff changeset	59
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	60 def __getitem__(self, repo):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	61 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	62 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	63 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	64 bcache._filtername,
51515 3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	65 repo.filtername,
3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	66 )
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	67 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	68
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 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	70 """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	71
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 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	73 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	74
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 If a transaction is in progress, the writing is schedule to transaction
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 close. See the `BranchMapCache.write_delayed` method.
7f7086a42b2b branchcache: have an explicit method to update the on disk cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51377 diff changeset	77
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 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	79 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	80 """
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 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	82 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	83 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	84 bcache._filtername,
51515 3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	85 repo.filtername,
3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	86 )
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	87 bcache.write(repo)
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	88
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	89 def updatecache(self, repo):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	90 """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	91 # 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	92 # 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	93 # is stale.
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	94
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	95 cl = repo.changelog
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	96 filtername = repo.filtername
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	97 bcache = self._per_filter.get(filtername)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	98 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	99 # cache object missing or cache object stale? Read from disk
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	100 bcache = branchcache.fromfile(repo)
41581 c795c462b1d6 branchmap: add some clarifications and clean up flow Martijn Pieters <mj@octobus.net> parents: 41580 diff changeset	101
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	102 revs = []
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	103 if bcache is None:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	104 # 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	105 # 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	106 # revisions.
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	107 subsetname = subsettable.get(filtername)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	108 if subsetname is not None:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	109 subset = repo.filtered(subsetname)
51515 3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	110 bcache = self[subset].copy(repo)
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	111 extrarevs = subset.changelog.filteredrevs - cl.filteredrevs
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	112 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	113 else:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	114 # nothing to fall back on, start empty.
46793 6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46444 diff changeset	115 bcache = branchcache(repo)
24373 59cc09240afb revbranchcache: move out of branchmap onto localrepo Durham Goode <durham@fb.com> parents: 24163 diff changeset	116
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	117 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	118 if revs:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	119 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	120
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	121 assert bcache.validfor(repo), filtername
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	122 self._per_filter[repo.filtername] = bcache
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	123
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	124 def replace(self, repo, remotebranchmap):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	125 """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	126
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	127 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	128 remote.
26460 79ef867538ea branchmap: move branch cache code out of streamclone.py Gregory Szorc <gregory.szorc@gmail.com> parents: 25918 diff changeset	129
41626 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 cl = repo.changelog
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	132 clrev = cl.rev
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	133 clbranchinfo = cl.branchinfo
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	134 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	135 closed = set()
49026 2cce2fa5bcf7 py3: replace pycompat.itervalues(x) with x.values() Gregory Szorc <gregory.szorc@gmail.com> parents: 49004 diff changeset	136 for bheads in remotebranchmap.values():
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	137 rbheads += bheads
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	138 for h in bheads:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	139 r = clrev(h)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	140 b, c = clbranchinfo(r)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	141 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	142 closed.add(h)
26460 79ef867538ea branchmap: move branch cache code out of streamclone.py Gregory Szorc <gregory.szorc@gmail.com> parents: 25918 diff changeset	143
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	144 if rbheads:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	145 rtiprev = max((int(clrev(node)) for node in rbheads))
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	146 cache = branchcache(
46793 6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46444 diff changeset	147 repo,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	148 remotebranchmap,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	149 repo[rtiprev].node(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	150 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	151 closednodes=closed,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	152 )
26460 79ef867538ea branchmap: move branch cache code out of streamclone.py Gregory Szorc <gregory.szorc@gmail.com> parents: 25918 diff changeset	153
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	154 # 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	155 # 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	156 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	157 rview = repo.filtered(candidate)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	158 if cache.validfor(rview):
51515 3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	159 cache = self._per_filter[candidate] = cache.copy(rview)
41626 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	160 cache.write(rview)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	161 return
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	162
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	163 def clear(self):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	164 self._per_filter.clear()
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41581 diff changeset	165
48363 8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	166 def write_delayed(self, repo):
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	167 unfi = repo.unfiltered()
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	168 for filtername, cache in self._per_filter.items():
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	169 if cache._delayed:
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	170 repo = unfi.filtered(filtername)
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	171 cache.write(repo)
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	172
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	173
42120 2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	174 def _unknownnode(node):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	175 """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	176 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	177
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	178
42602 c7d236b55a3e py3: fix formatting of branchmap log messages with repo.filtername=None Martin von Zweigbergk <martinvonz@google.com> parents: 42247 diff changeset	179 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	180 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	181 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	182 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	183 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	184
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	185
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 49026 diff changeset	186 class branchcache:
20181 b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	187 """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	188
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	189 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	190 branch heads of a repo.
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	191
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	192 The cache is serialized on disk in the following format:
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	193
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	194 <tip hex node> <tip rev number> [optional filtered repo hex hash]
20185 7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	195 <branch head hex node> <open/closed state> <branch name>
7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	196 <branch head hex node> <open/closed state> <branch name>
20181 b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	197 ...
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	198
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	199 The first line is used to check if the cache is still valid. If the
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	200 branch cache is for a filtered repo view, an optional third hash is
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	201 included that hashes the hashes of all filtered and obsolete revisions.
20185 7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	202
7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	203 The open/closed state is represented by a single letter 'o' or 'c'.
7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	204 This field can be used to avoid changelog reads when determining if a
7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	205 branch head closes a branch or not.
20181 b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	206 """
41688 bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41626 diff changeset	207
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	208 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	209 self,
51304 f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	210 repo: "localrepo.localrepository",
f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	211 entries: Union[
f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	212 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	213 ] = (),
f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	214 tipnode: Optional[bytes] = None,
f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	215 tiprev: Optional[int] = nullrev,
f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	216 filteredhash: Optional[bytes] = None,
f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	217 closednodes: Optional[Set[bytes]] = None,
f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	218 hasnode: Optional[Callable[[bytes], bool]] = None,
f15cb5111a1e pytype: move some type comment to proper annotation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51302 diff changeset	219 ) -> None:
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	220 """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	221 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	222 we have exists in changelog"""
51516 fd30c4301929 branchcache: stop storing a repository instance on the cache altogether Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51515 diff changeset	223 self._filtername = repo.filtername
48363 8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	224 self._delayed = False
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	225 if tipnode is None:
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	226 self.tipnode = repo.nullid
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	227 else:
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	228 self.tipnode = tipnode
41688 bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41626 diff changeset	229 self.tiprev = tiprev
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41626 diff changeset	230 self.filteredhash = filteredhash
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41626 diff changeset	231 # 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	232 # 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	233 # heads.
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41626 diff changeset	234 if closednodes is None:
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41626 diff changeset	235 self._closednodes = set()
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41626 diff changeset	236 else:
43680 9c1eccdd7ed8 branchmap: annotate constructor type for branchcache Augie Fackler <augie@google.com> parents: 43678 diff changeset	237 self._closednodes = closednodes
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	238 self._entries = dict(entries)
42006 111de135fc76 branchcache: add attributes to track which nodes are verified Pulkit Goyal <pulkit@yandex-team.ru> parents: 42005 diff changeset	239 # whether closed nodes are verified or not
111de135fc76 branchcache: add attributes to track which nodes are verified Pulkit Goyal <pulkit@yandex-team.ru> parents: 42005 diff changeset	240 self._closedverified = False
111de135fc76 branchcache: add attributes to track which nodes are verified Pulkit Goyal <pulkit@yandex-team.ru> parents: 42005 diff changeset	241 # branches for which nodes are verified
111de135fc76 branchcache: add attributes to track which nodes are verified Pulkit Goyal <pulkit@yandex-team.ru> parents: 42005 diff changeset	242 self._verifiedbranches = set()
42007 b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	243 self._hasnode = hasnode
b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	244 if self._hasnode is None:
b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	245 self._hasnode = lambda x: True
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	246
42120 2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	247 def _verifyclosed(self):
47031 f38bf44e077f black: make codebase compatible with black v21.4b2 and v20.8b1 Kyle Lippincott <spectral@google.com> parents: 46819 diff changeset	248 """verify the closed nodes we have"""
42120 2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	249 if self._closedverified:
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	250 return
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	251 for node in self._closednodes:
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	252 if not self._hasnode(node):
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	253 _unknownnode(node)
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	254
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	255 self._closedverified = True
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	256
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	257 def _verifybranch(self, branch):
47031 f38bf44e077f black: make codebase compatible with black v21.4b2 and v20.8b1 Kyle Lippincott <spectral@google.com> parents: 46819 diff changeset	258 """verify head nodes for the given branch."""
42120 2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	259 if branch not in self._entries or branch in self._verifiedbranches:
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	260 return
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	261 for n in self._entries[branch]:
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	262 if not self._hasnode(n):
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	263 _unknownnode(n)
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	264
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	265 self._verifiedbranches.add(branch)
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	266
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	267 def _verifyall(self):
47031 f38bf44e077f black: make codebase compatible with black v21.4b2 and v20.8b1 Kyle Lippincott <spectral@google.com> parents: 46819 diff changeset	268 """verifies nodes of all the branches"""
42133 75e8e16ca107 branchcache: only iterate over branches which needs to be verified Pulkit Goyal <pulkit@yandex-team.ru> parents: 42132 diff changeset	269 needverification = set(self._entries.keys()) - self._verifiedbranches
75e8e16ca107 branchcache: only iterate over branches which needs to be verified Pulkit Goyal <pulkit@yandex-team.ru> parents: 42132 diff changeset	270 for b in needverification:
42120 2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	271 self._verifybranch(b)
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	272
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	273 def __iter__(self):
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	274 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	275
624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	276 def __setitem__(self, key, value):
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	277 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	278
624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	279 def __getitem__(self, key):
42121 6578654916ae branchcache: lazily validate nodes from the branchmap Pulkit Goyal <pulkit@yandex-team.ru> parents: 42120 diff changeset	280 self._verifybranch(key)
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	281 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	282
42113 f0def07fa82f branchmap: implement __contains__() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42112 diff changeset	283 def __contains__(self, key):
42121 6578654916ae branchcache: lazily validate nodes from the branchmap Pulkit Goyal <pulkit@yandex-team.ru> parents: 42120 diff changeset	284 self._verifybranch(key)
42113 f0def07fa82f branchmap: implement __contains__() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42112 diff changeset	285 return key in self._entries
f0def07fa82f branchmap: implement __contains__() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42112 diff changeset	286
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	287 def iteritems(self):
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	288 for k, v in self._entries.items():
42134 f0203c3406e7 branchcache: lazily validate nodes in iteritems() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42133 diff changeset	289 self._verifybranch(k)
f0203c3406e7 branchcache: lazily validate nodes in iteritems() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42133 diff changeset	290 yield k, v
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41844 diff changeset	291
42603 3018749a71bb py3: source-transform only call-sites of iteritems(), not definitions Martin von Zweigbergk <martinvonz@google.com> parents: 42602 diff changeset	292 items = iteritems
3018749a71bb py3: source-transform only call-sites of iteritems(), not definitions Martin von Zweigbergk <martinvonz@google.com> parents: 42602 diff changeset	293
42004 0bd730fbcc2b branchcache: introduce hasbranch() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42003 diff changeset	294 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	295 """checks whether a branch of this name exists or not"""
42121 6578654916ae branchcache: lazily validate nodes from the branchmap Pulkit Goyal <pulkit@yandex-team.ru> parents: 42120 diff changeset	296 self._verifybranch(label)
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	297 return label in self._entries
42004 0bd730fbcc2b branchcache: introduce hasbranch() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42003 diff changeset	298
41579 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	299 @classmethod
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	300 def fromfile(cls, repo):
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	301 f = None
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	302 try:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	303 f = repo.cachevfs(cls._filename(repo))
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	304 lineiter = iter(f)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	305 cachekey = next(lineiter).rstrip(b'\n').split(b" ", 2)
41579 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	306 last, lrev = cachekey[:2]
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	307 last, lrev = bin(last), int(lrev)
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	308 filteredhash = None
42007 b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	309 hasnode = repo.changelog.hasnode
41579 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	310 if len(cachekey) > 2:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	311 filteredhash = bin(cachekey[2])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	312 bcache = cls(
46793 6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46444 diff changeset	313 repo,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	314 tipnode=last,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	315 tiprev=lrev,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	316 filteredhash=filteredhash,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	317 hasnode=hasnode,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	318 )
41579 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	319 if not bcache.validfor(repo):
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	320 # invalidate the cache
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43547 diff changeset	321 raise ValueError('tip differs')
41813 8ad46ac6728e branchmap: prevent reading the file twice through different iterators Pulkit Goyal <pulkit@yandex-team.ru> parents: 41802 diff changeset	322 bcache.load(repo, lineiter)
41579 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	323 except (IOError, OSError):
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	324 return None
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	325
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	326 except Exception as inst:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	327 if repo.ui.debugflag:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	328 msg = b'invalid %s: %s\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	329 repo.ui.debug(
43547 1a47fe4bc154 branchmap: pytype is confused about bytestr Augie Fackler <augie@google.com> parents: 43106 diff changeset	330 msg
1a47fe4bc154 branchmap: pytype is confused about bytestr Augie Fackler <augie@google.com> parents: 43106 diff changeset	331 % (
1a47fe4bc154 branchmap: pytype is confused about bytestr Augie Fackler <augie@google.com> parents: 43106 diff changeset	332 _branchcachedesc(repo),
46392 799973a44c82 branchmap: force Exception to bytes before logging Matt Harbison <matt_harbison@yahoo.com> parents: 46254 diff changeset	333 stringutil.forcebytestr(inst),
43547 1a47fe4bc154 branchmap: pytype is confused about bytestr Augie Fackler <augie@google.com> parents: 43106 diff changeset	334 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	335 )
41579 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	336 bcache = None
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	337
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	338 finally:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	339 if f:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	340 f.close()
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	341
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	342 return bcache
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	343
41813 8ad46ac6728e branchmap: prevent reading the file twice through different iterators Pulkit Goyal <pulkit@yandex-team.ru> parents: 41802 diff changeset	344 def load(self, repo, lineiter):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	345 """fully loads the branchcache by reading from the file using the line
41813 8ad46ac6728e branchmap: prevent reading the file twice through different iterators Pulkit Goyal <pulkit@yandex-team.ru> parents: 41802 diff changeset	346 iterator passed"""
41802 68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41768 diff changeset	347 for line in lineiter:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	348 line = line.rstrip(b'\n')
41802 68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41768 diff changeset	349 if not line:
68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41768 diff changeset	350 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	351 node, state, label = line.split(b" ", 2)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	352 if state not in b'oc':
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43547 diff changeset	353 raise ValueError('invalid branch state')
41802 68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41768 diff changeset	354 label = encoding.tolocal(label.strip())
68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41768 diff changeset	355 node = bin(node)
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	356 self._entries.setdefault(label, []).append(node)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	357 if state == b'c':
41802 68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41768 diff changeset	358 self._closednodes.add(node)
68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41768 diff changeset	359
41579 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	360 @staticmethod
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	361 def _filename(repo):
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	362 """name of a branchcache file for a given repo or repoview"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	363 filename = b"branch2"
41579 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	364 if repo.filtername:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	365 filename = b'%s-%s' % (filename, repo.filtername)
41579 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41418 diff changeset	366 return filename
18124 79db6d40bced branchmap: store branchcache in a dedicated object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18121 diff changeset	367
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	368 def validfor(self, repo):
48733 02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	369 """check that cache contents are valid for (a subset of) this repo
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	370
48733 02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	371 - False when the order of changesets changed or if we detect a strip.
02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	372 - True when cache is up-to-date for the current repo or its subset."""
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	373 try:
48733 02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	374 node = repo.changelog.node(self.tiprev)
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	375 except IndexError:
48733 02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	376 # changesets were stripped and now we don't even have enough to
02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	377 # find tiprev
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	378 return False
48733 02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	379 if self.tipnode != node:
02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	380 # tiprev doesn't correspond to tipnode: repo was stripped, or this
02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	381 # repo has a different order of changesets
02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	382 return False
02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	383 tiphash = scmutil.filteredhash(repo, self.tiprev, needobsolete=True)
02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	384 # hashes don't match if this repo view has a different set of filtered
02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	385 # revisions (e.g. due to phase changes) or obsolete revisions (e.g.
02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	386 # history was rewritten)
02e9ad08999b branchmap: split a long condition in branchcache.validfor(), add comments Anton Shestakov <av6@dwimlabs.net> parents: 48732 diff changeset	387 return self.filteredhash == tiphash
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	388
20186 f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	389 def _branchtip(self, heads):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	390 """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	391 otherwise return last closed head and true."""
20186 f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	392 tip = heads[-1]
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	393 closed = True
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	394 for h in reversed(heads):
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	395 if h not in self._closednodes:
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	396 tip = h
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	397 closed = False
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	398 break
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	399 return tip, closed
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	400
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	401 def branchtip(self, branch):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	402 """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	403 tipmost closed head on branch.
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44470 diff changeset	404 Raise KeyError for unknown branch."""
20186 f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	405 return self._branchtip(self[branch])[0]
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	406
34091 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 33661 diff changeset	407 def iteropen(self, nodes):
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 33661 diff changeset	408 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	409
20188 3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	410 def branchheads(self, branch, closed=False):
42121 6578654916ae branchcache: lazily validate nodes from the branchmap Pulkit Goyal <pulkit@yandex-team.ru> parents: 42120 diff changeset	411 self._verifybranch(branch)
42112 29c22496dd97 branchmap: prevent using __getitem__() in branchheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42111 diff changeset	412 heads = self._entries[branch]
20188 3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	413 if not closed:
34091 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 33661 diff changeset	414 heads = list(self.iteropen(heads))
20188 3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	415 return heads
3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	416
20190 d5d25e541637 branchmap: introduce iterbranches() method Brodie Rao <brodie@sf.io> parents: 20188 diff changeset	417 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	418 for bn, heads in self.items():
20190 d5d25e541637 branchmap: introduce iterbranches() method Brodie Rao <brodie@sf.io> parents: 20188 diff changeset	419 yield (bn, heads) + self._branchtip(heads)
d5d25e541637 branchmap: introduce iterbranches() method Brodie Rao <brodie@sf.io> parents: 20188 diff changeset	420
42002 662ffdde5adf branchcache: rename itervalues() to iterheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42001 diff changeset	421 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	422 """returns all the heads"""
42121 6578654916ae branchcache: lazily validate nodes from the branchmap Pulkit Goyal <pulkit@yandex-team.ru> parents: 42120 diff changeset	423 self._verifyall()
49026 2cce2fa5bcf7 py3: replace pycompat.itervalues(x) with x.values() Gregory Szorc <gregory.szorc@gmail.com> parents: 49004 diff changeset	424 return self._entries.values()
42002 662ffdde5adf branchcache: rename itervalues() to iterheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42001 diff changeset	425
51515 3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	426 def copy(self, repo):
18232 dd0b636b0b65 branchmap: add a copy method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18218 diff changeset	427 """return an deep copy of the branchcache object"""
42111 f0fa0fc4900a branchmap: dynamically resolve type of branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 42007 diff changeset	428 return type(self)(
51515 3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	429 repo,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	430 self._entries,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	431 self.tipnode,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	432 self.tiprev,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	433 self.filteredhash,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	434 self._closednodes,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	435 )
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	436
18128 f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	437 def write(self, repo):
51516 fd30c4301929 branchcache: stop storing a repository instance on the cache altogether Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51515 diff changeset	438 assert self._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	439 self._filtername,
51515 3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	440 repo.filtername,
3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	441 )
48363 8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	442 tr = repo.currenttransaction()
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	443 if not getattr(tr, 'finalized', True):
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	444 # Avoid premature writing.
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	445 #
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	446 # (The cache warming setup by localrepo will update the file later.)
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	447 self._delayed = True
8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	448 return
18128 f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	449 try:
49233 f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	450 filename = self._filename(repo)
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	451 with repo.cachevfs(filename, b"w", atomictemp=True) as f:
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	452 cachekey = [hex(self.tipnode), b'%d' % self.tiprev]
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	453 if self.filteredhash is not None:
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	454 cachekey.append(hex(self.filteredhash))
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	455 f.write(b" ".join(cachekey) + b'\n')
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	456 nodecount = 0
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	457 for label, nodes in sorted(self._entries.items()):
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	458 label = encoding.fromlocal(label)
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	459 for node in nodes:
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	460 nodecount += 1
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	461 if node in self._closednodes:
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	462 state = b'c'
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	463 else:
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	464 state = b'o'
f923bdd7477d branchmap: use a context manager when writing the branchmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	465 f.write(b"%s %s %s\n" % (hex(node), state, label))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	466 repo.ui.log(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	467 b'branchcache',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	468 b'wrote %s with %d labels and %d nodes\n',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	469 _branchcachedesc(repo),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	470 len(self._entries),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	471 nodecount,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	472 )
48363 8e5effbf52d0 branchmap: stop writing cache for uncommitted data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	473 self._delayed = False
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26460 diff changeset	474 except (IOError, OSError, error.Abort) as inst:
34371 d0db41af73c0 branchmap: remove superfluous pass statements Augie Fackler <augie@google.com> parents: 34091 diff changeset	475 # Abort may be raised by read only opener, so log and continue
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	476 repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	477 b"couldn't write branch cache: %s\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	478 % stringutil.forcebytestr(inst)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	479 )
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	480
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	481 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	482 """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	483 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	484 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	485 """
51516 fd30c4301929 branchcache: stop storing a repository instance on the cache altogether Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51515 diff changeset	486 assert self._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	487 self._filtername,
51515 3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	488 repo.filtername,
3aba79ce52a9 branchcache: pass the target repository when copying Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51514 diff changeset	489 )
30995 22fbca1d11ed mercurial: switch to util.timer for all interval timings Simon Farnsworth <simonfar@fb.com> parents: 29758 diff changeset	490 starttime = util.timer()
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	491 cl = repo.changelog
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	492 # collect new branch entries
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	493 newbranches = {}
24373 59cc09240afb revbranchcache: move out of branchmap onto localrepo Durham Goode <durham@fb.com> parents: 24163 diff changeset	494 getbranchinfo = repo.revbranchcache().branchinfo
18307 0eed2546118a branchmap: Save changectx creation during update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18305 diff changeset	495 for r in revgen:
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	496 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	497 newbranches.setdefault(branch, []).append(r)
20185 7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	498 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	499 self._closednodes.add(cl.node(r))
22357 9c3c3dc14a65 branchmap: pre-filter topological heads before ancestors based filtering Pierre-Yves David <pierre-yves.david@fb.com> parents: 22356 diff changeset	500
42247 9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	501 # new tip revision which we found after iterating items from new
9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	502 # branches
9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	503 ntiprev = self.tiprev
9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	504
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	505 # 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	506 # 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	507 topoheads = None
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	508
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	509 # 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	510 # 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	511 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	512
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	513 # Faster than using ctx.obsolete()
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	514 obsrevs = obsolete.getrevs(repo, b'obsolete')
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	515
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	516 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	517 # 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	518 # 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	519 # the same branch.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	520 #
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	521 # 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	522 # 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	523 # 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	524 # 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	525 #
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	526 # Core observations:
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	527 # - 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	528 # 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	529 # - 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	530 # 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	531 # 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	532 # the same branch.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	533 # - 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	534 # 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	535 # 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	536 # of that parent before.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	537 # - 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	538 # 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	539 # - 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	540 # 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	541 # 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	542 # 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	543 # 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	544 # a branchhead as ancestor.
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	545 # - 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	546 # 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	547 # 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	548 # 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	549 # 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	550 # "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	551 # 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	552 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	553 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	554 uncertain = set()
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	555 for newrev in sorted(newheadrevs):
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	556 if newrev in obsrevs:
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	557 # 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	558 # considered heads.
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	559 continue
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	560
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	561 if not bheadset:
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	562 bheadset.add(newrev)
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	563 continue
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	564
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	565 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	566 samebranch = set()
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	567 otherbranch = set()
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	568 obsparents = set()
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	569 for p in parents:
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	570 if p in obsrevs:
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	571 # 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	572 # 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	573 # 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	574 # 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	575 # changeset as a parent from other branch.
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	576 obsparents.add(p)
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	577 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	578 samebranch.add(p)
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	579 else:
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	580 otherbranch.add(p)
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	581 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	582 uncertain.update(otherbranch)
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	583 uncertain.update(obsparents)
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	584 bheadset.difference_update(samebranch)
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	585 bheadset.add(newrev)
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	586
22357 9c3c3dc14a65 branchmap: pre-filter topological heads before ancestors based filtering Pierre-Yves David <pierre-yves.david@fb.com> parents: 22356 diff changeset	587 if uncertain:
46254 c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	588 if topoheads is None:
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	589 topoheads = set(cl.headrevs())
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	590 if bheadset - topoheads:
c4b792fa109e branchmap: avoid ancestor computations in absence of non-continous branches Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	591 floorrev = min(bheadset)
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	592 if floorrev <= max(uncertain):
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	593 ancestors = set(cl.ancestors(uncertain, floorrev))
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	594 bheadset -= ancestors
48732 8b393f40a5e6 branchmap: don't add branch entries if there are no heads Anton Shestakov <av6@dwimlabs.net> parents: 48701 diff changeset	595 if bheadset:
8b393f40a5e6 branchmap: don't add branch entries if there are no heads Anton Shestakov <av6@dwimlabs.net> parents: 48701 diff changeset	596 self[branch] = [cl.node(rev) for rev in sorted(bheadset)]
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	597 tiprev = max(newheadrevs)
42247 9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	598 if tiprev > ntiprev:
9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	599 ntiprev = tiprev
9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	600
9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	601 if ntiprev > self.tiprev:
9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	602 self.tiprev = ntiprev
9893d7aa7420 branchcache: store the maximum tip in a variable inside for loop Pulkit Goyal <pulkit@yandex-team.ru> parents: 42228 diff changeset	603 self.tipnode = cl.node(ntiprev)
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	604
19838 23386881abeb branchmap: remove the droppednodes logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19837 diff changeset	605 if not self.validfor(repo):
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	606 # 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	607 # 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	608 # 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	609 self.tipnode = repo.nullid
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	610 self.tiprev = nullrev
42002 662ffdde5adf branchcache: rename itervalues() to iterheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42001 diff changeset	611 for heads in self.iterheads():
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	612 if not heads:
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	613 # all revisions on a branch are obsolete
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	614 continue
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	615 # 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	616 # 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	617 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	618 if tiprev > self.tiprev:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	619 self.tipnode = cl.node(tiprev)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	620 self.tiprev = tiprev
48701 f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	621 self.filteredhash = scmutil.filteredhash(
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	622 repo, self.tiprev, needobsolete=True
f8f2ecdde4b5 branchmap: skip obsolete revisions while computing heads Anton Shestakov <av6@dwimlabs.net> parents: 48363 diff changeset	623 )
21031 05cfcecb3aef branchmap: log events related to branch cache Gregory Szorc <gregory.szorc@gmail.com> parents: 20264 diff changeset	624
30995 22fbca1d11ed mercurial: switch to util.timer for all interval timings Simon Farnsworth <simonfar@fb.com> parents: 29758 diff changeset	625 duration = util.timer() - starttime
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	626 repo.ui.log(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	627 b'branchcache',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	628 b'updated %s in %.4f seconds\n',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	629 _branchcachedesc(repo),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	630 duration,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	631 )
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	632
41580 eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	633 self.write(repo)
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	634
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	635
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	636 class remotebranchcache(branchcache):
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	637 """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	638
41580 eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	639 def write(self, repo):
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	640 pass
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	641
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41579 diff changeset	642
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	643 # Revision branch info cache
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	644
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	645 _rbcversion = b'-v1'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	646 _rbcnames = b'rbc-names' + _rbcversion
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	647 _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	648 # [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	649 _rbcrecfmt = b'>4sI'
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	650 _rbcrecsize = calcsize(_rbcrecfmt)
46434 1726a53a8494 reverse-branch-cache: switch to doubling allocating scheme Joerg Sonnenberger <joerg@bec.de> parents: 46254 diff changeset	651 _rbcmininc = 64 * _rbcrecsize
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	652 _rbcnodelen = 4
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	653 _rbcbranchidxmask = 0x7FFFFFFF
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	654 _rbccloseflag = 0x80000000
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	655
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	656
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	657 class rbcrevs:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	658 """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	659
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	660 def __init__(self, revs):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	661 self._prefix = revs
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	662 self._rest = bytearray()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	663
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	664 def __len__(self):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	665 return len(self._prefix) + len(self._rest)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	666
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	667 def unpack_record(self, rbcrevidx):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	668 if rbcrevidx < len(self._prefix):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	669 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	670 else:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	671 return unpack_from(
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	672 _rbcrecfmt,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	673 util.buffer(self._rest),
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	674 rbcrevidx - len(self._prefix),
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	675 )
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	676
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	677 def make_mutable(self):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	678 if len(self._prefix) > 0:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	679 entirety = bytearray()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	680 entirety[:] = self._prefix
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	681 entirety.extend(self._rest)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	682 self._rest = entirety
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	683 self._prefix = bytearray()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	684
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	685 def truncate(self, pos):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	686 self.make_mutable()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	687 del self._rest[pos:]
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	688
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	689 def pack_into(self, rbcrevidx, node, branchidx):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	690 if rbcrevidx < len(self._prefix):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	691 self.make_mutable()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	692 buf = self._rest
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	693 start_offset = rbcrevidx - len(self._prefix)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	694 end_offset = start_offset + _rbcrecsize
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	695
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	696 if len(self._rest) < end_offset:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	697 # 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	698 # 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	699 # 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	700 # 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	701 # 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	702 self._rest.extend(b'\0' * end_offset)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	703 return pack_into(
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	704 _rbcrecfmt,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	705 buf,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	706 start_offset,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	707 node,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	708 branchidx,
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	709 )
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	710
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	711 def extend(self, extension):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	712 return self._rest.extend(extension)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	713
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	714 def slice(self, begin, end):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	715 if begin < len(self._prefix):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	716 acc = bytearray()
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	717 acc[:] = self._prefix[begin:end]
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	718 acc.extend(
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	719 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	720 )
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	721 return acc
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	722 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	723
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	724
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 49026 diff changeset	725 class revbranchcache:
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	726 """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	727 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	728
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	729 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	730 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	731 thus have a unique index.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	732
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	733 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	734 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	735 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	736 modification is detected.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	737 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	738 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	739 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	740 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	741 node hashes.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	742 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	743 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	744 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	745 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	746 """
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	747
24159 5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	748 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	749 assert repo.filtername is None
24374 77fd1fb538cd revbranchcache: store repo on the object Durham Goode <durham@fb.com> parents: 24373 diff changeset	750 self._repo = repo
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	751 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	752 self._rbcrevs = rbcrevs(bytearray())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	753 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	754 try:
33535 755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	755 bndata = repo.cachevfs.read(_rbcnames)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	756 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	757 if bndata:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	758 self._names = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	759 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	760 ]
29423 d2c6f3a948fa branchmap: remove unused exception variable Gregory Szorc <gregory.szorc@gmail.com> parents: 28558 diff changeset	761 except (IOError, OSError):
24159 5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	762 if readonly:
5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	763 # 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	764 self.branchinfo = self._branchinfo
5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	765
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	766 if self._names:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	767 try:
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	768 if repo.ui.configbool(b'format', b'mmap-revbranchcache'):
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	769 with repo.cachevfs(_rbcrevs) as fp:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	770 data = util.buffer(util.mmapread(fp))
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	771 else:
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	772 data = repo.cachevfs.read(_rbcrevs)
02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	773 self._rbcrevs = rbcrevs(data)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25266 diff changeset	774 except (IOError, OSError) as inst:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	775 repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	776 b"couldn't read revision branch cache: %s\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	777 % stringutil.forcebytestr(inst)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	778 )
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	779 # remember number of good records on disk
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	780 self._rbcrevslen = min(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	781 len(self._rbcrevs) // _rbcrecsize, len(repo.changelog)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	782 )
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	783 if self._rbcrevslen == 0:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	784 self._names = []
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	785 self._rbcnamescount = len(self._names) # number of names read at
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	786 # _rbcsnameslen
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	787
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	788 def _clear(self):
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	789 self._rbcsnameslen = 0
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	790 del self._names[:]
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	791 self._rbcnamescount = 0
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	792 self._rbcrevslen = len(self._repo.changelog)
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	793 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	794 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	795
50a64c321c1e branchmap: build the revbranchcache._namesreverse() only when required Pulkit Goyal <pulkit@yandex-team.ru> parents: 40494 diff changeset	796 @util.propertycache
50a64c321c1e branchmap: build the revbranchcache._namesreverse() only when required Pulkit Goyal <pulkit@yandex-team.ru> parents: 40494 diff changeset	797 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	798 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	799
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	800 def branchinfo(self, rev):
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	801 """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	802 persistent cache."""
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	803 changelog = self._repo.changelog
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	804 rbcrevidx = rev * _rbcrecsize
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	805
25266 38117278f295 revbranchcache: return uncached branchinfo for nullrev (issue4683) Yuya Nishihara <yuya@tcha.org> parents: 24728 diff changeset	806 # 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	807 if rev == nullrev:
38117278f295 revbranchcache: return uncached branchinfo for nullrev (issue4683) Yuya Nishihara <yuya@tcha.org> parents: 24728 diff changeset	808 return changelog.branchinfo(rev)
38117278f295 revbranchcache: return uncached branchinfo for nullrev (issue4683) Yuya Nishihara <yuya@tcha.org> parents: 24728 diff changeset	809
29604 db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29423 diff changeset	810 # 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	811 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	812 return self._branchinfo(rev)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	813
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	814 # 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	815 reponode = changelog.node(rev)[:_rbcnodelen]
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	816 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	817 close = bool(branchidx & _rbccloseflag)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	818 if close:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	819 branchidx &= _rbcbranchidxmask
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	820 if cachenode == b'\0\0\0\0':
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	821 pass
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	822 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	823 try:
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	824 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	825 except IndexError:
a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	826 # recover from invalid reference to unknown branch
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	827 self._repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	828 b"referenced branch names not found"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	829 b" - rebuilding revision branch cache from scratch\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	830 )
29615 a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	831 self._clear()
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	832 else:
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	833 # 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	834 self._repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	835 b"history modification detected - truncating "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	836 b"revision branch cache to revision %d\n" % rev
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	837 )
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	838 truncate = rbcrevidx + _rbcrecsize
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	839 self._rbcrevs.truncate(truncate)
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	840 self._rbcrevslen = min(self._rbcrevslen, truncate)
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	841
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	842 # 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	843 return self._branchinfo(rev)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	844
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	845 def _branchinfo(self, rev):
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	846 """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	847 changelog = self._repo.changelog
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	848 b, close = changelog.branchinfo(rev)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	849 if b in self._namesreverse:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	850 branchidx = self._namesreverse[b]
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	851 else:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	852 branchidx = len(self._names)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	853 self._names.append(b)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	854 self._namesreverse[b] = branchidx
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	855 reponode = changelog.node(rev)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	856 if close:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	857 branchidx \|= _rbccloseflag
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	858 self._setcachedata(rev, reponode, branchidx)
24375 fe255b2525d5 revbranchcache: move entry writing to a separate function Durham Goode <durham@fb.com> parents: 24374 diff changeset	859 return b, close
fe255b2525d5 revbranchcache: move entry writing to a separate function Durham Goode <durham@fb.com> parents: 24374 diff changeset	860
46444 3e91d9978bec branchmap: update rev-branch-cache incrementally Joerg Sonnenberger <joerg@bec.de> parents: 46434 diff changeset	861 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	862 """add new data information to the cache"""
46444 3e91d9978bec branchmap: update rev-branch-cache incrementally Joerg Sonnenberger <joerg@bec.de> parents: 46434 diff changeset	863 branch, close = changelogrevision.branchinfo
3e91d9978bec branchmap: update rev-branch-cache incrementally Joerg Sonnenberger <joerg@bec.de> parents: 46434 diff changeset	864
36968 95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	865 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	866 branchidx = self._namesreverse[branch]
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	867 else:
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	868 branchidx = len(self._names)
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	869 self._names.append(branch)
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	870 self._namesreverse[branch] = branchidx
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	871 if close:
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	872 branchidx \|= _rbccloseflag
46444 3e91d9978bec branchmap: update rev-branch-cache incrementally Joerg Sonnenberger <joerg@bec.de> parents: 46434 diff changeset	873 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	874 # 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	875 # 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	876 #
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	877 # self.branchinfo = self._branchinfo
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	878 #
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	879 # 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	880 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	881 del self.branchinfo
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36504 diff changeset	882
40494 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	883 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	884 """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	885 if rev == nullrev:
a5bad127128d branchmap: handle nullrev in setcachedata Durham Goode <durham@fb.com> parents: 31390 diff changeset	886 return
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	887 rbcrevidx = rev * _rbcrecsize
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	888 self._rbcrevs.pack_into(rbcrevidx, node, branchidx)
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	889 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	890
24377 656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	891 tr = self._repo.currenttransaction()
656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	892 if tr:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	893 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	894
656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	895 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	896 """Save branch cache if it is dirty."""
24374 77fd1fb538cd revbranchcache: store repo on the object Durham Goode <durham@fb.com> parents: 24373 diff changeset	897 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	898 wlock = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	899 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	900 try:
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	901 # 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	902 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	903 wlock = repo.wlock(wait=False)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	904 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	905 self._writenames(repo)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	906
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	907 # 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	908 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	909 if start != len(self._rbcrevs):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	910 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	911 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	912 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	913 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	914
29757 3b184adfb5be branchmap: simplify error handlind when writing rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29756 diff changeset	915 except (IOError, OSError, error.Abort, error.LockError) as inst:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	916 repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	917 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	918 % (step, stringutil.forcebytestr(inst))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	919 )
29756 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29755 diff changeset	920 finally:
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29755 diff changeset	921 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	922 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	923
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	924 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	925 """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	926 if self._rbcnamescount != 0:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	927 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	928 if f.tell() == self._rbcsnameslen:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	929 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	930 else:
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	931 f.close()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	932 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	933 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	934 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	935 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	936 # 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	937 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	938 f = repo.cachevfs.open(_rbcnames, b'wb')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	939 f.write(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	940 b'\0'.join(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	941 encoding.fromlocal(b)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	942 for b in self._names[self._rbcnamescount :]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	943 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42603 diff changeset	944 )
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	945 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	946 f.close()
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	947 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	948
09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	949 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	950 """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	951 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	952 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	953 if f.tell() != start:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	954 repo.ui.debug(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	955 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	956 )
42222 09fd338522fa revbranchcache: factor logic to write names and revs in separate functions Pulkit Goyal <pulkit@yandex-team.ru> parents: 42138 diff changeset	957 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	958 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	959 start = 0
ececa45c80d8 revbranchcache: use context manager in _writerevs() to write to file Pulkit Goyal <pulkit@yandex-team.ru> parents: 42222 diff changeset	960 f.seek(start)
ececa45c80d8 revbranchcache: use context manager in _writerevs() to write to file Pulkit Goyal <pulkit@yandex-team.ru> parents: 42222 diff changeset	961 f.truncate()
ececa45c80d8 revbranchcache: use context manager in _writerevs() to write to file Pulkit Goyal <pulkit@yandex-team.ru> parents: 42222 diff changeset	962 end = revs * _rbcrecsize
51377 02e7d79edf62 branchmap: use mmap for faster revbranchcache loading Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51307 diff changeset	963 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	964 self._rbcrevslen = revs

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/branchmap.py @ 51516:fd30c4301929