##// END OF EJS Templates
graphlog: move creation of workingdir-parent nodes to displaygraph()...
Yuya Nishihara -
r27213:ccae1588 default
parent child Browse files
Show More
@@ -2159,8 +2159,9 b' def getlogrevs(repo, pats, opts):'
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'
@@ -2202,9 +2203,8 b' def graphlog(ui, repo, *pats, **opts):'
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"]:
@@ -4696,8 +4696,7 b' def incoming(ui, repo, source="default",'
4696 cmdutil.checkunsupportedgraphflags([], opts)
4696 cmdutil.checkunsupportedgraphflags([], opts)
4697 def display(other, chlist, displayer):
4697 def display(other, chlist, displayer):
4698 revdag = cmdutil.graphrevs(other, chlist, opts)
4698 revdag = cmdutil.graphrevs(other, chlist, opts)
4699 showparents = [ctx.node() for ctx in repo[None].parents()]
4699 cmdutil.displaygraph(ui, repo, revdag, displayer,
4700 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4701 graphmod.asciiedges)
4700 graphmod.asciiedges)
4702
4701
4703 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4702 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
@@ -5134,9 +5133,7 b' def outgoing(ui, repo, dest=None, **opts'
5134
5133
5135 revdag = cmdutil.graphrevs(repo, o, opts)
5134 revdag = cmdutil.graphrevs(repo, o, opts)
5136 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5135 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5137 showparents = [ctx.node() for ctx in repo[None].parents()]
5136 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5138 cmdutil.displaygraph(ui, revdag, displayer, showparents,
5139 graphmod.asciiedges)
5140 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5137 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5141 return 0
5138 return 0
5142
5139
General Comments 0
You need to be logged in to leave comments. Login now