/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,
23
    symbol_versioning
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
        """
117
        return self.message.split('\n', 1)[0]
118
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
119
120
def is_ancestor(revision_id, candidate_id, branch):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
121
    """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
122
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
123
    A false negative will be returned if any intermediate descendent of
124
    candidate_id is not present in any of the revision_sources.
810 by Martin Pool
- New validate_revision_id function
125
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
126
    revisions_source is an object supporting a get_revision operation that
127
    behaves like Branch's.
128
    """
2598.5.3 by Aaron Bentley
Push NULL_REVISION deeper
129
    if is_null(candidate_id):
130
        return True
2490.2.33 by Aaron Bentley
Disable topological sorting of get_ancestry where sensible
131
    return (candidate_id in branch.repository.get_ancestry(revision_id,
132
            topo_sorted=False))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
133
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
134
135
def iter_ancestors(revision_id, revision_source, only_present=False):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
136
    ancestors = (revision_id,)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
137
    distance = 0
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
138
    while len(ancestors) > 0:
139
        new_ancestors = []
140
        for ancestor in ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
141
            if not only_present:
142
                yield ancestor, distance
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
143
            try:
144
                revision = revision_source.get_revision(ancestor)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
145
            except errors.NoSuchRevision, e:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
146
                if e.revision == revision_id:
147
                    raise 
148
                else:
149
                    continue
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
150
            if only_present:
151
                yield ancestor, distance
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
152
            new_ancestors.extend(revision.parent_ids)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
153
        ancestors = new_ancestors
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
154
        distance += 1
155
156
157
def find_present_ancestors(revision_id, revision_source):
1133 by Martin Pool
doc
158
    """Return the ancestors of a revision present in a branch.
159
160
    It's possible that a branch won't have the complete ancestry of
161
    one of its revisions.  
162
163
    """
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
164
    found_ancestors = {}
165
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
166
                         only_present=True))
167
    for anc_order, (anc_id, anc_distance) in anc_iter:
1963.2.1 by Robey Pointer
remove usage of has_key()
168
        if anc_id not in found_ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
169
            found_ancestors[anc_id] = (anc_order, anc_distance)
170
    return found_ancestors
171
    
1153 by Martin Pool
- clean up some code in revision.py
172
173
def __get_closest(intersection):
174
    intersection.sort()
175
    matches = [] 
176
    for entry in intersection:
177
        if entry[0] == intersection[0][0]:
178
            matches.append(entry[2])
179
    return matches
180
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
181
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
182
def revision_graph(revision, revision_source):
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
183
    """Produce a graph of the ancestry of the specified revision.
1590.1.1 by Robert Collins
Improve common_ancestor performance.
184
    
185
    :return: root, ancestors map, descendants map
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
186
    """
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
187
    revision_source.lock_read()
188
    try:
189
        return _revision_graph(revision, revision_source)
190
    finally:
191
        revision_source.unlock()
192
1590.1.1 by Robert Collins
Improve common_ancestor performance.
193
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
194
def _revision_graph(revision, revision_source):
195
    """See revision_graph."""
1590.1.1 by Robert Collins
Improve common_ancestor performance.
196
    from bzrlib.tsort import topo_sort
197
    graph = revision_source.get_revision_graph(revision)
198
    # mark all no-parent revisions as being NULL_REVISION parentage.
199
    for node, parents in graph.items():
200
        if len(parents) == 0:
201
            graph[node] = [NULL_REVISION]
202
    # add NULL_REVISION to the graph
203
    graph[NULL_REVISION] = []
204
205
    # pick a root. If there are multiple roots
206
    # this could pick a random one.
207
    topo_order = topo_sort(graph.items())
208
    root = topo_order[0]
209
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
210
    ancestors = {}
211
    descendants = {}
1590.1.1 by Robert Collins
Improve common_ancestor performance.
212
213
    # map the descendants of the graph.
214
    # and setup our set based return graph.
215
    for node in graph.keys():
216
        descendants[node] = {}
217
    for node, parents in graph.items():
218
        for parent in parents:
219
            descendants[parent][node] = 1
220
        ancestors[node] = set(parents)
221
974.1.63 by Aaron Bentley
Fixed graph-generation
222
    assert root not in descendants[root]
223
    assert root not in ancestors[root]
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
224
    return root, ancestors, descendants
225
1092.3.4 by Robert Collins
update symlink branch to integration
226
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
227
def combined_graph(revision_a, revision_b, revision_source):
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
228
    """Produce a combined ancestry graph.
