~bzr-pqm/bzr/bzr.dev

2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
1
# Copyright (C) 2005, 2006 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1 by mbp at sourcefrog
import from baz patch-364
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.16.40 by Martin Pool
todo
17
# TODO: Some kind of command-line display of revision properties: 
18
# perhaps show them in log -v and allow them as options to the commit command.
1 by mbp at sourcefrog
import from baz patch-364
19
1590.1.1 by Robert Collins
Improve common_ancestor performance.
20
21
import bzrlib.errors as errors
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
22
from bzrlib.deprecated_graph import (
23
    all_descendants,
24
    Graph,
25
    node_distances,
26
    select_farthest,
27
    )
1185.16.39 by Martin Pool
- constraints on revprops
28
from bzrlib.osutils import contains_whitespace
1534.9.1 by Aaron Bentley
Added progress bars to merge
29
from bzrlib.progress import DummyProgress
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
30
from bzrlib.symbol_versioning import (deprecated_function,
31
        zero_eight,
32
        )
8 by mbp at sourcefrog
store committer's timezone in revision and show
33
974.1.90 by Aaron Bentley
Switched NULL revision ID to 'null:' per robertc's suggestion
34
NULL_REVISION="null:"
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
35
CURRENT_REVISION="current:"
974.1.89 by Aaron Bentley
Fixed merging with multiple roots, by using null as graph root.
36
1911.2.1 by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate
37
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
38
class Revision(object):
1 by mbp at sourcefrog
import from baz patch-364
39
    """Single revision on a branch.
40
41
    Revisions may know their revision_hash, but only once they've been
42
    written out.  This is not stored because you cannot write the hash
43
    into the file it describes.
44
697 by Martin Pool
- write out parent list for new revisions
45
    After bzr 0.0.5 revisions are allowed to have multiple parents.
696 by Martin Pool
- Refactor revision deserialization code
46
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
47
    parent_ids
48
        List of parent revision_ids
1185.16.39 by Martin Pool
- constraints on revprops
49
50
    properties
51
        Dictionary of revision properties.  These are attached to the
52
        revision as extra metadata.  The name must be a single 
53
        word; the value can be an arbitrary string.
1 by mbp at sourcefrog
import from baz patch-364
54
    """
696 by Martin Pool
- Refactor revision deserialization code
55
    
1185.16.35 by Martin Pool
- stub for revision properties
56
    def __init__(self, revision_id, properties=None, **args):
1092.2.25 by Robert Collins
support ghosts in commits
57
        self.revision_id = revision_id
1185.16.35 by Martin Pool
- stub for revision properties
58
        self.properties = properties or {}
1185.16.39 by Martin Pool
- constraints on revprops
59
        self._check_properties()
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
60
        self.parent_ids = []
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
61
        self.parent_sha1s = []
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
62
        """Not used anymore - legacy from for 4."""
1185.42.6 by Jelmer Vernooij
Don't clear Revision.parent_ids after it has been set from the arguments
63
        self.__dict__.update(args)
696 by Martin Pool
- Refactor revision deserialization code
64
1 by mbp at sourcefrog
import from baz patch-364
65
    def __repr__(self):
184 by mbp at sourcefrog
pychecker fixups
66
        return "<Revision id %s>" % self.revision_id
1 by mbp at sourcefrog
import from baz patch-364
67
1185 by Martin Pool
- add xml round-trip test for revisions
68
    def __eq__(self, other):
69
        if not isinstance(other, Revision):
70
            return False
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
71
        # FIXME: rbc 20050930 parent_ids are not being compared
72
        return (
73
                self.inventory_sha1 == other.inventory_sha1
1185 by Martin Pool
- add xml round-trip test for revisions
74
                and self.revision_id == other.revision_id
75
                and self.timestamp == other.timestamp
76
                and self.message == other.message
77
                and self.timezone == other.timezone
1185.16.35 by Martin Pool
- stub for revision properties
78
                and self.committer == other.committer
79
                and self.properties == other.properties)
1185 by Martin Pool
- add xml round-trip test for revisions
80
81
    def __ne__(self, other):
82
        return not self.__eq__(other)
83
1185.16.39 by Martin Pool
- constraints on revprops
84
    def _check_properties(self):
1732.3.2 by Matthieu Moy
merge
85
        """Verify that all revision properties are OK."""
1185.16.39 by Martin Pool
- constraints on revprops
86
        for name, value in self.properties.iteritems():
87
            if not isinstance(name, basestring) or contains_whitespace(name):
88
                raise ValueError("invalid property name %r" % name)
