sapling/fastannotate/context.py
Jun Wu bd3b5783c6 fastannotate: use a more efficient way to get filectx
Summary:
Usually we simply use `repo[node][path]` to get a `filectx` object.
But that can be painfully slow - it's reading the whole manifest by default.

The flat manifest and tree manifest both provide a method called `find` to
get a `filenode` without reading the entire manifest - which is our use-case
here since we don't need to resolve all files but just need to peek several
individual files.

As we are touching this area, also deal with revset string resolution so
we can simplify the logic in more places - now master can be a revset string
and is no lonnger needed to be lazily resolved. Besides, the `_getbase` logic
is also moved here and to be more efficient - the old `_getbase` still need
to read manifest.

This patch replaces all code using the `repo[node][path]` pattern to use the
more efficient implementation one.

Test Plan: Run existing tests

Reviewers: #sourcecontrol, stash

Reviewed By: stash

Subscribers: mjpieters

Differential Revision: https://phabricator.intern.facebook.com/D3936992

Signature: t1:3936992:1475138449:2ec6c71a592a256fa9487a5f7b41241bf7440f89
2016-09-28 15:56:31 +01:00

620 lines
23 KiB
Python

# Copyright 2016-present Facebook. All Rights Reserved.
#
# context: context needed to annotate a file
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
from collections import defaultdict
import contextlib
import os
from fastannotate import (
revmap as revmapmod,
error as faerror,
)
from mercurial import (
context as hgcontext,
error,
lock as lockmod,
mdiff,
node,
scmutil,
util,
)
from mercurial.i18n import _
import linelog as linelogmod
# given path, get filelog, cached
@util.lrucachefunc
def _getflog(repo, path):
return repo.file(path)
# extracted from mercurial.context.basefilectx.annotate
def _parents(f, follow=True):
# Cut _descendantrev here to mitigate the penalty of lazy linkrev
# adjustment. Otherwise, p._adjustlinkrev() would walk changelog
# from the topmost introrev (= srcrev) down to p.linkrev() if it
# isn't an ancestor of the srcrev.
f._changeid
pl = f.parents()
# Don't return renamed parents if we aren't following.
if not follow:
pl = [p for p in pl if p.path() == f.path()]
# renamed filectx won't have a filelog yet, so set it
# from the cache to save time
for p in pl:
if not '_filelog' in p.__dict__:
p._filelog = _getflog(f._repo, p.path())
return pl
# extracted from mercurial.context.basefilectx.annotate. slightly modified
# so it takes a fctx instead of a pair of text and fctx.
def _decorate(fctx):
text = fctx.data()
linecount = text.count('\n')
if not text.endswith('\n'):
linecount += 1
return ([(fctx, i) for i in xrange(linecount)], text)
# extracted from mercurial.context.basefilectx.annotate. slightly modified
# so it takes an extra "blocks" parameter calculated elsewhere, instead of
# calculating diff here.
def _pair(parent, child, blocks):
for (a1, a2, b1, b2), t in blocks:
# Changed blocks ('!') or blocks made only of blank lines ('~')
# belong to the child.
if t == '=':
child[0][b1:b2] = parent[0][a1:a2]
return child
# like scmutil.revsingle, but with lru cache, so their states (like manifests)
# could be reused
_revsingle = util.lrucachefunc(scmutil.revsingle)
def resolvefctx(repo, rev, path, resolverev=False, adjustctx=None):
"""(repo, str, str) -> fctx
get the filectx object from repo, rev, path, in an efficient way.
if resolverev is True, "rev" is a revision specified by the revset
language, otherwise "rev" is a nodeid, or a revision number that can
be consumed by repo.__getitem__.
if adjustctx is not None, the returned fctx will point to a changeset
that introduces the change (last modified the file).
"""
if resolverev:
ctx = _revsingle(repo, rev)
else:
ctx = repo[rev]
# manifest.find is optimized for single file resolution. use it instead
# of manifest.get or ctx.__getitem__ or ctx.filectx for better performance.
# note: this is kind of reinventing ctx.filectx.
try:
fnode, flag = ctx.manifest().find(path)
except KeyError:
raise error.ManifestLookupError(rev, path, _('not found in manifest'))
# TODO: remotefilelog compatibility - remotefilelog does not have a real
# filelog - need a different approach
flog = _getflog(repo, path)
fctx = hgcontext.filectx(repo, path, fileid=fnode, filelog=flog,
changeid=ctx.rev(), changectx=ctx)
if adjustctx is not None:
introrev = fctx.introrev()
if introrev != ctx.rev():
fctx._changeid = introrev
fctx._changectx = repo[introrev]
return fctx
class annotateopts(object):
"""like mercurial.mdiff.diffopts, but is for annotate
followrename: follow renames, like "hg annotate -f"
followmerge: follow p2 of a merge changeset, otherwise p2 is ignored
"""
defaults = {
'followrename': True,
'followmerge': True,
}
def __init__(self, **opts):
for k, v in self.defaults.iteritems():
setattr(self, k, opts.get(k, v))
@property
def shortstr(self):
"""represent opts in a short string, suitable for a directory name"""
result = ''
if not self.followrename:
result += 'r0'
if not self.followmerge:
result += 'm0'
return result or 'default'
defaultopts = annotateopts()
class _annotatecontext(object):
"""do not use this class directly as it does not use lock to protect
writes. use "with annotatecontext(...)" instead.
"""
def __init__(self, repo, path, linelog, revmap, opts):
self.repo = repo
self.ui = repo.ui
self.path = path
self.linelog = linelog
self.revmap = revmap
self.opts = opts
def annotate(self, rev, master=None, showpath=False, showlines=False):
"""incrementally update the cache so it includes revisions in the main
branch till 'master'. and run annotate on 'rev', which may or may not be
included in the main branch.
if master is None, do not update linelog.
the first value returned is the annotate result, it is [(node, linenum)]
by default. [(node, linenum, path)] if showpath is True.
if showlines is True, a second value will be returned, it is a list of
corresponding line contents.
"""
# fast path: if rev is in the main branch already
directly, revfctx = self.canannotatedirectly(rev)
if directly:
if self.ui.debugflag:
self.ui.debug('fastannotate: %s: no need to update linelog\n'
% self.path)
return self.annotatedirectly(revfctx, showpath, showlines)
# resolve master
masterfctx = None
if master:
masterfctx = self._resolvefctx(master, resolverev=True,
adjustctx=True)
if masterfctx in self.revmap: # no need to update linelog
masterfctx = None
# ... - @ <- rev (can be an arbitrary changeset,
# / not necessarily a descendant
# master -> o of master)
# |
# a merge -> o 'o': new changesets in the main branch
# |\ '#': revisions in the main branch that
# o * exist in linelog / revmap
# | . '*': changesets in side branches, or
# last master -> # . descendants of master
# | .
# # * joint: '#', and is a parent of a '*'
# |/
# a joint -> # ^^^^ --- side branches
# |
# ^ --- main branch (in linelog)
# these DFSes are similar to the traditional annotate algorithm.
# we cannot really reuse the code for perf reason.
# 1st DFS calculates merges, joint points, and needed.
# "needed" is a simple reference counting dict to free items in
# "hist", reducing its memory usage otherwise could be huge.
initvisit = [revfctx]
if masterfctx:
initvisit.append(masterfctx)
visit = initvisit[:]
pcache = {}
needed = {revfctx: 1}
hist = {} # {fctx: ([(llrev or fctx, linenum)], text)}
while visit:
f = visit.pop()
if f in pcache or f in hist:
continue
if f in self.revmap: # in the old main branch, it's a joint
llrev = self.revmap.hsh2rev(f.node())
self.linelog.annotate(llrev)
result = self.linelog.annotateresult
hist[f] = (result, f.data())
continue
pl = self._parentfunc(f)
pcache[f] = pl
for p in pl:
needed[p] = needed.get(p, 0) + 1
if p not in pcache:
visit.append(p)
# 2nd (simple) DFS calculates new changesets in the main branch
# ('o' nodes in # the above graph), so we know when to update linelog.
newmainbranch = set()
f = masterfctx
while f and f not in self.revmap:
newmainbranch.add(f)
pl = pcache[f]
if pl:
f = pl[0]
else:
f = None
break
# f, if present, is the position where the last build stopped at, and
# should be the "master" last time. check to see if we can continue
# building the linelog incrementally. (we cannot if diverged)
if masterfctx is not None:
self._checklastmasterhead(f)
if self.ui.debugflag:
self.ui.debug('fastannotate: %s: %d new changesets in the main '
'branch\n' % (self.path, len(newmainbranch)))
# prepare annotateresult so we can update linelog incrementally
self.linelog.annotate(self.linelog.maxrev)
# 3rd DFS does the actual annotate
visit = initvisit[:]
progress = 0
while visit:
f = visit[-1]
if f in hist or f in self.revmap:
visit.pop()
continue
ready = True
pl = pcache[f]
for p in pl:
if p not in hist:
ready = False
visit.append(p)
if not ready:
continue
visit.pop()
blocks = None # mdiff blocks, used for appending linelog
ismainbranch = (f in newmainbranch)
# curr is the same as the traditional annotate algorithm,
# if we only care about linear history (do not follow merge),
# then curr is not actually used.
assert f not in hist
curr = _decorate(f)
for i, p in enumerate(pl):
bs = list(mdiff.allblocks(hist[p][1], curr[1]))
if i == 0 and ismainbranch:
blocks = bs
curr = _pair(hist[p], curr, bs)
if needed[p] == 1:
del hist[p]
del needed[p]
else:
needed[p] -= 1
hist[f] = curr
del pcache[f]
if ismainbranch: # need to write to linelog
if not self.ui.quiet:
progress += 1
self.ui.progress(_('building cache'), progress,
total=len(newmainbranch))
bannotated = None
if len(pl) == 2 and self.opts.followmerge: # merge
bannotated = curr[0]
if blocks is None: # no parents, add an empty one
blocks = list(mdiff.allblocks('', curr[1]))
self._appendrev(f, blocks, bannotated)
if progress: # clean progress bar
self.ui.write()
result = [
((self.revmap.rev2hsh(f) if isinstance(f, int) else f.node()), l)
for f, l in hist[revfctx][0]]
return self._refineannotateresult(result, revfctx, showpath, showlines)
def canannotatedirectly(self, rev):
"""(str) -> bool, fctx or node.
return (True, f) if we can annotate without updating the linelog, pass
f to annotatedirectly.
return (False, f) if we need extra calculation. f is the fctx resolved
from rev.
"""
result = True
f = None
if len(rev) == 20 and rev in self.revmap:
f = rev
elif len(rev) == 40 and node.bin(rev) in self.revmap:
f = node.bin(rev)
else:
adjustctx = True
f = self._resolvefctx(rev, adjustctx=adjustctx, resolverev=True)
result = f in self.revmap
return result, f
def annotatealllines(self, rev, showpath=False, showlines=False):
"""(rev : str) -> [(node : str, linenum : int, path : str)]
the result has the same format with annotate, but include all (including
deleted) lines up to rev. call this after calling annotate(rev, ...) for
better performance and accuracy.
"""
revfctx = self._resolvefctx(rev, resolverev=True, adjustctx=True)
# find a chain from rev to anything in the mainbranch
if revfctx not in self.revmap:
chain = [revfctx]
a = ''
while True:
f = chain[-1]
pl = self._parentfunc(f)
if not pl:
break
if pl[0] in self.revmap:
a = pl[0].data()
break
chain.append(pl[0])
# both self.linelog and self.revmap is backed by filesystem. now
# we want to modify them but do not want to write changes back to
# files. so we create in-memory objects and copy them. it's like
# a "fork".
linelog = linelogmod.linelog()
linelog.copyfrom(self.linelog)
revmap = revmapmod.revmap()
revmap.copyfrom(self.revmap)
for f in reversed(chain):
b = f.data()
blocks = list(mdiff.allblocks(a, b))
self._doappendrev(linelog, revmap, f, blocks)
a = b
else:
# fastpath: use existing linelog, revmap as we don't write to them
linelog = self.linelog
revmap = self.revmap
lines = linelog.getalllines()
hsh = revfctx.node()
llrev = revmap.hsh2rev(hsh)
result = [(revmap.rev2hsh(r), l) for r, l in lines if r <= llrev]
# cannot use _refineannotateresult since we need custom logic for
# resolving line contents
if showpath:
result = self._addpathtoresult(result, revmap)
if showlines:
linecontents = self._resolvelines(result, revmap, linelog)
result = (result, linecontents)
return result
def _resolvelines(self, annotateresult, revmap, linelog):
"""(annotateresult) -> [line]. designed for annotatealllines.
this is probably the most inefficient code in the whole fastannotate
directory. but we have made a decision that the linelog does not
store line contents. so getting them requires random accesses to
the revlog data, since they can be many, it can be very slow.
"""
# [llrev]
revs = [revmap.hsh2rev(l[0]) for l in annotateresult]
result = [None] * len(annotateresult)
# {(rev, linenum): [lineindex]}
key2idxs = defaultdict(list)
for i in xrange(len(result)):
key2idxs[(revs[i], annotateresult[i][1])].append(i)
while key2idxs:
# find an unresolved line and its linelog rev to annotate
hsh = None
try:
for (rev, _linenum), idxs in key2idxs.iteritems():
if revmap.rev2flag(rev) & revmapmod.sidebranchflag:
continue
hsh = annotateresult[idxs[0]][0]
break
except StopIteration: # no more unresolved lines
return result
if hsh is None:
# the remaining key2idxs are not in main branch, resolving them
# using the hard way...
revlines = {}
for (rev, linenum), idxs in key2idxs.iteritems():
if rev not in revlines:
hsh = annotateresult[idxs[0]][0]
if self.ui.debugflag:
self.ui.debug('fastannotate: reading %s line #%d '
'to resolve lines %r\n'
% (node.short(hsh), linenum, idxs))
fctx = self._resolvefctx(hsh, revmap.rev2path(rev))
lines = mdiff.splitnewlines(fctx.data())
revlines[rev] = lines
for idx in idxs:
result[idx] = revlines[rev][linenum]
assert all(x is not None for x in result)
return result
# run the annotate and the lines should match to the file content
self.ui.debug('fastannotate: annotate %s to resolve lines\n'
% node.short(hsh))
linelog.annotate(rev)
fctx = self._resolvefctx(hsh, revmap.rev2path(rev))
annotated = linelog.annotateresult
lines = mdiff.splitnewlines(fctx.data())
assert len(lines) == len(annotated)
# resolve lines from the annotate result
for i, line in enumerate(lines):
k = annotated[i]
if k in key2idxs:
for idx in key2idxs[k]:
result[idx] = line
del key2idxs[k]
return result
def annotatedirectly(self, f, showpath, showlines):
"""like annotate, but when we know that f is in linelog.
f can be either a 20-char str (node) or a fctx. this is for perf - in
the best case, the user provides a node and we don't need to read the
filelog or construct any filecontext.
"""
if isinstance(f, str):
hsh = f
else:
hsh = f.node()
llrev = self.revmap.hsh2rev(hsh)
assert llrev
assert (self.revmap.rev2flag(llrev) & revmapmod.sidebranchflag) == 0
self.linelog.annotate(llrev)
result = [(self.revmap.rev2hsh(r), l)
for r, l in self.linelog.annotateresult]
return self._refineannotateresult(result, f, showpath, showlines)
def _refineannotateresult(self, result, f, showpath, showlines):
"""add the missing path or line contents, they can be expensive.
f could be either node or fctx.
"""
if showpath:
result = self._addpathtoresult(result)
if showlines:
if isinstance(f, str): # f: node or fctx
llrev = self.revmap.hsh2rev(f)
fctx = self._resolvefctx(f, self.revmap.rev2path(llrev))
else:
fctx = f
lines = mdiff.splitnewlines(fctx.data())
assert len(lines) == len(result)
result = (result, lines)
return result
def _appendrev(self, fctx, blocks, bannotated=None):
self._doappendrev(self.linelog, self.revmap, fctx, blocks, bannotated)
@staticmethod
def _doappendrev(linelog, revmap, fctx, blocks, bannotated=None):
"""append a revision to linelog and revmap"""
def getllrev(f):
"""(fctx) -> int"""
# f should not be a linelog revision
assert not isinstance(f, int)
# f is a fctx, allocate linelog rev on demand
hsh = f.node()
rev = revmap.hsh2rev(hsh)
if rev is None:
rev = revmap.append(hsh, sidebranch=True, path=f.path())
return rev
# append sidebranch revisions to revmap
siderevs = []
siderevmap = {} # node: int
if bannotated is not None:
for (a1, a2, b1, b2), op in blocks:
if op != '=':
# f could be either linelong rev, or fctx.
siderevs += [f for f, l in bannotated[b1:b2]
if not isinstance(f, int)]
siderevs = set(siderevs)
if fctx in siderevs: # mainnode must be appended seperately
siderevs.remove(fctx)
for f in siderevs:
siderevmap[f] = getllrev(f)
# the changeset in the main branch, could be a merge
llrev = revmap.append(fctx.node(), path=fctx.path())
siderevmap[fctx] = llrev
for (a1, a2, b1, b2), op in reversed(blocks):
if op == '=':
continue
if bannotated is None:
linelog.replacelines(llrev, a1, a2, b1, b2)
else:
blines = [((r if isinstance(r, int) else siderevmap[r]), l)
for r, l in bannotated[b1:b2]]
linelog.replacelines_vec(llrev, a1, a2, blines)
def _addpathtoresult(self, annotateresult, revmap=None):
"""(revmap, [(node, linenum)]) -> [(node, linenum, path)]"""
if revmap is None:
revmap = self.revmap
nodes = set([n for n, l in annotateresult])
paths = dict((n, revmap.rev2path(revmap.hsh2rev(n))) for n in nodes)
return [(n, l, paths[n]) for n, l in annotateresult]
def _checklastmasterhead(self, fctx):
"""check if fctx is the master's head last time, raise if not"""
if fctx is None:
llrev = 0
else:
llrev = self.revmap.hsh2rev(fctx.node())
assert llrev
if self.linelog.maxrev != llrev:
raise faerror.CannotReuseError()
@util.propertycache
def _parentfunc(self):
"""-> (fctx) -> [fctx]"""
followrename = self.opts.followrename
followmerge = self.opts.followmerge
def parents(f):
pl = _parents(f, follow=followrename)
if not followmerge:
pl = pl[:1]
return pl
return parents
def _resolvefctx(self, rev, path=None, **kwds):
return resolvefctx(self.repo, rev, (path or self.path), **kwds)
def _unlinkpaths(paths):
"""silent, best-effort unlink"""
for path in paths:
try:
util.unlink(path)
except OSError:
pass
@contextlib.contextmanager
def annotatecontext(repo, path, opts=defaultopts, rebuild=False):
"""context needed to perform (fast) annotate on a file
an annotatecontext of a single file consists of two structures: the
linelog and the revmap. this function takes care of locking. only 1
process is allowed to write that file's linelog and revmap at a time.
when something goes wrong, this function will assume the linelog and the
revmap are in a bad state, and remove them from disk.
use this function in the following way:
with annotatecontext(...) as actx:
actx. ....
"""
# different options use different directories
subpath = os.path.join('fastannotate', opts.shortstr, path)
util.makedirs(repo.vfs.join(os.path.dirname(subpath)))
lockpath = subpath + '.lock'
lock = lockmod.lock(repo.vfs, lockpath)
fullpath = repo.vfs.join(subpath)
revmappath = fullpath + '.m'
linelogpath = fullpath + '.l'
linelog = revmap = None
try:
with lock:
if rebuild:
_unlinkpaths([revmappath, linelogpath])
revmap = revmapmod.revmap(revmappath)
linelog = linelogmod.linelog(linelogpath)
yield _annotatecontext(repo, path, linelog, revmap, opts)
except Exception:
revmap = linelog = None
_unlinkpaths([revmappath, linelogpath])
repo.ui.debug('fastannotate: %s: cache broken and deleted\n' % path)
raise
finally:
if revmap:
revmap.flush()
if linelog:
linelog.close()