/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
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
23
from bzrlib import deprecated_graph
24
""")
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
25
from bzrlib import (
26
    errors,
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
27
    symbol_versioning,
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
28
    )
1185.16.39 by Martin Pool
- constraints on revprops
29
from bzrlib.osutils import contains_whitespace
1534.9.1 by Aaron Bentley
Added progress bars to merge
30
from bzrlib.progress import DummyProgress
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
31
from bzrlib.symbol_versioning import (deprecated_function,
32
        )
8 by mbp at sourcefrog
store committer's timezone in revision and show
33
974.1.90 by Aaron Bentley
Switched NULL revision ID to 'null:' per robertc's suggestion
34
NULL_REVISION="null:"
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
35
CURRENT_REVISION="current:"
974.1.89 by Aaron Bentley
Fixed merging with multiple roots, by using null as graph root.
36
1911.2.1 by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate
37
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
38
class Revision(object):
1 by mbp at sourcefrog
import from baz patch-364
39
    """Single revision on a branch.
40
41
    Revisions may know their revision_hash, but only once they've been
42
    written out.  This is not stored because you cannot write the hash
43
    into the file it describes.
44
697 by Martin Pool
- write out parent list for new revisions
45
    After bzr 0.0.5 revisions are allowed to have multiple parents.
696 by Martin Pool
- Refactor revision deserialization code
46
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
47
    parent_ids
48
        List of parent revision_ids
1185.16.39 by Martin Pool
- constraints on revprops
49
50
    properties
51
        Dictionary of revision properties.  These are attached to the
52
        revision as extra metadata.  The name must be a single 
53
        word; the value can be an arbitrary string.
1 by mbp at sourcefrog
import from baz patch-364
54
    """
696 by Martin Pool
- Refactor revision deserialization code
55
    
1185.16.35 by Martin Pool
- stub for revision properties
56
    def __init__(self, revision_id, properties=None, **args):
1092.2.25 by Robert Collins
support ghosts in commits
57
        self.revision_id = revision_id
1185.16.35 by Martin Pool
- stub for revision properties
58
        self.properties = properties or {}
1185.16.39 by Martin Pool
- constraints on revprops
59
        self._check_properties()
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
60
        self.parent_ids = []
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
61
        self.parent_sha1s = []
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
62
        """Not used anymore - legacy from for 4."""
1185.42.6 by Jelmer Vernooij
Don't clear Revision.parent_ids after it has been set from the arguments
63
        self.__dict__.update(args)
696 by Martin Pool
- Refactor revision deserialization code
64
1 by mbp at sourcefrog
import from baz patch-364
65
    def __repr__(self):
184 by mbp at sourcefrog
pychecker fixups
66
        return "<Revision id %s>" % self.revision_id
1 by mbp at sourcefrog
import from baz patch-364
67
1185 by Martin Pool
- add xml round-trip test for revisions
68
    def __eq__(self, other):
69
        if not isinstance(other, Revision):
70
            return False
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
71
        # FIXME: rbc 20050930 parent_ids are not being compared
72
        return (
73
                self.inventory_sha1 == other.inventory_sha1
1185 by Martin Pool
- add xml round-trip test for revisions
74
                and self.revision_id == other.revision_id
75
                and self.timestamp == other.timestamp
76
                and self.message == other.message
77
                and self.timezone == other.timezone
1185.16.35 by Martin Pool
- stub for revision properties
78
                and self.committer == other.committer
79
                and self.properties == other.properties)
1185 by Martin Pool
- add xml round-trip test for revisions
80
81
    def __ne__(self, other):
82
        return not self.__eq__(other)
83
1185.16.39 by Martin Pool
- constraints on revprops
84
    def _check_properties(self):
1732.3.2 by Matthieu Moy
merge
85
        """Verify that all revision properties are OK."""
1185.16.39 by Martin Pool
- constraints on revprops
86
        for name, value in self.properties.iteritems():
87
            if not isinstance(name, basestring) or contains_whitespace(name):
88
                raise ValueError("invalid property name %r" % name)
89
            if not isinstance(value, basestring):
90
                raise ValueError("invalid property value %r for %r" % 
91
                                 (name, value))
92
1534.4.49 by Robert Collins
Provide a revision.get_history(repository) method for generating a synthetic revision history.
93
    def get_history(self, repository):
94
        """Return the canonical line-of-history for this revision.
95
96
        If ghosts are present this may differ in result from a ghost-free
97
        repository.
