~bzr-pqm/bzr/bzr.dev

3246.2.2 by Martin Pool
Fix up import of tsort
1
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
1185.16.113 by mbp at sourcefrog
Add topo_sort utility function
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1185.16.113 by mbp at sourcefrog
Add topo_sort utility function
16
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
17
18
"""Topological sorting routines."""
19
20
4593.5.30 by John Arbash Meinel
Move the topo_sort implementation into KnownGraph, rather than calling back to it.
21
from bzrlib import (
22
    errors,
23
    graph as _mod_graph,
24
    revision as _mod_revision,
25
    )
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
26
1185.16.114 by mbp at sourcefrog
Improved topological sort
27
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
28
__all__ = ["topo_sort", "TopoSorter", "merge_sort", "MergeSorter"]
29
30
1185.16.114 by mbp at sourcefrog
Improved topological sort
31
def topo_sort(graph):
1185.16.113 by mbp at sourcefrog
Add topo_sort utility function
32
    """Topological sort a graph.
33
1185.16.114 by mbp at sourcefrog
Improved topological sort
34
    graph -- sequence of pairs of node->parents_list.
35
4593.5.3 by John Arbash Meinel
Bring in the optimized tsort code.
36
    The result is a list of node names, such that all parents come before their
37
    children.
1185.16.114 by mbp at sourcefrog
Improved topological sort
38
1185.16.113 by mbp at sourcefrog
Add topo_sort utility function
39
    node identifiers can be any hashable object, and are typically strings.
4577.2.3 by Maarten Bosmans
tsort.topo_sort: new algorithm, improving performance
40
41
    This function has the same purpose as the TopoSorter class, but uses a
4593.5.3 by John Arbash Meinel
Bring in the optimized tsort code.
42
    different algorithm to sort the graph. That means that while both return a
43
    list with parents before their child nodes, the exact ordering can be
44
    different.
4577.2.3 by Maarten Bosmans
tsort.topo_sort: new algorithm, improving performance
45
4593.5.3 by John Arbash Meinel
Bring in the optimized tsort code.
46
    topo_sort is faster when the whole list is needed, while when iterating
47
    over a part of the list, TopoSorter.iter_topo_order should be used.
1185.16.113 by mbp at sourcefrog
Add topo_sort utility function
48
    """
4593.5.43 by John Arbash Meinel
The api for topo_sort() was to allow a list of (key, value)
49
    kg = _mod_graph.KnownGraph(dict(graph))
4593.5.30 by John Arbash Meinel
Move the topo_sort implementation into KnownGraph, rather than calling back to it.
50
    return kg.topo_sort()
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
51
52
53
class TopoSorter(object):
54
55
    def __init__(self, graph):
56
        """Topological sorting of a graph.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
57
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
58
        :param graph: sequence of pairs of node_name->parent_names_list.
59
                      i.e. [('C', ['B']), ('B', ['A']), ('A', [])]
60
                      For this input the output from the sort or
61
                      iter_topo_order routines will be:
62
                      'A', 'B', 'C'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
63
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
64
        node identifiers can be any hashable object, and are typically strings.
65
1587.1.2 by Robert Collins
Review comments for reconcile.
66
        If you have a graph like [('a', ['b']), ('a', ['c'])] this will only use
67
        one of the two values for 'a'.
68
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
69
        The graph is sorted lazily: until you iterate or sort the input is
70
        not processed other than to create an internal representation.
71
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
72
        iteration or sorting may raise GraphCycleError if a cycle is present
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
73
        in the graph.
74
        """
4577.2.2 by Maarten Bosmans
tsort.TopoSorter: performance improvements
75
        # store a dict of the graph.
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
76
        self._graph = dict(graph)
77
78
    def sorted(self):
79
        """Sort the graph and return as a list.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
80
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
81
        After calling this the sorter is empty and you must create a new one.
82
        """
83
        return list(self.iter_topo_order())
84
85
###        Useful if fiddling with this code.
86
###        # cross check
87
###        sorted_names = list(self.iter_topo_order())
88
###        for index in range(len(sorted_names)):
89
###            rev = sorted_names[index]
90
###            for left_index in range(index):
91
###                if rev in self.original_graph[sorted_names[left_index]]:
92
###                    print "revision in parent list of earlier revision"
93
###                    import pdb;pdb.set_trace()
94
95
    def iter_topo_order(self):
1587.1.3 by Robert Collins
Typos for reconcile - docstring in tsort.py was out of sync with code.
96
        """Yield the nodes of the graph in a topological order.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
97
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
98
        After finishing iteration the sorter is empty and you cannot continue
99
        iteration.
100
        """
4577.2.2 by Maarten Bosmans
tsort.TopoSorter: performance improvements
101
        graph = self._graph
102
        visitable = set(graph)
103
104
        # this is a stack storing the depth first search into the graph.
105
        pending_node_stack = []
106
        # at each level of 'recursion' we have to check each parent. This
107
        # stack stores the parents we have not yet checked for the node at the
108
        # matching depth in pending_node_stack
109
        pending_parents_stack = []
110
111
        # this is a set of the completed nodes for fast checking whether a
112
        # parent in a node we are processing on the stack has already been
113
        # emitted and thus can be skipped.
114
        completed_node_names = set()
115
116
        while graph:
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
117
            # now pick a random node in the source graph, and transfer it to the
4577.2.2 by Maarten Bosmans
tsort.TopoSorter: performance improvements
118
            # top of the depth first search stack of pending nodes.
119
            node_name, parents = graph.popitem()
120
            pending_node_stack.append(node_name)
121
            pending_parents_stack.append(list(parents))
122
123
            # loop until pending_node_stack is empty
124
            while pending_node_stack:
125
                parents_to_visit = pending_parents_stack[-1]
126
                # if there are no parents left, the revision is done
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
127
                if not parents_to_visit:
128
                    # append the revision to the topo sorted list
4577.2.2 by Maarten Bosmans
tsort.TopoSorter: performance improvements
129
                    # all the nodes parents have been added to the output,
130
                    # now we can add it to the output.
131
                    popped_node = pending_node_stack.pop()
132
                    pending_parents_stack.pop()
133
                    completed_node_names.add(popped_node)
134
                    yield popped_node
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
135
                else:
4577.2.2 by Maarten Bosmans
tsort.TopoSorter: performance improvements
136
                    # recurse depth first into a single parent
137
                    next_node_name = parents_to_visit.pop()
138
139
                    if next_node_name in completed_node_names:
140
                        # parent was already completed by a child, skip it.
141
                        continue
142
                    if next_node_name not in visitable:
143
                        # parent is not a node in the original graph, skip it.
144
                        continue
145
146
                    # transfer it along with its parents from the source graph
147
                    # into the top of the current depth first search stack.
148
                    try:
149
                        parents = graph.pop(next_node_name)
150
                    except KeyError:
151
                        # if the next node is not in the source graph it has
152
                        # already been popped from it and placed into the
153
                        # current search stack (but not completed or we would
154
                        # have hit the continue 6 lines up).  this indicates a
155
                        # cycle.
156
                        raise errors.GraphCycleError(pending_node_stack)
157
                    pending_node_stack.append(next_node_name)
158
                    pending_parents_stack.append(list(parents))
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
159
160
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
161
def merge_sort(graph, branch_tip, mainline_revisions=None, generate_revno=False):
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
162
    """Topological sort a graph which groups merges.
163
164
    :param graph: sequence of pairs of node->parents_list.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
165
    :param branch_tip: the tip of the branch to graph. Revisions not
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
166
                       reachable from branch_tip are not included in the
167
                       output.
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
168
    :param mainline_revisions: If not None this forces a mainline to be
169
                               used rather than synthesised from the graph.
170
                               This must be a valid path through some part
171
                               of the graph. If the mainline does not cover all
172
                               the revisions, output stops at the start of the
173
                               old revision listed in the mainline revisions
174
                               list.
175
                               The order for this parameter is oldest-first.
1988.4.4 by Robert Collins
Tidy up the patch.
176
    :param generate_revno: Optional parameter controlling the generation of
177
        revision number sequences in the output. See the output description of
178
        the MergeSorter docstring for details.
179
    :result: See the MergeSorter docstring for details.
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
180
    node identifiers can be any hashable object, and are typically strings.
181
    """
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
182
    return MergeSorter(graph, branch_tip, mainline_revisions,
183
        generate_revno).sorted()
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
184
185
186
class MergeSorter(object):
187
2425.4.1 by John Arbash Meinel
Use __slots__ for MergeSorter
188
    __slots__ = ['_node_name_stack',
189
                 '_node_merge_depth_stack',
190
                 '_pending_parents_stack',
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
191
                 '_first_child_stack',
2425.4.1 by John Arbash Meinel
Use __slots__ for MergeSorter
192
                 '_left_subtree_pushed_stack',
193
                 '_generate_revno',
194
                 '_graph',
195
                 '_mainline_revisions',
196
                 '_stop_revision',
197
                 '_original_graph',
198
                 '_revnos',
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
199
                 '_revno_to_branch_count',
2425.4.1 by John Arbash Meinel
Use __slots__ for MergeSorter
200
                 '_completed_node_names',
201
                 '_scheduled_nodes',
202
                ]
203
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
204
    def __init__(self, graph, branch_tip, mainline_revisions=None,
205
        generate_revno=False):
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
206
        """Merge-aware topological sorting of a graph.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
207
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
208
        :param graph: sequence of pairs of node_name->parent_names_list.
209
                      i.e. [('C', ['B']), ('B', ['A']), ('A', [])]
210
                      For this input the output from the sort or
211
                      iter_topo_order routines will be:
212
                      'A', 'B', 'C'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
213
        :param branch_tip: the tip of the branch to graph. Revisions not
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
214
                       reachable from branch_tip are not included in the
215
                       output.
216
        :param mainline_revisions: If not None this forces a mainline to be
217
                               used rather than synthesised from the graph.
218
                               This must be a valid path through some part
219
                               of the graph. If the mainline does not cover all
220
                               the revisions, output stops at the start of the
221
                               old revision listed in the mainline revisions
222
                               list.
223
                               The order for this parameter is oldest-first.
1988.4.4 by Robert Collins
Tidy up the patch.
224
        :param generate_revno: Optional parameter controlling the generation of
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
225
            revision number sequences in the output. See the output description
226
            for more details.
227
1988.4.4 by Robert Collins
Tidy up the patch.
228
        The result is a list sorted so that all parents come before
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
229
        their children. Each element of the list is a tuple containing:
230
        (sequence_number, node_name, merge_depth, end_of_merge)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
231
         * sequence_number: The sequence of this row in the output. Useful for
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
232
           GUIs.
1988.4.4 by Robert Collins
Tidy up the patch.
233
         * node_name: The node name: opaque text to the merge routine.
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
234
         * merge_depth: How many levels of merging deep this node has been
235
           found.
236
         * revno_sequence: When requested this field provides a sequence of
237
             revision numbers for all revisions. The format is:
3170.3.7 by John Arbash Meinel
update MergeSorter.__init__() docstring
238
             (REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
239
             branch that the revno is on. From left to right the REVNO numbers
240
             are the sequence numbers within that branch of the revision.
241
             For instance, the graph {A:[], B:['A'], C:['A', 'B']} will get
242
             the following revno_sequences assigned: A:(1,), B:(1,1,1), C:(2,).
243
             This should be read as 'A is the first commit in the trunk',
244
             'B is the first commit on the first branch made from A', 'C is the
245
             second commit in the trunk'.
246
         * end_of_merge: When True the next node is part of a different merge.
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
247
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
248
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
249
        node identifiers can be any hashable object, and are typically strings.
250
251
        If you have a graph like [('a', ['b']), ('a', ['c'])] this will only use
252
        one of the two values for 'a'.
253
254
        The graph is sorted lazily: until you iterate or sort the input is
255
        not processed other than to create an internal representation.
256
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
257
        iteration or sorting may raise GraphCycleError if a cycle is present
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
258
        in the graph.
259
260
        Background information on the design:
261
        -------------------------------------
262
        definition: the end of any cluster or 'merge' occurs when:
263
            1 - the next revision has a lower merge depth than we do.
264
              i.e.
265
              A 0
266
              B  1
267
              C   2
268
              D  1
269
              E 0
270
              C, D are the ends of clusters, E might be but we need more data.
271
            2 - or the next revision at our merge depth is not our left most
272
              ancestor.
273
              This is required to handle multiple-merges in one commit.
274
              i.e.
275
              A 0    [F, B, E]
276
              B  1   [D, C]
277
              C   2  [D]
278
              D  1   [F]
279
              E  1   [F]
280
              F 0
281
              C is the end of a cluster due to rule 1.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
282
              D is not the end of a cluster from rule 1, but is from rule 2: E
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
283
                is not its left most ancestor
284
              E is the end of a cluster due to rule 1
285
              F might be but we need more data.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
286
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
287
        we show connecting lines to a parent when:
288
         - The parent is the start of a merge within this cluster.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
289
           That is, the merge was not done to the mainline before this cluster
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
290
           was merged to the mainline.
291
           This can be detected thus:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
292
            * The parent has a higher merge depth and is the next revision in
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
293
              the list.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
294
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
295
          The next revision in the list constraint is needed for this case:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
296
          A 0   [D, B]
297
          B  1  [C, F]   # we do not want to show a line to F which is depth 2
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
298
                           but not a merge
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
299
          C  1  [H]      # note that this is a long line to show back to the
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
300
                           ancestor - see the end of merge rules.
301
          D 0   [G, E]
302
          E  1  [G, F]
303
          F   2 [G]
304
          G  1  [H]
305
          H 0
306
         - Part of this merges 'branch':
307
          The parent has the same merge depth and is our left most parent and we
308
           are not the end of the cluster.
309
          A 0   [C, B] lines: [B, C]
310
          B  1  [E, C] lines: [C]
311
          C 0   [D]    lines: [D]
312
          D 0   [F, E] lines: [E, F]
313
          E  1  [F]    lines: [F]
314
          F 0
315
         - The end of this merge/cluster:
316
          we can ONLY have multiple parents at the end of a cluster if this
317
          branch was previously merged into the 'mainline'.
318
          - if we have one and only one parent, show it
319
            Note that this may be to a greater merge depth - for instance if
320
            this branch continued from a deeply nested branch to add something
321
            to it.
322
          - if we have more than one parent - show the second oldest (older ==
323
            further down the list) parent with
324
            an equal or lower merge depth
325
             XXXX revisit when awake. ddaa asks about the relevance of each one
326
             - maybe more than one parent is relevant
327
        """
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
328
        self._generate_revno = generate_revno
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
329
        # a dict of the graph.
