Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 27213:ccae1588117f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graphlog: move creation of workingdir-parent nodes to displaygraph() Future patches will make a node symbol templatable. Because arguments of a templatekw function are repo and ctx, "showparents" list will have to be built from a repo object by that function.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 14 Nov 2015 16:45:15 +0900
parents 8d3c5797a175
children 60af96494a76
comparison
equal deleted inserted replaced
27212:ef9301ce6046 27213:ccae1588117f
2157 limitedrevs.append(r) 2157 limitedrevs.append(r)
2158 revs = revset.baseset(limitedrevs) 2158 revs = revset.baseset(limitedrevs)
2159 2159
2160 return revs, expr, filematcher 2160 return revs, expr, filematcher
2161 2161
2162 def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None, 2162 def displaygraph(ui, repo, dag, displayer, edgefn, getrenamed=None,
2163 filematcher=None): 2163 filematcher=None):
2164 showparents = [ctx.node() for ctx in repo[None].parents()]
2164 seen, state = [], graphmod.asciistate() 2165 seen, state = [], graphmod.asciistate()
2165 for rev, type, ctx, parents in dag: 2166 for rev, type, ctx, parents in dag:
2166 char = 'o' 2167 char = 'o'
2167 if ctx.node() in showparents: 2168 if ctx.node() in showparents:
2168 char = '@' 2169 char = '@'
2200 endrev = None 2201 endrev = None
2201 if opts.get('rev'): 2202 if opts.get('rev'):
2202 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 2203 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
2203 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) 2204 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
2204 displayer = show_changeset(ui, repo, opts, buffered=True) 2205 displayer = show_changeset(ui, repo, opts, buffered=True)
2205 showparents = [ctx.node() for ctx in repo[None].parents()] 2206 displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed,
2206 displaygraph(ui, revdag, displayer, showparents, 2207 filematcher)
2207 graphmod.asciiedges, getrenamed, filematcher)
2208 2208
2209 def checkunsupportedgraphflags(pats, opts): 2209 def checkunsupportedgraphflags(pats, opts):
2210 for op in ["newest_first"]: 2210 for op in ["newest_first"]:
2211 if op in opts and opts[op]: 2211 if op in opts and opts[op]:
2212 raise error.Abort(_("-G/--graph option is incompatible with --%s") 2212 raise error.Abort(_("-G/--graph option is incompatible with --%s")