98
        """
99
        current_revision = self
100
        reversed_result = []
101
        while current_revision is not None:
102
            reversed_result.append(current_revision.revision_id)
103
            if not len (current_revision.parent_ids):
104
                reversed_result.append(None)
105
                current_revision = None
106
            else:
107
                next_revision_id = current_revision.parent_ids[0]
108
                current_revision = repository.get_revision(next_revision_id)
109
        reversed_result.reverse()
110
        return reversed_result
111
1740.2.5 by Aaron Bentley
Merge from bzr.dev
112
    def get_summary(self):
113
        """Get the first line of the log message for this revision.
114
        """
2671.5.1 by Lukáš Lalinsky
Strip leading whitespace from the commit message before using the first line as a commit summary.
115
        return self.message.lstrip().split('\n', 1)[0]
1740.2.5 by Aaron Bentley
Merge from bzr.dev
116
2671.5.7 by Lukáš Lalinsky
Rename get_author to get_apparent_author, revert the long log back to displaying the committer.
117
    def get_apparent_author(self):
118
        """Return the apparent author of this revision.
119
120
        If the revision properties contain the author name,
121
        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.
122
        """
123
        return self.properties.get('author', self.committer)
124
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
125
3123.1.2 by John Arbash Meinel
Aaron caught one more one_zero deprecation.
126
@deprecated_function(symbol_versioning.one_zero)
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
127
def is_ancestor(revision_id, candidate_id, branch):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
128
    """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
129
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
130
    A false negative will be returned if any intermediate descendent of
131
    candidate_id is not present in any of the revision_sources.
810 by Martin Pool
- New validate_revision_id function
132
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
133
    revisions_source is an object supporting a get_revision operation that
134
    behaves like Branch's.
3052.1.3 by John Arbash Meinel
deprecate revision.is_ancestor, update the callers and the tests.
135
136
    This function is deprecated, it is better for callers to directly use
137
    Graph.is_ancestor() (just watch out that the parameter order is switched)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
138
    """
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
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
189
@deprecated_function(symbol_versioning.one_four)
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
3228.4.11 by John Arbash Meinel
Deprecations abound.
235
@deprecated_function(symbol_versioning.one_three)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
236
def combined_graph(revision_a, revision_b, revision_source):
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
237
    """Produce a combined ancestry graph.
