Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 35545:349bcd7fa670

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 22 Oct 2017 22:38:16 +0900
parents a7f7eff4ec08
children b14c8bcfbad9
comparison
equal deleted inserted replaced
35544:8494944940e5 35545:349bcd7fa670
3431 return scmutil.matchfiles(repo, files) 3431 return scmutil.matchfiles(repo, files)
3432 3432
3433 elif filematcher is None: 3433 elif filematcher is None:
3434 filematcher = lrfilematcher 3434 filematcher = lrfilematcher
3435 3435
3436 limit = cmdutil.loglimit(opts)
3437 count = 0
3438
3439 getrenamed = None 3436 getrenamed = None
3440 if opts.get('copies'): 3437 if opts.get('copies'):
3441 endrev = None 3438 endrev = None
3442 if opts.get('rev'): 3439 if opts.get('rev'):
3443 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 3440 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3444 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) 3441 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3445 3442
3446 ui.pager('log') 3443 ui.pager('log')
3447 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) 3444 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3448 for rev in revs: 3445 for rev in revs:
3449 if count == limit:
3450 break
3451 ctx = repo[rev] 3446 ctx = repo[rev]
3452 copies = None 3447 copies = None
3453 if getrenamed is not None and rev: 3448 if getrenamed is not None and rev:
3454 copies = [] 3449 copies = []
3455 for fn in ctx.files(): 3450 for fn in ctx.files():
3464 revhunksfilter = hunksfilter(rev) 3459 revhunksfilter = hunksfilter(rev)
3465 else: 3460 else:
3466 revhunksfilter = None 3461 revhunksfilter = None
3467 displayer.show(ctx, copies=copies, matchfn=revmatchfn, 3462 displayer.show(ctx, copies=copies, matchfn=revmatchfn,
3468 hunksfilterfn=revhunksfilter) 3463 hunksfilterfn=revhunksfilter)
3469 if displayer.flush(ctx): 3464 displayer.flush(ctx)
3470 count += 1
3471 3465
3472 displayer.close() 3466 displayer.close()
3473 3467
3474 @command('manifest', 3468 @command('manifest',
3475 [('r', 'rev', '', _('revision to display'), _('REV')), 3469 [('r', 'rev', '', _('revision to display'), _('REV')),