# HG changeset patch # User Yuya Nishihara # Date 1516518920 -32400 # Node ID 7bc10d3f68b4d0dcbd2c747492b6dd93e93798b6 # Parent db26e6a0a677377369e2741ecf29951417fe483b log: factor out function to feed revisions to displayer diff -r db26e6a0a677 -r 7bc10d3f68b4 mercurial/commands.py --- a/mercurial/commands.py Sun Jan 21 16:04:59 2018 +0900 +++ b/mercurial/commands.py Sun Jan 21 16:15:20 2018 +0900 @@ -3434,22 +3434,10 @@ displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ, buffered=True) if opts.get('graph'): - logcmdutil.graphlog(ui, repo, revs, displayer, getrenamed) - return - - for rev in revs: - ctx = repo[rev] - copies = None - if getrenamed is not None and rev: - copies = [] - for fn in ctx.files(): - rename = getrenamed(fn, rev) - if rename: - copies.append((fn, rename[0])) - displayer.show(ctx, copies=copies) - displayer.flush(ctx) - - displayer.close() + displayfn = logcmdutil.displaygraphrevs + else: + displayfn = logcmdutil.displayrevs + displayfn(ui, repo, revs, displayer, getrenamed) @command('manifest', [('r', 'rev', '', _('revision to display'), _('REV')), diff -r db26e6a0a677 -r 7bc10d3f68b4 mercurial/logcmdutil.py --- a/mercurial/logcmdutil.py Sun Jan 21 16:04:59 2018 +0900 +++ b/mercurial/logcmdutil.py Sun Jan 21 16:15:20 2018 +0900 @@ -899,10 +899,24 @@ lines = [] displayer.close() -def graphlog(ui, repo, revs, displayer, getrenamed): +def displaygraphrevs(ui, repo, revs, displayer, getrenamed): revdag = graphmod.dagwalker(repo, revs) displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed) +def displayrevs(ui, repo, revs, displayer, getrenamed): + for rev in revs: + ctx = repo[rev] + copies = None + if getrenamed is not None and rev: + copies = [] + for fn in ctx.files(): + rename = getrenamed(fn, rev) + if rename: + copies.append((fn, rename[0])) + displayer.show(ctx, copies=copies) + displayer.flush(ctx) + displayer.close() + def checkunsupportedgraphflags(pats, opts): for op in ["newest_first"]: if op in opts and opts[op]: