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

annotate mercurial/branchmap.py @ 51514:7f7086a42b2b

branchcache: have an explicit method to update the on disk cache Explicit is better and will give use more flexibility for future evolution of the storage.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Fri, 19 Jan 2024 11:30:10 +0100
parents	02e7d79edf62
children	3aba79ce52a9

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

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/branchmap.py @ 51514:7f7086a42b2b