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

annotate mercurial/branchmap.py @ 18184:8d48af68e2ae

branchmap: read and write key part related to filtered revision Now that we have a third part for the cache key we need to write and read it on disk. It is only written when there is filtered revision. This keep the format compatible with older version. Notes that, at this state, filtered repository does not use any disk caches yet.

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
date	Tue, 01 Jan 2013 18:19:24 +0100
parents	c351759ab0a0
children	5a047276764e

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:
18184 8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	21 cachekey = lines.pop(0).split(" ", 2)
8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	22 last, lrev = cachekey[:2]
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	23 last, lrev = bin(last), int(lrev)
18184 8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	24 filteredhash = None
8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	25 if len(cachekey) > 2:
8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	26 filteredhash = bin(cachekey[2])
8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	27 partial = branchcache(tipnode=last, tiprev=lrev,
8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	28 filteredhash=filteredhash)
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	29 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	30 # invalidate the cache
18166 3a2e810dd3d8 branchmap: improve invalid cache message when reading Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18132 diff changeset	31 raise ValueError('tip differs')
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	32 for l in lines:
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	33 if not l:
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	34 continue
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	35 node, label = l.split(" ", 1)
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	36 label = encoding.tolocal(label.strip())
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	37 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	38 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	39 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	40 except KeyboardInterrupt:
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	41 raise
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	42 except Exception, inst:
e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	43 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	44 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	45 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	46 return partial
18118 e70ff1e599f4 branchmap: extract read logic from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18117 diff changeset	47
18130 1b05ffce47bd branchmap: make update responsible to update the cache key Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18129 diff changeset	48
18120 88990d3e3d75 branchmap: extract _updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18118 diff changeset	49
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	50 def updatecache(repo):
f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	51 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	52 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	53 partial = repo._branchcache
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	54
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	55 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	56 partial = read(repo)
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	57
f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	58 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	59 # 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	60 # 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	61 # 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	62 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	63 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	64 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	65 partial.write(repo)
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	66 # 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	67 # 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	68 # 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	69 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	70 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	71 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	72 partial.update(repo, ctxgen)
18121 f8a13f061a8a branchmap: extract updatebranchcache from repo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18120 diff changeset	73 repo._branchcache = partial
18124 79db6d40bced branchmap: store branchcache in a dedicated object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18121 diff changeset	74
79db6d40bced branchmap: store branchcache in a dedicated object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18121 diff changeset	75 class branchcache(dict):
79db6d40bced branchmap: store branchcache in a dedicated object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18121 diff changeset	76 """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	77
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 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	79 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	80 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	81 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	82 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	83 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	84
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	85 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	86 """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	87
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	88 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	89 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	90 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	91
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	92 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	93 """
c351759ab0a0 branchmap: takes filtered revision in account for cache calculation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18167 diff changeset	94 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	95 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	96 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	97 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	98 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	99 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	100 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	101 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	102 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	103 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	104 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	105
18132 db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	106 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	107 """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	108
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	109 - 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	110 - 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	111 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	112 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	113 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	114 except IndexError:
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	115 return False
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	116
db25bf1dc828 branchmap: move validity logic in the object itself Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18131 diff changeset	117
18128 f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	118 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	119 try:
f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	120 f = repo.opener("cache/branchheads", "w", atomictemp=True)
18184 8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	121 cachekey = [hex(self.tipnode), str(self.tiprev)]
8d48af68e2ae branchmap: read and write key part related to filtered revision Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18168 diff changeset	122 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	123 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	124 f.write(" ".join(cachekey) + '\n')
18128 f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	125 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	126 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	127 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	128 f.close()
f0d56efaa35a branchmap: make write a method on the branchmap object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18127 diff changeset	129 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	130 pass
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	131
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	132 def update(self, repo, ctxgen):
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	133 """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	134 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	135 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	136 """
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	137 cl = repo.changelog
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	138 # collect new branch entries
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	139 newbranches = {}
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	140 for c in ctxgen:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	141 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	142 # 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	143 # 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	144 # 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	145 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	146 bheads = self.setdefault(branch, [])
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	147 # 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	148 # 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	149 # 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	150 # recursively.
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	151 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	152 if cl.hasnode(node)]
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	153 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	154 if cl.hasnode(node)]
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	155 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	156 # 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	157 # 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	158 # 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	159 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	160
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	161 # 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	162 # 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	163 # 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	164 if ctxisnew:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	165 iterrevs = sorted(newheadrevs)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	166 else:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	167 iterrevs = list(bheadrevs)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	168
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	169 # 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	170 # 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	171 # 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	172 while iterrevs:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	173 latest = iterrevs.pop()
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	174 if latest not in bheadrevs:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	175 continue
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	176 ancestors = set(cl.ancestors([latest],
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	177 bheadrevs[0]))
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	178 if ancestors:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	179 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	180 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	181 tiprev = max(bheadrevs)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	182 if tiprev > self.tiprev:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	183 self.tipnode = cl.node(tiprev)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	184 self.tiprev = tiprev
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	185
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	186 # 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	187 # 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	188 # 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	189 # 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	190 # 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	191 droppednodes = []
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	192 for branch in self.keys():
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	193 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	194 if cl.hasnode(head)]
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	195 if not nodes:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	196 droppednodes.extend(nodes)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	197 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	198 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	199
18131 f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	200 # 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	201 self.tipnode = nullid
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	202 self.tiprev = nullrev
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	203 for heads in self.values():
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	204 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	205 if tiprev > self.tiprev:
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	206 self.tipnode = cl.node(tiprev)
f0eeb9b3444a branchmap: make update a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18130 diff changeset	207 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	208 self.filteredhash = self._hashfiltered(repo)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/branchmap.py @ 18184:8d48af68e2ae