mercurial-scm/hg-stable: hgext/fastannotate/context.py annotate

annotate hgext/fastannotate/context.py @ 42951:0152a907f714

fastannotate: remove support for flock() locking We've seen enough weirdness in CI with flock for remotefilelog that I'm now of the opinion we should just stop using flock() everywhere until someone has a concrete need for the extra performance *and* a way to only use it when safe (even if that's just default-to-off.) Differential Revision: https://phab.mercurial-scm.org/D6861

author	Augie Fackler <augie@google.com>
date	Tue, 17 Sep 2019 14:22:22 -0400
parents	1198c86beb73
children	2372284d9457

rev	line source
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	1 # Copyright 2016-present Facebook. All Rights Reserved.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	2 #
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	3 # context: context needed to annotate a file
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	4 #
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	7
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	8 from __future__ import absolute_import
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	9
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	10 import collections
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	11 import contextlib
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	12 import hashlib
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	13 import os
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	14
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	15 from mercurial.i18n import _
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	16 from mercurial import (
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	17 error,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	18 linelog as linelogmod,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	19 lock as lockmod,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	20 mdiff,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	21 node,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	22 pycompat,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	23 scmutil,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	24 util,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	25 )
39413 2df3271ef139 fastannotate: use stringutil.pprint() to dump diffopts to be hashed Yuya Nishihara <yuya@tcha.org> parents: 39407 diff changeset	26 from mercurial.utils import (
2df3271ef139 fastannotate: use stringutil.pprint() to dump diffopts to be hashed Yuya Nishihara <yuya@tcha.org> parents: 39407 diff changeset	27 stringutil,
2df3271ef139 fastannotate: use stringutil.pprint() to dump diffopts to be hashed Yuya Nishihara <yuya@tcha.org> parents: 39407 diff changeset	28 )
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	29
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	30 from . import (
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	31 error as faerror,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	32 revmap as revmapmod,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	33 )
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	34
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	35 # given path, get filelog, cached
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	36 @util.lrucachefunc
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	37 def _getflog(repo, path):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	38 return repo.file(path)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	39
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	40 # extracted from mercurial.context.basefilectx.annotate
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	41 def _parents(f, follow=True):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	42 # Cut _descendantrev here to mitigate the penalty of lazy linkrev
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	43 # adjustment. Otherwise, p._adjustlinkrev() would walk changelog
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	44 # from the topmost introrev (= srcrev) down to p.linkrev() if it
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	45 # isn't an ancestor of the srcrev.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	46 f._changeid
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	47 pl = f.parents()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	48
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	49 # Don't return renamed parents if we aren't following.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	50 if not follow:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	51 pl = [p for p in pl if p.path() == f.path()]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	52
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	53 # renamed filectx won't have a filelog yet, so set it
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	54 # from the cache to save time
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	55 for p in pl:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	56 if not '_filelog' in p.__dict__:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	57 p._filelog = _getflog(f._repo, p.path())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	58
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	59 return pl
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	60
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	61 # extracted from mercurial.context.basefilectx.annotate. slightly modified
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	62 # so it takes a fctx instead of a pair of text and fctx.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	63 def _decorate(fctx):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	64 text = fctx.data()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	65 linecount = text.count('\n')
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	66 if text and not text.endswith('\n'):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	67 linecount += 1
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	68 return ([(fctx, i) for i in pycompat.xrange(linecount)], text)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	69
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	70 # extracted from mercurial.context.basefilectx.annotate. slightly modified
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	71 # so it takes an extra "blocks" parameter calculated elsewhere, instead of
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	72 # calculating diff here.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	73 def _pair(parent, child, blocks):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	74 for (a1, a2, b1, b2), t in blocks:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	75 # Changed blocks ('!') or blocks made only of blank lines ('~')
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	76 # belong to the child.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	77 if t == '=':
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	78 child[0][b1:b2] = parent[0][a1:a2]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	79 return child
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	80
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	81 # like scmutil.revsingle, but with lru cache, so their states (like manifests)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	82 # could be reused
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	83 _revsingle = util.lrucachefunc(scmutil.revsingle)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	84
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	85 def resolvefctx(repo, rev, path, resolverev=False, adjustctx=None):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	86 """(repo, str, str) -> fctx
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	87
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	88 get the filectx object from repo, rev, path, in an efficient way.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	89
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	90 if resolverev is True, "rev" is a revision specified by the revset
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	91 language, otherwise "rev" is a nodeid, or a revision number that can
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	92 be consumed by repo.__getitem__.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	93
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	94 if adjustctx is not None, the returned fctx will point to a changeset
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	95 that introduces the change (last modified the file). if adjustctx
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	96 is 'linkrev', trust the linkrev and do not adjust it. this is noticeably
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	97 faster for big repos but is incorrect for some cases.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	98 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	99 if resolverev and not isinstance(rev, int) and rev is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	100 ctx = _revsingle(repo, rev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	101 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	102 ctx = repo[rev]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	103
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	104 # If we don't need to adjust the linkrev, create the filectx using the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	105 # changectx instead of using ctx[path]. This means it already has the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	106 # changectx information, so blame -u will be able to look directly at the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	107 # commitctx object instead of having to resolve it by going through the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	108 # manifest. In a lazy-manifest world this can prevent us from downloading a
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	109 # lot of data.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	110 if adjustctx is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	111 # ctx.rev() is None means it's the working copy, which is a special
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	112 # case.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	113 if ctx.rev() is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	114 fctx = ctx[path]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	115 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	116 fctx = repo.filectx(path, changeid=ctx.rev())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	117 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	118 fctx = ctx[path]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	119 if adjustctx == 'linkrev':
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	120 introrev = fctx.linkrev()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	121 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	122 introrev = fctx.introrev()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	123 if introrev != ctx.rev():
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	124 fctx._changeid = introrev
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	125 fctx._changectx = repo[introrev]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	126 return fctx
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	127
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	128 # like mercurial.store.encodedir, but use linelog suffixes: .m, .l, .lock
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	129 def encodedir(path):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	130 return (path
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	131 .replace('.hg/', '.hg.hg/')
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	132 .replace('.l/', '.l.hg/')
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	133 .replace('.m/', '.m.hg/')
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	134 .replace('.lock/', '.lock.hg/'))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	135
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	136 def hashdiffopts(diffopts):
39413 2df3271ef139 fastannotate: use stringutil.pprint() to dump diffopts to be hashed Yuya Nishihara <yuya@tcha.org> parents: 39407 diff changeset	137 diffoptstr = stringutil.pprint(sorted(
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	138 (k, getattr(diffopts, k))
39407 1099d9bbdf9a py3: don't use dict.iterkeys() in hgext/fastannotate/context.py Pulkit Goyal <pulkit@yandex-team.ru> parents: 39238 diff changeset	139 for k in mdiff.diffopts.defaults
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	140 ))
40714 9fcf8084ada8 py3: use node.hex(m.digest()) instead of m.hexdigest() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40710 diff changeset	141 return node.hex(hashlib.sha1(diffoptstr).digest())[:6]
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	142
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	143 _defaultdiffopthash = hashdiffopts(mdiff.defaultopts)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	144
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	145 class annotateopts(object):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	146 """like mercurial.mdiff.diffopts, but is for annotate
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	147
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	148 followrename: follow renames, like "hg annotate -f"
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	149 followmerge: follow p2 of a merge changeset, otherwise p2 is ignored
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	150 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	151
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	152 defaults = {
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	153 'diffopts': None,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	154 'followrename': True,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	155 'followmerge': True,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	156 }
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	157
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	158 def __init__(self, **opts):
40710 d6a13f6db69c py3: use pycompat.byteskwargs() to covert keys of kwargs to bytes Pulkit Goyal <pulkit@yandex-team.ru> parents: 39744 diff changeset	159 opts = pycompat.byteskwargs(opts)
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	160 for k, v in self.defaults.iteritems():
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	161 setattr(self, k, opts.get(k, v))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	162
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	163 @util.propertycache
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	164 def shortstr(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	165 """represent opts in a short string, suitable for a directory name"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	166 result = ''
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	167 if not self.followrename:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	168 result += 'r0'
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	169 if not self.followmerge:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	170 result += 'm0'
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	171 if self.diffopts is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	172 assert isinstance(self.diffopts, mdiff.diffopts)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	173 diffopthash = hashdiffopts(self.diffopts)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	174 if diffopthash != _defaultdiffopthash:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	175 result += 'i' + diffopthash
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	176 return result or 'default'
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	177
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	178 defaultopts = annotateopts()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	179
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	180 class _annotatecontext(object):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	181 """do not use this class directly as it does not use lock to protect
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	182 writes. use "with annotatecontext(...)" instead.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	183 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	184
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	185 def __init__(self, repo, path, linelogpath, revmappath, opts):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	186 self.repo = repo
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	187 self.ui = repo.ui
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	188 self.path = path
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	189 self.opts = opts
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	190 self.linelogpath = linelogpath
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	191 self.revmappath = revmappath
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	192 self._linelog = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	193 self._revmap = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	194 self._node2path = {} # {str: str}
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	195
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	196 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	197 def linelog(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	198 if self._linelog is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	199 if os.path.exists(self.linelogpath):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	200 with open(self.linelogpath, 'rb') as f:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	201 try:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	202 self._linelog = linelogmod.linelog.fromdata(f.read())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	203 except linelogmod.LineLogError:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	204 self._linelog = linelogmod.linelog()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	205 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	206 self._linelog = linelogmod.linelog()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	207 return self._linelog
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	208
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	209 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	210 def revmap(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	211 if self._revmap is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	212 self._revmap = revmapmod.revmap(self.revmappath)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	213 return self._revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	214
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	215 def close(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	216 if self._revmap is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	217 self._revmap.flush()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	218 self._revmap = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	219 if self._linelog is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	220 with open(self.linelogpath, 'wb') as f:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	221 f.write(self._linelog.encode())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	222 self._linelog = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	223
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	224 __del__ = close
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	225
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	226 def rebuild(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	227 """delete linelog and revmap, useful for rebuilding"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	228 self.close()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	229 self._node2path.clear()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	230 _unlinkpaths([self.revmappath, self.linelogpath])
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	231
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	232 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	233 def lastnode(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	234 """return last node in revmap, or None if revmap is empty"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	235 if self._revmap is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	236 # fast path, read revmap without loading its full content
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	237 return revmapmod.getlastnode(self.revmappath)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	238 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	239 return self._revmap.rev2hsh(self._revmap.maxrev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	240
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	241 def isuptodate(self, master, strict=True):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	242 """return True if the revmap / linelog is up-to-date, or the file
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	243 does not exist in the master revision. False otherwise.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	244
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	245 it tries to be fast and could return false negatives, because of the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	246 use of linkrev instead of introrev.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	247
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	248 useful for both server and client to decide whether to update
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	249 fastannotate cache or not.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	250
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	251 if strict is True, even if fctx exists in the revmap, but is not the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	252 last node, isuptodate will return False. it's good for performance - no
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	253 expensive check was done.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	254
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	255 if strict is False, if fctx exists in the revmap, this function may
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	256 return True. this is useful for the client to skip downloading the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	257 cache if the client's master is behind the server's.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	258 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	259 lastnode = self.lastnode
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	260 try:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	261 f = self._resolvefctx(master, resolverev=True)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	262 # choose linkrev instead of introrev as the check is meant to be
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	263 # fast.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	264 linknode = self.repo.changelog.node(f.linkrev())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	265 if not strict and lastnode and linknode != lastnode:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	266 # check if f.node() is in the revmap. note: this loads the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	267 # revmap and can be slow.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	268 return self.revmap.hsh2rev(linknode) is not None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	269 # avoid resolving old manifest, or slow adjustlinkrev to be fast,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	270 # false negatives are acceptable in this case.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	271 return linknode == lastnode
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	272 except LookupError:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	273 # master does not have the file, or the revmap is ahead
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	274 return True
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	275
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	276 def annotate(self, rev, master=None, showpath=False, showlines=False):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	277 """incrementally update the cache so it includes revisions in the main
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	278 branch till 'master'. and run annotate on 'rev', which may or may not be
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	279 included in the main branch.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	280
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	281 if master is None, do not update linelog.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	282
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	283 the first value returned is the annotate result, it is [(node, linenum)]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	284 by default. [(node, linenum, path)] if showpath is True.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	285
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	286 if showlines is True, a second value will be returned, it is a list of
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	287 corresponding line contents.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	288 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	289
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	290 # the fast path test requires commit hash, convert rev number to hash,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	291 # so it may hit the fast path. note: in the "fctx" mode, the "annotate"
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	292 # command could give us a revision number even if the user passes a
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	293 # commit hash.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	294 if isinstance(rev, int):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	295 rev = node.hex(self.repo.changelog.node(rev))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	296
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	297 # fast path: if rev is in the main branch already
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	298 directly, revfctx = self.canannotatedirectly(rev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	299 if directly:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	300 if self.ui.debugflag:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	301 self.ui.debug('fastannotate: %s: using fast path '
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	302 '(resolved fctx: %s)\n'
39744 ce4c29705983 py3: use stringutil.pprint() to print boolean values Pulkit Goyal <pulkit@yandex-team.ru> parents: 39413 diff changeset	303 % (self.path,
ce4c29705983 py3: use stringutil.pprint() to print boolean values Pulkit Goyal <pulkit@yandex-team.ru> parents: 39413 diff changeset	304 stringutil.pprint(util.safehasattr(revfctx,
ce4c29705983 py3: use stringutil.pprint() to print boolean values Pulkit Goyal <pulkit@yandex-team.ru> parents: 39413 diff changeset	305 'node'))))
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	306 return self.annotatedirectly(revfctx, showpath, showlines)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	307
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	308 # resolve master
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	309 masterfctx = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	310 if master:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	311 try:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	312 masterfctx = self._resolvefctx(master, resolverev=True,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	313 adjustctx=True)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	314 except LookupError: # master does not have the file
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	315 pass
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	316 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	317 if masterfctx in self.revmap: # no need to update linelog
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	318 masterfctx = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	319
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	320 # ... - @ <- rev (can be an arbitrary changeset,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	321 # / not necessarily a descendant
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	322 # master -> o of master)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	323 # \|
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	324 # a merge -> o 'o': new changesets in the main branch
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	325 # \|\ '#': revisions in the main branch that
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	326 # o * exist in linelog / revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	327 # \| . '*': changesets in side branches, or
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	328 # last master -> # . descendants of master
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	329 # \| .
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	330 # # * joint: '#', and is a parent of a '*'
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	331 # \|/
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	332 # a joint -> # ^^^^ --- side branches
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	333 # \|
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	334 # ^ --- main branch (in linelog)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	335
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	336 # these DFSes are similar to the traditional annotate algorithm.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	337 # we cannot really reuse the code for perf reason.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	338
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	339 # 1st DFS calculates merges, joint points, and needed.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	340 # "needed" is a simple reference counting dict to free items in
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	341 # "hist", reducing its memory usage otherwise could be huge.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	342 initvisit = [revfctx]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	343 if masterfctx:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	344 if masterfctx.rev() is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	345 raise error.Abort(_('cannot update linelog to wdir()'),
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	346 hint=_('set fastannotate.mainbranch'))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	347 initvisit.append(masterfctx)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	348 visit = initvisit[:]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	349 pcache = {}
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	350 needed = {revfctx: 1}
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	351 hist = {} # {fctx: ([(llrev or fctx, linenum)], text)}
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	352 while visit:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	353 f = visit.pop()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	354 if f in pcache or f in hist:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	355 continue
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	356 if f in self.revmap: # in the old main branch, it's a joint
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	357 llrev = self.revmap.hsh2rev(f.node())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	358 self.linelog.annotate(llrev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	359 result = self.linelog.annotateresult
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	360 hist[f] = (result, f.data())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	361 continue
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	362 pl = self._parentfunc(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	363 pcache[f] = pl
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	364 for p in pl:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	365 needed[p] = needed.get(p, 0) + 1
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	366 if p not in pcache:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	367 visit.append(p)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	368
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	369 # 2nd (simple) DFS calculates new changesets in the main branch
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	370 # ('o' nodes in # the above graph), so we know when to update linelog.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	371 newmainbranch = set()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	372 f = masterfctx
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	373 while f and f not in self.revmap:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	374 newmainbranch.add(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	375 pl = pcache[f]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	376 if pl:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	377 f = pl[0]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	378 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	379 f = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	380 break
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	381
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	382 # f, if present, is the position where the last build stopped at, and
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	383 # should be the "master" last time. check to see if we can continue
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	384 # building the linelog incrementally. (we cannot if diverged)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	385 if masterfctx is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	386 self._checklastmasterhead(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	387
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	388 if self.ui.debugflag:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	389 if newmainbranch:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	390 self.ui.debug('fastannotate: %s: %d new changesets in the main'
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	391 ' branch\n' % (self.path, len(newmainbranch)))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	392 elif not hist: # no joints, no updates
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	393 self.ui.debug('fastannotate: %s: linelog cannot help in '
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	394 'annotating this revision\n' % self.path)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	395
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	396 # prepare annotateresult so we can update linelog incrementally
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	397 self.linelog.annotate(self.linelog.maxrev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	398
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	399 # 3rd DFS does the actual annotate
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	400 visit = initvisit[:]
40857 dd1006874a5a fastannotate: use progress helper Martin von Zweigbergk <martinvonz@google.com> parents: 40714 diff changeset	401 progress = self.ui.makeprogress(('building cache'),
dd1006874a5a fastannotate: use progress helper Martin von Zweigbergk <martinvonz@google.com> parents: 40714 diff changeset	402 total=len(newmainbranch))
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	403 while visit:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	404 f = visit[-1]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	405 if f in hist:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	406 visit.pop()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	407 continue
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	408
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	409 ready = True
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	410 pl = pcache[f]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	411 for p in pl:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	412 if p not in hist:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	413 ready = False
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	414 visit.append(p)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	415 if not ready:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	416 continue
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	417
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	418 visit.pop()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	419 blocks = None # mdiff blocks, used for appending linelog
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	420 ismainbranch = (f in newmainbranch)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	421 # curr is the same as the traditional annotate algorithm,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	422 # if we only care about linear history (do not follow merge),
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	423 # then curr is not actually used.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	424 assert f not in hist
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	425 curr = _decorate(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	426 for i, p in enumerate(pl):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	427 bs = list(self._diffblocks(hist[p][1], curr[1]))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	428 if i == 0 and ismainbranch:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	429 blocks = bs
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	430 curr = _pair(hist[p], curr, bs)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	431 if needed[p] == 1:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	432 del hist[p]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	433 del needed[p]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	434 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	435 needed[p] -= 1
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	436
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	437 hist[f] = curr
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	438 del pcache[f]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	439
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	440 if ismainbranch: # need to write to linelog
40857 dd1006874a5a fastannotate: use progress helper Martin von Zweigbergk <martinvonz@google.com> parents: 40714 diff changeset	441 progress.increment()
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	442 bannotated = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	443 if len(pl) == 2 and self.opts.followmerge: # merge
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	444 bannotated = curr[0]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	445 if blocks is None: # no parents, add an empty one
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	446 blocks = list(self._diffblocks('', curr[1]))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	447 self._appendrev(f, blocks, bannotated)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	448 elif showpath: # not append linelog, but we need to record path
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	449 self._node2path[f.node()] = f.path()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	450
40857 dd1006874a5a fastannotate: use progress helper Martin von Zweigbergk <martinvonz@google.com> parents: 40714 diff changeset	451 progress.complete()
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	452
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	453 result = [
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	454 ((self.revmap.rev2hsh(fr) if isinstance(fr, int) else fr.node()), l)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	455 for fr, l in hist[revfctx][0]] # [(node, linenumber)]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	456 return self._refineannotateresult(result, revfctx, showpath, showlines)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	457
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	458 def canannotatedirectly(self, rev):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	459 """(str) -> bool, fctx or node.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	460 return (True, f) if we can annotate without updating the linelog, pass
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	461 f to annotatedirectly.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	462 return (False, f) if we need extra calculation. f is the fctx resolved
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	463 from rev.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	464 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	465 result = True
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	466 f = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	467 if not isinstance(rev, int) and rev is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	468 hsh = {20: bytes, 40: node.bin}.get(len(rev), lambda x: None)(rev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	469 if hsh is not None and (hsh, self.path) in self.revmap:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	470 f = hsh
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	471 if f is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	472 adjustctx = 'linkrev' if self._perfhack else True
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	473 f = self._resolvefctx(rev, adjustctx=adjustctx, resolverev=True)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	474 result = f in self.revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	475 if not result and self._perfhack:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	476 # redo the resolution without perfhack - as we are going to
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	477 # do write operations, we need a correct fctx.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	478 f = self._resolvefctx(rev, adjustctx=True, resolverev=True)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	479 return result, f
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	480
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	481 def annotatealllines(self, rev, showpath=False, showlines=False):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	482 """(rev : str) -> [(node : str, linenum : int, path : str)]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	483
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	484 the result has the same format with annotate, but include all (including
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	485 deleted) lines up to rev. call this after calling annotate(rev, ...) for
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	486 better performance and accuracy.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	487 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	488 revfctx = self._resolvefctx(rev, resolverev=True, adjustctx=True)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	489
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	490 # find a chain from rev to anything in the mainbranch
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	491 if revfctx not in self.revmap:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	492 chain = [revfctx]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	493 a = ''
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	494 while True:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	495 f = chain[-1]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	496 pl = self._parentfunc(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	497 if not pl:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	498 break
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	499 if pl[0] in self.revmap:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	500 a = pl[0].data()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	501 break
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	502 chain.append(pl[0])
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	503
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	504 # both self.linelog and self.revmap is backed by filesystem. now
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	505 # we want to modify them but do not want to write changes back to
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	506 # files. so we create in-memory objects and copy them. it's like
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	507 # a "fork".
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	508 linelog = linelogmod.linelog()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	509 linelog.copyfrom(self.linelog)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	510 linelog.annotate(linelog.maxrev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	511 revmap = revmapmod.revmap()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	512 revmap.copyfrom(self.revmap)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	513
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	514 for f in reversed(chain):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	515 b = f.data()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	516 blocks = list(self._diffblocks(a, b))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	517 self._doappendrev(linelog, revmap, f, blocks)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	518 a = b
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	519 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	520 # fastpath: use existing linelog, revmap as we don't write to them
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	521 linelog = self.linelog
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	522 revmap = self.revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	523
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	524 lines = linelog.getalllines()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	525 hsh = revfctx.node()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	526 llrev = revmap.hsh2rev(hsh)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	527 result = [(revmap.rev2hsh(r), l) for r, l in lines if r <= llrev]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	528 # cannot use _refineannotateresult since we need custom logic for
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	529 # resolving line contents
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	530 if showpath:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	531 result = self._addpathtoresult(result, revmap)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	532 if showlines:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	533 linecontents = self._resolvelines(result, revmap, linelog)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	534 result = (result, linecontents)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	535 return result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	536
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	537 def _resolvelines(self, annotateresult, revmap, linelog):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	538 """(annotateresult) -> [line]. designed for annotatealllines.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	539 this is probably the most inefficient code in the whole fastannotate
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	540 directory. but we have made a decision that the linelog does not
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	541 store line contents. so getting them requires random accesses to
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	542 the revlog data, since they can be many, it can be very slow.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	543 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	544 # [llrev]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	545 revs = [revmap.hsh2rev(l[0]) for l in annotateresult]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	546 result = [None] * len(annotateresult)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	547 # {(rev, linenum): [lineindex]}
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	548 key2idxs = collections.defaultdict(list)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	549 for i in pycompat.xrange(len(result)):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	550 key2idxs[(revs[i], annotateresult[i][1])].append(i)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	551 while key2idxs:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	552 # find an unresolved line and its linelog rev to annotate
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	553 hsh = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	554 try:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	555 for (rev, _linenum), idxs in key2idxs.iteritems():
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	556 if revmap.rev2flag(rev) & revmapmod.sidebranchflag:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	557 continue
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	558 hsh = annotateresult[idxs[0]][0]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	559 break
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	560 except StopIteration: # no more unresolved lines
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	561 return result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	562 if hsh is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	563 # the remaining key2idxs are not in main branch, resolving them
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	564 # using the hard way...
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	565 revlines = {}
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	566 for (rev, linenum), idxs in key2idxs.iteritems():
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	567 if rev not in revlines:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	568 hsh = annotateresult[idxs[0]][0]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	569 if self.ui.debugflag:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	570 self.ui.debug('fastannotate: reading %s line #%d '
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	571 'to resolve lines %r\n'
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	572 % (node.short(hsh), linenum, idxs))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	573 fctx = self._resolvefctx(hsh, revmap.rev2path(rev))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	574 lines = mdiff.splitnewlines(fctx.data())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	575 revlines[rev] = lines
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	576 for idx in idxs:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	577 result[idx] = revlines[rev][linenum]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	578 assert all(x is not None for x in result)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	579 return result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	580
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	581 # run the annotate and the lines should match to the file content
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	582 self.ui.debug('fastannotate: annotate %s to resolve lines\n'
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	583 % node.short(hsh))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	584 linelog.annotate(rev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	585 fctx = self._resolvefctx(hsh, revmap.rev2path(rev))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	586 annotated = linelog.annotateresult
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	587 lines = mdiff.splitnewlines(fctx.data())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	588 if len(lines) != len(annotated):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	589 raise faerror.CorruptedFileError('unexpected annotated lines')
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	590 # resolve lines from the annotate result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	591 for i, line in enumerate(lines):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	592 k = annotated[i]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	593 if k in key2idxs:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	594 for idx in key2idxs[k]:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	595 result[idx] = line
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	596 del key2idxs[k]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	597 return result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	598
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	599 def annotatedirectly(self, f, showpath, showlines):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	600 """like annotate, but when we know that f is in linelog.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	601 f can be either a 20-char str (node) or a fctx. this is for perf - in
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	602 the best case, the user provides a node and we don't need to read the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	603 filelog or construct any filecontext.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	604 """
41261 1198c86beb73 fastannotate: fix isinstance checks to be against bytes instead of str Augie Fackler <augie@google.com> parents: 40857 diff changeset	605 if isinstance(f, bytes):
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	606 hsh = f
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	607 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	608 hsh = f.node()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	609 llrev = self.revmap.hsh2rev(hsh)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	610 if not llrev:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	611 raise faerror.CorruptedFileError('%s is not in revmap'
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	612 % node.hex(hsh))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	613 if (self.revmap.rev2flag(llrev) & revmapmod.sidebranchflag) != 0:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	614 raise faerror.CorruptedFileError('%s is not in revmap mainbranch'
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	615 % node.hex(hsh))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	616 self.linelog.annotate(llrev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	617 result = [(self.revmap.rev2hsh(r), l)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	618 for r, l in self.linelog.annotateresult]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	619 return self._refineannotateresult(result, f, showpath, showlines)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	620
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	621 def _refineannotateresult(self, result, f, showpath, showlines):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	622 """add the missing path or line contents, they can be expensive.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	623 f could be either node or fctx.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	624 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	625 if showpath:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	626 result = self._addpathtoresult(result)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	627 if showlines:
41261 1198c86beb73 fastannotate: fix isinstance checks to be against bytes instead of str Augie Fackler <augie@google.com> parents: 40857 diff changeset	628 if isinstance(f, bytes): # f: node or fctx
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	629 llrev = self.revmap.hsh2rev(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	630 fctx = self._resolvefctx(f, self.revmap.rev2path(llrev))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	631 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	632 fctx = f
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	633 lines = mdiff.splitnewlines(fctx.data())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	634 if len(lines) != len(result): # linelog is probably corrupted
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	635 raise faerror.CorruptedFileError()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	636 result = (result, lines)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	637 return result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	638
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	639 def _appendrev(self, fctx, blocks, bannotated=None):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	640 self._doappendrev(self.linelog, self.revmap, fctx, blocks, bannotated)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	641
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	642 def _diffblocks(self, a, b):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	643 return mdiff.allblocks(a, b, self.opts.diffopts)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	644
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	645 @staticmethod
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	646 def _doappendrev(linelog, revmap, fctx, blocks, bannotated=None):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	647 """append a revision to linelog and revmap"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	648
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	649 def getllrev(f):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	650 """(fctx) -> int"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	651 # f should not be a linelog revision
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	652 if isinstance(f, int):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	653 raise error.ProgrammingError('f should not be an int')
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	654 # f is a fctx, allocate linelog rev on demand
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	655 hsh = f.node()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	656 rev = revmap.hsh2rev(hsh)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	657 if rev is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	658 rev = revmap.append(hsh, sidebranch=True, path=f.path())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	659 return rev
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	660
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	661 # append sidebranch revisions to revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	662 siderevs = []
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	663 siderevmap = {} # node: int
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	664 if bannotated is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	665 for (a1, a2, b1, b2), op in blocks:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	666 if op != '=':
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	667 # f could be either linelong rev, or fctx.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	668 siderevs += [f for f, l in bannotated[b1:b2]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	669 if not isinstance(f, int)]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	670 siderevs = set(siderevs)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	671 if fctx in siderevs: # mainnode must be appended seperately
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	672 siderevs.remove(fctx)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	673 for f in siderevs:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	674 siderevmap[f] = getllrev(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	675
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	676 # the changeset in the main branch, could be a merge
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	677 llrev = revmap.append(fctx.node(), path=fctx.path())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	678 siderevmap[fctx] = llrev
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	679
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	680 for (a1, a2, b1, b2), op in reversed(blocks):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	681 if op == '=':
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	682 continue
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	683 if bannotated is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	684 linelog.replacelines(llrev, a1, a2, b1, b2)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	685 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	686 blines = [((r if isinstance(r, int) else siderevmap[r]), l)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	687 for r, l in bannotated[b1:b2]]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	688 linelog.replacelines_vec(llrev, a1, a2, blines)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	689
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	690 def _addpathtoresult(self, annotateresult, revmap=None):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	691 """(revmap, [(node, linenum)]) -> [(node, linenum, path)]"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	692 if revmap is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	693 revmap = self.revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	694
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	695 def _getpath(nodeid):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	696 path = self._node2path.get(nodeid)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	697 if path is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	698 path = revmap.rev2path(revmap.hsh2rev(nodeid))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	699 self._node2path[nodeid] = path
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	700 return path
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	701
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	702 return [(n, l, _getpath(n)) for n, l in annotateresult]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	703
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	704 def _checklastmasterhead(self, fctx):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	705 """check if fctx is the master's head last time, raise if not"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	706 if fctx is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	707 llrev = 0
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	708 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	709 llrev = self.revmap.hsh2rev(fctx.node())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	710 if not llrev:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	711 raise faerror.CannotReuseError()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	712 if self.linelog.maxrev != llrev:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	713 raise faerror.CannotReuseError()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	714
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	715 @util.propertycache
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	716 def _parentfunc(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	717 """-> (fctx) -> [fctx]"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	718 followrename = self.opts.followrename
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	719 followmerge = self.opts.followmerge
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	720 def parents(f):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	721 pl = _parents(f, follow=followrename)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	722 if not followmerge:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	723 pl = pl[:1]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	724 return pl
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	725 return parents
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	726
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	727 @util.propertycache
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	728 def _perfhack(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	729 return self.ui.configbool('fastannotate', 'perfhack')
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	730
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	731 def _resolvefctx(self, rev, path=None, **kwds):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	732 return resolvefctx(self.repo, rev, (path or self.path), **kwds)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	733
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	734 def _unlinkpaths(paths):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	735 """silent, best-effort unlink"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	736 for path in paths:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	737 try:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	738 util.unlink(path)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	739 except OSError:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	740 pass
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	741
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	742 class pathhelper(object):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	743 """helper for getting paths for lockfile, linelog and revmap"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	744
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	745 def __init__(self, repo, path, opts=defaultopts):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	746 # different options use different directories
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	747 self._vfspath = os.path.join('fastannotate',
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	748 opts.shortstr, encodedir(path))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	749 self._repo = repo
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	750
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	751 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	752 def dirname(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	753 return os.path.dirname(self._repo.vfs.join(self._vfspath))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	754
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	755 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	756 def linelogpath(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	757 return self._repo.vfs.join(self._vfspath + '.l')
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	758
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	759 def lock(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	760 return lockmod.lock(self._repo.vfs, self._vfspath + '.lock')
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	761
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	762 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	763 def revmappath(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	764 return self._repo.vfs.join(self._vfspath + '.m')
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	765
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	766 @contextlib.contextmanager
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	767 def annotatecontext(repo, path, opts=defaultopts, rebuild=False):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	768 """context needed to perform (fast) annotate on a file
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	769
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	770 an annotatecontext of a single file consists of two structures: the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	771 linelog and the revmap. this function takes care of locking. only 1
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	772 process is allowed to write that file's linelog and revmap at a time.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	773
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	774 when something goes wrong, this function will assume the linelog and the
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	775 revmap are in a bad state, and remove them from disk.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	776
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	777 use this function in the following way:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	778
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	779 with annotatecontext(...) as actx:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	780 actx. ....
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	781 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	782 helper = pathhelper(repo, path, opts)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	783 util.makedirs(helper.dirname)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	784 revmappath = helper.revmappath
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	785 linelogpath = helper.linelogpath
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	786 actx = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	787 try:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	788 with helper.lock():
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	789 actx = _annotatecontext(repo, path, linelogpath, revmappath, opts)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	790 if rebuild:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	791 actx.rebuild()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	792 yield actx
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	793 except Exception:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	794 if actx is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	795 actx.rebuild()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	796 repo.ui.debug('fastannotate: %s: cache broken and deleted\n' % path)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	797 raise
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	798 finally:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	799 if actx is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	800 actx.close()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	801
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	802 def fctxannotatecontext(fctx, follow=True, diffopts=None, rebuild=False):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	803 """like annotatecontext but get the context from a fctx. convenient when
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	804 used in fctx.annotate
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	805 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	806 repo = fctx._repo
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	807 path = fctx._path
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	808 if repo.ui.configbool('fastannotate', 'forcefollow', True):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	809 follow = True
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	810 aopts = annotateopts(diffopts=diffopts, followrename=follow)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	811 return annotatecontext(repo, path, aopts, rebuild)

Mercurial > public > mercurial-scm > hg-stable

annotate hgext/fastannotate/context.py @ 42951:0152a907f714