89
            if not isinstance(value, basestring):
90
                raise ValueError("invalid property value %r for %r" % 
91
                                 (name, value))
92
1534.4.49 by Robert Collins
Provide a revision.get_history(repository) method for generating a synthetic revision history.
93
    def get_history(self, repository):
94
        """Return the canonical line-of-history for this revision.
95
96
        If ghosts are present this may differ in result from a ghost-free
97
        repository.
98
        """
99
        current_revision = self
100
        reversed_result = []
101
        while current_revision is not None:
102
            reversed_result.append(current_revision.revision_id)
103
            if not len (current_revision.parent_ids):
104
                reversed_result.append(None)
105
                current_revision = None
106
            else:
107
                next_revision_id = current_revision.parent_ids[0]
108
                current_revision = repository.get_revision(next_revision_id)
109
        reversed_result.reverse()
110
        return reversed_result
111
1740.2.5 by Aaron Bentley
Merge from bzr.dev
112
    def get_summary(self):
113
        """Get the first line of the log message for this revision.
114
        """
115
        return self.message.split('\n', 1)[0]
116
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
117
118
def is_ancestor(revision_id, candidate_id, branch):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
119
    """Return true if candidate_id is an ancestor of revision_id.
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
120
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
121
    A false negative will be returned if any intermediate descendent of
122
    candidate_id is not present in any of the revision_sources.
810 by Martin Pool
- New validate_revision_id function
123
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
124
    revisions_source is an object supporting a get_revision operation that
125
    behaves like Branch's.
126
    """
2490.2.33 by Aaron Bentley
Disable topological sorting of get_ancestry where sensible
127
    return (candidate_id in branch.repository.get_ancestry(revision_id,
128
            topo_sorted=False))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
129
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
130
131
def iter_ancestors(revision_id, revision_source, only_present=False):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
132
    ancestors = (revision_id,)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
133
    distance = 0
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
134
    while len(ancestors) > 0:
135
        new_ancestors = []
136
        for ancestor in ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
137
            if not only_present:
138
                yield ancestor, distance
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
139
            try:
140
                revision = revision_source.get_revision(ancestor)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
141
            except errors.NoSuchRevision, e:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
142
                if e.revision == revision_id:
143
                    raise 
144
                else:
145
                    continue
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
146
            if only_present:
147
                yield ancestor, distance
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
148
            new_ancestors.extend(revision.parent_ids)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
149
        ancestors = new_ancestors
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
150
        distance += 1
151
152
153
def find_present_ancestors(revision_id, revision_source):
1133 by Martin Pool
doc
154
    """Return the ancestors of a revision present in a branch.
155
156
    It's possible that a branch won't have the complete ancestry of
157
    one of its revisions.  
158
159
    """
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
160
    found_ancestors = {}
161
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
162
                         only_present=True))
163
    for anc_order, (anc_id, anc_distance) in anc_iter:
1963.2.1 by Robey Pointer
remove usage of has_key()
164
        if anc_id not in found_ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
165
            found_ancestors[anc_id] = (anc_order, anc_distance)
166
    return found_ancestors
167
    
1153 by Martin Pool
- clean up some code in revision.py
168
169
def __get_closest(intersection):
170
    intersection.sort()
171
    matches = [] 
172
    for entry in intersection:
173
        if entry[0] == intersection[0][0]:
174
            matches.append(entry[2])
175
    return matches
176
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
177
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
178
def revision_graph(revision, revision_source):
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
179
    """Produce a graph of the ancestry of the specified revision.
1590.1.1 by Robert Collins
Improve common_ancestor performance.
180
    
181
    :return: root, ancestors map, descendants map
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
182
    """
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
183
    revision_source.lock_read()
184
    try:
185
        return _revision_graph(revision, revision_source)
186
    finally:
187
        revision_source.unlock()
188
1590.1.1 by Robert Collins
Improve common_ancestor performance.
189
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
190
def _revision_graph(revision, revision_source):
191
    """See revision_graph."""
1590.1.1 by Robert Collins
Improve common_ancestor performance.
192
    from bzrlib.tsort import topo_sort
193
    graph = revision_source.get_revision_graph(revision)
194
    # mark all no-parent revisions as being NULL_REVISION parentage.
195
    for node, parents in graph.items():
196
        if len(parents) == 0:
197
            graph[node] = [NULL_REVISION]
198
    # add NULL_REVISION to the graph
199
    graph[NULL_REVISION] = []
200
201
    # pick a root. If there are multiple roots
202
    # this could pick a random one.
