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