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

annotate hgext/fastannotate/context.py @ 48583:c91418480cb0

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels Before this patch, we use a combination of `mode` and `labels` to decide which marker style to use. That's mostly my own fault because I was the one who added the `mergediff` as a "mode" instead of adding a separate argument for marker style. Still, let's make these arguments more orthogonal by ignoring the number of labels when deciding which marker style to use. This refactoring makes it a little clearer in the simplemerge *extension* that passing more than 2 `--label` arguments changes the marker style. Differential Revision: https://phab.mercurial-scm.org/D11972

author	Martin von Zweigbergk <martinvonz@google.com>
date	Tue, 14 Dec 2021 13:12:56 -0800
parents	59fa3890d40a
children	6000f5b25c9b

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 os
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	13
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	14 from mercurial.i18n import _
43087 66f2cc210a29 py3: manually import pycompat.setattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	15 from mercurial.pycompat import (
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	16 getattr,
43087 66f2cc210a29 py3: manually import pycompat.setattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	17 open,
66f2cc210a29 py3: manually import pycompat.setattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	18 setattr,
66f2cc210a29 py3: manually import pycompat.setattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	19 )
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	20 from mercurial.node import (
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	21 bin,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	22 hex,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	23 short,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	24 )
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	25 from mercurial import (
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	26 error,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	27 linelog as linelogmod,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	28 lock as lockmod,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	29 mdiff,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	30 pycompat,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	31 scmutil,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	32 util,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	33 )
44062 2d49482d0dd4 hgext: replace references to hashlib.sha1 with hashutil.sha1 Augie Fackler <augie@google.com> parents: 43421 diff changeset	34 from mercurial.utils import (
2d49482d0dd4 hgext: replace references to hashlib.sha1 with hashutil.sha1 Augie Fackler <augie@google.com> parents: 43421 diff changeset	35 hashutil,
2d49482d0dd4 hgext: replace references to hashlib.sha1 with hashutil.sha1 Augie Fackler <augie@google.com> parents: 43421 diff changeset	36 stringutil,
2d49482d0dd4 hgext: replace references to hashlib.sha1 with hashutil.sha1 Augie Fackler <augie@google.com> parents: 43421 diff changeset	37 )
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	38
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	39 from . import (
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	40 error as faerror,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	41 revmap as revmapmod,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	42 )
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	43
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	44 # given path, get filelog, cached
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	45 @util.lrucachefunc
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	46 def _getflog(repo, path):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	47 return repo.file(path)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	48
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	49
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	50 # extracted from mercurial.context.basefilectx.annotate
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	51 def _parents(f, follow=True):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	52 # 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	53 # adjustment. Otherwise, p._adjustlinkrev() would walk changelog
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	54 # 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	55 # isn't an ancestor of the srcrev.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	56 f._changeid
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	57 pl = f.parents()
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 # 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	60 if not follow:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	61 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	62
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	63 # 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	64 # from the cache to save time
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	65 for p in pl:
43421 be384a2052aa py3: don't use bytes with vars() or __dict__ Martin von Zweigbergk <martinvonz@google.com> parents: 43105 diff changeset	66 if not '_filelog' in p.__dict__:
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	67 p._filelog = _getflog(f._repo, p.path())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	68
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	69 return pl
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	70
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	71
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	72 # 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	73 # 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	74 def _decorate(fctx):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	75 text = fctx.data()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	76 linecount = text.count(b'\n')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	77 if text and not text.endswith(b'\n'):
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	78 linecount += 1
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	79 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	80
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	81
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	82 # 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	83 # 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	84 # calculating diff here.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	85 def _pair(parent, child, blocks):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	86 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	87 # 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	88 # belong to the child.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	89 if t == b'=':
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	90 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	91 return child
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	92
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	93
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	94 # 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	95 # could be reused
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	96 _revsingle = util.lrucachefunc(scmutil.revsingle)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	97
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	98
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	99 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	100 """(repo, str, str) -> fctx
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	101
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	102 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	103
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	104 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	105 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	106 be consumed by repo.__getitem__.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	107
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	108 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	109 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	110 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	111 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	112 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	113 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	114 ctx = _revsingle(repo, rev)
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 ctx = repo[rev]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	117
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	118 # 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	119 # 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	120 # 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	121 # 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	122 # 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	123 # lot of data.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	124 if adjustctx is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	125 # 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	126 # case.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	127 if ctx.rev() is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	128 fctx = ctx[path]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	129 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	130 fctx = repo.filectx(path, changeid=ctx.rev())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	131 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	132 fctx = ctx[path]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	133 if adjustctx == b'linkrev':
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	134 introrev = fctx.linkrev()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	135 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	136 introrev = fctx.introrev()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	137 if introrev != ctx.rev():
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	138 fctx._changeid = introrev
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	139 fctx._changectx = repo[introrev]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	140 return fctx
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	141
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	142
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	143 # 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	144 def encodedir(path):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	145 return (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	146 path.replace(b'.hg/', b'.hg.hg/')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	147 .replace(b'.l/', b'.l.hg/')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	148 .replace(b'.m/', b'.m.hg/')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	149 .replace(b'.lock/', b'.lock.hg/')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	150 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	151
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	152
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	153 def hashdiffopts(diffopts):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	154 diffoptstr = stringutil.pprint(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	155 sorted((k, getattr(diffopts, k)) for k in mdiff.diffopts.defaults)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	156 )
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	157 return hex(hashutil.sha1(diffoptstr).digest())[:6]
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	158
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	159
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	160 _defaultdiffopthash = hashdiffopts(mdiff.defaultopts)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	161
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	162
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	163 class annotateopts(object):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	164 """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	165
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	166 followrename: follow renames, like "hg annotate -f"
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	167 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	168 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	169
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	170 defaults = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	171 b'diffopts': None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	172 b'followrename': True,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	173 b'followmerge': True,
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	174 }
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	175
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	176 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	177 opts = pycompat.byteskwargs(opts)
43105 649d3ac37a12 py3: define and use pycompat.iteritems() for hgext/ Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	178 for k, v in pycompat.iteritems(self.defaults):
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	179 setattr(self, k, opts.get(k, v))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	180
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	181 @util.propertycache
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	182 def shortstr(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	183 """represent opts in a short string, suitable for a directory name"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	184 result = b''
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	185 if not self.followrename:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	186 result += b'r0'
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	187 if not self.followmerge:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	188 result += b'm0'
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	189 if self.diffopts is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	190 assert isinstance(self.diffopts, mdiff.diffopts)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	191 diffopthash = hashdiffopts(self.diffopts)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	192 if diffopthash != _defaultdiffopthash:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	193 result += b'i' + diffopthash
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	194 return result or b'default'
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	195
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	196
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	197 defaultopts = annotateopts()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	198
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	199
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	200 class _annotatecontext(object):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	201 """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	202 writes. use "with annotatecontext(...)" instead.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	203 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	204
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	205 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	206 self.repo = repo
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	207 self.ui = repo.ui
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	208 self.path = path
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	209 self.opts = opts
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	210 self.linelogpath = linelogpath
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	211 self.revmappath = revmappath
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	212 self._linelog = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	213 self._revmap = None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	214 self._node2path = {} # {str: str}
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	215
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	216 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	217 def linelog(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	218 if self._linelog is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	219 if os.path.exists(self.linelogpath):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	220 with open(self.linelogpath, b'rb') as f:
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	221 try:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	222 self._linelog = linelogmod.linelog.fromdata(f.read())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	223 except linelogmod.LineLogError:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	224 self._linelog = linelogmod.linelog()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	225 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	226 self._linelog = linelogmod.linelog()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	227 return self._linelog
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	228
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	229 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	230 def revmap(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	231 if self._revmap is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	232 self._revmap = revmapmod.revmap(self.revmappath)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	233 return self._revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	234
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	235 def close(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	236 if self._revmap is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	237 self._revmap.flush()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	238 self._revmap = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	239 if self._linelog is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	240 with open(self.linelogpath, b'wb') as f:
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	241 f.write(self._linelog.encode())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	242 self._linelog = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	243
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	244 __del__ = close
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	245
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	246 def rebuild(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	247 """delete linelog and revmap, useful for rebuilding"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	248 self.close()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	249 self._node2path.clear()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	250 _unlinkpaths([self.revmappath, self.linelogpath])
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	251
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	252 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	253 def lastnode(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	254 """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	255 if self._revmap is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	256 # 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	257 return revmapmod.getlastnode(self.revmappath)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	258 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	259 return self._revmap.rev2hsh(self._revmap.maxrev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	260
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	261 def isuptodate(self, master, strict=True):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	262 """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	263 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	264
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	265 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	266 use of linkrev instead of introrev.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	267
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	268 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	269 fastannotate cache or not.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	270
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	271 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	272 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	273 expensive check was done.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	274
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	275 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	276 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	277 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	278 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	279 lastnode = self.lastnode
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	280 try:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	281 f = self._resolvefctx(master, resolverev=True)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	282 # 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	283 # fast.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	284 linknode = self.repo.changelog.node(f.linkrev())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	285 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	286 # 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	287 # revmap and can be slow.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	288 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	289 # 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	290 # false negatives are acceptable in this case.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	291 return linknode == lastnode
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	292 except LookupError:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	293 # 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	294 return True
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	295
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	296 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	297 """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	298 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	299 included in the main branch.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	300
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	301 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	302
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	303 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	304 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	305
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	306 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	307 corresponding line contents.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	308 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	309
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	310 # 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	311 # 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	312 # 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	313 # commit hash.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	314 if isinstance(rev, int):
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	315 rev = hex(self.repo.changelog.node(rev))
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	316
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	317 # 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	318 directly, revfctx = self.canannotatedirectly(rev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	319 if directly:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	320 if self.ui.debugflag:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	321 self.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	322 b'fastannotate: %s: using fast path '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	323 b'(resolved fctx: %s)\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	324 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	325 self.path,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	326 stringutil.pprint(util.safehasattr(revfctx, b'node')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	327 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	328 )
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	329 return self.annotatedirectly(revfctx, showpath, showlines)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	330
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	331 # resolve master
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	332 masterfctx = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	333 if master:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	334 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	335 masterfctx = self._resolvefctx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	336 master, resolverev=True, adjustctx=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	337 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	338 except LookupError: # master does not have the file
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	339 pass
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	340 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	341 if masterfctx in self.revmap: # no need to update linelog
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	342 masterfctx = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	343
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	344 # ... - @ <- rev (can be an arbitrary changeset,
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	345 # / not necessarily a descendant
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	346 # master -> o of master)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	347 # \|
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	348 # 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	349 # \|\ '#': revisions in the main branch that
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	350 # o * exist in linelog / revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	351 # \| . '*': changesets in side branches, or
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	352 # last master -> # . descendants of master
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	353 # \| .
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	354 # # * joint: '#', and is a parent of a '*'
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	355 # \|/
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	356 # a joint -> # ^^^^ --- side branches
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	357 # \|
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	358 # ^ --- main branch (in linelog)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	359
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	360 # 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	361 # 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	362
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	363 # 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	364 # "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	365 # "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	366 initvisit = [revfctx]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	367 if masterfctx:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	368 if masterfctx.rev() is None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	369 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	370 _(b'cannot update linelog to wdir()'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	371 hint=_(b'set fastannotate.mainbranch'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	372 )
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	373 initvisit.append(masterfctx)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	374 visit = initvisit[:]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	375 pcache = {}
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	376 needed = {revfctx: 1}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	377 hist = {} # {fctx: ([(llrev or fctx, linenum)], text)}
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	378 while visit:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	379 f = visit.pop()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	380 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	381 continue
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	382 if f in self.revmap: # in the old main branch, it's a joint
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	383 llrev = self.revmap.hsh2rev(f.node())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	384 self.linelog.annotate(llrev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	385 result = self.linelog.annotateresult
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	386 hist[f] = (result, f.data())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	387 continue
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	388 pl = self._parentfunc(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	389 pcache[f] = pl
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	390 for p in pl:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	391 needed[p] = needed.get(p, 0) + 1
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	392 if p not in pcache:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	393 visit.append(p)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	394
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	395 # 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	396 # ('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	397 newmainbranch = set()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	398 f = masterfctx
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	399 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	400 newmainbranch.add(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	401 pl = pcache[f]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	402 if pl:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	403 f = pl[0]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	404 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	405 f = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	406 break
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	407
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	408 # 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	409 # 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	410 # 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	411 if masterfctx is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	412 self._checklastmasterhead(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	413
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	414 if self.ui.debugflag:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	415 if newmainbranch:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	416 self.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	417 b'fastannotate: %s: %d new changesets in the main'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	418 b' branch\n' % (self.path, len(newmainbranch))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	419 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	420 elif not hist: # no joints, no updates
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	421 self.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	422 b'fastannotate: %s: linelog cannot help in '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	423 b'annotating this revision\n' % self.path
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	424 )
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	425
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	426 # 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	427 self.linelog.annotate(self.linelog.maxrev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	428
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	429 # 3rd DFS does the actual annotate
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	430 visit = initvisit[:]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	431 progress = self.ui.makeprogress(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	432 b'building cache', total=len(newmainbranch)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	433 )
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	434 while visit:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	435 f = visit[-1]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	436 if f in hist:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	437 visit.pop()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	438 continue
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 ready = True
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	441 pl = pcache[f]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	442 for p in pl:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	443 if p not in hist:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	444 ready = False
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	445 visit.append(p)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	446 if not ready:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	447 continue
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	448
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	449 visit.pop()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	450 blocks = None # mdiff blocks, used for appending linelog
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	451 ismainbranch = f in newmainbranch
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	452 # 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	453 # 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	454 # then curr is not actually used.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	455 assert f not in hist
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	456 curr = _decorate(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	457 for i, p in enumerate(pl):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	458 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	459 if i == 0 and ismainbranch:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	460 blocks = bs
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	461 curr = _pair(hist[p], curr, bs)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	462 if needed[p] == 1:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	463 del hist[p]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	464 del needed[p]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	465 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	466 needed[p] -= 1
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	467
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	468 hist[f] = curr
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	469 del pcache[f]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	470
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	471 if ismainbranch: # need to write to linelog
40857 dd1006874a5a fastannotate: use progress helper Martin von Zweigbergk <martinvonz@google.com> parents: 40714 diff changeset	472 progress.increment()
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	473 bannotated = None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	474 if len(pl) == 2 and self.opts.followmerge: # merge
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	475 bannotated = curr[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	476 if blocks is None: # no parents, add an empty one
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	477 blocks = list(self._diffblocks(b'', curr[1]))
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	478 self._appendrev(f, blocks, bannotated)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	479 elif showpath: # not append linelog, but we need to record path
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	480 self._node2path[f.node()] = f.path()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	481
40857 dd1006874a5a fastannotate: use progress helper Martin von Zweigbergk <martinvonz@google.com> parents: 40714 diff changeset	482 progress.complete()
39238 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 result = [
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	485 ((self.revmap.rev2hsh(fr) if isinstance(fr, int) else fr.node()), l)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	486 for fr, l in hist[revfctx][0]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	487 ] # [(node, linenumber)]
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	488 return self._refineannotateresult(result, revfctx, showpath, showlines)
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 def canannotatedirectly(self, rev):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	491 """(str) -> bool, fctx or node.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	492 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	493 f to annotatedirectly.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	494 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	495 from rev.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	496 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	497 result = True
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	498 f = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	499 if not isinstance(rev, int) and rev is not None:
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	500 hsh = {20: bytes, 40: bin}.get(len(rev), lambda x: None)(rev)
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	501 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	502 f = hsh
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	503 if f is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	504 adjustctx = b'linkrev' if self._perfhack else True
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	505 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	506 result = f in self.revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	507 if not result and self._perfhack:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	508 # 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	509 # 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	510 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	511 return result, f
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	512
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	513 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	514 """(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	515
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	516 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	517 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	518 better performance and accuracy.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	519 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	520 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	521
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	522 # 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	523 if revfctx not in self.revmap:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	524 chain = [revfctx]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	525 a = b''
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	526 while True:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	527 f = chain[-1]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	528 pl = self._parentfunc(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	529 if not pl:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	530 break
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	531 if pl[0] in self.revmap:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	532 a = pl[0].data()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	533 break
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	534 chain.append(pl[0])
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	535
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	536 # 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	537 # 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	538 # 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	539 # a "fork".
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	540 linelog = linelogmod.linelog()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	541 linelog.copyfrom(self.linelog)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	542 linelog.annotate(linelog.maxrev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	543 revmap = revmapmod.revmap()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	544 revmap.copyfrom(self.revmap)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	545
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	546 for f in reversed(chain):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	547 b = f.data()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	548 blocks = list(self._diffblocks(a, b))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	549 self._doappendrev(linelog, revmap, f, blocks)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	550 a = b
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	551 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	552 # 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	553 linelog = self.linelog
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	554 revmap = self.revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	555
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	556 lines = linelog.getalllines()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	557 hsh = revfctx.node()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	558 llrev = revmap.hsh2rev(hsh)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	559 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	560 # 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	561 # resolving line contents
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	562 if showpath:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	563 result = self._addpathtoresult(result, revmap)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	564 if showlines:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	565 linecontents = self._resolvelines(result, revmap, linelog)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	566 result = (result, linecontents)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	567 return result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	568
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	569 def _resolvelines(self, annotateresult, revmap, linelog):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	570 """(annotateresult) -> [line]. designed for annotatealllines.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	571 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	572 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	573 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	574 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	575 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	576 # [llrev]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	577 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	578 result = [None] * len(annotateresult)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	579 # {(rev, linenum): [lineindex]}
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	580 key2idxs = collections.defaultdict(list)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	581 for i in pycompat.xrange(len(result)):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	582 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	583 while key2idxs:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	584 # 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	585 hsh = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	586 try:
43105 649d3ac37a12 py3: define and use pycompat.iteritems() for hgext/ Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	587 for (rev, _linenum), idxs in pycompat.iteritems(key2idxs):
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	588 if revmap.rev2flag(rev) & revmapmod.sidebranchflag:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	589 continue
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	590 hsh = annotateresult[idxs[0]][0]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	591 break
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	592 except StopIteration: # no more unresolved lines
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	593 return result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	594 if hsh is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	595 # 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	596 # using the hard way...
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	597 revlines = {}
43105 649d3ac37a12 py3: define and use pycompat.iteritems() for hgext/ Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	598 for (rev, linenum), idxs in pycompat.iteritems(key2idxs):
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	599 if rev not in revlines:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	600 hsh = annotateresult[idxs[0]][0]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	601 if self.ui.debugflag:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	602 self.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	603 b'fastannotate: reading %s line #%d '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	604 b'to resolve lines %r\n'
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	605 % (short(hsh), linenum, idxs)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	606 )
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	607 fctx = self._resolvefctx(hsh, revmap.rev2path(rev))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	608 lines = mdiff.splitnewlines(fctx.data())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	609 revlines[rev] = lines
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	610 for idx in idxs:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	611 result[idx] = revlines[rev][linenum]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	612 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	613 return result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	614
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	615 # run the annotate and the lines should match to the file content
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	616 self.ui.debug(
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	617 b'fastannotate: annotate %s to resolve lines\n' % short(hsh)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	618 )
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	619 linelog.annotate(rev)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	620 fctx = self._resolvefctx(hsh, revmap.rev2path(rev))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	621 annotated = linelog.annotateresult
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	622 lines = mdiff.splitnewlines(fctx.data())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	623 if len(lines) != len(annotated):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	624 raise faerror.CorruptedFileError(b'unexpected annotated lines')
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	625 # resolve lines from the annotate result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	626 for i, line in enumerate(lines):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	627 k = annotated[i]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	628 if k in key2idxs:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	629 for idx in key2idxs[k]:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	630 result[idx] = line
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	631 del key2idxs[k]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	632 return result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	633
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	634 def annotatedirectly(self, f, showpath, showlines):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	635 """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	636 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	637 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	638 filelog or construct any filecontext.
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	639 """
41261 1198c86beb73 fastannotate: fix isinstance checks to be against bytes instead of str Augie Fackler <augie@google.com> parents: 40857 diff changeset	640 if isinstance(f, bytes):
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	641 hsh = f
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	642 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	643 hsh = f.node()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	644 llrev = self.revmap.hsh2rev(hsh)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	645 if not llrev:
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	646 raise faerror.CorruptedFileError(b'%s is not in revmap' % hex(hsh))
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	647 if (self.revmap.rev2flag(llrev) & revmapmod.sidebranchflag) != 0:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	648 raise faerror.CorruptedFileError(
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 44062 diff changeset	649 b'%s is not in revmap mainbranch' % hex(hsh)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	650 )
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	651 self.linelog.annotate(llrev)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	652 result = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	653 (self.revmap.rev2hsh(r), l) for r, l in self.linelog.annotateresult
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	654 ]
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	655 return self._refineannotateresult(result, f, showpath, showlines)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	656
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	657 def _refineannotateresult(self, result, f, showpath, showlines):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	658 """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	659 f could be either node or fctx.
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 if showpath:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	662 result = self._addpathtoresult(result)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	663 if showlines:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	664 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	665 llrev = self.revmap.hsh2rev(f)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	666 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	667 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	668 fctx = f
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	669 lines = mdiff.splitnewlines(fctx.data())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	670 if len(lines) != len(result): # linelog is probably corrupted
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	671 raise faerror.CorruptedFileError()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	672 result = (result, lines)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	673 return result
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	674
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	675 def _appendrev(self, fctx, blocks, bannotated=None):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	676 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	677
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	678 def _diffblocks(self, a, b):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	679 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	680
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	681 @staticmethod
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	682 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	683 """append a revision to linelog and revmap"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	684
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	685 def getllrev(f):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	686 """(fctx) -> int"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	687 # f should not be a linelog revision
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	688 if isinstance(f, int):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	689 raise error.ProgrammingError(b'f should not be an int')
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	690 # 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	691 hsh = f.node()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	692 rev = revmap.hsh2rev(hsh)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	693 if rev is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	694 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	695 return rev
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	696
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	697 # append sidebranch revisions to revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	698 siderevs = []
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	699 siderevmap = {} # node: int
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	700 if bannotated is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	701 for (a1, a2, b1, b2), op in blocks:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	702 if op != b'=':
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	703 # f could be either linelong rev, or fctx.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	704 siderevs += [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	705 f
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	706 for f, l in bannotated[b1:b2]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	707 if not isinstance(f, int)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	708 ]
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	709 siderevs = set(siderevs)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	710 if fctx in siderevs: # mainnode must be appended seperately
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	711 siderevs.remove(fctx)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	712 for f in siderevs:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	713 siderevmap[f] = getllrev(f)
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 # 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	716 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	717 siderevmap[fctx] = llrev
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	718
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	719 for (a1, a2, b1, b2), op in reversed(blocks):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	720 if op == b'=':
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	721 continue
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	722 if bannotated is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	723 linelog.replacelines(llrev, a1, a2, b1, b2)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	724 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	725 blines = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	726 ((r if isinstance(r, int) else siderevmap[r]), l)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	727 for r, l in bannotated[b1:b2]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	728 ]
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	729 linelog.replacelines_vec(llrev, a1, a2, blines)
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 _addpathtoresult(self, annotateresult, revmap=None):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	732 """(revmap, [(node, linenum)]) -> [(node, linenum, path)]"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	733 if revmap is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	734 revmap = self.revmap
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	735
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	736 def _getpath(nodeid):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	737 path = self._node2path.get(nodeid)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	738 if path is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	739 path = revmap.rev2path(revmap.hsh2rev(nodeid))
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	740 self._node2path[nodeid] = path
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	741 return path
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	742
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	743 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	744
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	745 def _checklastmasterhead(self, fctx):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	746 """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	747 if fctx is None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	748 llrev = 0
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	749 else:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	750 llrev = self.revmap.hsh2rev(fctx.node())
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	751 if not llrev:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	752 raise faerror.CannotReuseError()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	753 if self.linelog.maxrev != llrev:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	754 raise faerror.CannotReuseError()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	755
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	756 @util.propertycache
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	757 def _parentfunc(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	758 """-> (fctx) -> [fctx]"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	759 followrename = self.opts.followrename
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	760 followmerge = self.opts.followmerge
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	761
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	762 def parents(f):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	763 pl = _parents(f, follow=followrename)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	764 if not followmerge:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	765 pl = pl[:1]
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	766 return pl
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	767
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	768 return parents
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 @util.propertycache
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	771 def _perfhack(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	772 return self.ui.configbool(b'fastannotate', b'perfhack')
39238 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 def _resolvefctx(self, rev, path=None, **kwds):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	775 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	776
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	777
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	778 def _unlinkpaths(paths):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	779 """silent, best-effort unlink"""
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	780 for path in paths:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	781 try:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	782 util.unlink(path)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	783 except OSError:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	784 pass
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	785
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	786
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	787 class pathhelper(object):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	788 """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	789
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	790 def __init__(self, repo, path, opts=defaultopts):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	791 # different options use different directories
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	792 self._vfspath = os.path.join(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	793 b'fastannotate', opts.shortstr, encodedir(path)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	794 )
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	795 self._repo = repo
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	796
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	797 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	798 def dirname(self):
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	799 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	800
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	801 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	802 def linelogpath(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	803 return self._repo.vfs.join(self._vfspath + b'.l')
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	804
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	805 def lock(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	806 return lockmod.lock(self._repo.vfs, self._vfspath + b'.lock')
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	807
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	808 @property
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	809 def revmappath(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	810 return self._repo.vfs.join(self._vfspath + b'.m')
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	811
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	812
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	813 @contextlib.contextmanager
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	814 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	815 """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	816
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	817 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	818 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	819 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	820
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	821 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	822 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	823
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	824 use this function in the following way:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	825
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	826 with annotatecontext(...) as actx:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	827 actx. ....
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	828 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	829 helper = pathhelper(repo, path, opts)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	830 util.makedirs(helper.dirname)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	831 revmappath = helper.revmappath
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	832 linelogpath = helper.linelogpath
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	833 actx = None
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	834 try:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	835 with helper.lock():
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	836 actx = _annotatecontext(repo, path, linelogpath, revmappath, opts)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	837 if rebuild:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	838 actx.rebuild()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	839 yield actx
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	840 except Exception:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	841 if actx is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	842 actx.rebuild()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	843 repo.ui.debug(b'fastannotate: %s: cache broken and deleted\n' % path)
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	844 raise
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	845 finally:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	846 if actx is not None:
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	847 actx.close()
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	848
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42951 diff changeset	849
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	850 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	851 """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	852 used in fctx.annotate
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	853 """
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	854 repo = fctx._repo
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	855 path = fctx._path
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	856 if repo.ui.configbool(b'fastannotate', b'forcefollow', True):
39238 1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	857 follow = True
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	858 aopts = annotateopts(diffopts=diffopts, followrename=follow)
1ddb296e0dee fastannotate: initial import from Facebook's hg-experimental Augie Fackler <augie@google.com> parents: diff changeset	859 return annotatecontext(repo, path, aopts, rebuild)

Mercurial > public > mercurial-scm > hg-stable

annotate hgext/fastannotate/context.py @ 48583:c91418480cb0