| martinvonz | |
| marmoute | |
| sebhtml |
| hg-reviewers |
| No Linters Available |
| No Unit Test Coverage |
Functionality implemented by this and later patches got pushed as D9341. Moving this out of review.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (9 lines) | |||
| M | mercurial/logcmdutil.py (18 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| c6b7b56eee8f | 3e7bf5e20a83 | Sebastien Boisvert | Nov 12 2020, 6:25 PM |
| if linerange and pats: | if linerange and pats: | ||||
| # TODO: take pats as patterns with no line-range filter | # TODO: take pats as patterns with no line-range filter | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'FILE arguments are not compatible with --line-range option') | _(b'FILE arguments are not compatible with --line-range option') | ||||
| ) | ) | ||||
| repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn') | repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn') | ||||
| walk_opts = logcmdutil.parseopts(ui, pats, opts) | |||||
| revs, differ = logcmdutil.getrevs( | revs, differ = logcmdutil.getrevs( | ||||
| repo, logcmdutil.parseopts(ui, pats, opts) | repo, walk_opts | ||||
| ) | ) | ||||
| if linerange: | if linerange: | ||||
| # TODO: should follow file history from logcmdutil._initialrevs(), | # TODO: should follow file history from logcmdutil._initialrevs(), | ||||
| # then filter the result by logcmdutil._makerevset() and --limit | # then filter the result by logcmdutil._makerevset() and --limit | ||||
| revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) | revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) | ||||
| if opts.get(b'bookmark'): | |||||
| cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark') | |||||
| bookmarks = opts.get(b'bookmark') | |||||
| bookmark = bookmarks[0] | |||||
| revs, differ = logcmdutil.get_bookmark_revs(repo, bookmark, walk_opts) | |||||
| getcopies = None | getcopies = None | ||||
| if opts.get(b'copies'): | if opts.get(b'copies'): | ||||
| endrev = None | endrev = None | ||||
| if revs: | if revs: | ||||
| endrev = revs.max() + 1 | endrev = revs.max() + 1 | ||||
| getcopies = scmutil.getcopiesfn(repo, endrev=endrev) | getcopies = scmutil.getcopiesfn(repo, endrev=endrev) | ||||
| ui.pager(b'log') | ui.pager(b'log') | ||||
| """ | """ | ||||
| revs, filematcher = makewalker(repo, wopts) | revs, filematcher = makewalker(repo, wopts) | ||||
| if not revs: | if not revs: | ||||
| return revs, None | return revs, None | ||||
| differ = changesetdiffer() | differ = changesetdiffer() | ||||
| differ._makefilematcher = filematcher | differ._makefilematcher = filematcher | ||||
| return revs, differ | return revs, differ | ||||
| def get_bookmark_revs(repo, bookmark, walk_opts): | |||||
| # type: (Any, bookmark, walk_opts) -> Tuple[smartset.abstractsmartset, Optional[changesetdiffer]] | |||||
| """Return (revs, differ) where revs is a smartset | |||||
| differ is a changesetdiffer with pre-configured file matcher. | |||||
| """ | |||||
| revs, filematcher = makewalker(repo, walk_opts) | |||||
| if not revs: | |||||
| return revs, None | |||||
| differ = changesetdiffer() | |||||
| differ._makefilematcher = filematcher | |||||
| if bookmark: | |||||
| if bookmark not in repo._bookmarks: | |||||
| raise error.Abort(_(b"bookmark '%s' not found") % bookmark) | |||||
| revs = scmutil.bookmarkrevs(repo, bookmark) | |||||
| return revs, differ | |||||
| def _parselinerangeopt(repo, opts): | def _parselinerangeopt(repo, opts): | ||||
| """Parse --line-range log option and return a list of tuples (filename, | """Parse --line-range log option and return a list of tuples (filename, | ||||
| (fromline, toline)). | (fromline, toline)). | ||||
| """ | """ | ||||
| linerangebyfname = [] | linerangebyfname = [] | ||||
| for pat in opts.get(b'line_range', []): | for pat in opts.get(b'line_range', []): | ||||
| try: | try: | ||||