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

annotate hgext/fastannotate/context.py @ 51859:f4733654f144

typing: add `from __future__ import annotations` to most files Now that py36 is no longer supported, we can postpone annotation evaluation. This means that the quoting is usually optional (for things imported under the guard of `if typing.TYPE_CHECKING:` to avoid circular imports), and there's less overhead on startup[1]. There may be some missing here. I backed out 6000f5b25c9b (which removed the `from __future__ import ...` that was supporting py2), reverted the changes in `contrib/`, `doc/`, and `tests/`, and then ran: $ hg status -n --change . | \ xargs sed -i -e 's/from __future__ import .*$/from __future__ import annotations/' There were some minor tweaks needed when reviewing (mostly making the spacing around the import consistent, and `mercurial/testing/__init__.py` had a multiline import that wasn't fully rewritten. [1] https://docs.python.org/3/whatsnew/3.7.html#pep-563-postponed-evaluation-of-annotations

author	Matt Harbison <matt_harbison@yahoo.com>
date	Mon, 16 Sep 2024 15:36:44 +0200
parents	45d5e9a0f6a6
children	472c30a4df0e

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

Mercurial > public > mercurial-scm > hg

annotate hgext/fastannotate/context.py @ 51859:f4733654f144