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

annotate mercurial/branchmap.py @ 18168:c351759ab0a0

branchmap: takes filtered revision in account for cache calculation Tracking tipnode and tiprev is not enough to ensure validaty of the cache as they do not help distinguish a cache that ignored various revisions below tiprev. To detect such difference, we build a hash of all ignored revisions. This hash is then used when checking the validity of a cache for a repo.

author	Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date	Mon, 31 Dec 2012 18:11:18 -0600
parents	59ac9a551bf4
children	8d48af68e2ae

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
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	8 from node import bin, hex, nullid, nullrev
18117 526e7ec5c96e branchmap: extract write logic from localrepo Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18116 diff changeset	9 import encoding
18168 c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	10 import util
18117 526e7ec5c96e branchmap: extract write logic from localrepo Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18116 diff changeset	11
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	12 def read(repo):
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	13 try:
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	14 f = repo.opener("cache/branchheads")
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	15 lines = f.read().split('\n')
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	16 f.close()
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	17 except (IOError, OSError):
18126 090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	18 return branchcache()
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	19
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	20 try:
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	21 last, lrev = lines.pop(0).split(" ", 1)
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	22 last, lrev = bin(last), int(lrev)
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	23 partial = branchcache(tipnode=last, tiprev=lrev)
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	24 if not partial.validfor(repo):
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	25 # invalidate the cache
18166 3a2e810dd3d8 branchmap: improve invalid cache message when reading Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18132 diff changeset	26 raise ValueError('tip differs')
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	27 for l in lines:
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	28 if not l:
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	29 continue
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	30 node, label = l.split(" ", 1)
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	31 label = encoding.tolocal(label.strip())
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	32 if not node in repo:
18166 3a2e810dd3d8 branchmap: improve invalid cache message when reading Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18132 diff changeset	33 raise ValueError('node %s does not exist' % node)
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	34 partial.setdefault(label, []).append(bin(node))
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	35 except KeyboardInterrupt:
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	36 raise
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	37 except Exception, inst:
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	38 if repo.ui.debugflag:
18166 3a2e810dd3d8 branchmap: improve invalid cache message when reading Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18132 diff changeset	39 repo.ui.warn(('invalid branchheads cache: %s\n') % inst)
18126 090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	40 partial = branchcache()
090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	41 return partial
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	42
18130 1b05ffce47bd branchmap: make update responsible to update the cache key Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18129 diff changeset	43
18120 88990d3e3d75 branchmap: extract _updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18118 diff changeset	44
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	45 def updatecache(repo):
f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	46 repo = repo.unfiltered() # Until we get a smarter cache management
f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	47 cl = repo.changelog
18125 ad194a8ab5c1 branchmap: add the tipnode (cache key) on the branchcache object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18124 diff changeset	48 partial = repo._branchcache
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	49
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	50 if partial is None or not partial.validfor(repo):
18126 090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	51 partial = read(repo)
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	52
f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	53 catip = repo._cacheabletip()
18126 090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	54 # if partial.tiprev == catip: cache is already up to date
090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	55 # if partial.tiprev > catip: we have uncachable element in `partial` can't
090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	56 # write on disk
090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	57 if partial.tiprev < catip:
090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	58 ctxgen = (repo[r] for r in cl.revs(partial.tiprev + 1, catip))
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	59 partial.update(repo, ctxgen)
18128 f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	60 partial.write(repo)
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	61 # If cacheable tip were lower than actual tip, we need to update the
f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	62 # cache up to tip. This update (from cacheable to actual tip) is not
f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	63 # written to disk since it's not cacheable.
18167 59ac9a551bf4 branchmap: improve computation of target tip Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	64 tiprev = cl.rev(cl.tip())
18126 090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	65 if partial.tiprev < tiprev:
090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	66 ctxgen = (repo[r] for r in cl.revs(partial.tiprev + 1, tiprev))
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	67 partial.update(repo, ctxgen)
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	68 repo._branchcache = partial
18124 79db6d40bced branchmap: store branchcache in a dedicated object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18121 diff changeset	69
79db6d40bced branchmap: store branchcache in a dedicated object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18121 diff changeset	70 class branchcache(dict):
79db6d40bced branchmap: store branchcache in a dedicated object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18121 diff changeset	71 """A dict like object that hold branches heads cache"""
79db6d40bced branchmap: store branchcache in a dedicated object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18121 diff changeset	72
18168 c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	73 def __init__(self, entries=(), tipnode=nullid, tiprev=nullrev,
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	74 filteredhash=None):
18125 ad194a8ab5c1 branchmap: add the tipnode (cache key) on the branchcache object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18124 diff changeset	75 super(branchcache, self).__init__(entries)
ad194a8ab5c1 branchmap: add the tipnode (cache key) on the branchcache object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18124 diff changeset	76 self.tipnode = tipnode
18126 090ada0acddb branchmap: add the tiprev (cache key) on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18125 diff changeset	77 self.tiprev = tiprev
18168 c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	78 self.filteredhash = filteredhash
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	79
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	80 def _hashfiltered(self, repo):
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	81 """build hash of revision filtered in the current cache
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	82
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	83 Tracking tipnode and tiprev is not enough to ensure validaty of the
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	84 cache as they do not help to distinct cache that ignored various
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	85 revision bellow tiprev.
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	86
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	87 To detect such difference, we build a cache of all ignored revisions.
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	88 """
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	89 cl = repo.changelog
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	90 if not cl.filteredrevs:
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	91 return None
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	92 key = None
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	93 revs = sorted(r for r in cl.filteredrevs if r <= self.tiprev)
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	94 if revs:
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	95 s = util.sha1()
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	96 for rev in revs:
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	97 s.update('%s;' % rev)
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	98 key = s.digest()
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	99 return key
18128 f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	100
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	101 def validfor(self, repo):
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	102 """Is the cache content valide regarding a repo
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	103
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	104 - False when cached tipnode are unknown or if we detect a strip.
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	105 - 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	106 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	107 return ((self.tipnode == repo.changelog.node(self.tiprev))
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	108 and (self.filteredhash == self._hashfiltered(repo)))
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	109 except IndexError:
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	110 return False
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	111
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	112
18128 f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	113 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	114 try:
f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	115 f = repo.opener("cache/branchheads", "w", atomictemp=True)
f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	116 f.write("%s %s\n" % (hex(self.tipnode), self.tiprev))
f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	117 for label, nodes in self.iteritems():
f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	118 for node in nodes:
f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	119 f.write("%s %s\n" % (hex(node), encoding.fromlocal(label)))
f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	120 f.close()
f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	121 except (IOError, OSError):
f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	122 pass
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	123
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	124 def update(self, repo, ctxgen):
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	125 """Given a branchhead cache, self, that may have extra nodes or be
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	126 missing heads, and a generator of nodes that are at least a superset of
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	127 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	128 """
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	129 cl = repo.changelog
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	130 # collect new branch entries
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	131 newbranches = {}
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	132 for c in ctxgen:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	133 newbranches.setdefault(c.branch(), []).append(c.node())
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	134 # 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	135 # 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	136 # 1 (branch a) -> 2 (branch b) -> 3 (branch a)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	137 for branch, newnodes in newbranches.iteritems():
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	138 bheads = self.setdefault(branch, [])
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	139 # Remove candidate heads that no longer are in the repo (e.g., as
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	140 # the result of a strip that just happened). Avoid using 'node in
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	141 # self' here because that dives down into branchcache code somewhat
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	142 # recursively.
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	143 bheadrevs = [cl.rev(node) for node in bheads
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	144 if cl.hasnode(node)]
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	145 newheadrevs = [cl.rev(node) for node in newnodes
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	146 if cl.hasnode(node)]
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	147 ctxisnew = bheadrevs and min(newheadrevs) > max(bheadrevs)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	148 # Remove duplicates - nodes that are in newheadrevs and are already
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	149 # in bheadrevs. This can happen if you strip a node whose parent
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	150 # was already a head (because they're on different branches).
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	151 bheadrevs = sorted(set(bheadrevs).union(newheadrevs))
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	152
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	153 # Starting from tip means fewer passes over reachable. If we know
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	154 # the new candidates are not ancestors of existing heads, we don't
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	155 # have to examine ancestors of existing heads
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	156 if ctxisnew:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	157 iterrevs = sorted(newheadrevs)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	158 else:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	159 iterrevs = list(bheadrevs)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	160
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	161 # This loop prunes out two kinds of heads - heads that are
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	162 # superseded by a head in newheadrevs, and newheadrevs that are not
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	163 # heads because an existing head is their descendant.
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	164 while iterrevs:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	165 latest = iterrevs.pop()
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	166 if latest not in bheadrevs:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	167 continue
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	168 ancestors = set(cl.ancestors([latest],
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	169 bheadrevs[0]))
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	170 if ancestors:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	171 bheadrevs = [b for b in bheadrevs if b not in ancestors]
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	172 self[branch] = [cl.node(rev) for rev in bheadrevs]
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	173 tiprev = max(bheadrevs)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	174 if tiprev > self.tiprev:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	175 self.tipnode = cl.node(tiprev)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	176 self.tiprev = tiprev
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	177
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	178 # There may be branches that cease to exist when the last commit in the
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	179 # branch was stripped. This code filters them out. Note that the
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	180 # branch that ceased to exist may not be in newbranches because
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	181 # newbranches is the set of candidate heads, which when you strip the
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	182 # last commit in a branch will be the parent branch.
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	183 droppednodes = []
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	184 for branch in self.keys():
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	185 nodes = [head for head in self[branch]
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	186 if cl.hasnode(head)]
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	187 if not nodes:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	188 droppednodes.extend(nodes)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	189 del self[branch]
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	190 if ((not self.validfor(repo)) or (self.tipnode in droppednodes)):
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	191
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	192 # 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	193 self.tipnode = nullid
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	194 self.tiprev = nullrev
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	195 for heads in self.values():
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	196 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	197 if tiprev > self.tiprev:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	198 self.tipnode = cl.node(tiprev)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	199 self.tiprev = tiprev
18168 c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	200 self.filteredhash = self._hashfiltered(repo)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/branchmap.py @ 18168:c351759ab0a0