##// END OF EJS Templates
rebase: add boolean config item rebase.store-source...
rebase: add boolean config item rebase.store-source This allows to use rebase without recording a rebase_source extra field. This is useful for example to build a mirror converted from another SCM (such as svn) by converting only new revisions, and then incrementally add them to the destination by pulling from the newly converted (unrelated) repo and rebasing the new revisions onto the last old already stored changeset. Without this patch the rebased changesets would always receive some rebase_source that would depend on the particular history of the conversion process, instead of only depending on the original source revisions. This is used to implement a hg mirror repo of SvarDOS (a partially nonfree but completely redistributable DOS distribution) in the scripts at https://hg.pushbx.org/ecm/svardos.scr/ In particular, cre.sh creates an svn mirror, upd.sh recreates an entire hg repo from the svn mirror (which takes too long to do in a regular job), and akt.sh uses hg convert with the config item convert.svn.startrev to incrementally convert only the two most recent revisions already found in the mirror destination plus any possible new revisions. If any are found, the temporary repo's changesets are pulled into the destination (as changesets from an unrelated repository). Then the changesets corresponding to the new revisions are rebased onto the prior final changeset. (Finally, the two remaining duplicates of the prior head and its parent are stripped from the destination repository.) Without this patch, the particular rebase_source extra field would depend on the order and times at which akt.sh was used, instead of only depending on the source repository. In other words, whatever sequence of upd.sh and akt.sh is used at whatever times, it is desired that the final output repositories always match each other exactly.

File last commit:

r49801:642e31cb default
r50343:cfff73ca default
Show More
support.py
136 lines | 4.0 KiB | text/x-python | PythonLexer
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 # Copyright 2016-present Facebook. All Rights Reserved.
#
# support: fastannotate support for hgweb, and filectx
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Gregory Szorc
py3: manually import getattr where it is needed...
r43359 from mercurial.pycompat import getattr
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 from mercurial import (
context as hgcontext,
dagop,
extensions,
hgweb,
patch,
util,
)
from . import (
context,
revmap,
)
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
py3: use class X: instead of class X(object):...
r49801 class _lazyfctx:
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 """delegates to fctx but do not construct fctx when unnecessary"""
def __init__(self, repo, node, path):
self._node = node
self._path = path
self._repo = repo
def node(self):
return self._node
def path(self):
return self._path
@util.propertycache
def _fctx(self):
return context.resolvefctx(self._repo, self._node, self._path)
def __getattr__(self, name):
return getattr(self._fctx, name)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 def _convertoutputs(repo, annotated, contents):
"""convert fastannotate outputs to vanilla annotate format"""
# fastannotate returns: [(nodeid, linenum, path)], [linecontent]
# convert to what fctx.annotate returns: [annotateline]
results = []
fctxmap = {}
annotateline = dagop.annotateline
for i, (hsh, linenum, path) in enumerate(annotated):
if (hsh, path) not in fctxmap:
fctxmap[(hsh, path)] = _lazyfctx(repo, hsh, path)
# linenum: the user wants 1-based, we have 0-based.
lineno = linenum + 1
fctx = fctxmap[(hsh, path)]
line = contents[i]
results.append(annotateline(fctx=fctx, lineno=lineno, text=line))
return results
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 def _getmaster(fctx):
"""(fctx) -> str"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return fctx._repo.ui.config(b'fastannotate', b'mainbranch') or b'default'
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 def _doannotate(fctx, follow=True, diffopts=None):
"""like the vanilla fctx.annotate, but do it via fastannotate, and make
the output format compatible with the vanilla fctx.annotate.
may raise Exception, and always return line numbers.
"""
master = _getmaster(fctx)
with context.fctxannotatecontext(fctx, follow, diffopts) as ac:
try:
Augie Fackler
formatting: blacken the codebase...
r43346 annotated, contents = ac.annotate(
fctx.rev(), master=master, showpath=True, showlines=True
)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 except Exception:
Augie Fackler
formatting: blacken the codebase...
r43346 ac.rebuild() # try rebuild once
fctx._repo.ui.debug(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'fastannotate: %s: rebuilding broken cache\n' % fctx._path
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 try:
Augie Fackler
formatting: blacken the codebase...
r43346 annotated, contents = ac.annotate(
fctx.rev(), master=master, showpath=True, showlines=True
)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 except Exception:
raise
assert annotated and contents
return _convertoutputs(fctx._repo, annotated, contents)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 def _hgwebannotate(orig, fctx, ui):
Augie Fackler
formatting: blacken the codebase...
r43346 diffopts = patch.difffeatureopts(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui, untrusted=True, section=b'annotate', whitespace=True
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 return _doannotate(fctx, diffopts=diffopts)
Augie Fackler
formatting: blacken the codebase...
r43346
def _fctxannotate(
orig, self, follow=False, linenumber=False, skiprevs=None, diffopts=None
):
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 if skiprevs:
# skiprevs is not supported yet
Augie Fackler
formatting: blacken the codebase...
r43346 return orig(
self, follow, linenumber, skiprevs=skiprevs, diffopts=diffopts
)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 try:
return _doannotate(self, follow, diffopts)
except Exception as ex:
Augie Fackler
formatting: blacken the codebase...
r43346 self._repo.ui.debug(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 b'fastannotate: falling back to the vanilla annotate: %r\n' % ex
Augie Fackler
formatting: blacken the codebase...
r43346 )
return orig(self, follow=follow, skiprevs=skiprevs, diffopts=diffopts)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243
def _remotefctxannotate(orig, self, follow=False, skiprevs=None, diffopts=None):
# skipset: a set-like used to test if a fctx needs to be downloaded
with context.fctxannotatecontext(self, follow, diffopts) as ac:
skipset = revmap.revmap(ac.revmappath)
Augie Fackler
formatting: blacken the codebase...
r43346 return orig(
self, follow, skiprevs=skiprevs, diffopts=diffopts, prefetchskip=skipset
)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243
def replacehgwebannotate():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 extensions.wrapfunction(hgweb.webutil, b'annotate', _hgwebannotate)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 def replacefctxannotate():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 extensions.wrapfunction(hgcontext.basefilectx, b'annotate', _fctxannotate)