This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5485

log: fixes line wrap on diffstat (issue5800)
ClosedPublic

Authored by navaneeth.suresh on Dec 27 2018, 6:48 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6a63ba61e71f: log: fix line wrap on diffstat with -G/--graph (issue5800)

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

yuja added a subscriber: yuja.Dec 30 2018, 3:58 AM
  • return max(i * graphwidth // maxtotal, int(bool(i)))

+ return max(i * graphwidth // max(diffstatsum(stats)), int(bool(i)))

Doesn't look correct. Why taking max of
(maxname, maxtotal, totaladds, totalremoves, hasbinary)?

IIUC, the problem is that the width parameter is incorrect because of
graph lines.

navaneeth.suresh added a comment.Dec 30 2018, 8:34 AM

IIUC, the problem is that the width parameter is incorrect because of
graph lines.

Thanks for the insight Yuya! I guess my current revision addresses what you meant by abusing graphwidth

yuja added a comment.Jan 1 2019, 10:52 PM

Looks generally good.

Can you add some tests with/without the -T option? There are two callers of
_showpatch().

+ graphwidth = props.get('graphwidth')
+ if not graphwidth:
+ graphwidth = 0

Nit: can be written as props.get('graphwidth', 0).

navaneeth.suresh added a comment.Jan 2 2019, 6:36 AM

@yuja Requested changes have been made in the current revision.

yuja added a comment.Jan 3 2019, 4:27 AM

Queued, thanks.

def diffordiffstat(ui, repo, diffopts, node1, node2, match,

  • changes=None, stat=False, fp=None, prefix='',
  • root='', listsubrepos=False, hunksfilterfn=None):

+ changes=None, stat=False, graphwidth=0, fp=None,

Reordered arguments to fix mq failure. Next time, please run all tests.

Closed by commit rHG6a63ba61e71f: log: fix line wrap on diffstat with -G/--graph (issue5800) (authored by navaneeth.suresh). · Explain WhyJan 3 2019, 4:39 AM
This revision was automatically updated to reflect the committed changes.
navaneeth.suresh added a comment.Jan 3 2019, 5:11 AM

Thanks for queuing Yuya!

Reordered arguments to fix mq failure. Next time, please run all tests.

Sure will do. Sorry about that.

Revision Contents
Changeset List

PathPackages
Mmercurial/logcmdutil.py (23 lines)
Mtests/test-log.t (120 lines)

Diff 12997

mercurial/logcmdutil.py

raise error.Abort(_('limit must be a positive integer')) raise error.Abort(_('limit must be a positive integer'))
if limit <= 0: if limit <= 0:
raise error.Abort(_('limit must be positive')) raise error.Abort(_('limit must be positive'))
else: else:
limit = None limit = None
return limit return limit
def diffordiffstat(ui, repo, diffopts, node1, node2, match, def diffordiffstat(ui, repo, diffopts, node1, node2, match,
changes=None, stat=False, fp=None, prefix='', changes=None, stat=False, fp=None, graphwidth=0,
root='', listsubrepos=False, hunksfilterfn=None): prefix='', root='', listsubrepos=False, hunksfilterfn=None):
'''show diff or diffstat.''' '''show diff or diffstat.'''
if root: if root:
relroot = pathutil.canonpath(repo.root, repo.getcwd(), root) relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
else: else:
relroot = '' relroot = ''
if relroot != '': if relroot != '':
# XXX relative roots currently don't work if the root is within a # XXX relative roots currently don't work if the root is within a
# subrepo # subrepo
uirelroot = match.uipath(relroot) uirelroot = match.uipath(relroot)
relroot += '/' relroot += '/'
for matchroot in match.files(): for matchroot in match.files():
if not matchroot.startswith(relroot): if not matchroot.startswith(relroot):
ui.warn(_('warning: %s not inside relative root %s\n') % ( ui.warn(_('warning: %s not inside relative root %s\n') % (
match.uipath(matchroot), uirelroot)) match.uipath(matchroot), uirelroot))
if stat: if stat:
diffopts = diffopts.copy(context=0, noprefix=False) diffopts = diffopts.copy(context=0, noprefix=False)
width = 80 width = 80
if not ui.plain(): if not ui.plain():
width = ui.termwidth() width = ui.termwidth() - graphwidth
chunks = repo[node2].diff(repo[node1], match, changes, opts=diffopts, chunks = repo[node2].diff(repo[node1], match, changes, opts=diffopts,
prefix=prefix, relroot=relroot, prefix=prefix, relroot=relroot,
hunksfilterfn=hunksfilterfn) hunksfilterfn=hunksfilterfn)
if fp is not None or ui.canwritewithoutlabels(): if fp is not None or ui.canwritewithoutlabels():
out = fp or ui out = fp or ui
if stat: if stat:
"""Generate diff of changeset with pre-configured filtering functions""" """Generate diff of changeset with pre-configured filtering functions"""
def _makefilematcher(self, ctx): def _makefilematcher(self, ctx):
return scmutil.matchall(ctx.repo()) return scmutil.matchall(ctx.repo())
def _makehunksfilter(self, ctx): def _makehunksfilter(self, ctx):
return None return None
def showdiff(self, ui, ctx, diffopts, stat=False): def showdiff(self, ui, ctx, diffopts, graphwidth=0, stat=False):
repo = ctx.repo() repo = ctx.repo()
node = ctx.node() node = ctx.node()
prev = ctx.p1().node() prev = ctx.p1().node()
diffordiffstat(ui, repo, diffopts, prev, node, diffordiffstat(ui, repo, diffopts, prev, node,
match=self._makefilematcher(ctx), stat=stat, match=self._makefilematcher(ctx), stat=stat,
graphwidth=graphwidth,
hunksfilterfn=self._makehunksfilter(ctx)) hunksfilterfn=self._makehunksfilter(ctx))
def changesetlabels(ctx): def changesetlabels(ctx):
labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()] labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
if ctx.obsolete(): if ctx.obsolete():
labels.append('changeset.obsolete') labels.append('changeset.obsolete')
if ctx.isunstable(): if ctx.isunstable():
labels.append('changeset.unstable') labels.append('changeset.unstable')
self._show(ctx, copies, props) self._show(ctx, copies, props)
self.hunk[ctx.rev()] = self.ui.popbuffer() self.hunk[ctx.rev()] = self.ui.popbuffer()
else: else:
self._show(ctx, copies, props) self._show(ctx, copies, props)
def _show(self, ctx, copies, props): def _show(self, ctx, copies, props):
'''show a single changeset or file revision''' '''show a single changeset or file revision'''
changenode = ctx.node() changenode = ctx.node()
graphwidth = props.get('graphwidth', 0)
if self.ui.quiet: if self.ui.quiet:
self.ui.write("%s\n" % scmutil.formatchangeid(ctx), self.ui.write("%s\n" % scmutil.formatchangeid(ctx),
label='log.node') label='log.node')
return return
columns = self._columns columns = self._columns
self.ui.write(columns['changeset'] % scmutil.formatchangeid(ctx), self.ui.write(columns['changeset'] % scmutil.formatchangeid(ctx),
self.ui.write(description, self.ui.write(description,
label='ui.note log.description') label='ui.note log.description')
self.ui.write("\n\n") self.ui.write("\n\n")
else: else:
self.ui.write(columns['summary'] % description.splitlines()[0], self.ui.write(columns['summary'] % description.splitlines()[0],
label='log.summary') label='log.summary')
self.ui.write("\n") self.ui.write("\n")
self._showpatch(ctx) self._showpatch(ctx, graphwidth)
def _showobsfate(self, ctx): def _showobsfate(self, ctx):
# TODO: do not depend on templater # TODO: do not depend on templater
tres = formatter.templateresources(self.repo.ui, self.repo) tres = formatter.templateresources(self.repo.ui, self.repo)
t = formatter.maketemplater(self.repo.ui, '{join(obsfate, "\n")}', t = formatter.maketemplater(self.repo.ui, '{join(obsfate, "\n")}',
defaults=templatekw.keywords, defaults=templatekw.keywords,
resources=tres) resources=tres)
obsfate = t.renderdefault({'ctx': ctx}).splitlines() obsfate = t.renderdefault({'ctx': ctx}).splitlines()
if obsfate: if obsfate:
for obsfateline in obsfate: for obsfateline in obsfate:
self.ui.write(self._columns['obsolete'] % obsfateline, self.ui.write(self._columns['obsolete'] % obsfateline,
label='log.obsfate') label='log.obsfate')
def _exthook(self, ctx): def _exthook(self, ctx):
'''empty method used by extension as a hook point '''empty method used by extension as a hook point
''' '''
def _showpatch(self, ctx): def _showpatch(self, ctx, graphwidth=0):
if self._includestat: if self._includestat:
self._differ.showdiff(self.ui, ctx, self._diffopts, stat=True) self._differ.showdiff(self.ui, ctx, self._diffopts,
graphwidth, stat=True)
if self._includestat and self._includediff: if self._includestat and self._includediff:
self.ui.write("\n") self.ui.write("\n")
if self._includediff: if self._includediff:
self._differ.showdiff(self.ui, ctx, self._diffopts, stat=False) self._differ.showdiff(self.ui, ctx, self._diffopts,
graphwidth, stat=False)
if self._includestat or self._includediff: if self._includestat or self._includediff:
self.ui.write("\n") self.ui.write("\n")
class changesetformatter(changesetprinter): class changesetformatter(changesetprinter):
"""Format changeset information by generic formatter""" """Format changeset information by generic formatter"""
def __init__(self, ui, repo, fm, differ=None, diffopts=None, def __init__(self, ui, repo, fm, differ=None, diffopts=None,
buffered=False): buffered=False):
return super(changesettemplater, self).close() return super(changesettemplater, self).close()
def _show(self, ctx, copies, props): def _show(self, ctx, copies, props):
'''show a single changeset or file revision''' '''show a single changeset or file revision'''
props = props.copy() props = props.copy()
props['ctx'] = ctx props['ctx'] = ctx
props['index'] = index = next(self._counter) props['index'] = index = next(self._counter)
props['revcache'] = {'copies': copies} props['revcache'] = {'copies': copies}
graphwidth = props.get('graphwidth', 0)
# write separator, which wouldn't work well with the header part below # write separator, which wouldn't work well with the header part below
# since there's inherently a conflict between header (across items) and # since there's inherently a conflict between header (across items) and
# separator (per item) # separator (per item)
if self._parts['separator'] and index > 0: if self._parts['separator'] and index > 0:
self.ui.write(self.t.render(self._parts['separator'], {})) self.ui.write(self.t.render(self._parts['separator'], {}))
# write header # write header
if self._parts['header']: if self._parts['header']:
h = self.t.render(self._parts['header'], props) h = self.t.render(self._parts['header'], props)
if self.buffered: if self.buffered:
self.header[ctx.rev()] = h self.header[ctx.rev()] = h
else: else:
if self.lastheader != h: if self.lastheader != h:
self.lastheader = h self.lastheader = h
self.ui.write(h) self.ui.write(h)
# write changeset metadata, then patch if requested # write changeset metadata, then patch if requested
key = self._parts[self._tref] key = self._parts[self._tref]
self.ui.write(self.t.render(key, props)) self.ui.write(self.t.render(key, props))
self._showpatch(ctx) self._showpatch(ctx, graphwidth)
if self._parts['footer']: if self._parts['footer']:
if not self.footer: if not self.footer:
self.footer = self.t.render(self._parts['footer'], props) self.footer = self.t.render(self._parts['footer'], props)
def templatespec(tmpl, mapfile): def templatespec(tmpl, mapfile):
if pycompat.ispy3: if pycompat.ispy3:
assert not isinstance(tmpl, str), 'tmpl must not be a str' assert not isinstance(tmpl, str), 'tmpl must not be a str'

tests/test-log.t

| summary: A3B2C2 | summary: A3B2C2
| |
o changeset: 0:abf4f0e38563 o changeset: 0:abf4f0e38563
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: A1B1C1 summary: A1B1C1
$ cd .. $ cd ..
--- going to test line wrap fix on using both --stat and -G (issue5800)
$ hg init issue5800
$ cd issue5800
$ touch a
$ hg ci -Am 'add a'
adding a
---- now we are going to add 300 lines to a
$ for i in `$TESTDIR/seq.py 1 300`; do echo $i >> a; done
$ hg ci -m 'modify a'
$ hg log
changeset: 1:a98683e6a834
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify a
changeset: 0:ac82d8b1f7c4
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add a
---- now visualise the changes we made without template
$ hg log -l1 -r a98683e6a834 --stat -G
@ changeset: 1:a98683e6a834
| tag: tip
~ user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify a
a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 300 insertions(+), 0 deletions(-)
---- with template
$ hg log -l1 -r a98683e6a834 --stat -G -T bisect
@ changeset: 1:a98683e6a834
| bisect:
~ tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify a
a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 300 insertions(+), 0 deletions(-)
$ hg log -l1 -r a98683e6a834 --stat -G -T changelog
1970-01-01 test <test>
@ * a:
| modify a
~ [a98683e6a834] [tip]
a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 300 insertions(+), 0 deletions(-)
$ hg log -l1 -r a98683e6a834 --stat -G -T compact
@ 1[tip] a98683e6a834 1970-01-01 00:00 +0000 test
| modify a
~
a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 300 insertions(+), 0 deletions(-)
$ hg log -l1 -r a98683e6a834 --stat -G -T default
@ changeset: 1:a98683e6a834
| tag: tip
~ user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify a
a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 300 insertions(+), 0 deletions(-)
$ hg log -l1 -r a98683e6a834 --stat -G -T phases
@ changeset: 1:a98683e6a834
| tag: tip
~ phase: draft
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify a
a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 300 insertions(+), 0 deletions(-)
$ hg log -l1 -r a98683e6a834 --stat -G -T show
@ changeset: 1:a98683e6a834
| tag: tip
~ user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify a
a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 300 insertions(+), 0 deletions(-)
$ hg log -l1 -r a98683e6a834 --stat -G -T status
@ changeset: 1:a98683e6a834
| tag: tip
~ user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: modify a
files:
M a
a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 300 insertions(+), 0 deletions(-)
$ hg log -l1 -r a98683e6a834 --stat -G -T xml
<?xml version="1.0"?>
<log>
@ <logentry revision="1" node="a98683e6a8340830a7683909768b62871e84bc9d">
| <tag>tip</tag>
~ <author email="test">test</author>
<date>1970-01-01T00:00:00+00:00</date>
<msg xml:space="preserve">modify a</msg>
</logentry>
a | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 300 insertions(+), 0 deletions(-)
</log>
$ cd ..