##// END OF EJS Templates
repair: migrate revlogs during upgrade...
repair: migrate revlogs during upgrade Our next step for in-place upgrade is to migrate store data. Revlogs are the biggest source of data within the store and a store is useless without them, so we implement their migration first. Our strategy for migrating revlogs is to walk the store and call `revlog.clone()` on each revlog. There are some minor complications. Because revlogs have different storage options (e.g. changelog has generaldelta and delta chains disabled), we need to obtain the correct class of revlog so inserted data is encoded properly for its type. Various attempts at implementing progress indicators that didn't lead to frustration from false "it's almost done" indicators were made. I initially used a single progress bar based on number of revlogs. However, this quickly churned through all filelogs, got to 99% then effectively froze at 99.99% when it got to the manifest. So I converted the progress bar to total revision count. This was a little bit better. But the manifest was still significantly slower than filelogs and it took forever to process the last few percent. I then tried both revision/chunk bytes and raw bytes as the denominator. This had the opposite effect: because so much data is in manifests, it would churn through filelogs without showing much progress. When it got to manifests, it would fill in 90+% of the progress bar. I finally gave up having a unified progress bar and instead implemented 3 progress bars: 1 for filelog revisions, 1 for manifest revisions, and 1 for changelog revisions. I added extra messages indicating the total number of revisions of each so users know there are more progress bars coming. I also added extra messages before and after each stage to give extra details about what is happening. Strictly speaking, this isn't necessary. But the numbers are impressive. For example, when converting a non-generaldelta mozilla-central repository, the messages you see are: migrating 2475593 total revisions (1833043 in filelogs, 321156 in manifests, 321394 in changelog) migrating 1.67 GB in store; 2508 GB tracked data migrating 267868 filelogs containing 1833043 revisions (1.09 GB in store; 57.3 GB tracked data) finished migrating 1833043 filelog revisions across 267868 filelogs; change in size: -415776 bytes migrating 1 manifests containing 321156 revisions (518 MB in store; 2451 GB tracked data) That "2508 GB" figure really blew me away. I had no clue that the raw tracked data in mozilla-central was that large. Granted, 2451 GB is in the manifest and "only" 57.3 GB is in filelogs. But still. It's worth noting that gratuitous loading of source revlogs in order to display numbers and progress bars does serve a purpose: it ensures we can open all source revlogs. We don't want to spend several minutes copying revlogs only to encounter a permissions error or similar later. As part of this commit, we also add swapping of the store directory to the upgrade function. After revlogs are converted, we move the old store into the backup directory then move the temporary repo's store into the old store's location. On well-behaved systems, this should be 2 atomic operations and the window of inconsistency show be very narrow. There are still a few improvements to be made to store copying and upgrading. But this commit gets the bulk of the work out of the way.

File last commit:

r30712:5dde81de default
r30779:38aa1ca9 default
Show More
templatekw.py
607 lines | 20.3 KiB | text/x-python | PythonLexer
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053 # templatekw.py - common changeset template keywords
#
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Merge with stable
r10264 # GNU General Public License version 2 or any later version.
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053
Gregory Szorc
templatekw: use absolute_import
r25984 from __future__ import absolute_import
Yuya Nishihara
templatekw: avoid slow creation of changectx objects in showgraphnode()...
r27215 from .node import hex, nullid
Gregory Szorc
templatekw: use absolute_import
r25984 from . import (
Yuya Nishihara
templatekw: workaround for utf-8 round-trip of {desc}...
r28239 encoding,
Gregory Szorc
templatekw: use absolute_import
r25984 error,
hbisect,
patch,
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 registrar,
Gregory Szorc
templatekw: use absolute_import
r25984 scmutil,
util,
)
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053
Matt Mackall
templating: make new-style templating features work with command line lists
r17631 # This helper class allows us to handle both:
# "{files}" (legacy command-line-specific list hack) and
# "{files % '{file}\n'}" (hgweb-style with inlining and function support)
Yuya Nishihara
templater: implement _hybrid.__contains__ so that ifcontains can accept dict...
r24240 # and to access raw values:
# "{ifcontains(file, files, ...)}", "{ifcontains(key, extras, ...)}"
Yuya Nishihara
templatekw: forward _hybrid.get to raw values so that get(extras, key) works...
r24241 # "{get(extras, key)}"
Matt Mackall
templating: make new-style templating features work with command line lists
r17631
class _hybrid(object):
Yuya Nishihara
templatekw: change joinfmt to a mandatory argument of _hybrid object...
r29669 def __init__(self, gen, values, makemap, joinfmt):
Matt Mackall
templating: make new-style templating features work with command line lists
r17631 self.gen = gen
self.values = values
Yuya Nishihara
templatekw: keep raw list or dict in _hybrid object...
r24239 self._makemap = makemap
Yuya Nishihara
templatekw: change joinfmt to a mandatory argument of _hybrid object...
r29669 self.joinfmt = joinfmt
Matt Mackall
templating: make new-style templating features work with command line lists
r17631 def __iter__(self):
return self.gen
Yuya Nishihara
templater: make _hybrid not callable to avoid conflicting semantics...
r27891 def itermaps(self):
Yuya Nishihara
templatekw: keep raw list or dict in _hybrid object...
r24239 makemap = self._makemap
Matt Mackall
templating: make new-style templating features work with command line lists
r17631 for x in self.values:
Yuya Nishihara
templatekw: keep raw list or dict in _hybrid object...
r24239 yield makemap(x)
Yuya Nishihara
templater: implement _hybrid.__contains__ so that ifcontains can accept dict...
r24240 def __contains__(self, x):
return x in self.values
Anton Shestakov
templater: implement __len__ for _hybrid...
r22393 def __len__(self):
return len(self.values)
Yuya Nishihara
templatekw: forward _hybrid.get to raw values so that get(extras, key) works...
r24241 def __getattr__(self, name):
if name != 'get':
raise AttributeError(name)
return getattr(self.values, name)
Matt Mackall
templating: make new-style templating features work with command line lists
r17631
Matt Harbison
templatekw: allow the caller of showlist() to specify the join() separator...
r25726 def showlist(name, values, plural=None, element=None, separator=' ', **args):
Matt Mackall
templating: make new-style templating features work with command line lists
r17631 if not element:
element = name
Matt Harbison
templatekw: allow the caller of showlist() to specify the join() separator...
r25726 f = _showlist(name, values, plural, separator, **args)
Yuya Nishihara
templatekw: change joinfmt to a mandatory argument of _hybrid object...
r29669 return _hybrid(f, values, lambda x: {element: x}, lambda d: d[element])
Matt Mackall
templating: make new-style templating features work with command line lists
r17631
Matt Harbison
templatekw: allow the caller of showlist() to specify the join() separator...
r25726 def _showlist(name, values, plural=None, separator=' ', **args):
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053 '''expand set of values.
name is name of key in template map.
values is list of strings or dicts.
plural is plural of name, if not simply name + 's'.
Matt Harbison
templatekw: allow the caller of showlist() to specify the join() separator...
r25726 separator is used to join values as a string
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053
expansion works like this, given name 'foo'.
if values is empty, expand 'no_foos'.
if 'foo' not in template map, return values as a string,
Matt Harbison
templatekw: allow the caller of showlist() to specify the join() separator...
r25726 joined by 'separator'.
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053
expand 'start_foos'.
for each value, expand 'foo'. if 'last_foo' in template
map, expand it instead of 'foo' for last key.
expand 'end_foos'.
'''
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 templ = args['templ']
Matt Mackall
many, many trivial check-code fixups
r10282 if plural:
names = plural
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053 else: names = name + 's'
if not values:
noname = 'no_' + names
if noname in templ:
yield templ(noname, **args)
return
if name not in templ:
if isinstance(values[0], str):
Matt Harbison
templatekw: allow the caller of showlist() to specify the join() separator...
r25726 yield separator.join(values)
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053 else:
for v in values:
yield dict(v, **args)
return
startname = 'start_' + names
if startname in templ:
yield templ(startname, **args)
vargs = args.copy()
def one(v, tag=name):
try:
vargs.update(v)
except (AttributeError, ValueError):
try:
for a, b in v:
vargs[a] = b
except ValueError:
vargs[name] = v
return templ(tag, **vargs)
lastname = 'last_' + name
if lastname in templ:
last = values.pop()
else:
last = None
for v in values:
yield one(v)
if last is not None:
yield one(last, tag=lastname)
endname = 'end_' + names
if endname in templ:
yield templ(endname, **args)
Yuya Nishihara
templatekw: fix join format of parents keyword (issue5292)...
r29624 def _formatrevnode(ctx):
"""Format changeset as '{rev}:{node|formatnode}', which is the default
template provided by cmdutil.changeset_templater"""
repo = ctx.repo()
if repo.ui.debugflag:
hexnode = ctx.hex()
else:
hexnode = ctx.hex()[:12]
return '%d:%s' % (scmutil.intrev(ctx.rev()), hexnode)
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056 def getfiles(repo, ctx, revcache):
if 'files' not in revcache:
FUJIWARA Katsunori
templatekw: compare target context and its parent exactly (issue4690)...
r25392 revcache['files'] = repo.status(ctx.p1(), ctx)[:3]
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056 return revcache['files']
Matt Harbison
templatekw: allow getlatesttags() to match a specific tag pattern...
r26482 def getlatesttags(repo, ctx, cache, pattern=None):
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 '''return date, distance and name for the latest tag of rev'''
Matt Harbison
templatekw: allow getlatesttags() to match a specific tag pattern...
r26482 cachename = 'latesttags'
if pattern is not None:
cachename += '-' + pattern
match = util.stringmatcher(pattern)[2]
else:
match = util.always
if cachename not in cache:
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 # Cache mapping from rev to a tuple with tag date, tag
# distance and tag name
Matt Harbison
templatekw: allow getlatesttags() to match a specific tag pattern...
r26482 cache[cachename] = {-1: (0, 0, ['null'])}
latesttags = cache[cachename]
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057
rev = ctx.rev()
todo = [rev]
while todo:
rev = todo.pop()
if rev in latesttags:
continue
ctx = repo[rev]
Andrew Shadura
templatekw: allow tagtypes other than global in getlatesttags...
r20218 tags = [t for t in ctx.tags()
Matt Harbison
templatekw: allow getlatesttags() to match a specific tag pattern...
r26482 if (repo.tagtype(t) and repo.tagtype(t) != 'local'
and match(t))]
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 if tags:
Matt Harbison
templatekw: use a list of tags in getlatesttags() instead of joining them...
r25700 latesttags[rev] = ctx.date()[0], 0, [t for t in sorted(tags)]
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 continue
try:
# The tuples are laid out so the right one can be found by
# comparison.
pdate, pdist, ptag = max(
latesttags[p.rev()] for p in ctx.parents())
except KeyError:
# Cache miss - recurse
todo.append(rev)
todo.extend(p.rev() for p in ctx.parents())
continue
latesttags[rev] = pdate, pdist + 1, ptag
return latesttags[rev]
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 def getrenamedfn(repo, endrev=None):
rcache = {}
if endrev is None:
endrev = len(repo)
def getrenamed(fn, rev):
'''looks up all renames for a file (up to endrev) the first
time the file is given. It indexes on the changerev and only
parses the manifest if linkrev != changerev.
Returns rename info for fn at changerev rev.'''
if fn not in rcache:
rcache[fn] = {}
fl = repo.file(fn)
for i in fl:
lr = fl.linkrev(i)
renamed = fl.renamed(fl.node(i))
rcache[fn][lr] = renamed
if lr >= endrev:
break
if rev in rcache[fn]:
return rcache[fn][rev]
# If linkrev != rev (i.e. rev not found in rcache) fallback to
# filectx logic.
try:
return repo[rev][fn].renamed()
except error.LookupError:
return None
return getrenamed
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 # keywords are callables like:
# fn(repo, ctx, templ, cache, revcache, **args)
# with:
# repo - current repository instance
# ctx - the changectx being displayed
# templ - the templater instance
# cache - a cache dictionary for the whole templater run
# revcache - a cache dictionary for the current revision
keywords = {}
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 templatekeyword = registrar.templatekeyword(keywords)
@templatekeyword('author')
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showauthor(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. The unmodified author of the changeset."""
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return ctx.user()
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('bisect')
"Yann E. MORIN"
templates: add 'bisect' keyword to return a cset's bisect status...
r15155 def showbisect(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. The changeset bisection status."""
"Yann E. MORIN"
templates: add 'bisect' keyword to return a cset's bisect status...
r15155 return hbisect.label(repo, ctx.node())
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('branch')
Eric Eisner
template: add showbranch template for {branch}...
r13156 def showbranch(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. The name of the branch on which the changeset was
Patrick Mezard
templates: generate keyword help dynamically
r13585 committed.
"""
Eric Eisner
template: add showbranch template for {branch}...
r13156 return args['ctx'].branch()
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('branches')
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showbranches(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. The name of the branch on which the
Patrick Mezard
templates: generate keyword help dynamically
r13585 changeset was committed. Will be empty if the branch name was
Yuya Nishihara
templatekw: hide help of "branches" by DEPRECATED marker...
r26437 default. (DEPRECATED)
Patrick Mezard
templates: generate keyword help dynamically
r13585 """
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 branch = args['ctx'].branch()
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 if branch != 'default':
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 return showlist('branch', [branch], plural='branches', **args)
Matt Mackall
templater: makes branches work correctly with stringify (issue4108)
r20076 return showlist('branch', [], plural='branches', **args)
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('bookmarks')
David Soria Parra
templater: add bookmarks to templates and default output...
r13386 def showbookmarks(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. Any bookmarks associated with the
Ryan McElroy
templatekw: introduce active subkeyword from bookmarks keyword...
r25348 changeset. Also sets 'active', the name of the active bookmark.
Patrick Mezard
templates: document missing keywords or filters...
r13592 """
Durham Goode
template: add 'current' to scope during {bookmarks % ...}...
r20520 repo = args['ctx']._repo
David Soria Parra
templater: add bookmarks to templates and default output...
r13386 bookmarks = args['ctx'].bookmarks()
Ryan McElroy
templatekw: introduce active subkeyword from bookmarks keyword...
r25348 active = repo._activebookmark
makemap = lambda v: {'bookmark': v, 'active': active, 'current': active}
Yuya Nishihara
templatekw: inline showlist() into showbookmarks()...
r24156 f = _showlist('bookmark', bookmarks, **args)
Yuya Nishihara
templatekw: keep raw list or dict in _hybrid object...
r24239 return _hybrid(f, bookmarks, makemap, lambda x: x['bookmark'])
David Soria Parra
templater: add bookmarks to templates and default output...
r13386
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('children')
Jason Harris
templates: 'children' keyword...
r11655 def showchildren(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. The children of the changeset."""
Jason Harris
templates: 'children' keyword...
r11655 ctx = args['ctx']
childrevs = ['%d:%s' % (cctx, cctx) for cctx in ctx.children()]
Matt Mackall
templating: make new-style templating features work with command line lists
r17631 return showlist('children', childrevs, element='child', **args)
Jason Harris
templates: 'children' keyword...
r11655
Ryan McElroy
templatekw: introduce activebookmark keyword...
r25013 # Deprecated, but kept alive for help generation a purpose.
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('currentbookmark')
FUJIWARA Katsunori
templatekw: add 'currentbookmark' keyword to show current bookmark easily...
r21896 def showcurrentbookmark(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. The active bookmark, if it is
Ryan McElroy
templatekw: introduce activebookmark keyword...
r25013 associated with the changeset (DEPRECATED)"""
return showactivebookmark(**args)
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('activebookmark')
Ryan McElroy
templatekw: introduce activebookmark keyword...
r25013 def showactivebookmark(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. The active bookmark, if it is
FUJIWARA Katsunori
templatekw: add 'currentbookmark' keyword to show current bookmark easily...
r21896 associated with the changeset"""
Ryan McElroy
templatekw: display active bookmark more consistently (issue4552) (BC)...
r25387 active = args['repo']._activebookmark
if active and active in args['ctx'].bookmarks():
return active
FUJIWARA Katsunori
templatekw: add 'currentbookmark' keyword to show current bookmark easily...
r21896 return ''
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('date')
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showdate(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """Date information. The date when the changeset was committed."""
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return ctx.date()
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('desc')
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showdescription(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. The text of the changeset description."""
Yuya Nishihara
templatekw: workaround for utf-8 round-trip of {desc}...
r28239 s = ctx.description()
if isinstance(s, encoding.localstr):
# try hard to preserve utf-8 bytes
return encoding.tolocal(encoding.fromlocal(s).strip())
else:
return s.strip()
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('diffstat')
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showdiffstat(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. Statistics of changes with the following format:
Patrick Mezard
templates: generate keyword help dynamically
r13585 "modified files: +added/-removed lines"
"""
Matt Mackall
templatekw: use diffstatsum in diffstat keyword
r14403 stats = patch.diffstatdata(util.iterlines(ctx.diff()))
Steven Brown
patch: restore the previous output of 'diff --stat'...
r14437 maxname, maxtotal, adds, removes, binary = patch.diffstatsum(stats)
Matt Mackall
templatekw: use diffstatsum in diffstat keyword
r14403 return '%s: +%s/-%s' % (len(stats), adds, removes)
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('extras')
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showextras(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of dicts with key, value entries of the 'extras'
Matthew Turk
help: document about {extras} template keyword...
r20015 field of this changeset."""
Matthew Turk
template: modify showextras to return a hybrid...
r20183 extras = args['ctx'].extra()
Yuya Nishihara
templatekw: convert list of key/value pairs to sortdict...
r24237 extras = util.sortdict((k, extras[k]) for k in sorted(extras))
Yuya Nishihara
templatekw: give name to lambda that constructs variables map of templater...
r24238 makemap = lambda k: {'key': k, 'value': extras[k]}
c = [makemap(k) for k in extras]
Matthew Turk
template: modify showextras to return a hybrid...
r20183 f = _showlist('extra', c, plural='extras', **args)
Yuya Nishihara
templatekw: keep raw list or dict in _hybrid object...
r24239 return _hybrid(f, extras, makemap,
lambda x: '%s=%s' % (x['key'], x['value']))
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('file_adds')
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfileadds(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. Files added by this changeset."""
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 repo, ctx, revcache = args['repo'], args['ctx'], args['revcache']
Matt Mackall
templating: make new-style templating features work with command line lists
r17631 return showlist('file_add', getfiles(repo, ctx, revcache)[1],
element='file', **args)
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('file_copies')
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfilecopies(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. Files copied in this changeset with
Patrick Mezard
templates: generate keyword help dynamically
r13585 their sources.
"""
Benoit Boissinot
fix coding style (reported by pylint)
r10394 cache, ctx = args['cache'], args['ctx']
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 copies = args['revcache'].get('copies')
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 if copies is None:
if 'getrenamed' not in cache:
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 cache['getrenamed'] = getrenamedfn(args['repo'])
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 copies = []
getrenamed = cache['getrenamed']
for fn in ctx.files():
rename = getrenamed(fn, ctx.rev())
if rename:
copies.append((fn, rename[0]))
Matt Mackall
many, many trivial check-code fixups
r10282
Yuya Nishihara
templatekw: convert list of key/value pairs to sortdict...
r24237 copies = util.sortdict(copies)
Yuya Nishihara
templatekw: give name to lambda that constructs variables map of templater...
r24238 makemap = lambda k: {'name': k, 'source': copies[k]}
c = [makemap(k) for k in copies]
Matt Mackall
templater: properly handle file_copies with %
r18715 f = _showlist('file_copy', c, plural='file_copies', **args)
Yuya Nishihara
templatekw: keep raw list or dict in _hybrid object...
r24239 return _hybrid(f, copies, makemap,
lambda x: '%s (%s)' % (x['name'], x['source']))
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060
# showfilecopiesswitch() displays file copies only if copy records are
# provided before calling the templater, usually with a --copies
# command line switch.
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('file_copies_switch')
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfilecopiesswitch(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. Like "file_copies" but displayed
Patrick Mezard
templates: generate keyword help dynamically
r13585 only if the --copied switch is set.
"""
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 copies = args['revcache'].get('copies') or []
Yuya Nishihara
templatekw: convert list of key/value pairs to sortdict...
r24237 copies = util.sortdict(copies)
Yuya Nishihara
templatekw: give name to lambda that constructs variables map of templater...
r24238 makemap = lambda k: {'name': k, 'source': copies[k]}
c = [makemap(k) for k in copies]
Matt Mackall
templater: properly handle file_copies with %
r18715 f = _showlist('file_copy', c, plural='file_copies', **args)
Yuya Nishihara
templatekw: keep raw list or dict in _hybrid object...
r24239 return _hybrid(f, copies, makemap,
lambda x: '%s (%s)' % (x['name'], x['source']))
Patrick Mezard
cmdutil: extract file copies closure into templatekw
r10058
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('file_dels')
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfiledels(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. Files removed by this changeset."""
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 repo, ctx, revcache = args['repo'], args['ctx'], args['revcache']
Matt Mackall
templating: make new-style templating features work with command line lists
r17631 return showlist('file_del', getfiles(repo, ctx, revcache)[2],
element='file', **args)
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('file_mods')
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfilemods(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. Files modified by this changeset."""
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 repo, ctx, revcache = args['repo'], args['ctx'], args['revcache']
Matt Mackall
templating: make new-style templating features work with command line lists
r17631 return showlist('file_mod', getfiles(repo, ctx, revcache)[0],
element='file', **args)
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('files')
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfiles(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. All files modified, added, or removed by this
Patrick Mezard
templates: generate keyword help dynamically
r13585 changeset.
"""
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 return showlist('file', args['ctx'].files(), **args)
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('graphnode')
Yuya Nishihara
graphlog: extract "graphnode" template keyword that represents node symbol...
r27214 def showgraphnode(repo, ctx, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. The character representing the changeset node in
Yuya Nishihara
graphlog: extract "graphnode" template keyword that represents node symbol...
r27214 an ASCII revision graph"""
Yuya Nishihara
templatekw: avoid slow creation of changectx objects in showgraphnode()...
r27215 wpnodes = repo.dirstate.parents()
if wpnodes[1] == nullid:
wpnodes = wpnodes[:1]
Yuya Nishihara
graphlog: extract "graphnode" template keyword that represents node symbol...
r27214 if ctx.node() in wpnodes:
return '@'
elif ctx.obsolete():
return 'x'
elif ctx.closesbranch():
return '_'
else:
return 'o'
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('latesttag')
Matt Harbison
templatekw: make {latesttag} a hybrid list...
r25727 def showlatesttag(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. The global tags on the most recent globally
Matt Harbison
templatekw: make {latesttag} a hybrid list...
r25727 tagged ancestor of this changeset.
Patrick Mezard
templates: generate keyword help dynamically
r13585 """
Matt Harbison
templatekw: add {changes}, {distance} and {tag} to the {latesttag} keyword
r26486 return showlatesttags(None, **args)
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057
Matt Harbison
templatekw: introduce showlatesttags() to handle {latesttag} keywords...
r26484 def showlatesttags(pattern, **args):
"""helper method for the latesttag keyword and function"""
repo, ctx = args['repo'], args['ctx']
cache = args['cache']
latesttags = getlatesttags(repo, ctx, cache, pattern)
# latesttag[0] is an implementation detail for sorting csets on different
# branches in a stable manner- it is the date the tagged cset was created,
# not the date the tag was created. Therefore it isn't made visible here.
makemap = lambda v: {
'changes': _showchangessincetag,
'distance': latesttags[1],
'latesttag': v, # BC with {latesttag % '{latesttag}'}
'tag': v
}
tags = latesttags[2]
f = _showlist('latesttag', tags, separator=':', **args)
return _hybrid(f, tags, makemap, lambda x: x['latesttag'])
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('latesttagdistance')
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 def showlatesttagdistance(repo, ctx, templ, cache, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """Integer. Longest path to the latest tag."""
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 return getlatesttags(repo, ctx, cache)[1]
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('changessincelatesttag')
Matt Harbison
templatekw: introduce the changessincelatesttag keyword...
r25724 def showchangessincelatesttag(repo, ctx, templ, cache, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """Integer. All ancestors not in the latest tag."""
Matt Harbison
templatekw: introduce the changessincelatesttag keyword...
r25724 latesttag = getlatesttags(repo, ctx, cache)[2][0]
Matt Harbison
templatekw: factor out the changessincetag calculation to a private method...
r26483
return _showchangessincetag(repo, ctx, tag=latesttag, **args)
def _showchangessincetag(repo, ctx, **args):
Matt Harbison
templatekw: introduce the changessincelatesttag keyword...
r25724 offset = 0
revs = [ctx.rev()]
Matt Harbison
templatekw: factor out the changessincetag calculation to a private method...
r26483 tag = args['tag']
Matt Harbison
templatekw: introduce the changessincelatesttag keyword...
r25724
# The only() revset doesn't currently support wdir()
if ctx.rev() is None:
offset = 1
revs = [p.rev() for p in ctx.parents()]
Matt Harbison
templatekw: factor out the changessincetag calculation to a private method...
r26483 return len(repo.revs('only(%ld, %s)', revs, tag)) + offset
Matt Harbison
templatekw: introduce the changessincelatesttag keyword...
r25724
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('manifest')
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showmanifest(**args):
repo, ctx, templ = args['repo'], args['ctx'], args['templ']
Yuya Nishihara
templatekw: have {manifest} use ctx.manifestnode() for consistency...
r24676 mnode = ctx.manifestnode()
Yuya Nishihara
templatekw: apply manifest template only if ctx.manifestnode() exists...
r25736 if mnode is None:
# just avoid crash, we might want to use the 'ff...' hash in future
return
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 args = args.copy()
Durham Goode
manifest: remove last uses of repo.manifest...
r30375 args.update({'rev': repo.manifestlog._revlog.rev(mnode),
'node': hex(mnode)})
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 return templ('manifest', **args)
Yuya Nishihara
templatekw: move shownames() helper to be sorted alphabetically...
r27893 def shownames(namespace, **args):
"""helper method to generate a template keyword for a namespace"""
ctx = args['ctx']
repo = ctx.repo()
ns = repo.names[namespace]
names = ns.names(repo, ctx.node())
return showlist(ns.templatename, names, plural=namespace, **args)
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('namespaces')
Yuya Nishihara
templatekw: add {namespaces} keyword...
r27894 def shownamespaces(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """Dict of lists. Names attached to this changeset per
Yuya Nishihara
templatekw: add {namespaces} keyword...
r27894 namespace."""
ctx = args['ctx']
repo = ctx.repo()
namespaces = util.sortdict((k, showlist('name', ns.names(repo, ctx.node()),
**args))
for k, ns in repo.names.iteritems())
f = _showlist('namespace', list(namespaces), **args)
return _hybrid(f, namespaces,
lambda k: {'namespace': k, 'names': namespaces[k]},
lambda x: x['namespace'])
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('node')
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def shownode(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. The changeset identification hash, as a 40 hexadecimal
Patrick Mezard
templates: generate keyword help dynamically
r13585 digit string.
"""
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return ctx.hex()
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('p1rev')
epriestley
templatekw: add p1rev, p1node, p2rev, p2node keywords...
r17357 def showp1rev(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """Integer. The repository-local revision number of the changeset's
epriestley
templatekw: add p1rev, p1node, p2rev, p2node keywords...
r17357 first parent, or -1 if the changeset has no parents."""
return ctx.p1().rev()
epriestley
templatekw: add parent1, parent1node, parent2, parent2node keywords...
r17355
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('p2rev')
epriestley
templatekw: add p1rev, p1node, p2rev, p2node keywords...
r17357 def showp2rev(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """Integer. The repository-local revision number of the changeset's
epriestley
templatekw: add p1rev, p1node, p2rev, p2node keywords...
r17357 second parent, or -1 if the changeset has no second parent."""
return ctx.p2().rev()
epriestley
templatekw: add parent1, parent1node, parent2, parent2node keywords...
r17355
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('p1node')
epriestley
templatekw: add p1rev, p1node, p2rev, p2node keywords...
r17357 def showp1node(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. The identification hash of the changeset's first parent,
epriestley
templatekw: add p1rev, p1node, p2rev, p2node keywords...
r17357 as a 40 digit hexadecimal string. If the changeset has no parents, all
digits are 0."""
return ctx.p1().hex()
epriestley
templatekw: add parent1, parent1node, parent2, parent2node keywords...
r17355
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('p2node')
epriestley
templatekw: add p1rev, p1node, p2rev, p2node keywords...
r17357 def showp2node(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. The identification hash of the changeset's second
epriestley
templatekw: add p1rev, p1node, p2rev, p2node keywords...
r17357 parent, as a 40 digit hexadecimal string. If the changeset has no second
parent, all digits are 0."""
return ctx.p2().hex()
epriestley
templatekw: add parent1, parent1node, parent2, parent2node keywords...
r17355
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('parents')
Yuya Nishihara
templatekw: port implementation of showparents() from changeset_templater...
r26435 def showparents(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. The parents of the changeset in "rev:node"
Yuya Nishihara
templatekw: reorder stub of showparents() function...
r26434 format. If the changeset has only one "natural" parent (the predecessor
revision) nothing is shown."""
Yuya Nishihara
templatekw: port implementation of showparents() from changeset_templater...
r26435 repo = args['repo']
ctx = args['ctx']
Yuya Nishihara
templatekw: switch ctx of list expression to rev of {parents} (BC)...
r28270 pctxs = scmutil.meaningfulparents(repo, ctx)
prevs = [str(p.rev()) for p in pctxs] # ifcontains() needs a list of str
Yuya Nishihara
templatekw: port implementation of showparents() from changeset_templater...
r26435 parents = [[('rev', p.rev()),
('node', p.hex()),
('phase', p.phasestr())]
Yuya Nishihara
templatekw: switch ctx of list expression to rev of {parents} (BC)...
r28270 for p in pctxs]
f = _showlist('parent', parents, **args)
Yuya Nishihara
templatekw: fix join format of parents keyword (issue5292)...
r29624 return _hybrid(f, prevs, lambda x: {'ctx': repo[int(x)], 'revcache': {}},
lambda d: _formatrevnode(d['ctx']))
Yuya Nishihara
templatekw: reorder stub of showparents() function...
r26434
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('phase')
Pierre-Yves David
phases: add a phase template keyword
r15422 def showphase(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """String. The changeset phase name."""
Pierre-Yves David
phases: ``{phase}`` template keyword display the phase name...
r15823 return ctx.phasestr()
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('phaseidx')
Pierre-Yves David
phases: ``{phase}`` template keyword display the phase name...
r15823 def showphaseidx(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """Integer. The changeset phase index."""
Pierre-Yves David
phases: add a phase template keyword
r15422 return ctx.phase()
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('rev')
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showrev(repo, ctx, templ, **args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """Integer. The repository-local changeset revision number."""
Yuya Nishihara
templatekw: make {rev} return wdirrev instead of None...
r25740 return scmutil.intrev(ctx.rev())
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054
Yuya Nishihara
templater: switch ctx of list expression to rev of revset() (BC)...
r26234 def showrevslist(name, revs, **args):
"""helper to generate a list of revisions in which a mapped template will
be evaluated"""
repo = args['ctx'].repo()
Yuya Nishihara
templater: factor out type conversion of revset() result...
r28178 revs = [str(r) for r in revs] # ifcontains() needs a list of str
Yuya Nishihara
templater: switch ctx of list expression to rev of revset() (BC)...
r26234 f = _showlist(name, revs, **args)
return _hybrid(f, revs,
Yuya Nishihara
templatekw: fix join format of revset() function...
r29623 lambda x: {name: x, 'ctx': repo[int(x)], 'revcache': {}},
lambda d: d[name])
Yuya Nishihara
templater: switch ctx of list expression to rev of revset() (BC)...
r26234
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('subrepos')
FUJIWARA Katsunori
templatekw: add 'subrepos' keyword to show updated subrepositories...
r21897 def showsubrepos(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. Updated subrepositories in the changeset."""
FUJIWARA Katsunori
templatekw: add 'subrepos' keyword to show updated subrepositories...
r21897 ctx = args['ctx']
substate = ctx.substate
if not substate:
return showlist('subrepo', [], **args)
psubstate = ctx.parents()[0].substate or {}
subrepos = []
for sub in substate:
if sub not in psubstate or substate[sub] != psubstate[sub]:
subrepos.append(sub) # modified or newly added in ctx
for sub in psubstate:
if sub not in substate:
subrepos.append(sub) # removed in ctx
return showlist('subrepo', sorted(subrepos), **args)
FUJIWARA Katsunori
templatekw: re-add showtags() to list tags keyword up in online help...
r23977 # don't remove "showtags" definition, even though namespaces will put
# a helper function for "tags" keyword into "keywords" map automatically,
# because online help text is built without namespaces initialization
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 @templatekeyword('tags')
FUJIWARA Katsunori
templatekw: re-add showtags() to list tags keyword up in online help...
r23977 def showtags(**args):
FUJIWARA Katsunori
templatekw: use templatekeyword to mark a function as template keyword...
r28539 """List of strings. Any tags associated with the changeset."""
FUJIWARA Katsunori
templatekw: re-add showtags() to list tags keyword up in online help...
r23977 return shownames('tags', **args)
FUJIWARA Katsunori
registrar: add templatekeyword to mark a function as template keyword (API)...
r28538 def loadkeyword(ui, extname, registrarobj):
"""Load template keyword from specified registrarobj
"""
for name, func in registrarobj._table.iteritems():
keywords[name] = func
Simon Farnsworth
template: provide a termwidth keyword (issue5395)...
r30088 @templatekeyword('termwidth')
def termwidth(repo, ctx, templ, **args):
"""Integer. The width of the current terminal."""
return repo.ui.termwidth()
Denis Laxalde
templatekw: add a "troubles" template keyword...
r30712 @templatekeyword('troubles')
def showtroubles(**args):
"""List of strings. Evolution troubles affecting the changeset.
(EXPERIMENTAL)
"""
return showlist('trouble', args['ctx'].troubles(), **args)
Patrick Mezard
templates: generate keyword help dynamically
r13585 # tell hggettext to extract docstrings from these functions:
Yuya Nishihara
templatekw: remove dockeywords hack...
r26436 i18nfunctions = keywords.values()