/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,
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
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
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)
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.
309
        distances = deprecated_graph.node_distances(
310
            descendants, ancestors, root)
1534.9.1 by Aaron Bentley
Added progress bars to merge
311
        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.
312
        farthest = deprecated_graph.select_farthest(distances, common)
1534.9.1 by Aaron Bentley
Added progress bars to merge
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
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.
401
        result = deprecated_graph.Graph()
1594.2.15 by Robert Collins
Unfuck performance.
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):
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
455
    """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
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)