229
    Return graph root, ancestors map, descendants map, set of common nodes"""
1590.1.1 by Robert Collins
Improve common_ancestor performance.
230
    root, ancestors, descendants = revision_graph(
231
        revision_a, revision_source)
232
    root_b, ancestors_b, descendants_b = revision_graph(
233
        revision_b, revision_source)
974.1.80 by Aaron Bentley
Improved merge error handling and testing
234
    if root != root_b:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
235
        raise errors.NoCommonRoot(revision_a, revision_b)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
236
    common = set()
237
    for node, node_anc in ancestors_b.iteritems():
238
        if node in ancestors:
239
            common.add(node)
240
        else:
241
            ancestors[node] = set()
242
        ancestors[node].update(node_anc)
243
    for node, node_dec in descendants_b.iteritems():
244
        if node not in descendants:
1185.8.1 by Aaron Bentley
Ensured combined_graph is order-insensitive
245
            descendants[node] = {}
974.1.63 by Aaron Bentley
Fixed graph-generation
246
        descendants[node].update(node_dec)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
247
    return root, ancestors, descendants, common
248
1092.3.4 by Robert Collins
update symlink branch to integration
249
1534.9.1 by Aaron Bentley
Added progress bars to merge
250
def common_ancestor(revision_a, revision_b, revision_source, 
251
                    pb=DummyProgress()):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
252
    if None in (revision_a, revision_b):
253
        return None
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
254
    if NULL_REVISION in (revision_a, revision_b):
255
        return NULL_REVISION
1594.2.15 by Robert Collins
Unfuck performance.
256
    # trivial optimisation
257
    if revision_a == revision_b:
258
        return revision_a
974.1.80 by Aaron Bentley
Improved merge error handling and testing
259
    try:
1534.9.1 by Aaron Bentley
Added progress bars to merge
260
        try:
261
            pb.update('Picking ancestor', 1, 3)
1594.2.15 by Robert Collins
Unfuck performance.
262
            graph = revision_source.get_revision_graph_with_ghosts(
263
                [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.
264
            # Shortcut the case where one of the tips is already included in
265
            # the other graphs ancestry.
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
266
            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.
267
            if revision_b in ancestry_a:
268
                return revision_b
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
269
            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.
270
            if revision_a in ancestry_b:
271
                return revision_a
1594.2.15 by Robert Collins
Unfuck performance.
272
            # convert to a NULL_REVISION based graph.
273
            ancestors = graph.get_ancestors()
274
            descendants = graph.get_descendants()
2401.1.2 by John Arbash Meinel
Ancestry checks can be done using the dictionaries
275
            common = set(ancestry_a)
276
            common.intersection_update(ancestry_b)
1594.2.15 by Robert Collins
Unfuck performance.
277
            descendants[NULL_REVISION] = {}
278
            ancestors[NULL_REVISION] = []
279
            for root in graph.roots:
280
                descendants[NULL_REVISION][root] = 1
281
                ancestors[root].append(NULL_REVISION)
1607.1.12 by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are
282
            for ghost in graph.ghosts:
283
                # ghosts act as roots for the purpose of finding 
284
                # the longest paths from the root: any ghost *might*
285
                # be directly attached to the root, so we treat them
286
                # as being such.
287
                # ghost now descends from NULL
288
                descendants[NULL_REVISION][ghost] = 1
289
                # that is it has an ancestor of NULL
290
                ancestors[ghost] = [NULL_REVISION]
291
                # ghost is common if any of ghosts descendants are common:
292
                for ghost_descendant in descendants[ghost]:
293
                    if ghost_descendant in common:
294
                        common.add(ghost)
295
                
1594.2.15 by Robert Collins
Unfuck performance.
296
            root = NULL_REVISION
297
            common.add(NULL_REVISION)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
298
        except errors.NoCommonRoot:
299
            raise errors.NoCommonAncestor(revision_a, revision_b)
1534.9.1 by Aaron Bentley
Added progress bars to merge
300
            
301
        pb.update('Picking ancestor', 2, 3)
302
        distances = node_distances (descendants, ancestors, root)
303
        pb.update('Picking ancestor', 3, 2)
304
        farthest = select_farthest(distances, common)
305
        if farthest is None or farthest == NULL_REVISION:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
306
            raise errors.NoCommonAncestor(revision_a, revision_b)
1534.9.1 by Aaron Bentley
Added progress bars to merge
307
    finally:
308
        pb.clear()
974.1.87 by Aaron Bentley
Refactored and documented graph stuff
309
    return farthest
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
310
311
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
312
class MultipleRevisionSources(object):
1153 by Martin Pool
- clean up some code in revision.py
313
    """Proxy that looks in multiple branches for revisions."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
314
    def __init__(self, *args):
315
        object.__init__(self)
316
        assert len(args) != 0
317
        self._revision_sources = args
318
1590.1.1 by Robert Collins
Improve common_ancestor performance.
319
    def revision_parents(self, revision_id):
320
        for source in self._revision_sources:
321
            try:
322
                return source.revision_parents(revision_id)
323
            except (errors.WeaveRevisionNotPresent, errors.NoSuchRevision), e:
324
                pass
325
        raise e
326
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
327
    def get_revision(self, revision_id):
328
        for source in self._revision_sources:
329
            try:
330
                return source.get_revision(revision_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
331
            except errors.NoSuchRevision, e:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
332
                pass
333
        raise e
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
334
1590.1.1 by Robert Collins
Improve common_ancestor performance.
335
    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.
336
        # we could probe incrementally until the pending
337
        # ghosts list stop growing, but its cheaper for now
338
        # to just ask for the complete graph for each repository.
339
        graphs = []
340
        for source in self._revision_sources:
341
            ghost_graph = source.get_revision_graph_with_ghosts()
342
            graphs.append(ghost_graph)
343
        absent = 0
344
        for graph in graphs:
345
            if not revision_id in graph.get_ancestors():
346
                absent += 1
347
        if absent == len(graphs):
348
            raise errors.NoSuchRevision(self._revision_sources[0], revision_id)
349
350
        # combine the graphs
1590.1.1 by Robert Collins
Improve common_ancestor performance.
351
        result = {}
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
352
        pending = set([revision_id])
353
        def find_parents(node_id):
354
            """find the parents for node_id."""
355
            for graph in graphs:
356
                ancestors = graph.get_ancestors()
357
                try:
358
                    return ancestors[node_id]
359
                except KeyError:
360
                    pass
361
            raise errors.NoSuchRevision(self._revision_sources[0], node_id)
362
        while len(pending):
363
            # all the graphs should have identical parent lists
364
            node_id = pending.pop()
1590.1.1 by Robert Collins
Improve common_ancestor performance.
365
            try:
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
366
                result[node_id] = find_parents(node_id)
367
                for parent_node in result[node_id]:
368
                    if not parent_node in result:
369
                        pending.add(parent_node)
370
            except errors.NoSuchRevision:
371
                # ghost, ignore it.
1590.1.1 by Robert Collins
Improve common_ancestor performance.
372
                pass
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
373
        return result
1590.1.1 by Robert Collins
Improve common_ancestor performance.
374
1594.2.15 by Robert Collins
Unfuck performance.
375
    def get_revision_graph_with_ghosts(self, revision_ids):
376
        # query all the sources for their entire graphs 
377
        # and then build a combined graph for just
378
        # revision_ids.
379
        graphs = []
380
        for source in self._revision_sources:
381
            ghost_graph = source.get_revision_graph_with_ghosts()
382
            graphs.append(ghost_graph.get_ancestors())
383
        for revision_id in revision_ids:
384
            absent = 0
385
            for graph in graphs:
386
                    if not revision_id in graph:
387
                        absent += 1
388
            if absent == len(graphs):
389
                raise errors.NoSuchRevision(self._revision_sources[0],
390
                                            revision_id)
391
392
        # combine the graphs
393
        result = Graph()
394
        pending = set(revision_ids)
395
        done = set()
396
        def find_parents(node_id):
397
            """find the parents for node_id."""
398
            for graph in graphs:
399
                try:
400
                    return graph[node_id]
401
                except KeyError:
402
                    pass
403
            raise errors.NoSuchRevision(self._revision_sources[0], node_id)
404
        while len(pending):
405
            # all the graphs should have identical parent lists
406
            node_id = pending.pop()
407
            try:
408
                parents = find_parents(node_id)
409
                for parent_node in parents:
410
                    # queued or done? 
411
                    if (parent_node not in pending and
412
                        parent_node not in done):
413
                        # no, queue
414
                        pending.add(parent_node)
415
                result.add_node(node_id, parents)
416
                done.add(node_id)
417
            except errors.NoSuchRevision:
418
                # ghost
419
                result.add_ghost(node_id)
420
                continue
421
        return result
422
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
423
    def lock_read(self):
424
        for source in self._revision_sources:
425
            source.lock_read()
426
427
    def unlock(self):
428
        for source in self._revision_sources:
429
            source.unlock()
430
1590.1.1 by Robert Collins
Improve common_ancestor performance.
431
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
432
def is_reserved_id(revision_id):
2229.2.2 by Aaron Bentley
Update docs
433
    """Determine whether a revision id is reserved
434
435
    :return: True if the revision is is reserved, False otherwise
436
    """
437
    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
438
439
440
def check_not_reserved_id(revision_id):
441
    """Raise ReservedId if the supplied revision_id is reserved"""
442
    if is_reserved_id(revision_id):
443
        raise errors.ReservedId(revision_id)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
444
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
445
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
446
def ensure_null(revision_id):
447
    """Ensure only NULL_REVISION is used to represent the null revisionn"""
448
    if revision_id is None:
449
        return NULL_REVISION
450
    else:
451
        return revision_id
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
452
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
453
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
454
def is_null(revision_id):
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
455
    if revision_id is None:
456
        symbol_versioning.warn('NULL_REVISION should be used for the null'
2687.2.2 by Martin Pool
Fix up other references to 0.19
457
            ' revision instead of None, as of bzr 0.90.',
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
458
            DeprecationWarning, stacklevel=2)
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
459
    return revision_id in (None, NULL_REVISION)