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