203
    topo_order = topo_sort(graph.items())
204
    root = topo_order[0]
205
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
206
    ancestors = {}
207
    descendants = {}
1590.1.1 by Robert Collins
Improve common_ancestor performance.
208
209
    # map the descendants of the graph.
210
    # and setup our set based return graph.
211
    for node in graph.keys():
212
        descendants[node] = {}
213
    for node, parents in graph.items():
214
        for parent in parents:
215
            descendants[parent][node] = 1
216
        ancestors[node] = set(parents)
217
974.1.63 by Aaron Bentley
Fixed graph-generation
218
    assert root not in descendants[root]
219
    assert root not in ancestors[root]
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
220
    return root, ancestors, descendants
221
1092.3.4 by Robert Collins
update symlink branch to integration
222
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
223
def combined_graph(revision_a, revision_b, revision_source):
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
224
    """Produce a combined ancestry graph.
225
    Return graph root, ancestors map, descendants map, set of common nodes"""
1590.1.1 by Robert Collins
Improve common_ancestor performance.
226
    root, ancestors, descendants = revision_graph(
227
        revision_a, revision_source)
228
    root_b, ancestors_b, descendants_b = revision_graph(
229
        revision_b, revision_source)
974.1.80 by Aaron Bentley
Improved merge error handling and testing
230
    if root != root_b:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
231
        raise errors.NoCommonRoot(revision_a, revision_b)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
232
    common = set()
233
    for node, node_anc in ancestors_b.iteritems():
234
        if node in ancestors:
235
            common.add(node)
236
        else:
237
            ancestors[node] = set()
238
        ancestors[node].update(node_anc)
239
    for node, node_dec in descendants_b.iteritems():
240
        if node not in descendants:
1185.8.1 by Aaron Bentley
Ensured combined_graph is order-insensitive
241
            descendants[node] = {}
974.1.63 by Aaron Bentley
Fixed graph-generation
242
        descendants[node].update(node_dec)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
243
    return root, ancestors, descendants, common
244
1092.3.4 by Robert Collins
update symlink branch to integration
245
1534.9.1 by Aaron Bentley
Added progress bars to merge
246
def common_ancestor(revision_a, revision_b, revision_source, 
247
                    pb=DummyProgress()):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
248
    if None in (revision_a, revision_b):
249
        return None
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
250
    if NULL_REVISION in (revision_a, revision_b):
251
        return NULL_REVISION
1594.2.15 by Robert Collins
Unfuck performance.
252
    # trivial optimisation
253
    if revision_a == revision_b:
254
        return revision_a
974.1.80 by Aaron Bentley
Improved merge error handling and testing
255
    try:
1534.9.1 by Aaron Bentley
Added progress bars to merge
256
        try:
257
            pb.update('Picking ancestor', 1, 3)
1594.2.15 by Robert Collins
Unfuck performance.
258
            graph = revision_source.get_revision_graph_with_ghosts(
259
                [revision_a, revision_b])
2401.1.1 by John Arbash Meinel
Shortcut the common_ancestor code when one tip is in the ancestry of the other.
260
            # Shortcut the case where one of the tips is already included in
261
            # the other graphs ancestry.
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
262
            ancestry_a = graph.get_ancestry(revision_a, topo_sorted=False)
2401.1.1 by John Arbash Meinel
Shortcut the common_ancestor code when one tip is in the ancestry of the other.
263
            if revision_b in ancestry_a:
264
                return revision_b
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
265
            ancestry_b = graph.get_ancestry(revision_b, topo_sorted=False)
2401.1.1 by John Arbash Meinel
Shortcut the common_ancestor code when one tip is in the ancestry of the other.
266
            if revision_a in ancestry_b:
267
                return revision_a
1594.2.15 by Robert Collins
Unfuck performance.
268
            # convert to a NULL_REVISION based graph.
269
            ancestors = graph.get_ancestors()
270
            descendants = graph.get_descendants()
2401.1.2 by John Arbash Meinel
Ancestry checks can be done using the dictionaries
271
            common = set(ancestry_a)
272
            common.intersection_update(ancestry_b)
1594.2.15 by Robert Collins
Unfuck performance.
273
            descendants[NULL_REVISION] = {}
274
            ancestors[NULL_REVISION] = []
275
            for root in graph.roots:
276
                descendants[NULL_REVISION][root] = 1
277
                ancestors[root].append(NULL_REVISION)
1607.1.12 by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are
278
            for ghost in graph.ghosts:
279
                # ghosts act as roots for the purpose of finding 
280
                # the longest paths from the root: any ghost *might*
