##// END OF EJS Templates
patch: support diff data loss detection and upgrade...
patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.

File last commit:

r10060:f780b109 default
r10189:e451e599 default
Show More
templatekw.py
249 lines | 7.7 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
# GNU General Public License version 2, incorporated herein by reference.
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 from node import hex
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 import encoding, patch, util, error
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053
def showlist(templ, name, values, plural=None, **args):
'''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'.
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,
joined by space.
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'.
'''
if plural: names = plural
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):
yield ' '.join(values)
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)
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056 def getfiles(repo, ctx, revcache):
if 'files' not in revcache:
revcache['files'] = repo.status(ctx.parents()[0].node(),
ctx.node())[:3]
return revcache['files']
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 def getlatesttags(repo, ctx, cache):
'''return date, distance and name for the latest tag of rev'''
if 'latesttags' not in cache:
# Cache mapping from rev to a tuple with tag date, tag
# distance and tag name
cache['latesttags'] = {-1: (0, 0, 'null')}
latesttags = cache['latesttags']
rev = ctx.rev()
todo = [rev]
while todo:
rev = todo.pop()
if rev in latesttags:
continue
ctx = repo[rev]
tags = [t for t in ctx.tags() if repo.tagtype(t) == 'global']
if tags:
latesttags[rev] = ctx.date()[0], 0, ':'.join(sorted(tags))
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
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showauthor(repo, ctx, templ, **args):
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return ctx.user()
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showbranches(repo, ctx, templ, **args):
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 branch = ctx.branch()
if branch != 'default':
branch = encoding.tolocal(branch)
return showlist(templ, 'branch', [branch], plural='branches', **args)
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showdate(repo, ctx, templ, **args):
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return ctx.date()
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showdescription(repo, ctx, templ, **args):
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return ctx.description().strip()
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showdiffstat(repo, ctx, templ, **args):
diff = patch.diff(repo, ctx.parents()[0].node(), ctx.node())
files, adds, removes = 0, 0, 0
for i in patch.diffstatdata(util.iterlines(diff)):
files += 1
adds += i[1]
removes += i[2]
return '%s: +%s/-%s' % (files, adds, removes)
def showextras(repo, ctx, templ, **args):
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 for key, value in sorted(ctx.extra().items()):
args = args.copy()
args.update(dict(key=key, value=value))
yield templ('extra', **args)
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056 def showfileadds(repo, ctx, templ, revcache, **args):
return showlist(templ, 'file_add', getfiles(repo, ctx, revcache)[1], **args)
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 def showfilecopies(repo, ctx, templ, cache, revcache, **args):
copies = revcache.get('copies')
if copies is None:
if 'getrenamed' not in cache:
cache['getrenamed'] = getrenamedfn(repo)
copies = []
getrenamed = cache['getrenamed']
for fn in ctx.files():
rename = getrenamed(fn, ctx.rev())
if rename:
copies.append((fn, rename[0]))
c = [{'name': x[0], 'source': x[1]} for x in copies]
return showlist(templ, 'file_copy', c, plural='file_copies', **args)
# showfilecopiesswitch() displays file copies only if copy records are
# provided before calling the templater, usually with a --copies
# command line switch.
def showfilecopiesswitch(repo, ctx, templ, cache, revcache, **args):
copies = revcache.get('copies') or []
c = [{'name': x[0], 'source': x[1]} for x in copies]
Patrick Mezard
cmdutil: extract file copies closure into templatekw
r10058 return showlist(templ, 'file_copy', c, plural='file_copies', **args)
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056 def showfiledels(repo, ctx, templ, revcache, **args):
return showlist(templ, 'file_del', getfiles(repo, ctx, revcache)[2], **args)
def showfilemods(repo, ctx, templ, revcache, **args):
return showlist(templ, 'file_mod', getfiles(repo, ctx, revcache)[0], **args)
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showfiles(repo, ctx, templ, **args):
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return showlist(templ, 'file', ctx.files(), **args)
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 def showlatesttag(repo, ctx, templ, cache, **args):
return getlatesttags(repo, ctx, cache)[2]
def showlatesttagdistance(repo, ctx, templ, cache, **args):
return getlatesttags(repo, ctx, cache)[1]
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showmanifest(repo, ctx, templ, **args):
args = args.copy()
args.update(dict(rev=repo.manifest.rev(ctx.changeset()[0]),
node=hex(ctx.changeset()[0])))
return templ('manifest', **args)
def shownode(repo, ctx, templ, **args):
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return ctx.hex()
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showrev(repo, ctx, templ, **args):
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return ctx.rev()
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showtags(repo, ctx, templ, **args):
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return showlist(templ, 'tag', ctx.tags(), **args)
keywords = {
'author': showauthor,
'branches': showbranches,
'date': showdate,
'desc': showdescription,
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 'diffstat': showdiffstat,
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 'extras': showextras,
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056 'file_adds': showfileadds,
Patrick Mezard
cmdutil: extract file copies closure into templatekw
r10058 'file_copies': showfilecopies,
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 'file_copies_switch': showfilecopiesswitch,
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056 'file_dels': showfiledels,
'file_mods': showfilemods,
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 'files': showfiles,
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 'latesttag': showlatesttag,
'latesttagdistance': showlatesttagdistance,
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 'manifest': showmanifest,
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 'node': shownode,
'rev': showrev,
'tags': showtags,
}