This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4352

log: add a config option to limit the number of csets
AbandonedPublic

Authored by pulkit on Aug 22 2018, 8:06 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Things like editor integrations which rely on hg log tends to be very slow on
large repos because calculating the whole log takes time. This patch adds a
config option to limit the number of csets to be displayed using hg log.

Right now, we have an extension which provides a similar config option because
we don't want to patch core mercurial. This will help us in getting rid of that
extension.

.. feature::

A new config option `commands.log.limit` to limit the number of changesets to
be displayed by log command.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Aug 22 2018, 8:06 AM
yuja added a subscriber: yuja.Aug 22 2018, 9:12 AM

diff --git a/hgext/journal.py b/hgext/journal.py

  • a/hgext/journal.py

+++ b/hgext/journal.py
@@ -485,7 +485,7 @@

    displayname = "'%s'" % name
ui.status(_("previous locations of %s:\n") % displayname)
  • limit = logcmdutil.getlimit(opts)

+ limit = logcmdutil.getlimit(ui, opts)

entry = None
ui.pager('journal')
for count, entry in enumerate(repo.journal.filtered(name=name)):

I'm pretty sure this is unrelated to the log limit. Maybe extract
stringutil.parselimit()?

durin42 added a subscriber: durin42.Aug 22 2018, 12:36 PM

I'm -1 on this: we already have the --limit command line flag, and editor integrations can (and should!) use that flag as needed. Further, this config knob is /going/ to break automations somehow when a user sets it to something silly like 10 unless it reacts to HGPLAIN, but then it wouldn't be useful for editors since they should be setting HGPLAIN.

pulkit abandoned this revision.Aug 23 2018, 9:06 AM

Revision Contents
Changeset List

Diff 10504

hgext/journal.py

if opts.get("template") != "json": if opts.get("template") != "json":
if name is None: if name is None:
displayname = _('the working copy and bookmarks') displayname = _('the working copy and bookmarks')
else: else:
displayname = "'%s'" % name displayname = "'%s'" % name
ui.status(_("previous locations of %s:\n") % displayname) ui.status(_("previous locations of %s:\n") % displayname)
limit = logcmdutil.getlimit(opts) limit = logcmdutil.getlimit(ui, opts)
entry = None entry = None
ui.pager('journal') ui.pager('journal')
for count, entry in enumerate(repo.journal.filtered(name=name)): for count, entry in enumerate(repo.journal.filtered(name=name)):
if count == limit: if count == limit:
break break
newhashesstr = fm.formatlist(map(fm.hexfunc, entry.newhashes), newhashesstr = fm.formatlist(map(fm.hexfunc, entry.newhashes),
name='node', sep=',') name='node', sep=',')
oldhashesstr = fm.formatlist(map(fm.hexfunc, entry.oldhashes), oldhashesstr = fm.formatlist(map(fm.hexfunc, entry.oldhashes),

mercurial/configitems.py

default='auto', default='auto',
) )
coreconfigitem('color', 'pagermode', coreconfigitem('color', 'pagermode',
default=dynamicdefault, default=dynamicdefault,
) )
coreconfigitem('commands', 'grep.all-files', coreconfigitem('commands', 'grep.all-files',
default=False, default=False,
) )
coreconfigitem('commands', 'log.limit',
default=None,
)
coreconfigitem('commands', 'resolve.confirm', coreconfigitem('commands', 'resolve.confirm',
default=False, default=False,
) )
coreconfigitem('commands', 'resolve.mark-check', coreconfigitem('commands', 'resolve.mark-check',
default='none', default='none',
) )
coreconfigitem('commands', 'show.aliasprefix', coreconfigitem('commands', 'show.aliasprefix',
default=list, default=list,

mercurial/help/config.txt

codes). codes).
On some systems (such as MSYS in Windows), the terminal may support On some systems (such as MSYS in Windows), the terminal may support
a different color mode than the pager program. a different color mode than the pager program.
``commands`` ``commands``
------------ ------------
``log.limit``
Limit the number of changesets to be displayed by log.
(default: None)
``resolve.confirm`` ``resolve.confirm``
Confirm before performing action if no filename is passed. Confirm before performing action if no filename is passed.
(default: False) (default: False)
``resolve.mark-check`` ``resolve.mark-check``
Determines what level of checking :hg:`resolve --mark` will perform before Determines what level of checking :hg:`resolve --mark` will perform before
marking files as resolved. Valid values are ``none`, ``warn``, and marking files as resolved. Valid values are ``none`, ``warn``, and
``abort``. ``warn`` will output a warning listing the file(s) that still ``abort``. ``warn`` will output a warning listing the file(s) that still

mercurial/hg.py

