This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6546

log: pass getcopies() function instead of getrenamed() to displayer (API)
ClosedPublic

Authored by martinvonz on Jun 19 2019, 2:31 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa68350a7fc55: log: pass getcopies() function instead of getrenamed() to displayer (API)
Summary

This reduces the duplication between the two displayer functions (and
between them and scmutil.getcopiesfn()). It's still more code than two
patches ago, but there's less duplication.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jun 19 2019, 2:31 PM
pulkit accepted this revision.Jun 19 2019, 5:35 PM
This revision is now accepted and ready to land.Jun 19 2019, 5:35 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (6 lines)
Mmercurial/logcmdutil.py (20 lines)

Diff 15608

mercurial/commands.py

repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn') repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
revs, differ = logcmdutil.getrevs(repo, pats, opts) revs, differ = logcmdutil.getrevs(repo, pats, opts)
if linerange: if linerange:
# TODO: should follow file history from logcmdutil._initialrevs(), # TODO: should follow file history from logcmdutil._initialrevs(),
# then filter the result by logcmdutil._makerevset() and --limit # then filter the result by logcmdutil._makerevset() and --limit
revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
getrenamed = None getcopies = None
if opts.get('copies'): if opts.get('copies'):
endrev = None endrev = None
if revs: if revs:
endrev = revs.max() + 1 endrev = revs.max() + 1
getrenamed = scmutil.getrenamedfn(repo, endrev=endrev) getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
ui.pager('log') ui.pager('log')
displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ, displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
buffered=True) buffered=True)
if opts.get('graph'): if opts.get('graph'):
displayfn = logcmdutil.displaygraphrevs displayfn = logcmdutil.displaygraphrevs
else: else:
displayfn = logcmdutil.displayrevs displayfn = logcmdutil.displayrevs
displayfn(ui, repo, revs, displayer, getrenamed) displayfn(ui, repo, revs, displayer, getcopies)
@command('manifest', @command('manifest',
[('r', 'rev', '', _('revision to display'), _('REV')), [('r', 'rev', '', _('revision to display'), _('REV')),
('', 'all', False, _("list files from all revisions"))] ('', 'all', False, _("list files from all revisions"))]
+ formatteropts, + formatteropts,
_('[-r REV]'), _('[-r REV]'),
helpcategory=command.CATEGORY_MAINTENANCE, helpcategory=command.CATEGORY_MAINTENANCE,
intents={INTENT_READONLY}) intents={INTENT_READONLY})

mercurial/logcmdutil.py

tres = formatter.templateresources(ui) tres = formatter.templateresources(ui)
templ = formatter.maketemplater(ui, spec, defaults=templatekw.keywords, templ = formatter.maketemplater(ui, spec, defaults=templatekw.keywords,
resources=tres) resources=tres)
def formatnode(repo, ctx): def formatnode(repo, ctx):
props = {'ctx': ctx, 'repo': repo} props = {'ctx': ctx, 'repo': repo}
return templ.renderdefault(props) return templ.renderdefault(props)
return formatnode return formatnode
def displaygraph(ui, repo, dag, displayer, edgefn, getrenamed=None, props=None): def displaygraph(ui, repo, dag, displayer, edgefn, getcopies=None, props=None):
props = props or {} props = props or {}
formatnode = _graphnodeformatter(ui, displayer) formatnode = _graphnodeformatter(ui, displayer)
state = graphmod.asciistate() state = graphmod.asciistate()
styles = state['styles'] styles = state['styles']
# only set graph styling if HGPLAIN is not set. # only set graph styling if HGPLAIN is not set.
if ui.plain('graph'): if ui.plain('graph'):
# set all edge styles to |, the default pre-3.8 behaviour # set all edge styles to |, the default pre-3.8 behaviour
if not styles[key]: if not styles[key]:
styles[key] = None styles[key] = None
# experimental config: experimental.graphshorten # experimental config: experimental.graphshorten
state['graphshorten'] = ui.configbool('experimental', 'graphshorten') state['graphshorten'] = ui.configbool('experimental', 'graphshorten')
for rev, type, ctx, parents in dag: for rev, type, ctx, parents in dag:
char = formatnode(repo, ctx) char = formatnode(repo, ctx)
copies = None copies = getcopies(ctx) if getcopies else None
if getrenamed:
copies = []
for fn in ctx.files():
rename = getrenamed(fn, ctx.rev())
if rename:
copies.append((fn, rename))
edges = edgefn(type, char, state, rev, parents) edges = edgefn(type, char, state, rev, parents)
firstedge = next(edges) firstedge = next(edges)
width = firstedge[2] width = firstedge[2]
displayer.show(ctx, copies=copies, displayer.show(ctx, copies=copies,
graphwidth=width, **pycompat.strkwargs(props)) graphwidth=width, **pycompat.strkwargs(props))
lines = displayer.hunk.pop(rev).split('\n') lines = displayer.hunk.pop(rev).split('\n')
if not lines[-1]: if not lines[-1]:
del lines[-1] del lines[-1]
displayer.flush(ctx) displayer.flush(ctx)
for type, char, width, coldata in itertools.chain([firstedge], edges): for type, char, width, coldata in itertools.chain([firstedge], edges):
graphmod.ascii(ui, state, type, char, lines, coldata) graphmod.ascii(ui, state, type, char, lines, coldata)
lines = [] lines = []
displayer.close() displayer.close()
def displaygraphrevs(ui, repo, revs, displayer, getrenamed): def displaygraphrevs(ui, repo, revs, displayer, getrenamed):
revdag = graphmod.dagwalker(repo, revs) revdag = graphmod.dagwalker(repo, revs)
displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed) displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed)
def displayrevs(ui, repo, revs, displayer, getrenamed): def displayrevs(ui, repo, revs, displayer, getcopies):
for rev in revs: for rev in revs:
ctx = repo[rev] ctx = repo[rev]
copies = None copies = getcopies(ctx) if getcopies else None
if getrenamed is not None:
copies = []
for fn in ctx.files():
rename = getrenamed(fn, rev)
if rename:
copies.append((fn, rename))
displayer.show(ctx, copies=copies) displayer.show(ctx, copies=copies)
displayer.flush(ctx) displayer.flush(ctx)
displayer.close() displayer.close()
def checkunsupportedgraphflags(pats, opts): def checkunsupportedgraphflags(pats, opts):
for op in ["newest_first"]: for op in ["newest_first"]:
if op in opts and opts[op]: if op in opts and opts[op]:
raise error.Abort(_("-G/--graph option is incompatible with --%s") raise error.Abort(_("-G/--graph option is incompatible with --%s")
% op.replace("_", "-")) % op.replace("_", "-"))
def graphrevs(repo, nodes, opts): def graphrevs(repo, nodes, opts):
limit = getlimit(opts) limit = getlimit(opts)
nodes.reverse() nodes.reverse()
if limit is not None: if limit is not None:
nodes = nodes[:limit] nodes = nodes[:limit]
return graphmod.nodes(repo, nodes) return graphmod.nodes(repo, nodes)