281
                # be directly attached to the root, so we treat them
282
                # as being such.
283
                # ghost now descends from NULL
284
                descendants[NULL_REVISION][ghost] = 1
285
                # that is it has an ancestor of NULL
286
                ancestors[ghost] = [NULL_REVISION]
287
                # ghost is common if any of ghosts descendants are common:
288
                for ghost_descendant in descendants[ghost]:
289
                    if ghost_descendant in common:
290
                        common.add(ghost)
291
                
1594.2.15 by Robert Collins
Unfuck performance.
292
            root = NULL_REVISION
293
            common.add(NULL_REVISION)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
294
        except errors.NoCommonRoot:
295
            raise errors.NoCommonAncestor(revision_a, revision_b)
1534.9.1 by Aaron Bentley
Added progress bars to merge
296
            
297
        pb.update('Picking ancestor', 2, 3)
298
        distances = node_distances (descendants, ancestors, root)
299
        pb.update('Picking ancestor', 3, 2)
300
        farthest = select_farthest(distances, common)
301
        if farthest is None or farthest == NULL_REVISION:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
302
            raise errors.NoCommonAncestor(revision_a, revision_b)
1534.9.1 by Aaron Bentley
Added progress bars to merge
303
    finally:
304
        pb.clear()
974.1.87 by Aaron Bentley
Refactored and documented graph stuff
305
    return farthest
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
306
307
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
308
class MultipleRevisionSources(object):
1153 by Martin Pool
- clean up some code in revision.py
309
    """Proxy that looks in multiple branches for revisions."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
310
    def __init__(self, *args):
311
        object.__init__(self)
312
        assert len(args) != 0
313
        self._revision_sources = args
314
1590.1.1 by Robert Collins
Improve common_ancestor performance.
315
    def revision_parents(self, revision_id):
316
        for source in self._revision_sources:
317
            try:
318
                return source.revision_parents(revision_id)
319
            except (errors.WeaveRevisionNotPresent, errors.NoSuchRevision), e:
320
                pass
321
        raise e
322
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
323
    def get_revision(self, revision_id):
324
        for source in self._revision_sources:
325
            try:
326
                return source.get_revision(revision_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
327
            except errors.NoSuchRevision, e:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
328
                pass
329
        raise e
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
330
1590.1.1 by Robert Collins
Improve common_ancestor performance.
331
    def get_revision_graph(self, revision_id):
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
332
        # we could probe incrementally until the pending
333
        # ghosts list stop growing, but its cheaper for now
334
        # to just ask for the complete graph for each repository.
335
        graphs = []
336
        for source in self._revision_sources:
337
            ghost_graph = source.get_revision_graph_with_ghosts()
338
            graphs.append(ghost_graph)
339
        absent = 0
340
        for graph in graphs:
341
            if not revision_id in graph.get_ancestors():
342
                absent += 1
343
        if absent == len(graphs):
344
            raise errors.NoSuchRevision(self._revision_sources[0], revision_id)
345
346
        # combine the graphs
1590.1.1 by Robert Collins
Improve common_ancestor performance.
347
        result = {}
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
348
        pending = set([revision_id])
349
        def find_parents(node_id):
350
            """find the parents for node_id."""
351
            for graph in graphs:
352
                ancestors = graph.get_ancestors()
353
                try:
354
                    return ancestors[node_id]
355
                except KeyError:
356
                    pass
357
            raise errors.NoSuchRevision(self._revision_sources[0], node_id)
358
        while len(pending):
359
            # all the graphs should have identical parent lists
360
            node_id = pending.pop()
1590.1.1 by Robert Collins
Improve common_ancestor performance.
361
            try:
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
362
                result[node_id] = find_parents(node_id)
363
                for parent_node in result[node_id]:
364
                    if not parent_node in result:
365
                        pending.add(parent_node)
366
            except errors.NoSuchRevision:
367
                # ghost, ignore it.
1590.1.1 by Robert Collins
Improve common_ancestor performance.
368
                pass
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
369
        return result
1590.1.1 by Robert Collins
Improve common_ancestor performance.
370
1594.2.15 by Robert Collins
Unfuck performance.
371
    def get_revision_graph_with_ghosts(self, revision_ids):
372
        # query all the sources for their entire graphs 
373
        # and then build a combined graph for just
374
        # revision_ids.
375
        graphs = []
376
        for source in self._revision_sources:
377
            ghost_graph = source.get_revision_graph_with_ghosts()
378
            graphs.append(ghost_graph.get_ancestors())
379
        for revision_id in revision_ids:
380
            absent = 0
381
            for graph in graphs:
382
                    if not revision_id in graph:
383
                        absent += 1
384
            if absent == len(graphs):
385
                raise errors.NoSuchRevision(self._revision_sources[0],
386
                                            revision_id)
387
388
        # combine the graphs
389
        result = Graph()
390
        pending = set(revision_ids)
391
        done = set()
392
        def find_parents(node_id):
393
            """find the parents for node_id."""
394
            for graph in graphs:
395
                try:
396
                    return graph[node_id]
397
                except KeyError:
398
                    pass
399
            raise errors.NoSuchRevision(self._revision_sources[0], node_id)
400
        while len(pending):
401
            # all the graphs should have identical parent lists
402
            node_id = pending.pop()
403
            try:
404
                parents = find_parents(node_id)
405
                for parent_node in parents:
406
                    # queued or done? 
407
                    if (parent_node not in pending and
408
                        parent_node not in done):
409
                        # no, queue
410
                        pending.add(parent_node)
411
                result.add_node(node_id, parents)
412
                done.add(node_id)
413
            except errors.NoSuchRevision:
414
                # ghost
415
                result.add_ghost(node_id)
416
                continue
417
        return result
418
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
419
    def lock_read(self):
420
        for source in self._revision_sources:
421
            source.lock_read()
422
423
    def unlock(self):
424
        for source in self._revision_sources:
425
            source.unlock()
426
1590.1.1 by Robert Collins
Improve common_ancestor performance.
427
1685.1.65 by Martin Pool
[broken] Use deprecated_function not deprecated_method
428
@deprecated_function(zero_eight)
429
def get_intervening_revisions(ancestor_id, rev_id, rev_source,
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
430
                              revision_history=None):
431
    """Find the longest line of descent from maybe_ancestor to revision.
