# HG changeset patch # User Yuya Nishihara # Date 2017-10-22 13:38:16 # Node ID 349bcd7fa670afed2e78c4a4c1865a793b6d461d # Parent 8494944940e56c40f2f40ef8ef44f9a841fed4c8 log: remove redundant handling of --limit A returned 'revs' set is pre-filtered by cmdutil.getlogrevs(). The result of displayer.flush() isn't used anymore, so removed. diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1585,8 +1585,6 @@ class changeset_printer(object): if rev in self.hunk: self.ui.write(self.hunk[rev]) del self.hunk[rev] - return 1 - return 0 def close(self): if self.footer: diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3433,9 +3433,6 @@ def log(ui, repo, *pats, **opts): elif filematcher is None: filematcher = lrfilematcher - limit = cmdutil.loglimit(opts) - count = 0 - getrenamed = None if opts.get('copies'): endrev = None @@ -3446,8 +3443,6 @@ def log(ui, repo, *pats, **opts): ui.pager('log') displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) for rev in revs: - if count == limit: - break ctx = repo[rev] copies = None if getrenamed is not None and rev: @@ -3466,8 +3461,7 @@ def log(ui, repo, *pats, **opts): revhunksfilter = None displayer.show(ctx, copies=copies, matchfn=revmatchfn, hunksfilterfn=revhunksfilter) - if displayer.flush(ctx): - count += 1 + displayer.flush(ctx) displayer.close()