Mercurial > hg
diff mercurial/logcmdutil.py @ 42309:604c086ddde6
log: add config for making `hg log -G` always topo-sorted
I (and everyone else at Google) have an log alias that adds graph mode
and templating. I have another one that builds on the first and also
restricts the set of revisions to only show those I'm most likely to
care about. This second alias also adds topological sorting. I still
sometimes use the first one. When I do, it very often bothers me that
it's not topologically sorted (branches are interleaved). This patch
adds a config option for always using topological sorting with graph
log.
The revision set is sorted eagerly, which seems like a bad idea, but
it doesn't seem to make a big difference in the hg repo (150ms). I
initially tried to instead wrap the user's revset in sort(...,topo),
but that seemed much harder.
Differential Revision: https://phab.mercurial-scm.org/D6331
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 01 May 2019 09:34:47 -0700 |
parents | 1ce46f0ee218 |
children | b162229ebe0d |
line wrap: on
line diff
--- a/mercurial/logcmdutil.py Tue May 14 09:13:39 2019 -0700 +++ b/mercurial/logcmdutil.py Wed May 01 09:34:47 2019 -0700 @@ -746,7 +746,12 @@ if opts.get('graph'): # User-specified revs might be unsorted, but don't sort before # _makerevset because it might depend on the order of revs - if not (revs.isdescending() or revs.istopo()): + if repo.ui.configbool('experimental', 'log.topo'): + if not revs.istopo(): + revs = dagop.toposort(revs, repo.changelog.parentrevs) + # TODO: try to iterate the set lazily + revs = revset.baseset(list(revs)) + elif not (revs.isdescending() or revs.istopo()): revs.sort(reverse=True) if expr: matcher = revset.match(None, expr)