432
    Revision history is followed where possible.
433
434
    If ancestor_id == rev_id, list will be empty.
435
    Otherwise, rev_id will be the last entry.  ancestor_id will never appear.
436
    If ancestor_id is not an ancestor, NotAncestor will be thrown
437
    """
974.1.73 by Aaron Bentley
Reimplemented get_intervening_revisions for better scalability
438
    root, ancestors, descendants = revision_graph(rev_id, rev_source)
439
    if len(descendants) == 0:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
440
        raise errors.NoSuchRevision(rev_source, rev_id)
974.1.73 by Aaron Bentley
Reimplemented get_intervening_revisions for better scalability
441
    if ancestor_id not in descendants:
442
        rev_source.get_revision(ancestor_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
443
        raise errors.NotAncestor(rev_id, ancestor_id)
974.1.73 by Aaron Bentley
Reimplemented get_intervening_revisions for better scalability
444
    root_descendants = all_descendants(descendants, ancestor_id)
445
    root_descendants.add(ancestor_id)
446
    if rev_id not in root_descendants:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
447
        raise errors.NotAncestor(rev_id, ancestor_id)
974.1.73 by Aaron Bentley
Reimplemented get_intervening_revisions for better scalability
448
    distances = node_distances(descendants, ancestors, ancestor_id,
449
                               root_descendants=root_descendants)
450
451
    def best_ancestor(rev_id):
452
        best = None
453
        for anc_id in ancestors[rev_id]:
454
            try:
455
                distance = distances[anc_id]
456
            except KeyError:
457
                continue
458
            if revision_history is not None and anc_id in revision_history:
459
                return anc_id
460
            elif best is None or distance > best[1]:
461
                best = (anc_id, distance)
462
        return best[0]
463
464
    next = rev_id
465
    path = []
466
    while next != ancestor_id:
467
        path.append(next)
468
        next = best_ancestor(next)
469
    path.reverse()
470
    return path
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
471
2229.2.2 by Aaron Bentley
Update docs
472
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
473
def is_reserved_id(revision_id):
2229.2.2 by Aaron Bentley
Update docs
474
    """Determine whether a revision id is reserved
475
476
    :return: True if the revision is is reserved, False otherwise
477
    """
478
    return isinstance(revision_id, basestring) and revision_id.endswith(':')
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
479
480
481
def check_not_reserved_id(revision_id):
482
    """Raise ReservedId if the supplied revision_id is reserved"""
483
    if is_reserved_id(revision_id):
484
        raise errors.ReservedId(revision_id)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
485
486
def ensure_null(revision_id):
487
    """Ensure only NULL_REVISION is used to represent the null revisionn"""
488
    if revision_id is None:
489
        return NULL_REVISION
490
    else:
491
        return revision_id