##// END OF EJS Templates
rebase: skip resolved but emptied revisions...
rebase: skip resolved but emptied revisions When rebasing, if a conflict occurs and is resolved in a way the rebased revision becomes empty, it is not skipped, unlike revisions being emptied without conflicts. The reason is: - File 'x' is merged and resolved, merge.update() marks it as 'm' in the dirstate. - rebase.concludenode() calls localrepo.commit(), which calls localrepo.status() which calls dirstate.status(). 'x' shows up as 'm' and is unconditionnally added to the modified files list, instead of being checked again. - localrepo.commit() detects 'x' as changed an create a new revision where only the manifest parents and linkrev differ. Marking 'x' as modified without checking it makes sense for regular merges. But in rebase case, the merge looks normal but the second parent is usually discarded. When this happens, 'm' files in dirstate are a bit irrelevant and should be considered 'n' possibly dirty instead. That is what the current patch does. Another approach, maybe more efficient, would be to pass another flag to merge.update() saying the 'branchmerge' is a bit of a lie and recordupdate() should call dirstate.normallookup() instead of merge(). It is also tempting to add this logic to dirstate.setparents(), moving from two to one parent is what invalidates the 'm' markers. But this is a far bigger change to make. v2: succumb to the temptation and move the logic in dirstate.setparents(). mpm suggested trying _filecommit() first but it is called by commitctx() which knows nothing about the dirstate and comes too late into the game. A second approach was to rewrite the 'm' state into 'n' on the fly in dirstate.status() which failed for graft in the following case: $ hg init repo $ cd repo $ echo a > a $ hg ci -qAm0 $ echo a >> a $ hg ci -m1 $ hg up 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg mv a b $ echo c > b $ hg ci -m2 created new head $ hg graft 1 --tool internal:local grafting revision 1 $ hg --config extensions.graphlog= glog --template '{rev} {desc|firstline}\n' @ 3 1 | o 2 2 | | o 1 1 |/ o 0 0 $ hg log -r 3 --debug --patch --git --copies changeset: 3:19cd7d1417952af13161b94c32e901769104560c tag: tip phase: draft parent: 2:b5c505595c9e9a12d5dd457919c143e05fc16fb8 parent: -1:0000000000000000000000000000000000000000 manifest: 3:3d27ce8d02241aa59b60804805edf103c5c0cda4 user: test date: Thu Jan 01 00:00:00 1970 +0000 extra: branch=default extra: source=a03df74c41413a75c0a42997fc36c2de97b26658 description: 1 Here, revision 3 is created because there is a copy record for 'b' in the dirstate and thus 'b' is considered modified. But this information is discarded at commit time since 'b' content is unchanged. I do not know if discarding this information is correct or not, but at this time we cannot represent it anyway. This patch therefore implements the last solution of moving the logic into dirstate.setparents(). It does not sound crazy as 'm' files makes no sense with only one parent. It also makes dirstate.merge() calls .lookupnormal() if there is one parent, to preserve the invariant. I am a bit concerned about introducing this kind of stateful behaviour to existing code which historically treated setparents() as a basic setter without side-effects. And doing that during the code freeze.

File last commit:

r15947:bdd1ed80 stable
r16509:eab9119c stable
Show More
templatekw.py
330 lines | 10.6 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
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 from node import hex
Matt Mackall
help: consolidate topic hooks in help.py...
r14318 import patch, util, error
"Yann E. MORIN"
templates: add 'bisect' keyword to return a cset's bisect status...
r15155 import hbisect
Patrick Mezard
cmdutil: replace showlist() closure with a function
r10053
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showlist(name, values, plural=None, **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'.
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'.
'''
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):
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:
Matt Mackall
misc: replace .parents()[0] with p1()
r13878 revcache['files'] = repo.status(ctx.p1().node(), ctx.node())[:3]
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056 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
templates: generate keyword help dynamically
r13585 """:author: String. The unmodified author of the changeset."""
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return ctx.user()
"Yann E. MORIN"
templates: add 'bisect' keyword to return a cset's bisect status...
r15155 def showbisect(repo, ctx, templ, **args):
""":bisect: String. The changeset bisection status."""
return hbisect.label(repo, ctx.node())
Eric Eisner
template: add showbranch template for {branch}...
r13156 def showbranch(**args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:branch: String. The name of the branch on which the changeset was
committed.
"""
Eric Eisner
template: add showbranch template for {branch}...
r13156 return args['ctx'].branch()
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showbranches(**args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:branches: List of strings. The name of the branch on which the
changeset was committed. Will be empty if the branch name was
default.
"""
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)
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054
David Soria Parra
templater: add bookmarks to templates and default output...
r13386 def showbookmarks(**args):
Patrick Mezard
templates: document missing keywords or filters...
r13592 """:bookmarks: List of strings. Any bookmarks associated with the
changeset.
"""
David Soria Parra
templater: add bookmarks to templates and default output...
r13386 bookmarks = args['ctx'].bookmarks()
return showlist('bookmark', bookmarks, **args)
Jason Harris
templates: 'children' keyword...
r11655 def showchildren(**args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:children: 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()]
return showlist('children', childrevs, **args)
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showdate(repo, ctx, templ, **args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:date: Date information. The date when the changeset was committed."""
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
templates: generate keyword help dynamically
r13585 """:desc: String. The text of the changeset description."""
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):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:diffstat: String. Statistics of changes with the following format:
"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
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showextras(**args):
templ = args['templ']
for key, value in sorted(args['ctx'].extra().items()):
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 args = args.copy()
args.update(dict(key=key, value=value))
yield templ('extra', **args)
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfileadds(**args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:file_adds: 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']
return showlist('file_add', getfiles(repo, ctx, revcache)[1], **args)
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfilecopies(**args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:file_copies: List of strings. Files copied in this changeset with
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
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 c = [{'name': x[0], 'source': x[1]} for x in copies]
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 return showlist('file_copy', c, plural='file_copies', **args)
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.
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfilecopiesswitch(**args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:file_copies_switch: List of strings. Like "file_copies" but displayed
only if the --copied switch is set.
"""
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 copies = args['revcache'].get('copies') or []
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 c = [{'name': x[0], 'source': x[1]} for x in copies]
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 return showlist('file_copy', c, plural='file_copies', **args)
Patrick Mezard
cmdutil: extract file copies closure into templatekw
r10058
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfiledels(**args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:file_dels: 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']
return showlist('file_del', getfiles(repo, ctx, revcache)[2], **args)
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfilemods(**args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:file_mods: 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']
return showlist('file_mod', getfiles(repo, ctx, revcache)[0], **args)
Patrick Mezard
cmdutil: extract file changes closures into templatekw
r10056
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showfiles(**args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:files: List of strings. All files modified, added, or removed by this
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
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 def showlatesttag(repo, ctx, templ, cache, **args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:latesttag: String. Most recent global tag in the ancestors of this
changeset.
"""
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 return getlatesttags(repo, ctx, cache)[2]
def showlatesttagdistance(repo, ctx, templ, cache, **args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:latesttagdistance: Integer. Longest path to the latest tag."""
Patrick Mezard
cmdutil: extract latest tags closures in templatekw
r10057 return getlatesttags(repo, ctx, cache)[1]
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showmanifest(**args):
repo, ctx, templ = args['repo'], args['ctx'], args['templ']
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 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
templates: generate keyword help dynamically
r13585 """:node: String. The changeset identification hash, as a 40 hexadecimal
digit string.
"""
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return ctx.hex()
Pierre-Yves David
phases: add a phase template keyword
r15422 def showphase(repo, ctx, templ, **args):
Wagner Bruna
templatekw: fix phase keywords
r15947 """:phase: String. The changeset phase name."""
Pierre-Yves David
phases: ``{phase}`` template keyword display the phase name...
r15823 return ctx.phasestr()
def showphaseidx(repo, ctx, templ, **args):
Wagner Bruna
templatekw: fix phase keywords
r15947 """:phaseidx: Integer. The changeset phase index."""
Pierre-Yves David
phases: add a phase template keyword
r15422 return ctx.phase()
Patrick Mezard
cmdutil: extract repo dependent closures in templatekw
r10055 def showrev(repo, ctx, templ, **args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:rev: Integer. The repository-local changeset revision number."""
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 return ctx.rev()
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 def showtags(**args):
Patrick Mezard
templates: generate keyword help dynamically
r13585 """:tags: List of strings. Any tags associated with the changeset."""
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 return showlist('tag', args['ctx'].tags(), **args)
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054
Patrick Mezard
templatekw: fix extras, manifest and showlist args (issue1989)...
r10260 # 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
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 keywords = {
'author': showauthor,
"Yann E. MORIN"
templates: add 'bisect' keyword to return a cset's bisect status...
r15155 'bisect': showbisect,
Eric Eisner
template: add showbranch template for {branch}...
r13156 'branch': showbranch,
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 'branches': showbranches,
David Soria Parra
templater: add bookmarks to templates and default output...
r13386 'bookmarks': showbookmarks,
Jason Harris
templates: 'children' keyword...
r11655 'children': showchildren,
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 '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,
Pierre-Yves David
phases: add a phase template keyword
r15422 'phase': showphase,
Pierre-Yves David
phases: ``{phase}`` template keyword display the phase name...
r15823 'phaseidx': showphaseidx,
Patrick Mezard
cmdutil: extract ctx dependent closures into templatekw
r10054 'rev': showrev,
'tags': showtags,
}
Patrick Mezard
templates: generate keyword help dynamically
r13585 # tell hggettext to extract docstrings from these functions:
i18nfunctions = keywords.values()