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

annotate mercurial/branchmap.py @ 42126:ef0e3cc684b3

repoview: introduce a filter for serving hidden changesets There are multiple usecase for being able to explicitly view or pull obsolete from a server. We need to be able to do so without exposing the secret changesets. We introduces a dedicated repository "view" to do so. Way to expose this "view" to the user will come later. To keep a behavior consistent with expected client/server behavior, the general idea is for the obsolete access to be explicitly requested by the code generating the request. In addition, the will be server side configuration to restrict the access to this feature.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Mon, 21 May 2018 17:28:35 +0200
parents	be5eeaf5c24a
children	b26455ffa7fa

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 #
bcee63733aad branchmap: create a mercurial.branchmap module Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
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 from __future__ import absolute_import
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	9
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	10 import struct
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	11
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	12 from .node import (
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	13 bin,
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	14 hex,
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	15 nullid,
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	16 nullrev,
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	17 )
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	18 from . import (
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	19 encoding,
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26460 diff changeset	20 error,
35831 a011e4140435 branchmap: make error messages consistent between Python 2 and 3 Augie Fackler <augie@google.com> parents: 35495 diff changeset	21 pycompat,
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	22 scmutil,
30975 22fbca1d11ed mercurial: switch to util.timer for all interval timings Simon Farnsworth <simonfar@fb.com> parents: 29746 diff changeset	23 util,
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	24 )
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36962 diff changeset	25 from .utils import (
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36962 diff changeset	26 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36962 diff changeset	27 )
25918 47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	28
47f36e050c2e branchmap: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	29 calcsize = struct.calcsize
31370 906be86990c4 rbc: use struct unpack_from and pack_into instead of unpack and pack Mads Kiilerich <madski@unity3d.com> parents: 31360 diff changeset	30 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: 31360 diff changeset	31 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	32
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	33
20032 175c6fd8cacc subsettable: move from repoview to branchmap, the only place it's used Augie Fackler <raf@durin42.com> parents: 19839 diff changeset	34 ### Nearest subset relation
175c6fd8cacc subsettable: move from repoview to branchmap, the only place it's used Augie Fackler <raf@durin42.com> parents: 19839 diff changeset	35 # Nearest subset of filter X is a filter Y so that:
175c6fd8cacc subsettable: move from repoview to branchmap, the only place it's used Augie Fackler <raf@durin42.com> parents: 19839 diff changeset	36 # * Y is included in X,
175c6fd8cacc subsettable: move from repoview to branchmap, the only place it's used Augie Fackler <raf@durin42.com> parents: 19839 diff changeset	37 # * X - Y is as small as possible.
175c6fd8cacc subsettable: move from repoview to branchmap, the only place it's used Augie Fackler <raf@durin42.com> parents: 19839 diff changeset	38 # This create and ordering used for branchmap purpose.
175c6fd8cacc subsettable: move from repoview to branchmap, the only place it's used Augie Fackler <raf@durin42.com> parents: 19839 diff changeset	39 # the ordering may be partial
175c6fd8cacc subsettable: move from repoview to branchmap, the only place it's used Augie Fackler <raf@durin42.com> parents: 19839 diff changeset	40 subsettable = {None: 'visible',
35495 07fdac1d5c66 repoview: add a new filtername for accessing hidden commits Pulkit Goyal <7895pulkit@gmail.com> parents: 34370 diff changeset	41 'visible-hidden': 'visible',
20032 175c6fd8cacc subsettable: move from repoview to branchmap, the only place it's used Augie Fackler <raf@durin42.com> parents: 19839 diff changeset	42 'visible': 'served',
42126 ef0e3cc684b3 repoview: introduce a filter for serving hidden changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42123 diff changeset	43 'served.hidden': 'served',
20032 175c6fd8cacc subsettable: move from repoview to branchmap, the only place it's used Augie Fackler <raf@durin42.com> parents: 19839 diff changeset	44 'served': 'immutable',
175c6fd8cacc subsettable: move from repoview to branchmap, the only place it's used Augie Fackler <raf@durin42.com> parents: 19839 diff changeset	45 'immutable': 'base'}
175c6fd8cacc subsettable: move from repoview to branchmap, the only place it's used Augie Fackler <raf@durin42.com> parents: 19839 diff changeset	46
41615 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	47
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	48 class BranchMapCache(object):
41718 a87ca1d7e61d branchmap: improve doc about BranchMapCache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41678 diff changeset	49 """mapping of filtered views of repo with their branchcache"""
41615 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	50 def __init__(self):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	51 self._per_filter = {}
41567 c795c462b1d6 branchmap: add some clarifications and clean up flow Martijn Pieters <mj@octobus.net> parents: 41566 diff changeset	52
41615 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	53 def __getitem__(self, repo):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	54 self.updatecache(repo)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	55 return self._per_filter[repo.filtername]
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	56
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	57 def updatecache(self, repo):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	58 """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: 41567 diff changeset	59 # 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: 41567 diff changeset	60 # 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: 41567 diff changeset	61 # is stale.
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	62
41615 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	63 cl = repo.changelog
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	64 filtername = repo.filtername
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	65 bcache = self._per_filter.get(filtername)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	66 if bcache is None or not bcache.validfor(repo):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	67 # 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: 41567 diff changeset	68 bcache = branchcache.fromfile(repo)
41567 c795c462b1d6 branchmap: add some clarifications and clean up flow Martijn Pieters <mj@octobus.net> parents: 41566 diff changeset	69
41615 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	70 revs = []
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	71 if bcache is None:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	72 # 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: 41567 diff changeset	73 # 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: 41567 diff changeset	74 # revisions.
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	75 subsetname = subsettable.get(filtername)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	76 if subsetname is not None:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	77 subset = repo.filtered(subsetname)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	78 bcache = self[subset].copy()
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	79 extrarevs = subset.changelog.filteredrevs - cl.filteredrevs
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	80 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: 41567 diff changeset	81 else:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	82 # nothing to fall back on, start empty.
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	83 bcache = branchcache()
24373 59cc09240afb revbranchcache: move out of branchmap onto localrepo Durham Goode <durham@fb.com> parents: 24163 diff changeset	84
41615 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	85 revs.extend(cl.revs(start=bcache.tiprev + 1))
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	86 if revs:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	87 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	88
41615 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	89 assert bcache.validfor(repo), filtername
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	90 self._per_filter[repo.filtername] = bcache
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	91
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	92 def replace(self, repo, remotebranchmap):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	93 """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: 41567 diff changeset	94
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	95 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: 41567 diff changeset	96 remote.
26460 79ef867538ea branchmap: move branch cache code out of streamclone.py Gregory Szorc <gregory.szorc@gmail.com> parents: 25918 diff changeset	97
41615 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	98 """
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	99 cl = repo.changelog
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	100 clrev = cl.rev
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	101 clbranchinfo = cl.branchinfo
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	102 rbheads = []
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	103 closed = []
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	104 for bheads in remotebranchmap.itervalues():
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	105 rbheads += bheads
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	106 for h in bheads:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	107 r = clrev(h)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	108 b, c = clbranchinfo(r)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	109 if c:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	110 closed.append(h)
26460 79ef867538ea branchmap: move branch cache code out of streamclone.py Gregory Szorc <gregory.szorc@gmail.com> parents: 25918 diff changeset	111
41615 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	112 if rbheads:
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	113 rtiprev = max((int(clrev(node)) for node in rbheads))
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	114 cache = branchcache(
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	115 remotebranchmap, repo[rtiprev].node(), rtiprev,
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	116 closednodes=closed)
26460 79ef867538ea branchmap: move branch cache code out of streamclone.py Gregory Szorc <gregory.szorc@gmail.com> parents: 25918 diff changeset	117
41615 328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	118 # Try to stick it as low as possible
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	119 # filter above served are unlikely to be fetch from a clone
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	120 for candidate in ('base', 'immutable', 'served'):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	121 rview = repo.filtered(candidate)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	122 if cache.validfor(rview):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	123 self._per_filter[candidate] = cache
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	124 cache.write(rview)
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	125 return
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	126
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	127 def clear(self):
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	128 self._per_filter.clear()
328ca3b9e545 branchmap: encapsulate cache updating in the map itself Martijn Pieters <mj@octobus.net> parents: 41567 diff changeset	129
42120 2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	130 def _unknownnode(node):
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	131 """ raises ValueError when branchcache found a node which does not exists
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	132 """
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	133 raise ValueError(r'node %s does not exist' % pycompat.sysstr(hex(node)))
26460 79ef867538ea branchmap: move branch cache code out of streamclone.py Gregory Szorc <gregory.szorc@gmail.com> parents: 25918 diff changeset	134
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41839 diff changeset	135 class branchcache(object):
20181 b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	136 """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	137
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	138 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	139 branch heads of a repo.
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	140
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	141 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	142
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	143 <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	144 <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	145 <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	146 ...
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	147
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	148 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	149 branch cache is for a filtered repo view, an optional third hash is
b9515fb9e72a branchmap: add documentation on the branchcache on-disk format Brodie Rao <brodie@sf.io> parents: 20032 diff changeset	150 included that hashes the hashes of all filtered revisions.
20185 7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	151
7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	152 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	153 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	154 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	155 """
41677 bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41615 diff changeset	156
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41615 diff changeset	157 def __init__(self, entries=(), tipnode=nullid, tiprev=nullrev,
42007 b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	158 filteredhash=None, closednodes=None, hasnode=None):
b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	159 """ hasnode is a function which can be used to verify whether changelog
b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	160 has a given node or not. If it's not provided, we assume that every node
b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	161 we have exists in changelog """
41677 bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41615 diff changeset	162 self.tipnode = tipnode
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41615 diff changeset	163 self.tiprev = tiprev
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41615 diff changeset	164 self.filteredhash = filteredhash
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41615 diff changeset	165 # 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: 41615 diff changeset	166 # 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: 41615 diff changeset	167 # heads.
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41615 diff changeset	168 if closednodes is None:
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41615 diff changeset	169 self._closednodes = set()
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41615 diff changeset	170 else:
bfc49f1df615 branchmap: move __init__ up in branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 41615 diff changeset	171 self._closednodes = closednodes
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	172 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	173 # 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	174 self._closedverified = False
111de135fc76 branchcache: add attributes to track which nodes are verified Pulkit Goyal <pulkit@yandex-team.ru> parents: 42005 diff changeset	175 # 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	176 self._verifiedbranches = set()
42007 b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	177 self._hasnode = hasnode
b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	178 if self._hasnode is None:
b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	179 self._hasnode = lambda x: True
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41839 diff changeset	180
42120 2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	181 def _verifyclosed(self):
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	182 """ verify the closed nodes we have """
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	183 if self._closedverified:
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	184 return
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	185 for node in self._closednodes:
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	186 if not self._hasnode(node):
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	187 _unknownnode(node)
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	188
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	189 self._closedverified = True
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	190
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	191 def _verifybranch(self, branch):
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	192 """ verify head nodes for the given branch. If branch is None, verify
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	193 for all the branches """
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	194 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	195 return
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	196 for n in self._entries[branch]:
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	197 if not self._hasnode(n):
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	198 _unknownnode(n)
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	199
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	200 self._verifiedbranches.add(branch)
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	201
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	202 def _verifyall(self):
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	203 """ verifies nodes of all the branches """
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	204 for b in self._entries:
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	205 self._verifybranch(b)
2f8147521e59 branchcache: add functions to validate changelog nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42113 diff changeset	206
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41839 diff changeset	207 def __iter__(self):
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	208 return iter(self._entries)
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41839 diff changeset	209
624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41839 diff changeset	210 def __setitem__(self, key, value):
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	211 self._entries[key] = value
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41839 diff changeset	212
624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41839 diff changeset	213 def __getitem__(self, key):
42121 6578654916ae branchcache: lazily validate nodes from the branchmap Pulkit Goyal <pulkit@yandex-team.ru> parents: 42120 diff changeset	214 self._verifybranch(key)
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	215 return self._entries[key]
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41839 diff changeset	216
42113 f0def07fa82f branchmap: implement __contains__() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42112 diff changeset	217 def __contains__(self, key):
42121 6578654916ae branchcache: lazily validate nodes from the branchmap Pulkit Goyal <pulkit@yandex-team.ru> parents: 42120 diff changeset	218 self._verifybranch(key)
42113 f0def07fa82f branchmap: implement __contains__() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42112 diff changeset	219 return key in self._entries
f0def07fa82f branchmap: implement __contains__() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42112 diff changeset	220
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41839 diff changeset	221 def iteritems(self):
42121 6578654916ae branchcache: lazily validate nodes from the branchmap Pulkit Goyal <pulkit@yandex-team.ru> parents: 42120 diff changeset	222 self._verifyall()
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	223 return self._entries.iteritems()
42001 624d6683c705 branchmap: remove the dict interface from the branchcache class (API) Pulkit Goyal <pulkit@yandex-team.ru> parents: 41839 diff changeset	224
42004 0bd730fbcc2b branchcache: introduce hasbranch() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42003 diff changeset	225 def hasbranch(self, label):
0bd730fbcc2b branchcache: introduce hasbranch() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42003 diff changeset	226 """ 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	227 self._verifybranch(label)
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	228 return label in self._entries
42004 0bd730fbcc2b branchcache: introduce hasbranch() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42003 diff changeset	229
41565 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	230 @classmethod
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	231 def fromfile(cls, repo):
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	232 f = None
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	233 try:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	234 f = repo.cachevfs(cls._filename(repo))
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	235 lineiter = iter(f)
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	236 cachekey = next(lineiter).rstrip('\n').split(" ", 2)
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	237 last, lrev = cachekey[:2]
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	238 last, lrev = bin(last), int(lrev)
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	239 filteredhash = None
42007 b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	240 hasnode = repo.changelog.hasnode
41565 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	241 if len(cachekey) > 2:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	242 filteredhash = bin(cachekey[2])
42007 b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	243 bcache = cls(tipnode=last, tiprev=lrev, filteredhash=filteredhash,
b5511845f9d5 branchcache: have a hasnode function to validate nodes Pulkit Goyal <pulkit@yandex-team.ru> parents: 42006 diff changeset	244 hasnode=hasnode)
41565 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	245 if not bcache.validfor(repo):
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	246 # invalidate the cache
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	247 raise ValueError(r'tip differs')
41808 8ad46ac6728e branchmap: prevent reading the file twice through different iterators Pulkit Goyal <pulkit@yandex-team.ru> parents: 41797 diff changeset	248 bcache.load(repo, lineiter)
41565 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	249 except (IOError, OSError):
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	250 return None
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	251
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	252 except Exception as inst:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	253 if repo.ui.debugflag:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	254 msg = 'invalid branchheads cache'
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	255 if repo.filtername is not None:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	256 msg += ' (%s)' % repo.filtername
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	257 msg += ': %s\n'
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	258 repo.ui.debug(msg % pycompat.bytestr(inst))
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	259 bcache = None
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	260
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	261 finally:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	262 if f:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	263 f.close()
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	264
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	265 return bcache
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	266
41808 8ad46ac6728e branchmap: prevent reading the file twice through different iterators Pulkit Goyal <pulkit@yandex-team.ru> parents: 41797 diff changeset	267 def load(self, repo, lineiter):
8ad46ac6728e branchmap: prevent reading the file twice through different iterators Pulkit Goyal <pulkit@yandex-team.ru> parents: 41797 diff changeset	268 """ fully loads the branchcache by reading from the file using the line
8ad46ac6728e branchmap: prevent reading the file twice through different iterators Pulkit Goyal <pulkit@yandex-team.ru> parents: 41797 diff changeset	269 iterator passed"""
41797 68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41759 diff changeset	270 for line in lineiter:
68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41759 diff changeset	271 line = line.rstrip('\n')
68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41759 diff changeset	272 if not line:
68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41759 diff changeset	273 continue
68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41759 diff changeset	274 node, state, label = line.split(" ", 2)
68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41759 diff changeset	275 if state not in 'oc':
68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41759 diff changeset	276 raise ValueError(r'invalid branch state')
68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41759 diff changeset	277 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: 41759 diff changeset	278 node = bin(node)
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	279 self._entries.setdefault(label, []).append(node)
41797 68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41759 diff changeset	280 if state == 'c':
68bbcc70e274 branchcache: move loading of branch names and nodes into it's own function Pulkit Goyal <pulkit@yandex-team.ru> parents: 41759 diff changeset	281 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: 41759 diff changeset	282
41565 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	283 @staticmethod
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	284 def _filename(repo):
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	285 """name of a branchcache file for a given repo or repoview"""
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	286 filename = "branch2"
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	287 if repo.filtername:
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	288 filename = '%s-%s' % (filename, repo.filtername)
bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	289 return filename
18124 79db6d40bced branchmap: store branchcache in a dedicated object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18121 diff changeset	290
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	291 def validfor(self, repo):
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18451 diff changeset	292 """Is the cache content valid regarding a repo
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	293
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18451 diff changeset	294 - False when cached tipnode is unknown or if we detect a strip.
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	295 - True when cache is up to date or a subset of current repo."""
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	296 try:
18168 c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	297 return ((self.tipnode == repo.changelog.node(self.tiprev))
41759 aaad36b88298 cleanup: use () to wrap long lines instead of \ Augie Fackler <augie@google.com> parents: 41718 diff changeset	298 and (self.filteredhash ==
24723 467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24378 diff changeset	299 scmutil.filteredhash(repo, 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	300 except IndexError:
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	301 return False
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	302
20186 f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	303 def _branchtip(self, heads):
20245 4edd179fefb8 help: branch names primarily denote the tipmost unclosed branch head Mads Kiilerich <madski@unity3d.com> parents: 20190 diff changeset	304 '''Return tuple with last open head in heads and false,
4edd179fefb8 help: branch names primarily denote the tipmost unclosed branch head Mads Kiilerich <madski@unity3d.com> parents: 20190 diff changeset	305 otherwise return last closed head and true.'''
20186 f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	306 tip = heads[-1]
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	307 closed = True
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	308 for h in reversed(heads):
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	309 if h not in self._closednodes:
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	310 tip = h
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	311 closed = False
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	312 break
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	313 return tip, closed
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	314
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	315 def branchtip(self, branch):
20245 4edd179fefb8 help: branch names primarily denote the tipmost unclosed branch head Mads Kiilerich <madski@unity3d.com> parents: 20190 diff changeset	316 '''Return the tipmost open head on branch head, otherwise return the
4edd179fefb8 help: branch names primarily denote the tipmost unclosed branch head Mads Kiilerich <madski@unity3d.com> parents: 20190 diff changeset	317 tipmost closed head on branch.
4edd179fefb8 help: branch names primarily denote the tipmost unclosed branch head Mads Kiilerich <madski@unity3d.com> parents: 20190 diff changeset	318 Raise KeyError for unknown branch.'''
20186 f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	319 return self._branchtip(self[branch])[0]
f5b461a4bc55 branchmap: introduce branchtip() method Brodie Rao <brodie@sf.io> parents: 20185 diff changeset	320
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 33663 diff changeset	321 def iteropen(self, nodes):
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 33663 diff changeset	322 return (n for n in nodes if n not in self._closednodes)
abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 33663 diff changeset	323
20188 3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	324 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	325 self._verifybranch(branch)
42112 29c22496dd97 branchmap: prevent using __getitem__() in branchheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42111 diff changeset	326 heads = self._entries[branch]
20188 3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	327 if not closed:
34074 abf91c4f9608 branches: correctly show inactive multiheaded branches the31k <the31k@thethirty.one> parents: 33663 diff changeset	328 heads = list(self.iteropen(heads))
20188 3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	329 return heads
3a3727829607 branchmap: introduce branchheads() method Brodie Rao <brodie@sf.io> parents: 20186 diff changeset	330
20190 d5d25e541637 branchmap: introduce iterbranches() method Brodie Rao <brodie@sf.io> parents: 20188 diff changeset	331 def iterbranches(self):
d5d25e541637 branchmap: introduce iterbranches() method Brodie Rao <brodie@sf.io> parents: 20188 diff changeset	332 for bn, heads in self.iteritems():
d5d25e541637 branchmap: introduce iterbranches() method Brodie Rao <brodie@sf.io> parents: 20188 diff changeset	333 yield (bn, heads) + self._branchtip(heads)
d5d25e541637 branchmap: introduce iterbranches() method Brodie Rao <brodie@sf.io> parents: 20188 diff changeset	334
42002 662ffdde5adf branchcache: rename itervalues() to iterheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42001 diff changeset	335 def iterheads(self):
662ffdde5adf branchcache: rename itervalues() to iterheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42001 diff changeset	336 """ returns all the heads """
42121 6578654916ae branchcache: lazily validate nodes from the branchmap Pulkit Goyal <pulkit@yandex-team.ru> parents: 42120 diff changeset	337 self._verifyall()
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	338 return self._entries.itervalues()
42002 662ffdde5adf branchcache: rename itervalues() to iterheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42001 diff changeset	339
18232 dd0b636b0b65 branchmap: add a copy method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18218 diff changeset	340 def copy(self):
dd0b636b0b65 branchmap: add a copy method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18218 diff changeset	341 """return an deep copy of the branchcache object"""
42121 6578654916ae branchcache: lazily validate nodes from the branchmap Pulkit Goyal <pulkit@yandex-team.ru> parents: 42120 diff changeset	342 self._verifyall()
42111 f0fa0fc4900a branchmap: dynamically resolve type of branchcache class Pulkit Goyal <pulkit@yandex-team.ru> parents: 42007 diff changeset	343 return type(self)(
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	344 self._entries, self.tipnode, self.tiprev, self.filteredhash,
41566 eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41565 diff changeset	345 self._closednodes)
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	346
18128 f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	347 def write(self, repo):
f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	348 try:
41565 bf7fb97aecf1 branchmap: make branchcache responsible for reading Martijn Pieters <mj@octobus.net> parents: 41396 diff changeset	349 f = repo.cachevfs(self._filename(repo), "w", atomictemp=True)
31348 fc06c5260639 branchmap: stringify int in a portable way Augie Fackler <augie@google.com> parents: 31347 diff changeset	350 cachekey = [hex(self.tipnode), '%d' % self.tiprev]
18184 8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	351 if self.filteredhash is not None:
8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	352 cachekey.append(hex(self.filteredhash))
8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	353 f.write(" ".join(cachekey) + '\n')
21031 05cfcecb3aef branchmap: log events related to branch cache Gregory Szorc <gregory.szorc@gmail.com> parents: 20264 diff changeset	354 nodecount = 0
18357 a4ab37ca887b localrepo: store branchheads sorted Mads Kiilerich <mads@kiilerich.com> parents: 18307 diff changeset	355 for label, nodes in sorted(self.iteritems()):
41678 9d0d8793e847 branchmap: decode a label only once Pulkit Goyal <pulkit@yandex-team.ru> parents: 41677 diff changeset	356 label = encoding.fromlocal(label)
18128 f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	357 for node in nodes:
21031 05cfcecb3aef branchmap: log events related to branch cache Gregory Szorc <gregory.szorc@gmail.com> parents: 20264 diff changeset	358 nodecount += 1
20185 7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	359 if node in self._closednodes:
7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	360 state = 'c'
7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	361 else:
7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	362 state = 'o'
41678 9d0d8793e847 branchmap: decode a label only once Pulkit Goyal <pulkit@yandex-team.ru> parents: 41677 diff changeset	363 f.write("%s %s %s\n" % (hex(node), state, label))
18128 f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	364 f.close()
21031 05cfcecb3aef branchmap: log events related to branch cache Gregory Szorc <gregory.szorc@gmail.com> parents: 20264 diff changeset	365 repo.ui.log('branchcache',
05cfcecb3aef branchmap: log events related to branch cache Gregory Szorc <gregory.szorc@gmail.com> parents: 20264 diff changeset	366 'wrote %s branch cache with %d labels and %d nodes\n',
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	367 repo.filtername, len(self._entries), nodecount)
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26460 diff changeset	368 except (IOError, OSError, error.Abort) as inst:
34370 d0db41af73c0 branchmap: remove superfluous pass statements Augie Fackler <augie@google.com> parents: 34074 diff changeset	369 # Abort may be raised by read only opener, so log and continue
36396 743b293c3ca0 py3: use util.forcebytestr to convert error messages to bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 36201 diff changeset	370 repo.ui.debug("couldn't write branch cache: %s\n" %
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36962 diff changeset	371 stringutil.forcebytestr(inst))
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	372
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	373 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	374 """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	375 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	376 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	377 """
30975 22fbca1d11ed mercurial: switch to util.timer for all interval timings Simon Farnsworth <simonfar@fb.com> parents: 29746 diff changeset	378 starttime = util.timer()
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	379 cl = repo.changelog
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	380 # collect new branch entries
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	381 newbranches = {}
24373 59cc09240afb revbranchcache: move out of branchmap onto localrepo Durham Goode <durham@fb.com> parents: 24163 diff changeset	382 getbranchinfo = repo.revbranchcache().branchinfo
18307 0eed2546118a branchmap: Save changectx creation during update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18305 diff changeset	383 for r in revgen:
40425 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	384 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	385 newbranches.setdefault(branch, []).append(r)
20185 7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 20181 diff changeset	386 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	387 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	388
9c3c3dc14a65 branchmap: pre-filter topological heads before ancestors based filtering Pierre-Yves David <pierre-yves.david@fb.com> parents: 22356 diff changeset	389 # fetch current topological heads to speed up filtering
9c3c3dc14a65 branchmap: pre-filter topological heads before ancestors based filtering Pierre-Yves David <pierre-yves.david@fb.com> parents: 22356 diff changeset	390 topoheads = set(cl.headrevs())
9c3c3dc14a65 branchmap: pre-filter topological heads before ancestors based filtering Pierre-Yves David <pierre-yves.david@fb.com> parents: 22356 diff changeset	391
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	392 # if older branchheads are reachable from new ones, they aren't
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	393 # really branchheads. Note checking parents is insufficient:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	394 # 1 (branch a) -> 2 (branch b) -> 3 (branch a)
20262 cf450ee3f8f7 branchmap: stop useless rev -> node -> rev round trip Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20261 diff changeset	395 for branch, newheadrevs in newbranches.iteritems():
42005 b137a6793c51 branchcache: make entries a private attribute Pulkit Goyal <pulkit@yandex-team.ru> parents: 42004 diff changeset	396 bheads = self._entries.setdefault(branch, [])
20264 d9e1c167943b branchmap: use set for update code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20263 diff changeset	397 bheadset = set(cl.rev(node) for node in bheads)
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	398
20263 ea4996754d91 branchmap: simplify update code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20262 diff changeset	399 # This have been tested True on all internal usage of this function.
ea4996754d91 branchmap: simplify update code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20262 diff changeset	400 # run it again in case of doubt
ea4996754d91 branchmap: simplify update code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20262 diff changeset	401 # assert not (set(bheadrevs) & set(newheadrevs))
20264 d9e1c167943b branchmap: use set for update code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20263 diff changeset	402 bheadset.update(newheadrevs)
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	403
22356 3c8fb24334e9 branchmap: issue a single call to `ancestors` for all heads Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	404 # This prunes out two kinds of heads - heads that are superseded by
3c8fb24334e9 branchmap: issue a single call to `ancestors` for all heads Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	405 # a head in newheadrevs, and newheadrevs that are not heads because
3c8fb24334e9 branchmap: issue a single call to `ancestors` for all heads Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	406 # an existing head is their descendant.
22357 9c3c3dc14a65 branchmap: pre-filter topological heads before ancestors based filtering Pierre-Yves David <pierre-yves.david@fb.com> parents: 22356 diff changeset	407 uncertain = bheadset - topoheads
9c3c3dc14a65 branchmap: pre-filter topological heads before ancestors based filtering Pierre-Yves David <pierre-yves.david@fb.com> parents: 22356 diff changeset	408 if uncertain:
9c3c3dc14a65 branchmap: pre-filter topological heads before ancestors based filtering Pierre-Yves David <pierre-yves.david@fb.com> parents: 22356 diff changeset	409 floorrev = min(uncertain)
9c3c3dc14a65 branchmap: pre-filter topological heads before ancestors based filtering Pierre-Yves David <pierre-yves.david@fb.com> parents: 22356 diff changeset	410 ancestors = set(cl.ancestors(newheadrevs, floorrev))
9c3c3dc14a65 branchmap: pre-filter topological heads before ancestors based filtering Pierre-Yves David <pierre-yves.david@fb.com> parents: 22356 diff changeset	411 bheadset -= ancestors
20264 d9e1c167943b branchmap: use set for update code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20263 diff changeset	412 bheadrevs = sorted(bheadset)
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	413 self[branch] = [cl.node(rev) for rev in bheadrevs]
20263 ea4996754d91 branchmap: simplify update code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20262 diff changeset	414 tiprev = bheadrevs[-1]
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	415 if tiprev > self.tiprev:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	416 self.tipnode = cl.node(tiprev)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	417 self.tiprev = tiprev
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	418
19838 23386881abeb branchmap: remove the droppednodes logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19837 diff changeset	419 if not self.validfor(repo):
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	420 # cache key are not valid anymore
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	421 self.tipnode = nullid
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	422 self.tiprev = nullrev
42002 662ffdde5adf branchcache: rename itervalues() to iterheads() Pulkit Goyal <pulkit@yandex-team.ru> parents: 42001 diff changeset	423 for heads in self.iterheads():
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	424 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	425 if tiprev > self.tiprev:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	426 self.tipnode = cl.node(tiprev)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	427 self.tiprev = tiprev
24723 467a33142425 repoview: move function for computing filtered hash Gregory Szorc <gregory.szorc@gmail.com> parents: 24378 diff changeset	428 self.filteredhash = scmutil.filteredhash(repo, self.tiprev)
21031 05cfcecb3aef branchmap: log events related to branch cache Gregory Szorc <gregory.szorc@gmail.com> parents: 20264 diff changeset	429
30975 22fbca1d11ed mercurial: switch to util.timer for all interval timings Simon Farnsworth <simonfar@fb.com> parents: 29746 diff changeset	430 duration = util.timer() - starttime
21031 05cfcecb3aef branchmap: log events related to branch cache Gregory Szorc <gregory.szorc@gmail.com> parents: 20264 diff changeset	431 repo.ui.log('branchcache', 'updated %s branch cache in %.4f seconds\n',
41839 38de3300414f py3: convert filtername to str if it's None Pulkit Goyal <pulkit@yandex-team.ru> parents: 41808 diff changeset	432 repo.filtername or b'None', duration)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	433
41566 eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41565 diff changeset	434 self.write(repo)
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41565 diff changeset	435
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41565 diff changeset	436
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41565 diff changeset	437 class remotebranchcache(branchcache):
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41565 diff changeset	438 """Branchmap info for a remote connection, should not write locally"""
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41565 diff changeset	439 def write(self, repo):
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41565 diff changeset	440 pass
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41565 diff changeset	441
eb7ce452e0fb branchmap: updating triggers a write Martijn Pieters <mj@octobus.net> parents: 41565 diff changeset	442
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	443 # Revision branch info cache
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	444
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	445 _rbcversion = '-v1'
33535 755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	446 _rbcnames = 'rbc-names' + _rbcversion
755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	447 _rbcrevs = 'rbc-revs' + _rbcversion
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	448 # [4 byte hash prefix][4 byte branch name number with sign bit indicating open]
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	449 _rbcrecfmt = '>4sI'
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	450 _rbcrecsize = calcsize(_rbcrecfmt)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	451 _rbcnodelen = 4
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	452 _rbcbranchidxmask = 0x7fffffff
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	453 _rbccloseflag = 0x80000000
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	454
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	455 class revbranchcache(object):
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	456 """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	457 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	458
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	459 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	460 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	461 thus have a unique index.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	462
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	463 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	464 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	465 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	466 modification is detected.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	467 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	468 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	469 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	470 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	471 node hashes.
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	472 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	473 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	474 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	475 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	476 """
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	477
24159 5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	478 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	479 assert repo.filtername is None
24374 77fd1fb538cd revbranchcache: store repo on the object Durham Goode <durham@fb.com> parents: 24373 diff changeset	480 self._repo = repo
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	481 self._names = [] # branch names in local encoding with static index
31346 2a18e9e6ca43 py3: use bytearray() instead of array('c', ...) constructions Augie Fackler <augie@google.com> parents: 30975 diff changeset	482 self._rbcrevs = bytearray()
29615 a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	483 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	484 try:
33535 755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	485 bndata = repo.cachevfs.read(_rbcnames)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	486 self._rbcsnameslen = len(bndata) # for verification before writing
31371 7dd2f51f38ac rbc: empty (and invalid) rbc-names file should give an empty name list Mads Kiilerich <mads@kiilerich.com> parents: 31370 diff changeset	487 if bndata:
7dd2f51f38ac rbc: empty (and invalid) rbc-names file should give an empty name list Mads Kiilerich <mads@kiilerich.com> parents: 31370 diff changeset	488 self._names = [encoding.tolocal(bn)
7dd2f51f38ac rbc: empty (and invalid) rbc-names file should give an empty name list Mads Kiilerich <mads@kiilerich.com> parents: 31370 diff changeset	489 for bn in bndata.split('\0')]
29423 d2c6f3a948fa branchmap: remove unused exception variable Gregory Szorc <gregory.szorc@gmail.com> parents: 28558 diff changeset	490 except (IOError, OSError):
24159 5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	491 if readonly:
5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	492 # 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	493 self.branchinfo = self._branchinfo
5b4ed033390b revisionbranchcache: fall back to slow path if starting readonly (issue4531) Mads Kiilerich <madski@unity3d.com> parents: 23877 diff changeset	494
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	495 if self._names:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	496 try:
33535 755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	497 data = repo.cachevfs.read(_rbcrevs)
31346 2a18e9e6ca43 py3: use bytearray() instead of array('c', ...) constructions Augie Fackler <augie@google.com> parents: 30975 diff changeset	498 self._rbcrevs[:] = data
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25266 diff changeset	499 except (IOError, OSError) as inst:
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	500 repo.ui.debug("couldn't read revision branch cache: %s\n" %
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36962 diff changeset	501 stringutil.forcebytestr(inst))
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	502 # remember number of good records on disk
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	503 self._rbcrevslen = min(len(self._rbcrevs) // _rbcrecsize,
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	504 len(repo.changelog))
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	505 if self._rbcrevslen == 0:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	506 self._names = []
29615 a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	507 self._rbcnamescount = len(self._names) # number of names read at
a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	508 # _rbcsnameslen
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	509
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	510 def _clear(self):
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	511 self._rbcsnameslen = 0
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	512 del self._names[:]
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	513 self._rbcnamescount = 0
bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	514 self._rbcrevslen = len(self._repo.changelog)
31346 2a18e9e6ca43 py3: use bytearray() instead of array('c', ...) constructions Augie Fackler <augie@google.com> parents: 30975 diff changeset	515 self._rbcrevs = bytearray(self._rbcrevslen * _rbcrecsize)
40710 50a64c321c1e branchmap: build the revbranchcache._namesreverse() only when required Pulkit Goyal <pulkit@yandex-team.ru> parents: 40425 diff changeset	516 util.clearcachedproperty(self, '_namesreverse')
50a64c321c1e branchmap: build the revbranchcache._namesreverse() only when required Pulkit Goyal <pulkit@yandex-team.ru> parents: 40425 diff changeset	517
50a64c321c1e branchmap: build the revbranchcache._namesreverse() only when required Pulkit Goyal <pulkit@yandex-team.ru> parents: 40425 diff changeset	518 @util.propertycache
50a64c321c1e branchmap: build the revbranchcache._namesreverse() only when required Pulkit Goyal <pulkit@yandex-team.ru> parents: 40425 diff changeset	519 def _namesreverse(self):
50a64c321c1e branchmap: build the revbranchcache._namesreverse() only when required Pulkit Goyal <pulkit@yandex-team.ru> parents: 40425 diff changeset	520 return dict((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	521
40425 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	522 def branchinfo(self, rev):
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	523 """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	524 persistent cache."""
40425 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	525 changelog = self._repo.changelog
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	526 rbcrevidx = rev * _rbcrecsize
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	527
25266 38117278f295 revbranchcache: return uncached branchinfo for nullrev (issue4683) Yuya Nishihara <yuya@tcha.org> parents: 24728 diff changeset	528 # 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	529 if rev == nullrev:
38117278f295 revbranchcache: return uncached branchinfo for nullrev (issue4683) Yuya Nishihara <yuya@tcha.org> parents: 24728 diff changeset	530 return changelog.branchinfo(rev)
38117278f295 revbranchcache: return uncached branchinfo for nullrev (issue4683) Yuya Nishihara <yuya@tcha.org> parents: 24728 diff changeset	531
29604 db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29423 diff changeset	532 # 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	533 if len(self._rbcrevs) < rbcrevidx + _rbcrecsize:
40425 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	534 return self._branchinfo(rev)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	535
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	536 # 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	537 reponode = changelog.node(rev)[:_rbcnodelen]
33663 1814ca418b30 branchmap: revert c34532365b38 for Python 2.7 compatibility Mike Hommey <mh@glandium.org> parents: 33535 diff changeset	538 cachenode, branchidx = unpack_from(
1814ca418b30 branchmap: revert c34532365b38 for Python 2.7 compatibility Mike Hommey <mh@glandium.org> parents: 33535 diff changeset	539 _rbcrecfmt, util.buffer(self._rbcrevs), rbcrevidx)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	540 close = bool(branchidx & _rbccloseflag)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	541 if close:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	542 branchidx &= _rbcbranchidxmask
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	543 if cachenode == '\0\0\0\0':
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	544 pass
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	545 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	546 try:
28558 bcd106d456c4 cache: rebuild branch cache from scratch when inconsistencies are detected Mads Kiilerich <madski@unity3d.com> parents: 28557 diff changeset	547 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	548 except IndexError:
a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	549 # recover from invalid reference to unknown branch
a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	550 self._repo.ui.debug("referenced branch names not found"
a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	551 " - rebuilding revision branch cache from scratch\n")
a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	552 self._clear()
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	553 else:
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	554 # rev/node map has changed, invalidate the cache from here up
29615 a2a380e2750f rbc: fix superfluous rebuilding from scratch - don't abuse self._rbcnamescount Mads Kiilerich <madski@unity3d.com> parents: 29604 diff changeset	555 self._repo.ui.debug("history modification detected - truncating "
31497 a369482e9649 branchmap: be more careful about using %d on ints Augie Fackler <augie@google.com> parents: 31454 diff changeset	556 "revision branch cache to revision %d\n" % rev)
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	557 truncate = rbcrevidx + _rbcrecsize
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	558 del self._rbcrevs[truncate:]
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	559 self._rbcrevslen = min(self._rbcrevslen, truncate)
203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	560
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	561 # fall back to slow path and make sure it will be written to disk
40425 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	562 return self._branchinfo(rev)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	563
40425 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	564 def _branchinfo(self, rev):
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	565 """Retrieve branch info from changelog and update _rbcrevs"""
40425 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	566 changelog = self._repo.changelog
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	567 b, close = changelog.branchinfo(rev)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	568 if b in self._namesreverse:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	569 branchidx = self._namesreverse[b]
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	570 else:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	571 branchidx = len(self._names)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	572 self._names.append(b)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	573 self._namesreverse[b] = branchidx
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	574 reponode = changelog.node(rev)
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	575 if close:
cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	576 branchidx \|= _rbccloseflag
40425 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	577 self._setcachedata(rev, reponode, branchidx)
24375 fe255b2525d5 revbranchcache: move entry writing to a separate function Durham Goode <durham@fb.com> parents: 24374 diff changeset	578 return b, close
fe255b2525d5 revbranchcache: move entry writing to a separate function Durham Goode <durham@fb.com> parents: 24374 diff changeset	579
36962 95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	580 def setdata(self, branch, rev, node, close):
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	581 """add new data information to the cache"""
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	582 if branch in self._namesreverse:
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	583 branchidx = self._namesreverse[branch]
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	584 else:
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	585 branchidx = len(self._names)
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	586 self._names.append(branch)
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	587 self._namesreverse[branch] = branchidx
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	588 if close:
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	589 branchidx \|= _rbccloseflag
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	590 self._setcachedata(rev, node, branchidx)
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	591 # 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: 36474 diff changeset	592 # the cache was bypassing itself by setting:
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	593 #
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	594 # self.branchinfo = self._branchinfo
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	595 #
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	596 # Since we now have data in the cache, we need to drop this bypassing.
40232 d99a588d8515 py3: pass in system string to vars(branchmap).__contains__() Yuya Nishihara <yuya@tcha.org> parents: 39138 diff changeset	597 if r'branchinfo' in vars(self):
36962 95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	598 del self.branchinfo
95f4f1bfb650 revbranchcache: add a public function to update the data Boris Feld <boris.feld@octobus.net> parents: 36474 diff changeset	599
40425 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	600 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	601 """Writes the node's branch data to the in-memory cache data."""
31454 a5bad127128d branchmap: handle nullrev in setcachedata Durham Goode <durham@fb.com> parents: 31381 diff changeset	602 if rev == nullrev:
a5bad127128d branchmap: handle nullrev in setcachedata Durham Goode <durham@fb.com> parents: 31381 diff changeset	603 return
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	604 rbcrevidx = rev * _rbcrecsize
29604 db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29423 diff changeset	605 if len(self._rbcrevs) < rbcrevidx + _rbcrecsize:
db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29423 diff changeset	606 self._rbcrevs.extend('\0' *
40425 5e5c8f2a1eb5 branchmap: do not specify changelog as an argument Yuya Nishihara <yuya@tcha.org> parents: 40375 diff changeset	607 (len(self._repo.changelog) * _rbcrecsize -
29604 db0095c83344 rbc: fix invalid rbc-revs entries caused by missing cache growth Mads Kiilerich <madski@unity3d.com> parents: 29423 diff changeset	608 len(self._rbcrevs)))
31370 906be86990c4 rbc: use struct unpack_from and pack_into instead of unpack and pack Mads Kiilerich <madski@unity3d.com> parents: 31360 diff changeset	609 pack_into(_rbcrecfmt, self._rbcrevs, rbcrevidx, node, branchidx)
24376 203a078da052 revbranchcache: populate cache incrementally Durham Goode <durham@fb.com> parents: 24375 diff changeset	610 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	611
24377 656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	612 tr = self._repo.currenttransaction()
656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	613 if tr:
656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	614 tr.addfinalize('write-revbranchcache', self.write)
656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	615
656f93ce66d5 revbranchcache: move cache writing to the transaction finalizer Durham Goode <durham@fb.com> parents: 24376 diff changeset	616 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	617 """Save branch cache if it is dirty."""
24374 77fd1fb538cd revbranchcache: store repo on the object Durham Goode <durham@fb.com> parents: 24373 diff changeset	618 repo = self._repo
29744 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29743 diff changeset	619 wlock = None
29745 3b184adfb5be branchmap: simplify error handlind when writing rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29744 diff changeset	620 step = ''
29744 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29743 diff changeset	621 try:
29743 9f3c49ee4486 branchmap: preparatory indent of indent the branch rev writing code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	622 if self._rbcnamescount < len(self._names):
29745 3b184adfb5be branchmap: simplify error handlind when writing rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29744 diff changeset	623 step = ' names'
29744 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29743 diff changeset	624 wlock = repo.wlock(wait=False)
29746 3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	625 if self._rbcnamescount != 0:
33535 755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	626 f = repo.cachevfs.open(_rbcnames, 'ab')
29746 3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	627 if f.tell() == self._rbcsnameslen:
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	628 f.write('\0')
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	629 else:
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	630 f.close()
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	631 repo.ui.debug("%s changed - rewriting it\n" % _rbcnames)
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	632 self._rbcnamescount = 0
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	633 self._rbcrevslen = 0
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	634 if self._rbcnamescount == 0:
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	635 # before rewriting names, make sure references are removed
33535 755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	636 repo.cachevfs.unlinkpath(_rbcrevs, ignoremissing=True)
755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	637 f = repo.cachevfs.open(_rbcnames, 'wb')
29746 3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	638 f.write('\0'.join(encoding.fromlocal(b)
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	639 for b in self._names[self._rbcnamescount:]))
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	640 self._rbcsnameslen = f.tell()
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	641 f.close()
29743 9f3c49ee4486 branchmap: preparatory indent of indent the branch rev writing code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	642 self._rbcnamescount = len(self._names)
23785 cb99bacb9b4e branchcache: introduce revbranchcache for caching of revision branch names Mads Kiilerich <madski@unity3d.com> parents: 22357 diff changeset	643
29743 9f3c49ee4486 branchmap: preparatory indent of indent the branch rev writing code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	644 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	645 if start != len(self._rbcrevs):
29745 3b184adfb5be branchmap: simplify error handlind when writing rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29744 diff changeset	646 step = ''
29744 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29743 diff changeset	647 if wlock is None:
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29743 diff changeset	648 wlock = repo.wlock(wait=False)
29743 9f3c49ee4486 branchmap: preparatory indent of indent the branch rev writing code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	649 revs = min(len(repo.changelog),
9f3c49ee4486 branchmap: preparatory indent of indent the branch rev writing code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	650 len(self._rbcrevs) // _rbcrecsize)
33535 755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	651 f = repo.cachevfs.open(_rbcrevs, 'ab')
29746 3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	652 if f.tell() != start:
33535 755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	653 repo.ui.debug("truncating cache/%s to %d\n"
755e6532e81d cachevfs: migration the revbranchcache to 'cachevfs' Boris Feld <boris.feld@octobus.net> parents: 33534 diff changeset	654 % (_rbcrevs, start))
29746 3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	655 f.seek(start)
28557 4b83507bfc91 cache: safer handling of failing seek when writing revision branch cache Mads Kiilerich <madski@unity3d.com> parents: 28556 diff changeset	656 if f.tell() != start:
29746 3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	657 start = 0
28557 4b83507bfc91 cache: safer handling of failing seek when writing revision branch cache Mads Kiilerich <madski@unity3d.com> parents: 28556 diff changeset	658 f.seek(start)
29746 3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	659 f.truncate()
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	660 end = revs * _rbcrecsize
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	661 f.write(self._rbcrevs[start:end])
3dbc95f3eb31 branchmap: remove extra indent Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29745 diff changeset	662 f.close()
29743 9f3c49ee4486 branchmap: preparatory indent of indent the branch rev writing code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29615 diff changeset	663 self._rbcrevslen = revs
29745 3b184adfb5be branchmap: simplify error handlind when writing rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29744 diff changeset	664 except (IOError, OSError, error.Abort, error.LockError) as inst:
3b184adfb5be branchmap: simplify error handlind when writing rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29744 diff changeset	665 repo.ui.debug("couldn't write revision branch cache%s: %s\n"
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36962 diff changeset	666 % (step, stringutil.forcebytestr(inst)))
29744 0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29743 diff changeset	667 finally:
0d588332ad2c branchmap: acquires lock before writting the rev branch cache Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29743 diff changeset	668 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: 29743 diff changeset	669 wlock.release()

Mercurial > public > mercurial-scm > hg

annotate mercurial/branchmap.py @ 42126:ef0e3cc684b3