238
    Return graph root, ancestors map, descendants map, set of common nodes"""
1590.1.1 by Robert Collins
Improve common_ancestor performance.
239
    root, ancestors, descendants = revision_graph(
240
        revision_a, revision_source)
241
    root_b, ancestors_b, descendants_b = revision_graph(
242
        revision_b, revision_source)
974.1.80 by Aaron Bentley
Improved merge error handling and testing
243
    if root != root_b:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
244
        raise errors.NoCommonRoot(revision_a, revision_b)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
245
    common = set()
246
    for node, node_anc in ancestors_b.iteritems():
247
        if node in ancestors:
248
            common.add(node)
249
        else:
250
            ancestors[node] = set()
251
        ancestors[node].update(node_anc)
252
    for node, node_dec in descendants_b.iteritems():
253
        if node not in descendants:
1185.8.1 by Aaron Bentley
Ensured combined_graph is order-insensitive
254
            descendants[node] = {}
974.1.63 by Aaron Bentley
Fixed graph-generation
255
        descendants[node].update(node_dec)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
256
    return root, ancestors, descendants, common
257
1092.3.4 by Robert Collins
update symlink branch to integration
258
3228.4.1 by John Arbash Meinel
deprecate get_revision_graph_with_ghosts and its only caller, common_ancestor.
259
@deprecated_function(symbol_versioning.one_three)
1534.9.1 by Aaron Bentley
Added progress bars to merge
260
def common_ancestor(revision_a, revision_b, revision_source, 
261
                    pb=DummyProgress()):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
262
    if None in (revision_a, revision_b):
263
        return None
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
264
    if NULL_REVISION in (revision_a, revision_b):
265
        return NULL_REVISION
1594.2.15 by Robert Collins
Unfuck performance.
266
    # trivial optimisation
267
    if revision_a == revision_b:
268
        return revision_a
974.1.80 by Aaron Bentley
Improved merge error handling and testing
269
    try:
1534.9.1 by Aaron Bentley
Added progress bars to merge
270
        try:
271
            pb.update('Picking ancestor', 1, 3)
1594.2.15 by Robert Collins
Unfuck performance.
272
            graph = revision_source.get_revision_graph_with_ghosts(
273
                [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.
274
            # Shortcut the case where one of the tips is already included in
275
            # the other graphs ancestry.
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
276
            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.
277
            if revision_b in ancestry_a:
278
                return revision_b
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
279
            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.
280
            if revision_a in ancestry_b:
281
                return revision_a
1594.2.15 by Robert Collins
Unfuck performance.
282
            # convert to a NULL_REVISION based graph.
283
            ancestors = graph.get_ancestors()
284
            descendants = graph.get_descendants()
2401.1.2 by John Arbash Meinel
Ancestry checks can be done using the dictionaries
285
            common = set(ancestry_a)
286
            common.intersection_update(ancestry_b)
1594.2.15 by Robert Collins
Unfuck performance.
287
            descendants[NULL_REVISION] = {}
288
            ancestors[NULL_REVISION] = []
289
            for root in graph.roots:
290
                descendants[NULL_REVISION][root] = 1
291
                ancestors[root].append(NULL_REVISION)
1607.1.12 by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are
292
            for ghost in graph.ghosts:
293
                # ghosts act as roots for the purpose of finding 
294
                # the longest paths from the root: any ghost *might*
295
                # be directly attached to the root, so we treat them
296
                # as being such.
297
                # ghost now descends from NULL
298
                descendants[NULL_REVISION][ghost] = 1
299
                # that is it has an ancestor of NULL
300
                ancestors[ghost] = [NULL_REVISION]
301
                # ghost is common if any of ghosts descendants are common:
302
                for ghost_descendant in descendants[ghost]:
303
                    if ghost_descendant in common:
304
                        common.add(ghost)
305
                
1594.2.15 by Robert Collins
Unfuck performance.
306
            root = NULL_REVISION
307
            common.add(NULL_REVISION)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
308
        except errors.NoCommonRoot:
309
            raise errors.NoCommonAncestor(revision_a, revision_b)
1534.9.1 by Aaron Bentley
Added progress bars to merge
310
            
311
        pb.update('Picking ancestor', 2, 3)
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
312
        distances = deprecated_graph.node_distances(
313
            descendants, ancestors, root)
1534.9.1 by Aaron Bentley
Added progress bars to merge
314
        pb.update('Picking ancestor', 3, 2)
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
315
        farthest = deprecated_graph.select_farthest(distances, common)
1534.9.1 by Aaron Bentley
Added progress bars to merge
316
        if farthest is None or farthest == NULL_REVISION:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
317
            raise errors.NoCommonAncestor(revision_a, revision_b)
1534.9.1 by Aaron Bentley
Added progress bars to merge
318
    finally:
319
        pb.clear()
974.1.87 by Aaron Bentley
Refactored and documented graph stuff
320
    return farthest
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
321
322
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
323
class MultipleRevisionSources(object):
1153 by Martin Pool
- clean up some code in revision.py
324
    """Proxy that looks in multiple branches for revisions."""
3228.4.11 by John Arbash Meinel
Deprecations abound.
325
326
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
327
    def __init__(self, *args):
328
        object.__init__(self)
329
        assert len(args) != 0
330
        self._revision_sources = args
331
1590.1.1 by Robert Collins
Improve common_ancestor performance.
332
    def revision_parents(self, revision_id):
333
        for source in self._revision_sources:
334
            try:
335
                return source.revision_parents(revision_id)
336
            except (errors.WeaveRevisionNotPresent, errors.NoSuchRevision), e:
337
                pass
338
        raise e
339
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
340
    def get_revision(self, revision_id):
341
        for source in self._revision_sources:
342
            try:
343
                return source.get_revision(revision_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
344
            except errors.NoSuchRevision, e:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
345
                pass
346
        raise e
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
347
1590.1.1 by Robert Collins
Improve common_ancestor performance.
348
    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.
349
        # we could probe incrementally until the pending
350
        # ghosts list stop growing, but its cheaper for now
351
        # to just ask for the complete graph for each repository.
352
        graphs = []
353
        for source in self._revision_sources:
354
            ghost_graph = source.get_revision_graph_with_ghosts()
355
            graphs.append(ghost_graph)
356
        absent = 0
357
        for graph in graphs:
358
            if not revision_id in graph.get_ancestors():
359
                absent += 1
360
        if absent == len(graphs):
361
            raise errors.NoSuchRevision(self._revision_sources[0], revision_id)
362
363
        # combine the graphs
1590.1.1 by Robert Collins
Improve common_ancestor performance.
364
        result = {}
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
365
        pending = set([revision_id])
366
        def find_parents(node_id):
367
            """find the parents for node_id."""
368
            for graph in graphs:
369
                ancestors = graph.get_ancestors()
370
                try:
371
                    return ancestors[node_id]
372
                except KeyError:
373
                    pass
374
            raise errors.NoSuchRevision(self._revision_sources[0], node_id)
375
        while len(pending):
376
            # all the graphs should have identical parent lists
377
            node_id = pending.pop()
1590.1.1 by Robert Collins
Improve common_ancestor performance.
378
            try:
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
379
                result[node_id] = find_parents(node_id)
380
                for parent_node in result[node_id]:
381
                    if not parent_node in result:
382
                        pending.add(parent_node)
383
            except errors.NoSuchRevision:
384
                # ghost, ignore it.
1590.1.1 by Robert Collins
Improve common_ancestor performance.
385
                pass
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
386
        return result
1590.1.1 by Robert Collins
Improve common_ancestor performance.
387
1594.2.15 by Robert Collins
Unfuck performance.
388
    def get_revision_graph_with_ghosts(self, revision_ids):
389
        # query all the sources for their entire graphs 
390
        # and then build a combined graph for just
391
        # revision_ids.
392
        graphs = []
393
        for source in self._revision_sources:
394
            ghost_graph = source.get_revision_graph_with_ghosts()
395
            graphs.append(ghost_graph.get_ancestors())
396
        for revision_id in revision_ids:
397
            absent = 0
398
            for graph in graphs:
399
                    if not revision_id in graph:
400
                        absent += 1
401
            if absent == len(graphs):
402
                raise errors.NoSuchRevision(self._revision_sources[0],
403
                                            revision_id)
404
405
        # combine the graphs
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
406
        result = deprecated_graph.Graph()
1594.2.15 by Robert Collins
Unfuck performance.
407
        pending = set(revision_ids)
408
        done = set()
409
        def find_parents(node_id):
410
            """find the parents for node_id."""
411
            for graph in graphs:
412
                try:
413
                    return graph[node_id]
414
                except KeyError:
415
                    pass
416
            raise errors.NoSuchRevision(self._revision_sources[0], node_id)
417
        while len(pending):
418
            # all the graphs should have identical parent lists
419
            node_id = pending.pop()
420
            try:
421
                parents = find_parents(node_id)
422
                for parent_node in parents:
423
                    # queued or done? 
424
                    if (parent_node not in pending and
425
                        parent_node not in done):
426
                        # no, queue
427
                        pending.add(parent_node)
428
                result.add_node(node_id, parents)
429
                done.add(node_id)
430
            except errors.NoSuchRevision:
431
                # ghost
432
                result.add_ghost(node_id)
433
                continue
434
        return result
435
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
436
    def lock_read(self):
437
        for source in self._revision_sources:
438
            source.lock_read()
439
440
    def unlock(self):
441
        for source in self._revision_sources:
442
            source.unlock()
443
1590.1.1 by Robert Collins
Improve common_ancestor performance.
444
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
445
def is_reserved_id(revision_id):
2229.2.2 by Aaron Bentley
Update docs
446
    """Determine whether a revision id is reserved
447
448
    :return: True if the revision is is reserved, False otherwise
449
    """
450
    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
451
452
453
def check_not_reserved_id(revision_id):
454
    """Raise ReservedId if the supplied revision_id is reserved"""
455
    if is_reserved_id(revision_id):
456
        raise errors.ReservedId(revision_id)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
457
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
458
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
459
def ensure_null(revision_id):
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
460
    """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
461
    if revision_id is None:
2598.5.16 by Aaron Bentley
Replace exception with deprecation warning
462
        symbol_versioning.warn('NULL_REVISION should be used for the null'
463
            ' revision instead of None, as of bzr 0.91.',
464
            DeprecationWarning, stacklevel=2)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
465
        return NULL_REVISION
466
    else:
467
        return revision_id
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
468
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
469
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
470
def is_null(revision_id):
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
471
    if revision_id is None:
472
        symbol_versioning.warn('NULL_REVISION should be used for the null'
2687.2.2 by Martin Pool
Fix up other references to 0.19
473
            ' revision instead of None, as of bzr 0.90.',
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
474
            DeprecationWarning, stacklevel=2)
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
475
    return revision_id in (None, NULL_REVISION)