Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 34018:de286200f722
revset: move order argument to run-time match function
We no longer need the order flag to build a parsed tree.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Wed, 30 Aug 2017 22:41:36 +0900 |
parents | da07367d683b |
children | 205c47e30a93 |
comparison
equal
deleted
inserted
replaced
34017:62cc1f17c571 | 34018:de286200f722 |
---|---|
2556 # User-specified revs might be unsorted, but don't sort before | 2556 # User-specified revs might be unsorted, but don't sort before |
2557 # _makelogrevset because it might depend on the order of revs | 2557 # _makelogrevset because it might depend on the order of revs |
2558 if not (revs.isdescending() or revs.istopo()): | 2558 if not (revs.isdescending() or revs.istopo()): |
2559 revs.sort(reverse=True) | 2559 revs.sort(reverse=True) |
2560 if expr: | 2560 if expr: |
2561 matcher = revset.match(repo.ui, expr, order=revset.followorder) | 2561 matcher = revset.match(repo.ui, expr) |
2562 revs = matcher(repo, revs) | 2562 revs = matcher(repo, revs, order=revset.followorder) |
2563 if limit is not None: | 2563 if limit is not None: |
2564 limitedrevs = [] | 2564 limitedrevs = [] |
2565 for idx, rev in enumerate(revs): | 2565 for idx, rev in enumerate(revs): |
2566 if idx >= limit: | 2566 if idx >= limit: |
2567 break | 2567 break |
2582 revs = _logrevs(repo, opts) | 2582 revs = _logrevs(repo, opts) |
2583 if not revs: | 2583 if not revs: |
2584 return smartset.baseset([]), None, None | 2584 return smartset.baseset([]), None, None |
2585 expr, filematcher = _makelogrevset(repo, pats, opts, revs) | 2585 expr, filematcher = _makelogrevset(repo, pats, opts, revs) |
2586 if expr: | 2586 if expr: |
2587 matcher = revset.match(repo.ui, expr, order=revset.followorder) | 2587 matcher = revset.match(repo.ui, expr) |
2588 revs = matcher(repo, revs) | 2588 revs = matcher(repo, revs, order=revset.followorder) |
2589 if limit is not None: | 2589 if limit is not None: |
2590 limitedrevs = [] | 2590 limitedrevs = [] |
2591 for idx, r in enumerate(revs): | 2591 for idx, r in enumerate(revs): |
2592 if limit <= idx: | 2592 if limit <= idx: |
2593 break | 2593 break |