mercurial-scm/hg-stable: mercurial/graphmod.py annotate

annotate mercurial/graphmod.py @ 28600:0d6137891114

author	Martijn Pieters <mjpieters@fb.com>
date	Sat, 19 Mar 2016 16:46:15 -0700
parents	fa2cd0c9a567
children	cd10171d6c71

rev	line source
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	1 # Revision graph generator for Mercurial
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	2 #
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	3 # Copyright 2008 Dirkjan Ochtman <dirkjan@ochtman.nl>
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	4 # Copyright 2007 Joel Rosdahl <joel@rosdahl.net>
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	5 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 7873 diff changeset	6 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10084 diff changeset	7 # GNU General Public License version 2 or any later version.
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	8
8840 d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	9 """supports walking the history as DAGs suitable for graphical output
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	10
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	11 The most basic format we use is that of::
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	12
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	13 (id, type, data, [parentids])
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	14
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	15 The node and parent ids are arbitrary integers which identify a node in the
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	16 context of the graph returned. Type is a constant specifying the node type.
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	17 Data depends on type.
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	18 """
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	19
25951 69751804f2f5 graphmod: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24180 diff changeset	20 from __future__ import absolute_import
8840 d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	21
23567 1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	22 import heapq
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	23
25951 69751804f2f5 graphmod: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24180 diff changeset	24 from .node import nullrev
26003 62371c539c89 revset: remove grandparent by using reachableroots Laurent Charignon <lcharignon@fb.com> parents: 25951 diff changeset	25 from . import (
62371c539c89 revset: remove grandparent by using reachableroots Laurent Charignon <lcharignon@fb.com> parents: 25951 diff changeset	26 revset,
62371c539c89 revset: remove grandparent by using reachableroots Laurent Charignon <lcharignon@fb.com> parents: 25951 diff changeset	27 util,
62371c539c89 revset: remove grandparent by using reachableroots Laurent Charignon <lcharignon@fb.com> parents: 25951 diff changeset	28 )
25951 69751804f2f5 graphmod: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24180 diff changeset	29
8840 d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	30 CHANGESET = 'C'
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	31 PARENT = 'P'
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	32 GRANDPARENT = 'G'
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	33 MISSINGPARENT = 'M'
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	34 EDGES = {PARENT: '\|', GRANDPARENT: '\|', MISSINGPARENT: '\|'}
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	35
23568 740ae54573a3 groupbranchiter: allow callers to select the first branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 23567 diff changeset	36 def groupbranchiter(revs, parentsfunc, firstbranch=()):
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	37 """Yield revisions from heads to roots one (topo) branch at a time.
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	38
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	39 This function aims to be used by a graph generator that wishes to minimize
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	40 the number of parallel branches and their interleaving.
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	41
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	42 Example iteration order (numbers show the "true" order in a changelog):
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	43
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	44 o 4
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	45 \|
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	46 o 1
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	47 \|
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	48 \| o 3
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	49 \| \|
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	50 \| o 2
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	51 \|/
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	52 o 0
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	53
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	54 Note that the ancestors of merges are understood by the current
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	55 algorithm to be on the same branch. This means no reordering will
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	56 occur behind a merge.
23568 740ae54573a3 groupbranchiter: allow callers to select the first branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 23567 diff changeset	57 """
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	58
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	59 ### Quick summary of the algorithm
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	60 #
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	61 # This function is based around a "retention" principle. We keep revisions
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	62 # in memory until we are ready to emit a whole branch that immediately
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	63 # "merges" into an existing one. This reduces the number of parallel
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	64 # branches with interleaved revisions.
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	65 #
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	66 # During iteration revs are split into two groups:
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	67 # A) revision already emitted
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	68 # B) revision in "retention". They are stored as different subgroups.
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	69 #
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	70 # for each REV, we do the following logic:
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	71 #
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	72 # 1) if REV is a parent of (A), we will emit it. If there is a
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	73 # retention group ((B) above) that is blocked on REV being
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	74 # available, we emit all the revisions out of that retention
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	75 # group first.
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	76 #
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	77 # 2) else, we'll search for a subgroup in (B) awaiting for REV to be
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	78 # available, if such subgroup exist, we add REV to it and the subgroup is
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	79 # now awaiting for REV.parents() to be available.
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	80 #
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	81 # 3) finally if no such group existed in (B), we create a new subgroup.
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	82 #
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	83 #
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	84 # To bootstrap the algorithm, we emit the tipmost revision (which
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	85 # puts it in group (A) from above).
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	86
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	87 revs.sort(reverse=True)
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	88
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	89 # Set of parents of revision that have been emitted. They can be considered
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	90 # unblocked as the graph generator is already aware of them so there is no
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	91 # need to delay the revisions that reference them.
23568 740ae54573a3 groupbranchiter: allow callers to select the first branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 23567 diff changeset	92 #
740ae54573a3 groupbranchiter: allow callers to select the first branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 23567 diff changeset	93 # If someone wants to prioritize a branch over the others, pre-filling this
740ae54573a3 groupbranchiter: allow callers to select the first branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 23567 diff changeset	94 # set will force all other branches to wait until this branch is ready to be
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	95 # emitted.
23568 740ae54573a3 groupbranchiter: allow callers to select the first branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 23567 diff changeset	96 unblocked = set(firstbranch)
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	97
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	98 # list of groups waiting to be displayed, each group is defined by:
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	99 #
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	100 # (revs: lists of revs waiting to be displayed,
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	101 # blocked: set of that cannot be displayed before those in 'revs')
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	102 #
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	103 # The second value ('blocked') correspond to parents of any revision in the
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	104 # group ('revs') that is not itself contained in the group. The main idea
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	105 # of this algorithm is to delay as much as possible the emission of any
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	106 # revision. This means waiting for the moment we are about to display
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	107 # these parents to display the revs in a group.
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	108 #
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	109 # This first implementation is smart until it encounters a merge: it will
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	110 # emit revs as soon as any parent is about to be emitted and can grow an
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	111 # arbitrary number of revs in 'blocked'. In practice this mean we properly
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	112 # retains new branches but gives up on any special ordering for ancestors
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	113 # of merges. The implementation can be improved to handle this better.
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	114 #
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	115 # The first subgroup is special. It corresponds to all the revision that
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	116 # were already emitted. The 'revs' lists is expected to be empty and the
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	117 # 'blocked' set contains the parents revisions of already emitted revision.
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	118 #
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	119 # You could pre-seed the <parents> set of groups[0] to a specific
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	120 # changesets to select what the first emitted branch should be.
f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	121 groups = [([], unblocked)]
23567 1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	122 pendingheap = []
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	123 pendingset = set()
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	124
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	125 heapq.heapify(pendingheap)
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	126 heappop = heapq.heappop
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	127 heappush = heapq.heappush
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	128 for currentrev in revs:
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	129 # Heap works with smallest element, we want highest so we invert
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	130 if currentrev not in pendingset:
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	131 heappush(pendingheap, -currentrev)
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	132 pendingset.add(currentrev)
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	133 # iterates on pending rev until after the current rev have been
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23570 diff changeset	134 # processed.
23567 1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	135 rev = None
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	136 while rev != currentrev:
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	137 rev = -heappop(pendingheap)
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	138 pendingset.remove(rev)
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	139
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	140 # Seek for a subgroup blocked, waiting for the current revision.
23567 1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	141 matching = [i for i, g in enumerate(groups) if rev in g[1]]
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	142
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	143 if matching:
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	144 # The main idea is to gather together all sets that are blocked
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	145 # on the same revision.
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	146 #
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	147 # Groups are merged when a common blocking ancestor is
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	148 # observed. For example, given two groups:
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	149 #
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	150 # revs [5, 4] waiting for 1
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	151 # revs [3, 2] waiting for 1
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	152 #
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	153 # These two groups will be merged when we process
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	154 # 1. In theory, we could have merged the groups when
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	155 # we added 2 to the group it is now in (we could have
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	156 # noticed the groups were both blocked on 1 then), but
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	157 # the way it works now makes the algorithm simpler.
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	158 #
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	159 # We also always keep the oldest subgroup first. We can
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	160 # probably improve the behavior by having the longest set
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	161 # first. That way, graph algorithms could minimise the length
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	162 # of parallel lines their drawing. This is currently not done.
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	163 targetidx = matching.pop(0)
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	164 trevs, tparents = groups[targetidx]
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	165 for i in matching:
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	166 gr = groups[i]
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	167 trevs.extend(gr[0])
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	168 tparents \|= gr[1]
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	169 # delete all merged subgroups (except the one we kept)
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	170 # (starting from the last subgroup for performance and
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	171 # sanity reasons)
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	172 for i in reversed(matching):
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	173 del groups[i]
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	174 else:
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	175 # This is a new head. We create a new subgroup for it.
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	176 targetidx = len(groups)
23567 1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	177 groups.append(([], set([rev])))
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	178
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	179 gr = groups[targetidx]
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	180
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	181 # We now add the current nodes to this subgroups. This is done
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	182 # after the subgroup merging because all elements from a subgroup
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	183 # that relied on this rev must precede it.
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	184 #
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	185 # we also update the <parents> set to include the parents of the
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	186 # new nodes.
23567 1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	187 if rev == currentrev: # only display stuff in rev
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	188 gr[0].append(rev)
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	189 gr[1].remove(rev)
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	190 parents = [p for p in parentsfunc(rev) if p > nullrev]
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	191 gr[1].update(parents)
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	192 for p in parents:
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	193 if p not in pendingset:
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	194 pendingset.add(p)
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	195 heappush(pendingheap, -p)
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	196
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	197 # Look for a subgroup to display
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	198 #
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	199 # When unblocked is empty (if clause), we were not waiting for any
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	200 # revisions during the first iteration (if no priority was given) or
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	201 # if we emitted a whole disconnected set of the graph (reached a
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	202 # root). In that case we arbitrarily take the oldest known
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	203 # subgroup. The heuristic could probably be better.
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	204 #
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	205 # Otherwise (elif clause) if the subgroup is blocked on
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	206 # a revision we just emitted, we can safely emit it as
3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	207 # well.
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	208 if not unblocked:
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	209 if len(groups) > 1: # display other subset
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	210 targetidx = 1
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	211 gr = groups[1]
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	212 elif not gr[1] & unblocked:
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	213 gr = None
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	214
23566 fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	215 if gr is not None:
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	216 # update the set of awaited revisions with the one from the
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	217 # subgroup
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	218 unblocked \|= gr[1]
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	219 # output all revisions in the subgroup
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	220 for r in gr[0]:
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	221 yield r
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	222 # delete the subgroup that you just output
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	223 # unless it is groups[0] in which case you just empty it.
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	224 if targetidx:
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	225 del groups[targetidx]
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	226 else:
fee7a30cfdf5 groubranchhiter: indent most of the inner code Pierre-Yves David <pierre-yves.david@fb.com> parents: 23565 diff changeset	227 gr[0][:] = []
23570 3f86fe9bcef0 graphmod: attempt to clarify documentation of groupbranchiter() Augie Fackler <raf@durin42.com> parents: 23569 diff changeset	228 # Check if we have some subgroup waiting for revisions we are not going to
23567 1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	229 # iterate over
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	230 for g in groups:
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	231 for r in g[0]:
1f080c9c6a35 groupbranchiter: support for non-contiguous revsets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23566 diff changeset	232 yield r
23564 f7ce0837eefd graphmod: add a function for topological iteration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23006 diff changeset	233
14042 9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	234 def dagwalker(repo, revs):
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	235 """cset DAG generator yielding (id, CHANGESET, ctx, [parentinfo]) tuples
14042 9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	236
9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	237 This generator function walks through revisions (which should be ordered
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	238 from bigger to lower). It returns a tuple for each node.
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	239
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	240 Each parentinfo entry is a tuple with (edgetype, parentid), where edgetype
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	241 is one of PARENT, GRANDPARENT or MISSINGPARENT. The node and parent ids
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	242 are arbitrary integers which identify a node in the context of the graph
14042 9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	243 returned.
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	244
8836 11ff34956ee7 graphmod/graphlog: move log walks to graphmod Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8835 diff changeset	245 """
14042 9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	246 if not revs:
14087 f3d585c9b042 graphmod: restore generator nature of dagwalker Idan Kamara <idankk86@gmail.com> parents: 14064 diff changeset	247 return
14042 9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	248
9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	249 gpcache = {}
9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	250
23569 3ecbcffdeb0c graphmod: rename graph-topological config to graph-group-branches Augie Fackler <raf@durin42.com> parents: 23568 diff changeset	251 if repo.ui.configbool('experimental', 'graph-group-branches', False):
23568 740ae54573a3 groupbranchiter: allow callers to select the first branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 23567 diff changeset	252 firstbranch = ()
23569 3ecbcffdeb0c graphmod: rename graph-topological config to graph-group-branches Augie Fackler <raf@durin42.com> parents: 23568 diff changeset	253 firstbranchrevset = repo.ui.config(
3ecbcffdeb0c graphmod: rename graph-topological config to graph-group-branches Augie Fackler <raf@durin42.com> parents: 23568 diff changeset	254 'experimental', 'graph-group-branches.firstbranch', '')
23568 740ae54573a3 groupbranchiter: allow callers to select the first branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 23567 diff changeset	255 if firstbranchrevset:
740ae54573a3 groupbranchiter: allow callers to select the first branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 23567 diff changeset	256 firstbranch = repo.revs(firstbranchrevset)
740ae54573a3 groupbranchiter: allow callers to select the first branch Pierre-Yves David <pierre-yves.david@fb.com> parents: 23567 diff changeset	257 parentrevs = repo.changelog.parentrevs
26092 014044dbd4e8 graphmod: stop building a list out of branchgroupiter Pierre-Yves David <pierre-yves.david@fb.com> parents: 26003 diff changeset	258 revs = groupbranchiter(revs, parentrevs, firstbranch)
014044dbd4e8 graphmod: stop building a list out of branchgroupiter Pierre-Yves David <pierre-yves.david@fb.com> parents: 26003 diff changeset	259 revs = revset.baseset(revs)
23565 996c01bfbec4 graphlog: add a way to test the 'groupbranchiter' function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23564 diff changeset	260
14087 f3d585c9b042 graphmod: restore generator nature of dagwalker Idan Kamara <idankk86@gmail.com> parents: 14064 diff changeset	261 for rev in revs:
f3d585c9b042 graphmod: restore generator nature of dagwalker Idan Kamara <idankk86@gmail.com> parents: 14064 diff changeset	262 ctx = repo[rev]
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	263 # partition into parents in the rev set and missing parents, then
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	264 # augment the lists with markers, to inform graph drawing code about
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	265 # what kind of edge to draw between nodes.
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	266 pset = set(p.rev() for p in ctx.parents() if p.rev() in revs)
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	267 mpars = [p.rev() for p in ctx.parents()
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	268 if p.rev() != nullrev and p.rev() not in pset]
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	269 parents = [(PARENT, p) for p in sorted(pset)]
14042 9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	270
9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	271 for mpar in mpars:
14131 03e1c2d35c6a graphmod: correctly emit nodes with more than 2 predecessors Patrick Mezard <pmezard@gmail.com> parents: 14088 diff changeset	272 gp = gpcache.get(mpar)
14042 9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	273 if gp is None:
26187 9cf65f43b49b graphmod: compute slow revset query once prior to reachableroots (issue4782) Yuya Nishihara <yuya@tcha.org> parents: 26092 diff changeset	274 # precompute slow query as we know reachableroots() goes
9cf65f43b49b graphmod: compute slow revset query once prior to reachableroots (issue4782) Yuya Nishihara <yuya@tcha.org> parents: 26092 diff changeset	275 # through all revs (issue4782)
9cf65f43b49b graphmod: compute slow revset query once prior to reachableroots (issue4782) Yuya Nishihara <yuya@tcha.org> parents: 26092 diff changeset	276 if not isinstance(revs, revset.baseset):
9cf65f43b49b graphmod: compute slow revset query once prior to reachableroots (issue4782) Yuya Nishihara <yuya@tcha.org> parents: 26092 diff changeset	277 revs = revset.baseset(revs)
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	278 gp = gpcache[mpar] = sorted(set(revset.reachableroots(
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	279 repo, revs, [mpar])))
14131 03e1c2d35c6a graphmod: correctly emit nodes with more than 2 predecessors Patrick Mezard <pmezard@gmail.com> parents: 14088 diff changeset	280 if not gp:
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	281 parents.append((MISSINGPARENT, mpar))
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	282 pset.add(mpar)
14131 03e1c2d35c6a graphmod: correctly emit nodes with more than 2 predecessors Patrick Mezard <pmezard@gmail.com> parents: 14088 diff changeset	283 else:
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	284 parents.extend((GRANDPARENT, g) for g in gp if g not in pset)
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	285 pset.update(gp)
14042 9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	286
14087 f3d585c9b042 graphmod: restore generator nature of dagwalker Idan Kamara <idankk86@gmail.com> parents: 14064 diff changeset	287 yield (ctx.rev(), CHANGESET, ctx, parents)
8836 11ff34956ee7 graphmod/graphlog: move log walks to graphmod Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8835 diff changeset	288
8837 d8e3a98018cb graphmod/graphlog: extract nodelistwalk Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8836 diff changeset	289 def nodes(repo, nodes):
8840 d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	290 """cset DAG generator yielding (id, CHANGESET, ctx, [parentids]) tuples
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	291
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	292 This generator function walks the given nodes. It only returns parents
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	293 that are in nodes, too.
d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	294 """
8837 d8e3a98018cb graphmod/graphlog: extract nodelistwalk Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8836 diff changeset	295 include = set(nodes)
d8e3a98018cb graphmod/graphlog: extract nodelistwalk Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8836 diff changeset	296 for node in nodes:
d8e3a98018cb graphmod/graphlog: extract nodelistwalk Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8836 diff changeset	297 ctx = repo[node]
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	298 parents = set((PARENT, p.rev()) for p in ctx.parents()
fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	299 if p.node() in include)
8840 d9acbe7b0049 graphmod/graphlog: make dag walks carry data as type, payload Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8837 diff changeset	300 yield (ctx.rev(), CHANGESET, ctx, sorted(parents))
8837 d8e3a98018cb graphmod/graphlog: extract nodelistwalk Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8836 diff changeset	301
16129 5e50982c633c graph: in hgrc specify line width for main branch Constantine Linnick <theaspect@gmail.com> parents: 14131 diff changeset	302 def colored(dag, repo):
8842 acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	303 """annotates a DAG with colored edge information
acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	304
acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	305 For each DAG node this function emits tuples::
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	306
8842 acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	307 (id, type, data, (col, color), [(col, nextcol, color)])
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	308
8842 acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	309 with the following new elements:
acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	310
8835 ec5483efc31f graphmod: code cleanup and doc fix Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8225 diff changeset	311 - Tuple (col, color) with column and color index for the current node
8842 acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	312 - A list of tuples indicating the edges between the current node and its
acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	313 parents.
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	314 """
8841 94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	315 seen = []
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	316 colors = {}
8841 94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	317 newcolor = 1
16129 5e50982c633c graph: in hgrc specify line width for main branch Constantine Linnick <theaspect@gmail.com> parents: 14131 diff changeset	318 config = {}
5e50982c633c graph: in hgrc specify line width for main branch Constantine Linnick <theaspect@gmail.com> parents: 14131 diff changeset	319
5e50982c633c graph: in hgrc specify line width for main branch Constantine Linnick <theaspect@gmail.com> parents: 14131 diff changeset	320 for key, val in repo.ui.configitems('graph'):
16131 6f236c8bdc01 graphmod: rewrite graph config validation Matt Mackall <mpm@selenic.com> parents: 16130 diff changeset	321 if '.' in key:
6f236c8bdc01 graphmod: rewrite graph config validation Matt Mackall <mpm@selenic.com> parents: 16130 diff changeset	322 branch, setting = key.rsplit('.', 1)
6f236c8bdc01 graphmod: rewrite graph config validation Matt Mackall <mpm@selenic.com> parents: 16130 diff changeset	323 # Validation
6f236c8bdc01 graphmod: rewrite graph config validation Matt Mackall <mpm@selenic.com> parents: 16130 diff changeset	324 if setting == "width" and val.isdigit():
16138 6e4de55a41a4 hgweb: refactor graph customization javascript Patrick Mezard <patrick@mezard.eu> parents: 16132 diff changeset	325 config.setdefault(branch, {})[setting] = int(val)
16131 6f236c8bdc01 graphmod: rewrite graph config validation Matt Mackall <mpm@selenic.com> parents: 16130 diff changeset	326 elif setting == "color" and val.isalnum():
6f236c8bdc01 graphmod: rewrite graph config validation Matt Mackall <mpm@selenic.com> parents: 16130 diff changeset	327 config.setdefault(branch, {})[setting] = val
16129 5e50982c633c graph: in hgrc specify line width for main branch Constantine Linnick <theaspect@gmail.com> parents: 14131 diff changeset	328
16132 41fc1e078d68 graphmod: add config cache Matt Mackall <mpm@selenic.com> parents: 16131 diff changeset	329 if config:
16138 6e4de55a41a4 hgweb: refactor graph customization javascript Patrick Mezard <patrick@mezard.eu> parents: 16132 diff changeset	330 getconf = util.lrucachefunc(
6e4de55a41a4 hgweb: refactor graph customization javascript Patrick Mezard <patrick@mezard.eu> parents: 16132 diff changeset	331 lambda rev: config.get(repo[rev].branch(), {}))
16132 41fc1e078d68 graphmod: add config cache Matt Mackall <mpm@selenic.com> parents: 16131 diff changeset	332 else:
16138 6e4de55a41a4 hgweb: refactor graph customization javascript Patrick Mezard <patrick@mezard.eu> parents: 16132 diff changeset	333 getconf = lambda rev: {}
16129 5e50982c633c graph: in hgrc specify line width for main branch Constantine Linnick <theaspect@gmail.com> parents: 14131 diff changeset	334
8842 acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	335 for (cur, type, data, parents) in dag:
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	336
8841 94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	337 # Compute seen and next
94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	338 if cur not in seen:
94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	339 seen.append(cur) # new head
94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	340 colors[cur] = newcolor
94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	341 newcolor += 1
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	342
8841 94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	343 col = seen.index(cur)
94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	344 color = colors.pop(cur)
94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	345 next = seen[:]
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	346
8842 acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	347 # Add parents to next
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	348 addparents = [p for pt, p in parents if p not in next]
8841 94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	349 next[col:col + 1] = addparents
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	350
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	351 # Set colors for the parents
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	352 for i, p in enumerate(addparents):
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	353 if not i:
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	354 colors[p] = color
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	355 else:
8841 94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	356 colors[p] = newcolor
94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	357 newcolor += 1
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	358
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	359 # Add edges to the graph
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	360 edges = []
8841 94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	361 for ecol, eid in enumerate(seen):
94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	362 if eid in next:
16138 6e4de55a41a4 hgweb: refactor graph customization javascript Patrick Mezard <patrick@mezard.eu> parents: 16132 diff changeset	363 bconf = getconf(eid)
16129 5e50982c633c graph: in hgrc specify line width for main branch Constantine Linnick <theaspect@gmail.com> parents: 14131 diff changeset	364 edges.append((
5e50982c633c graph: in hgrc specify line width for main branch Constantine Linnick <theaspect@gmail.com> parents: 14131 diff changeset	365 ecol, next.index(eid), colors[eid],
16138 6e4de55a41a4 hgweb: refactor graph customization javascript Patrick Mezard <patrick@mezard.eu> parents: 16132 diff changeset	366 bconf.get('width', -1),
6e4de55a41a4 hgweb: refactor graph customization javascript Patrick Mezard <patrick@mezard.eu> parents: 16132 diff changeset	367 bconf.get('color', '')))
8842 acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	368 elif eid == cur:
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	369 for ptype, p in parents:
16138 6e4de55a41a4 hgweb: refactor graph customization javascript Patrick Mezard <patrick@mezard.eu> parents: 16132 diff changeset	370 bconf = getconf(p)
16129 5e50982c633c graph: in hgrc specify line width for main branch Constantine Linnick <theaspect@gmail.com> parents: 14131 diff changeset	371 edges.append((
5e50982c633c graph: in hgrc specify line width for main branch Constantine Linnick <theaspect@gmail.com> parents: 14131 diff changeset	372 ecol, next.index(p), color,
16138 6e4de55a41a4 hgweb: refactor graph customization javascript Patrick Mezard <patrick@mezard.eu> parents: 16132 diff changeset	373 bconf.get('width', -1),
6e4de55a41a4 hgweb: refactor graph customization javascript Patrick Mezard <patrick@mezard.eu> parents: 16132 diff changeset	374 bconf.get('color', '')))
6691 0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	375
0dba955c2636 add graph page to hgweb Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	376 # Yield and move on
8842 acd03a6e2426 graphmod/webcommands: use generic DAG walks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8841 diff changeset	377 yield (cur, type, data, (col, color), edges)
8841 94ac080e7af9 graphmod: rename a bunch of vars in graph() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8840 diff changeset	378 seen = next
14042 9966c95b8c4f graphmod: use revsets internally Alexander Solovyov <alexander@solovyov.net> parents: 12951 diff changeset	379
28375 97cb1aeaca78 graphmod: refactor state handling Martijn Pieters <mjpieters@fb.com> parents: 26187 diff changeset	380 def asciiedges(type, char, lines, state, rev, parents):
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	381 """adds edge info to changelog DAG walk suitable for ascii()"""
28375 97cb1aeaca78 graphmod: refactor state handling Martijn Pieters <mjpieters@fb.com> parents: 26187 diff changeset	382 seen = state['seen']
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	383 if rev not in seen:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	384 seen.append(rev)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	385 nodeidx = seen.index(rev)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	386
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	387 knownparents = []
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	388 newparents = []
28376 fa2cd0c9a567 graphmod: augment the graph to include more information about the edges Martijn Pieters <mjpieters@fb.com> parents: 28375 diff changeset	389 for ptype, parent in parents:
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	390 if parent in seen:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	391 knownparents.append(parent)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	392 else:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	393 newparents.append(parent)
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	394 state['edges'][parent] = state['styles'].get(ptype, '\|')
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	395
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	396 ncols = len(seen)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	397 nextseen = seen[:]
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	398 nextseen[nodeidx:nodeidx + 1] = newparents
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	399 edges = [(nodeidx, nextseen.index(p))
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	400 for p in knownparents if p != nullrev]
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	401
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	402 while len(newparents) > 2:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	403 # ascii() only knows how to add or remove a single column between two
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	404 # calls. Nodes with more than two parents break this constraint so we
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	405 # introduce intermediate expansion lines to grow the active node list
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	406 # slowly.
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	407 edges.append((nodeidx, nodeidx))
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	408 edges.append((nodeidx, nodeidx + 1))
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	409 nmorecols = 1
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	410 yield (type, char, lines, (nodeidx, edges, ncols, nmorecols))
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	411 char = '\\'
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	412 lines = []
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	413 nodeidx += 1
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	414 ncols += 1
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	415 edges = []
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	416 del newparents[0]
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	417
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	418 if len(newparents) > 0:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	419 edges.append((nodeidx, nodeidx))
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	420 if len(newparents) > 1:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	421 edges.append((nodeidx, nodeidx + 1))
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	422 nmorecols = len(nextseen) - ncols
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	423 seen[:] = nextseen
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	424 # remove current node from edge characters, no longer needed
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	425 state['edges'].pop(rev, None)
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	426 yield (type, char, lines, (nodeidx, edges, ncols, nmorecols))
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	427
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	428 def _fixlongrightedges(edges):
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	429 for (i, (start, end)) in enumerate(edges):
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	430 if end > start:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	431 edges[i] = (start, end + 1)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	432
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	433 def _getnodelineedgestail(
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	434 echars, idx, pidx, ncols, coldiff, pdiff, fix_tail):
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	435 if fix_tail and coldiff == pdiff and coldiff != 0:
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	436 # Still going in the same non-vertical direction.
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	437 if coldiff == -1:
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	438 start = max(idx + 1, pidx)
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	439 tail = echars[idx * 2:(start - 1) * 2]
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	440 tail.extend(["/", " "] * (ncols - start))
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	441 return tail
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	442 else:
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	443 return ["\\", " "] * (ncols - idx - 1)
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	444 else:
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	445 remainder = (ncols - idx - 1)
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	446 return echars[-(remainder * 2):] if remainder > 0 else []
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	447
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	448 def _drawedges(echars, edges, nodeline, interline):
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	449 for (start, end) in edges:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	450 if start == end + 1:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	451 interline[2 * end + 1] = "/"
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	452 elif start == end - 1:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	453 interline[2 * start + 1] = "\\"
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	454 elif start == end:
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	455 interline[2 * start] = echars[2 * start]
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	456 else:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	457 if 2 * end >= len(nodeline):
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	458 continue
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	459 nodeline[2 * end] = "+"
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	460 if start > end:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	461 (start, end) = (end, start)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	462 for i in range(2 * start + 1, 2 * end):
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	463 if nodeline[i] != "+":
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	464 nodeline[i] = "-"
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	465
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	466 def _getpaddingline(echars, idx, ncols, edges):
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	467 # all edges up to the current node
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	468 line = echars[:idx * 2]
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	469 # an edge for the current node, if there is one
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	470 if (idx, idx - 1) in edges or (idx, idx) in edges:
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	471 # (idx, idx - 1) (idx, idx)
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	472 # \| \| \| \| \| \| \| \|
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	473 # +---o \| \| o---+
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	474 # \| \| X \| \| X \| \|
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	475 # \| \|/ / \| \|/ /
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	476 # \| \| \| \| \| \|
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	477 line.extend(echars[idx * 2:(idx + 1) * 2])
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	478 else:
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	479 line.extend(' ')
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	480 # all edges to the right of the current node
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	481 remainder = ncols - idx - 1
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	482 if remainder > 0:
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	483 line.extend(echars[-(remainder * 2):])
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	484 return line
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	485
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	486 def asciistate():
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	487 """returns the initial value for the "state" argument to ascii()"""
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	488 return {
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	489 'seen': [],
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	490 'edges': {},
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	491 'lastcoldiff': 0,
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	492 'lastindex': 0,
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	493 'styles': EDGES.copy(),
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	494 }
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	495
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	496 def ascii(ui, state, type, char, text, coldata):
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	497 """prints an ASCII graph of the DAG
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	498
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	499 takes the following arguments (one call per node in the graph):
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	500
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	501 - ui to write to
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	502 - Somewhere to keep the needed state in (init to asciistate())
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	503 - Column of the current node in the set of ongoing edges.
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	504 - Type indicator of node data, usually 'C' for changesets.
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	505 - Payload: (char, lines):
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	506 - Character to use as node's symbol.
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	507 - List of lines to display as the node's text.
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	508 - Edges; a list of (col, next_col) indicating the edges between
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	509 the current node and its parents.
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	510 - Number of columns (ongoing edges) in the current revision.
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	511 - The difference between the number of columns (ongoing edges)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	512 in the next revision and the number of columns (ongoing edges)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	513 in the current revision. That is: -1 means one column removed;
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	514 0 means no columns added or removed; 1 means one column added.
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	515 """
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	516 idx, edges, ncols, coldiff = coldata
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	517 assert -2 < coldiff < 2
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	518
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	519 edgemap, seen = state['edges'], state['seen']
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	520 # Be tolerant of history issues; make sure we have at least ncols + coldiff
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	521 # elements to work with. See test-glog.t for broken history test cases.
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	522 echars = [c for p in seen for c in (edgemap.get(p, '\|'), ' ')]
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	523 echars.extend(('\|', ' ') * max(ncols + coldiff - len(seen), 0))
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	524
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	525 if coldiff == -1:
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	526 # Transform
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	527 #
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	528 # \| \| \| \| \| \|
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	529 # o \| \| into o---+
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	530 # \|X / \|/ /
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	531 # \| \| \| \|
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	532 _fixlongrightedges(edges)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	533
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	534 # add_padding_line says whether to rewrite
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	535 #
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	536 # \| \| \| \| \| \| \| \|
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	537 # \| o---+ into \| o---+
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	538 # \| / / \| \| \| # <--- padding line
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	539 # o \| \| \| / /
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	540 # o \| \|
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	541 add_padding_line = (len(text) > 2 and coldiff == -1 and
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	542 [x for (x, y) in edges if x + 1 < y])
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	543
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	544 # fix_nodeline_tail says whether to rewrite
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	545 #
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	546 # \| \| o \| \| \| \| o \| \|
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	547 # \| \| \|/ / \| \| \|/ /
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	548 # \| o \| \| into \| o / / # <--- fixed nodeline tail
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	549 # \| \|/ / \| \|/ /
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	550 # o \| \| o \| \|
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	551 fix_nodeline_tail = len(text) <= 2 and not add_padding_line
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	552
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	553 # nodeline is the line containing the node character (typically o)
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	554 nodeline = echars[:idx * 2]
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	555 nodeline.extend([char, " "])
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	556
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	557 nodeline.extend(
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	558 _getnodelineedgestail(
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	559 echars, idx, state['lastindex'], ncols, coldiff,
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	560 state['lastcoldiff'], fix_nodeline_tail))
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	561
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	562 # shift_interline is the line containing the non-vertical
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	563 # edges between this entry and the next
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	564 shift_interline = echars[:idx * 2]
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	565 shift_interline.extend(' ' * (2 + coldiff))
0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	566 count = ncols - idx - 1
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	567 if coldiff == -1:
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	568 shift_interline.extend('/ ' * count)
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	569 elif coldiff == 0:
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	570 shift_interline.extend(echars[(idx + 1) * 2:ncols * 2])
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	571 else:
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	572 shift_interline.extend(r'\ ' * count)
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	573
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	574 # draw edges from the current node to its parents
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	575 _drawedges(echars, edges, nodeline, shift_interline)
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	576
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	577 # lines is the list of all graph lines to print
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	578 lines = [nodeline]
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	579 if add_padding_line:
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	580 lines.append(_getpaddingline(echars, idx, ncols, edges))
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	581 lines.append(shift_interline)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	582
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	583 # make sure that there are as many graph lines as there are
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	584 # log strings
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	585 while len(text) < len(lines):
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	586 text.append("")
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	587 if len(lines) < len(text):
28600 0d6137891114 graphmod: allow for different styles for different edge types Martijn Pieters <mjpieters@fb.com> parents: 28376 diff changeset	588 extra_interline = echars[:(ncols + coldiff) * 2]
17179 0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	589 while len(lines) < len(text):
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	590 lines.append(extra_interline)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	591
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	592 # print lines
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	593 indentation_level = max(ncols, ncols + coldiff)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	594 for (line, logstr) in zip(lines, text):
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	595 ln = "%-s %s" % (2 indentation_level, "".join(line), logstr)
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	596 ui.write(ln.rstrip() + '\n')
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	597
0849d725e2f9 graphlog: extract ascii drawing code into graphmod Patrick Mezard <patrick@mezard.eu> parents: 16138 diff changeset	598 # ... and start over
28375 97cb1aeaca78 graphmod: refactor state handling Martijn Pieters <mjpieters@fb.com> parents: 26187 diff changeset	599 state['lastcoldiff'] = coldiff
97cb1aeaca78 graphmod: refactor state handling Martijn Pieters <mjpieters@fb.com> parents: 26187 diff changeset	600 state['lastindex'] = idx

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/graphmod.py @ 28600:0d6137891114