/brz/remove-bazaar

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