Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 42519:a68350a7fc55
log: pass getcopies() function instead of getrenamed() to displayer (API)
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.
Differential Revision: https://phab.mercurial-scm.org/D6546
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 19 Jun 2019 10:19:32 -0700 |
parents | abd4783db5a7 |
children | 5f2f6912c9e6 |
comparison
equal
deleted
inserted
replaced
42518:88ba0ff94605 | 42519:a68350a7fc55 |
---|---|
3885 if linerange: | 3885 if linerange: |
3886 # TODO: should follow file history from logcmdutil._initialrevs(), | 3886 # TODO: should follow file history from logcmdutil._initialrevs(), |
3887 # then filter the result by logcmdutil._makerevset() and --limit | 3887 # then filter the result by logcmdutil._makerevset() and --limit |
3888 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) | 3888 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) |
3889 | 3889 |
3890 getrenamed = None | 3890 getcopies = None |
3891 if opts.get('copies'): | 3891 if opts.get('copies'): |
3892 endrev = None | 3892 endrev = None |
3893 if revs: | 3893 if revs: |
3894 endrev = revs.max() + 1 | 3894 endrev = revs.max() + 1 |
3895 getrenamed = scmutil.getrenamedfn(repo, endrev=endrev) | 3895 getcopies = scmutil.getcopiesfn(repo, endrev=endrev) |
3896 | 3896 |
3897 ui.pager('log') | 3897 ui.pager('log') |
3898 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ, | 3898 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ, |
3899 buffered=True) | 3899 buffered=True) |
3900 if opts.get('graph'): | 3900 if opts.get('graph'): |
3901 displayfn = logcmdutil.displaygraphrevs | 3901 displayfn = logcmdutil.displaygraphrevs |
3902 else: | 3902 else: |
3903 displayfn = logcmdutil.displayrevs | 3903 displayfn = logcmdutil.displayrevs |
3904 displayfn(ui, repo, revs, displayer, getrenamed) | 3904 displayfn(ui, repo, revs, displayer, getcopies) |
3905 | 3905 |
3906 @command('manifest', | 3906 @command('manifest', |
3907 [('r', 'rev', '', _('revision to display'), _('REV')), | 3907 [('r', 'rev', '', _('revision to display'), _('REV')), |
3908 ('', 'all', False, _("list files from all revisions"))] | 3908 ('', 'all', False, _("list files from all revisions"))] |
3909 + formatteropts, | 3909 + formatteropts, |