330
        self._graph = dict(graph)
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
331
        # if there is an explicit mainline, alter the graph to match. This is
332
        # easier than checking at every merge whether we are on the mainline and
333
        # if so which path to take.
334
        if mainline_revisions is None:
335
            self._mainline_revisions = []
336
            self._stop_revision = None
337
        else:
338
            self._mainline_revisions = list(mainline_revisions)
339
            self._stop_revision = self._mainline_revisions[0]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
340
        # skip the first revision, its what we reach and its parents are
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
341
        # therefore irrelevant
342
        for index, revision in enumerate(self._mainline_revisions[1:]):
343
            # NB: index 0 means self._mainline_revisions[1]
344
            # if the mainline matches the graph, nothing to do.
345
            parent = self._mainline_revisions[index]
346
            if parent is None:
347
                # end of mainline_revisions history
348
                continue
3533.2.1 by John Arbash Meinel
(bug #243536) tsort.merge_sorted() should work even with a ghost in mainline.
349
            graph_parent_ids = self._graph[revision]
350
            if not graph_parent_ids:
351
                # We ran into a ghost, skip over it, this is a workaround for
352
                # bug #243536, the _graph has had ghosts stripped, but the
353
                # mainline_revisions have not
354
                continue
355
            if graph_parent_ids[0] == parent:
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
356
                continue
357
            # remove it from its prior spot
358
            self._graph[revision].remove(parent)
359
            # insert it into the start of the mainline
360
            self._graph[revision].insert(0, parent)
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
361
        # we need to do a check late in the process to detect end-of-merges
362
        # which requires the parents to be accessible: its easier for now
363
        # to just keep the original graph around.
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
364
        self._original_graph = dict(self._graph.items())
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
365
        # we need to know the revision numbers of revisions to determine
366
        # the revision numbers of their descendants
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
367
        # this is a graph from node to [revno_tuple, first_child]
368
        # where first_child is True if no other children have seen this node
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
369
        # and revno_tuple is the tuple that was assigned to the node.
370
        # we dont know revnos to start with, so we start it seeded with
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
371
        # [None, True]
372
        self._revnos = dict((revision, [None, True])
373
                            for revision in self._graph)
374
        # Each mainline revision counts how many child branches have spawned from it.
375
        self._revno_to_branch_count = {}
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
376
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
377
        # this is a stack storing the depth first search into the graph.
378
        self._node_name_stack = []
379
        # at each level of recursion we need the merge depth this node is at:
380
        self._node_merge_depth_stack = []
381
        # at each level of 'recursion' we have to check each parent. This
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
382
        # stack stores the parents we have not yet checked for the node at the
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
383
        # matching depth in _node_name_stack
384
        self._pending_parents_stack = []
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
385
        # When we first look at a node we assign it a seqence number from its
386
        # leftmost parent.
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
387
        self._first_child_stack = []
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
388
        # this is a set of the nodes who have been completely analysed for fast
389
        # membership checking
390
        self._completed_node_names = set()
391
        # this is the scheduling of nodes list.
392
        # Nodes are scheduled
393
        # from the bottom left of the tree: in the tree
394
        # A 0  [D, B]
395
        # B  1 [C]
396
        # C  1 [D]
397
        # D 0  [F, E]
398
        # E  1 [F]
399
        # F 0
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
400
        # the scheduling order is: F, E, D, C, B, A
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
401
        # that is - 'left subtree, right subtree, node'
402
        # which would mean that when we schedule A we can emit the entire tree.
403
        self._scheduled_nodes = []
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
404
        # This records for each node when we have processed its left most
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
405
        # unmerged subtree. After this subtree is scheduled, all other subtrees
406
        # have their merge depth increased by one from this nodes merge depth.
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
407
        # it contains tuples - name, merge_depth
408
        self._left_subtree_pushed_stack = []
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
409
410
        # seed the search with the tip of the branch
3236.2.1 by Michael Hudson
test and fix
411
        if (branch_tip is not None and
4593.5.42 by John Arbash Meinel
Turns out that some code assumed passing NULL_REVISION to merge_sort
412
            branch_tip != _mod_revision.NULL_REVISION and
413
            branch_tip != (_mod_revision.NULL_REVISION,)):
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
414
            parents = self._graph.pop(branch_tip)
415
            self._push_node(branch_tip, 0, parents)
416
417
    def sorted(self):
418
        """Sort the graph and return as a list.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
419
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
420
        After calling this the sorter is empty and you must create a new one.
421
        """
422
        return list(self.iter_topo_order())
423
424
    def iter_topo_order(self):
425
        """Yield the nodes of the graph in a topological order.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
426
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
427
        After finishing iteration the sorter is empty and you cannot continue
428
        iteration.
429
        """
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
430
        # These are safe to offload to local variables, because they are used
431
        # as a stack and modified in place, never assigned to.
432
        node_name_stack = self._node_name_stack
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
433
        node_merge_depth_stack = self._node_merge_depth_stack
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
434
        pending_parents_stack = self._pending_parents_stack
435
        left_subtree_pushed_stack = self._left_subtree_pushed_stack
436
        completed_node_names = self._completed_node_names
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
437
        scheduled_nodes = self._scheduled_nodes
438
439
        graph_pop = self._graph.pop
440
441
        def push_node(node_name, merge_depth, parents,
442
                      node_name_stack_append=node_name_stack.append,
443
                      node_merge_depth_stack_append=node_merge_depth_stack.append,
444
                      left_subtree_pushed_stack_append=left_subtree_pushed_stack.append,
445
                      pending_parents_stack_append=pending_parents_stack.append,
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
446
                      first_child_stack_append=self._first_child_stack.append,
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
447
                      revnos=self._revnos,
448
                      ):
449
            """Add node_name to the pending node stack.
450
451
            Names in this stack will get emitted into the output as they are popped
452
            off the stack.
453
454
            This inlines a lot of self._variable.append functions as local
455
            variables.
456
            """
457
            node_name_stack_append(node_name)
458
            node_merge_depth_stack_append(merge_depth)
459
            left_subtree_pushed_stack_append(False)
460
            pending_parents_stack_append(list(parents))
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
461
            # as we push it, check if it is the first child
4634.11.1 by John Arbash Meinel
Fix bug #419241. If a graph had a mainline ghost
462
            parent_info = None
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
463
            if parents:
464
                # node has parents, assign from the left most parent.
4634.11.1 by John Arbash Meinel
Fix bug #419241. If a graph had a mainline ghost
465
                try:
466
                    parent_info = revnos[parents[0]]
467
                except KeyError:
468
                    # Left-hand parent is a ghost, consider it not to exist
469
                    pass
470
            if parent_info is not None:
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
471
                first_child = parent_info[1]
472
                parent_info[1] = False
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
473
            else:
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
474
                # We don't use the same algorithm here, but we need to keep the
475
                # stack in line
476
                first_child = None
477
            first_child_stack_append(first_child)
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
478
479
        def pop_node(node_name_stack_pop=node_name_stack.pop,
480
                     node_merge_depth_stack_pop=node_merge_depth_stack.pop,
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
481
                     first_child_stack_pop=self._first_child_stack.pop,
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
482
                     left_subtree_pushed_stack_pop=left_subtree_pushed_stack.pop,
483
                     pending_parents_stack_pop=pending_parents_stack.pop,
484
                     original_graph=self._original_graph,
485
                     revnos=self._revnos,
486
                     completed_node_names_add=self._completed_node_names.add,
487
                     scheduled_nodes_append=scheduled_nodes.append,
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
488
                     revno_to_branch_count=self._revno_to_branch_count,
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
489
                    ):
490
            """Pop the top node off the stack
491
492
            The node is appended to the sorted output.
493
            """
494
            # we are returning from the flattened call frame:
495
            # pop off the local variables
496
            node_name = node_name_stack_pop()
497
            merge_depth = node_merge_depth_stack_pop()
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
498
            first_child = first_child_stack_pop()
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
499
            # remove this node from the pending lists:
500
            left_subtree_pushed_stack_pop()
501
            pending_parents_stack_pop()
502
503
            parents = original_graph[node_name]
4634.11.1 by John Arbash Meinel
Fix bug #419241. If a graph had a mainline ghost
504
            parent_revno = None
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
505
            if parents:
506
                # node has parents, assign from the left most parent.
4634.11.1 by John Arbash Meinel
Fix bug #419241. If a graph had a mainline ghost
507
                try:
508
                    parent_revno = revnos[parents[0]][0]
509
                except KeyError:
510
                    # left-hand parent is a ghost, treat it as not existing
511
                    pass
512
            if parent_revno is not None:
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
513
                if not first_child:
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
514
                    # not the first child, make a new branch
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
515
                    base_revno = parent_revno[0]
516
                    branch_count = revno_to_branch_count.get(base_revno, 0)
517
                    branch_count += 1
518
                    revno_to_branch_count[base_revno] = branch_count
519
                    revno = (parent_revno[0], branch_count, 1)
520
                    # revno = (parent_revno[0], branch_count, parent_revno[-1]+1)
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
521
                else:
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
522
                    # as the first child, we just increase the final revision
523
                    # number
524
                    revno = parent_revno[:-1] + (parent_revno[-1] + 1,)
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
525
            else:
526
                # no parents, use the root sequence
3613.1.1 by John Arbash Meinel
Fix the merge_sort code so that it properly increments.
527
                root_count = revno_to_branch_count.get(0, -1)
528
                root_count += 1
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
529
                if root_count:
530
                    revno = (0, root_count, 1)
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
531
                else:
532
                    revno = (1,)
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
533
                revno_to_branch_count[0] = root_count
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
534
535
            # store the revno for this node for future reference
536
            revnos[node_name][0] = revno
537
            completed_node_names_add(node_name)
538
            scheduled_nodes_append((node_name, merge_depth, revno))
539
            return node_name
540
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
541
542
        while node_name_stack:
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
543
            # loop until this call completes.
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
544
            parents_to_visit = pending_parents_stack[-1]
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
545
            # if all parents are done, the revision is done
546
            if not parents_to_visit:
547
                # append the revision to the topo sorted scheduled list:
548
                # all the nodes parents have been scheduled added, now
549
                # we can add it to the output.
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
550
                pop_node()
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
551
            else:
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
552
                while pending_parents_stack[-1]:
553
                    if not left_subtree_pushed_stack[-1]:
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
554
                        # recurse depth first into the primary parent
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
555
                        next_node_name = pending_parents_stack[-1].pop(0)
4615.1.1 by John Arbash Meinel
Change merge_sort to increase indent even for trivial merge histories.
556
                        is_left_subtree = True
557
                        left_subtree_pushed_stack[-1] = True
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
558
                    else:
559
                        # place any merges in right-to-left order for scheduling
560
                        # which gives us left-to-right order after we reverse
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
561
                        # the scheduled queue. XXX: This has the effect of
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
562
                        # allocating common-new revisions to the right-most
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
563
                        # subtree rather than the left most, which will
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
564
                        # display nicely (you get smaller trees at the top
565
                        # of the combined merge).
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
566
                        next_node_name = pending_parents_stack[-1].pop()
4615.1.1 by John Arbash Meinel
Change merge_sort to increase indent even for trivial merge histories.
567
                        is_left_subtree = False
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
568
                    if next_node_name in completed_node_names:
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
569
                        # this parent was completed by a child on the
570
                        # call stack. skip it.
571
                        continue
572
                    # otherwise transfer it from the source graph into the
573
                    # top of the current depth first search stack.
574
                    try:
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
575
                        parents = graph_pop(next_node_name)
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
576
                    except KeyError:
577
                        # if the next node is not in the source graph it has
578
                        # already been popped from it and placed into the
579
                        # current search stack (but not completed or we would
580
                        # have hit the continue 4 lines up.
581
                        # this indicates a cycle.
4593.5.25 by John Arbash Meinel
Add tests that we detect GraphCycleError
582
                        if next_node_name in self._original_graph:
583
                            raise errors.GraphCycleError(node_name_stack)
584
                        else:
585
                            # This is just a ghost parent, ignore it
586
                            continue
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
587
                    next_merge_depth = 0
4615.1.1 by John Arbash Meinel
Change merge_sort to increase indent even for trivial merge histories.
588
                    if is_left_subtree:
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
589
                        # a new child branch from name_stack[-1]
4615.1.1 by John Arbash Meinel
Change merge_sort to increase indent even for trivial merge histories.
590
                        next_merge_depth = 0
591
                    else:
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
592
                        next_merge_depth = 1
593
                    next_merge_depth = (
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
594
                        node_merge_depth_stack[-1] + next_merge_depth)
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
595
                    push_node(
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
596
                        next_node_name,
597
                        next_merge_depth,
598
                        parents)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
599
                    # and do not continue processing parents until this 'call'
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
600
                    # has recursed.
601
                    break
2425.4.3 by John Arbash Meinel
Inline self._pop_node and self._push_node
602
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
603
        # We have scheduled the graph. Now deliver the ordered output:
604
        sequence_number = 0
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
605
        stop_revision = self._stop_revision
606
        generate_revno = self._generate_revno
607
        original_graph = self._original_graph
608
609
        while scheduled_nodes:
610
            node_name, merge_depth, revno = scheduled_nodes.pop()
611
            if node_name == stop_revision:
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
612
                return
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
613
            if not len(scheduled_nodes):
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
614
                # last revision is the end of a merge
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
615
                end_of_merge = True
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
616
            elif scheduled_nodes[-1][1] < merge_depth:
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
617
                # the next node is to our left
618
                end_of_merge = True
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
619
            elif (scheduled_nodes[-1][1] == merge_depth and
620
                  (scheduled_nodes[-1][0] not in
621
                   original_graph[node_name])):
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
622
                # the next node was part of a multiple-merge.
623
                end_of_merge = True
624
            else:
625
                end_of_merge = False
2425.4.2 by John Arbash Meinel
Change valid self._foo variables into local variables.
626
            if generate_revno:
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
627
                yield (sequence_number, node_name, merge_depth, revno, end_of_merge)
628
            else:
629
                yield (sequence_number, node_name, merge_depth, end_of_merge)
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
630
            sequence_number += 1
631
632
    def _push_node(self, node_name, merge_depth, parents):
633
        """Add node_name to the pending node stack.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
634
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
635
        Names in this stack will get emitted into the output as they are popped
636
        off the stack.
637
        """
638
        self._node_name_stack.append(node_name)
639
        self._node_merge_depth_stack.append(merge_depth)
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
640
        self._left_subtree_pushed_stack.append(False)
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
641
        self._pending_parents_stack.append(list(parents))
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
642
        # as we push it, figure out if this is the first child
4634.11.1 by John Arbash Meinel
Fix bug #419241. If a graph had a mainline ghost
643
        parent_info = None
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
644
        if parents:
645
            # node has parents, assign from the left most parent.
4634.11.1 by John Arbash Meinel
Fix bug #419241. If a graph had a mainline ghost
646
            try:
647
                parent_info = self._revnos[parents[0]]
648
            except KeyError:
649
                # Left-hand parent is a ghost, consider it not to exist
650
                pass
651
        if parent_info is not None:
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
652
            first_child = parent_info[1]
653
            parent_info[1] = False
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
654
        else:
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
655
            # We don't use the same algorithm here, but we need to keep the
656
            # stack in line
657
            first_child = None
658
        self._first_child_stack.append(first_child)
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
659
660
    def _pop_node(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
661
        """Pop the top node off the stack
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
662
663
        The node is appended to the sorted output.
664
        """
665
        # we are returning from the flattened call frame:
666
        # pop off the local variables
667
        node_name = self._node_name_stack.pop()
668
        merge_depth = self._node_merge_depth_stack.pop()
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
669
        first_child = self._first_child_stack.pop()
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
670
        # remove this node from the pending lists:
671
        self._left_subtree_pushed_stack.pop()
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
672
        self._pending_parents_stack.pop()
673
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
674
        parents = self._original_graph[node_name]
4634.11.1 by John Arbash Meinel
Fix bug #419241. If a graph had a mainline ghost
675
        parent_revno = None
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
676
        if parents:
677
            # node has parents, assign from the left most parent.
4634.11.1 by John Arbash Meinel
Fix bug #419241. If a graph had a mainline ghost
678
            try:
679
                parent_revno = self._revnos[parents[0]][0]
680
            except KeyError:
681
                # left-hand parent is a ghost, treat it as not existing
682
                pass
683
        if parent_revno is not None:
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
684
            if not first_child:
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
685
                # not the first child, make a new branch
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
686
                base_revno = parent_revno[0]
687
                branch_count = self._revno_to_branch_count.get(base_revno, 0)
688
                branch_count += 1
689
                self._revno_to_branch_count[base_revno] = branch_count
690
                revno = (parent_revno[0], branch_count, 1)
691
                # revno = (parent_revno[0], branch_count, parent_revno[-1]+1)
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
692
            else:
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
693
                # as the first child, we just increase the final revision
694
                # number
695
                revno = parent_revno[:-1] + (parent_revno[-1] + 1,)
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
696
        else:
697
            # no parents, use the root sequence
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
698
            root_count = self._revno_to_branch_count.get(0, 0)
4593.5.9 by John Arbash Meinel
Fix a bug in MergeSorter that was fixed only in the inlined pop_node
699
            root_count = self._revno_to_branch_count.get(0, -1)
700
            root_count += 1
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
701
            if root_count:
702
                revno = (0, root_count, 1)
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
703
            else:
704
                revno = (1,)
3170.3.2 by John Arbash Meinel
Implement the new dotted revision numbering.
705
            self._revno_to_branch_count[0] = root_count
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
706
707
        # store the revno for this node for future reference
708
        self._revnos[node_name][0] = revno
1624.1.2 by Robert Collins
Add MergeSort facility to bzrlib.tsort.
709
        self._completed_node_names.add(node_name)
1988.4.1 by Robert Collins
bzrlib.tsort.merge_sorted now accepts 'generate_revnos'. This parameter
710
        self._scheduled_nodes.append((node_name, merge_depth, self._revnos[node_name][0]))
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
711
        return node_name