if opts.get('subrepos'): if opts.get('subrepos'):
ctx = repo[None] ctx = repo[None]
for subpath in sorted(ctx.substate): for subpath in sorted(ctx.substate):
sub = ctx.sub(subpath) sub = ctx.sub(subpath)
ret = min(ret, sub.incoming(ui, source, opts)) ret = min(ret, sub.incoming(ui, source, opts))
return ret return ret
def display(other, chlist, displayer): def display(other, chlist, displayer):
limit = logcmdutil.getlimit(opts) limit = logcmdutil.getlimit(ui, opts)
if opts.get('newest_first'): if opts.get('newest_first'):
chlist.reverse() chlist.reverse()
count = 0 count = 0
for n in chlist: for n in chlist:
if limit is not None and count >= limit: if limit is not None and count >= limit:
break break
parents = [p for p in other.changelog.parents(n) if p != nullid] parents = [p for p in other.changelog.parents(n) if p != nullid]
if opts.get('no_merges') and len(parents) == 2: if opts.get('no_merges') and len(parents) == 2:
ret = 1 ret = 1
if opts.get('subrepos'): if opts.get('subrepos'):
ctx = repo[None] ctx = repo[None]
for subpath in sorted(ctx.substate): for subpath in sorted(ctx.substate):
sub = ctx.sub(subpath) sub = ctx.sub(subpath)
ret = min(ret, sub.outgoing(ui, dest, opts)) ret = min(ret, sub.outgoing(ui, dest, opts))
return ret return ret
limit = logcmdutil.getlimit(opts) limit = logcmdutil.getlimit(ui, opts)
o, other = _outgoing(ui, repo, dest, opts) o, other = _outgoing(ui, repo, dest, opts)
if not o: if not o:
cmdutil.outgoinghooks(ui, repo, other, opts, o) cmdutil.outgoinghooks(ui, repo, other, opts, o)
return recurse() return recurse()
if opts.get('newest_first'): if opts.get('newest_first'):
o.reverse() o.reverse()
ui.pager('outgoing') ui.pager('outgoing')

mercurial/logcmdutil.py

templater, templater,
util, util,
) )
from .utils import ( from .utils import (
dateutil, dateutil,
stringutil, stringutil,
) )
def getlimit(opts): def getlimit(ui, opts):
"""get the log limit according to option -l/--limit""" """get the log limit according to option -l/--limit"""
limit = opts.get('limit') limit = opts.get('limit')
if not limit:
limit = ui.config('commands', 'log.limit')
if limit: if limit:
try: try:
limit = int(limit) limit = int(limit)
except ValueError: except ValueError:
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:
def getrevs(repo, pats, opts): def getrevs(repo, pats, opts):
"""Return (revs, differ) where revs is a smartset """Return (revs, differ) where revs is a smartset
differ is a changesetdiffer with pre-configured file matcher. differ is a changesetdiffer with pre-configured file matcher.
""" """
follow = opts.get('follow') or opts.get('follow_first') follow = opts.get('follow') or opts.get('follow_first')
followfirst = opts.get('follow_first') followfirst = opts.get('follow_first')
limit = getlimit(opts) limit = getlimit(repo.ui, opts)
revs = _initialrevs(repo, opts) revs = _initialrevs(repo, opts)
if not revs: if not revs:
return smartset.baseset(), None return smartset.baseset(), None
match, pats, slowpath = _makematcher(repo, revs, pats, opts) match, pats, slowpath = _makematcher(repo, revs, pats, opts)
filematcher = None filematcher = None
if follow: if follow:
if slowpath or match.always(): if slowpath or match.always():
revs = dagop.revancestors(repo, revs, followfirst=followfirst) revs = dagop.revancestors(repo, revs, followfirst=followfirst)
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(repo.ui, 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)

tests/test-log.t

Also check when maxrev < lastrevfilelog Also check when maxrev < lastrevfilelog
$ hg --traceback log -f -r4 foo $ hg --traceback log -f -r4 foo
changeset: 4:88176d361b69 changeset: 4:88176d361b69
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add foo, related summary: add foo, related
Testing the `commands.log.limit` config option
$ hg log --config commands.log.limit=4
changeset: 10:4dae8563d2c5
tag: tip
parent: 9:7b35701b003e
parent: 4:88176d361b69
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Last merge, related
changeset: 9:7b35701b003e
parent: 8:e5416ad8a855
parent: 7:87fe3144dcfa
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: First merge, related
changeset: 8:e5416ad8a855
parent: 6:dc6c325fe5ee
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: change foo in branch, related
changeset: 7:87fe3144dcfa
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: change foo, related
$ hg log --config commands.log.limit=-2
abort: limit must be positive
[255]
$ hg log --config commands.log.limit=0
abort: limit must be positive
[255]
$ hg log --config commands.log.limit='abc'
abort: limit must be a positive integer
[255]
$ hg log --config commands.log.limit=1
changeset: 10:4dae8563d2c5
tag: tip
parent: 9:7b35701b003e
parent: 4:88176d361b69
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Last merge, related
$ cd .. $ cd ..
Issue2383: hg log showing _less_ differences than hg diff Issue2383: hg log showing _less_ differences than hg diff
$ hg init issue2383 $ hg init issue2383
$ cd issue2383 $ cd issue2383
Create a test repo: Create a test repo: