/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
1
# Copyright (C) 2005, 2006 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.16.40 by Martin Pool
todo
17
# TODO: Some kind of command-line display of revision properties: 
18
# perhaps show them in log -v and allow them as options to the commit command.
1 by mbp at sourcefrog
import from baz patch-364
19
1590.1.1 by Robert Collins
Improve common_ancestor performance.
20
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
21
from bzrlib import (
22
    errors,
3228.4.1 by John Arbash Meinel
deprecate get_revision_graph_with_ghosts and its only caller, common_ancestor.
23
    symbol_versioning,
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
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
3123.1.2 by John Arbash Meinel
Aaron caught one more one_zero deprecation.
128
@deprecated_function(symbol_versioning.one_zero)
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
129
def is_ancestor(revision_id, candidate_id, branch):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
130
    """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
131
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
132
    A false negative will be returned if any intermediate descendent of
133
    candidate_id is not present in any of the revision_sources.
810 by Martin Pool
- New validate_revision_id function
134
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
135
    revisions_source is an object supporting a get_revision operation that
136
    behaves like Branch's.
3052.1.3 by John Arbash Meinel
deprecate revision.is_ancestor, update the callers and the tests.
137
138
    This function is deprecated, it is better for callers to directly use
139
    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
140
    """
3052.1.1 by John Arbash Meinel
(bug #172970) Switch revision.is_ancestor to use a graph search
141
    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
142
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
143
144
def iter_ancestors(revision_id, revision_source, only_present=False):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
145
    ancestors = (revision_id,)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
146
    distance = 0
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
147
    while len(ancestors) > 0:
148
        new_ancestors = []
149
        for ancestor in ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
150
            if not only_present:
151
                yield ancestor, distance
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
152
            try:
153
                revision = revision_source.get_revision(ancestor)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
154
            except errors.NoSuchRevision, e:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
155
                if e.revision == revision_id:
156
                    raise 
157
                else:
158
                    continue
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
159
            if only_present:
160
                yield ancestor, distance
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
161
            new_ancestors.extend(revision.parent_ids)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
162
        ancestors = new_ancestors
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
163
        distance += 1
164
165
166
def find_present_ancestors(revision_id, revision_source):
1133 by Martin Pool
doc
167
    """Return the ancestors of a revision present in a branch.
168
169
    It's possible that a branch won't have the complete ancestry of
170
    one of its revisions.  
171
172
    """
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
173
    found_ancestors = {}
174
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
175
                         only_present=True))
176
    for anc_order, (anc_id, anc_distance) in anc_iter:
1963.2.1 by Robey Pointer
remove usage of has_key()
177
        if anc_id not in found_ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
178
            found_ancestors[anc_id] = (anc_order, anc_distance)
179
    return found_ancestors
180
    
1153 by Martin Pool
- clean up some code in revision.py
181
182
def __get_closest(intersection):
183
    intersection.sort()
184
    matches = [] 
185
    for entry in intersection:
186
        if entry[0] == intersection[0][0]:
187
            matches.append(entry[2])
188
    return matches
189
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
190
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
191
@deprecated_function(symbol_versioning.one_four)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
192
def revision_graph(revision, revision_source):
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
193
    """Produce a graph of the ancestry of the specified revision.
1590.1.1 by Robert Collins
Improve common_ancestor performance.
194
    
195
    :return: root, ancestors map, descendants map
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
196
    """
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
197
    revision_source.lock_read()
198
    try:
199
        return _revision_graph(revision, revision_source)
200
    finally:
201
        revision_source.unlock()
202
1590.1.1 by Robert Collins
Improve common_ancestor performance.
203
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
204
def _revision_graph(revision, revision_source):
205
    """See revision_graph."""
1590.1.1 by Robert Collins
Improve common_ancestor performance.
206
    from bzrlib.tsort import topo_sort
207
    graph = revision_source.get_revision_graph(revision)
208
    # mark all no-parent revisions as being NULL_REVISION parentage.
209
    for node, parents in graph.items():
210
        if len(parents) == 0:
211
            graph[node] = [NULL_REVISION]
212
    # add NULL_REVISION to the graph
213
    graph[NULL_REVISION] = []
214
215
    # pick a root. If there are multiple roots
216
    # this could pick a random one.
217
    topo_order = topo_sort(graph.items())
218
    root = topo_order[0]
219
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
220
    ancestors = {}
221
    descendants = {}
1590.1.1 by Robert Collins
Improve common_ancestor performance.
222
223
    # map the descendants of the graph.
224
    # and setup our set based return graph.
225
    for node in graph.keys():
226
        descendants[node] = {}
227
    for node, parents in graph.items():
228
        for parent in parents:
229
            descendants[parent][node] = 1
230
        ancestors[node] = set(parents)
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
3228.4.11 by John Arbash Meinel
Deprecations abound.
234
@deprecated_function(symbol_versioning.one_three)
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
3228.4.1 by John Arbash Meinel
deprecate get_revision_graph_with_ghosts and its only caller, common_ancestor.
258
@deprecated_function(symbol_versioning.one_three)
1534.9.1 by Aaron Bentley
Added progress bars to merge
259
def common_ancestor(revision_a, revision_b, revision_source, 
260
                    pb=DummyProgress()):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
261
    if None in (revision_a, revision_b):
262
        return None
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
263
    if NULL_REVISION in (revision_a, revision_b):
264
        return NULL_REVISION
1594.2.15 by Robert Collins
Unfuck performance.
265
    # trivial optimisation
266
    if revision_a == revision_b:
267
        return revision_a
974.1.80 by Aaron Bentley
Improved merge error handling and testing
268
    try:
1534.9.1 by Aaron Bentley
Added progress bars to merge
269
        try:
270
            pb.update('Picking ancestor', 1, 3)
1594.2.15 by Robert Collins
Unfuck performance.
271
            graph = revision_source.get_revision_graph_with_ghosts(
272
                [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.
273
            # Shortcut the case where one of the tips is already included in
274
            # the other graphs ancestry.
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
275
            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.
276
            if revision_b in ancestry_a:
277
                return revision_b
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
278
            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.
279
            if revision_a in ancestry_b:
280
                return revision_a
1594.2.15 by Robert Collins
Unfuck performance.
281
            # convert to a NULL_REVISION based graph.
282
            ancestors = graph.get_ancestors()
283
            descendants = graph.get_descendants()
2401.1.2 by John Arbash Meinel
Ancestry checks can be done using the dictionaries
284
            common = set(ancestry_a)
285
            common.intersection_update(ancestry_b)
1594.2.15 by Robert Collins
Unfuck performance.
286
            descendants[NULL_REVISION] = {}
287
            ancestors[NULL_REVISION] = []
288
            for root in graph.roots:
289
                descendants[NULL_REVISION][root] = 1
290
                ancestors[root].append(NULL_REVISION)
1607.1.12 by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are
291
            for ghost in graph.ghosts:
292
                # ghosts act as roots for the purpose of finding 
293
                # the longest paths from the root: any ghost *might*
294
                # be directly attached to the root, so we treat them
295
                # as being such.
296
                # ghost now descends from NULL
297
                descendants[NULL_REVISION][ghost] = 1
298
                # that is it has an ancestor of NULL
299
                ancestors[ghost] = [NULL_REVISION]
300
                # ghost is common if any of ghosts descendants are common:
301
                for ghost_descendant in descendants[ghost]:
302
                    if ghost_descendant in common:
303
                        common.add(ghost)
304
                
1594.2.15 by Robert Collins
Unfuck performance.
305
            root = NULL_REVISION
306
            common.add(NULL_REVISION)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
307
        except errors.NoCommonRoot:
308
            raise errors.NoCommonAncestor(revision_a, revision_b)
1534.9.1 by Aaron Bentley
Added progress bars to merge
309
            
310
        pb.update('Picking ancestor', 2, 3)
311
        distances = node_distances (descendants, ancestors, root)
312
        pb.update('Picking ancestor', 3, 2)
313
        farthest = select_farthest(distances, common)
314
        if farthest is None or farthest == NULL_REVISION:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
315
            raise errors.NoCommonAncestor(revision_a, revision_b)
1534.9.1 by Aaron Bentley
Added progress bars to merge
316
    finally:
317
        pb.clear()
974.1.87 by Aaron Bentley
Refactored and documented graph stuff
318
    return farthest
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
319
320
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
321
class MultipleRevisionSources(object):
1153 by Martin Pool
- clean up some code in revision.py
322
    """Proxy that looks in multiple branches for revisions."""
3228.4.11 by John Arbash Meinel
Deprecations abound.
323
324
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
325
    def __init__(self, *args):
326
        object.__init__(self)
327
        self._revision_sources = args
328
1590.1.1 by Robert Collins
Improve common_ancestor performance.
329
    def revision_parents(self, revision_id):
330
        for source in self._revision_sources:
331
            try:
332
                return source.revision_parents(revision_id)
333
            except (errors.WeaveRevisionNotPresent, errors.NoSuchRevision), e:
334
                pass
335
        raise e
336
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
337
    def get_revision(self, revision_id):
338
        for source in self._revision_sources:
339
            try:
340
                return source.get_revision(revision_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
341
            except errors.NoSuchRevision, e:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
342
                pass
343
        raise e
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
344
1590.1.1 by Robert Collins
Improve common_ancestor performance.
345
    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.
346
        # we could probe incrementally until the pending
347
        # ghosts list stop growing, but its cheaper for now
348
        # to just ask for the complete graph for each repository.
349
        graphs = []
350
        for source in self._revision_sources:
351
            ghost_graph = source.get_revision_graph_with_ghosts()
352
            graphs.append(ghost_graph)
353
        absent = 0
354
        for graph in graphs:
355
            if not revision_id in graph.get_ancestors():
356
                absent += 1
357
        if absent == len(graphs):
358
            raise errors.NoSuchRevision(self._revision_sources[0], revision_id)
359
360
        # combine the graphs
1590.1.1 by Robert Collins
Improve common_ancestor performance.
361
        result = {}
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
362
        pending = set([revision_id])
363
        def find_parents(node_id):
364
            """find the parents for node_id."""
365
            for graph in graphs:
366
                ancestors = graph.get_ancestors()
367
                try:
368
                    return ancestors[node_id]
369
                except KeyError:
370
                    pass
371
            raise errors.NoSuchRevision(self._revision_sources[0], node_id)
372
        while len(pending):
373
            # all the graphs should have identical parent lists
374
            node_id = pending.pop()
1590.1.1 by Robert Collins
Improve common_ancestor performance.
375
            try:
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
376
                result[node_id] = find_parents(node_id)
377
                for parent_node in result[node_id]:
378
                    if not parent_node in result:
379
                        pending.add(parent_node)
380
            except errors.NoSuchRevision:
381
                # ghost, ignore it.
1590.1.1 by Robert Collins
Improve common_ancestor performance.
382
                pass
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
383
        return result
1590.1.1 by Robert Collins
Improve common_ancestor performance.
384
1594.2.15 by Robert Collins
Unfuck performance.
385
    def get_revision_graph_with_ghosts(self, revision_ids):
386
        # query all the sources for their entire graphs 
387
        # and then build a combined graph for just
388
        # revision_ids.
389
        graphs = []
390
        for source in self._revision_sources:
391
            ghost_graph = source.get_revision_graph_with_ghosts()
392
            graphs.append(ghost_graph.get_ancestors())
393
        for revision_id in revision_ids:
394
            absent = 0
395
            for graph in graphs:
396
                    if not revision_id in graph:
397
                        absent += 1
398
            if absent == len(graphs):
399
                raise errors.NoSuchRevision(self._revision_sources[0],
400
                                            revision_id)
401
402
        # combine the graphs
403
        result = Graph()
404
        pending = set(revision_ids)
405
        done = set()
406
        def find_parents(node_id):
407
            """find the parents for node_id."""
408
            for graph in graphs:
409
                try:
410
                    return graph[node_id]
411
                except KeyError:
412
                    pass
413
            raise errors.NoSuchRevision(self._revision_sources[0], node_id)
414
        while len(pending):
415
            # all the graphs should have identical parent lists
416
            node_id = pending.pop()
417
            try:
418
                parents = find_parents(node_id)
419
                for parent_node in parents:
420
                    # queued or done? 
421
                    if (parent_node not in pending and
422
                        parent_node not in done):
423
                        # no, queue
424
                        pending.add(parent_node)
425
                result.add_node(node_id, parents)
426
                done.add(node_id)
427
            except errors.NoSuchRevision:
428
                # ghost
429
                result.add_ghost(node_id)
430
                continue
431
        return result
432
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
433
    def lock_read(self):
434
        for source in self._revision_sources:
435
            source.lock_read()
436
437
    def unlock(self):
438
        for source in self._revision_sources:
439
            source.unlock()
440
1590.1.1 by Robert Collins
Improve common_ancestor performance.
441
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
442
def is_reserved_id(revision_id):
2229.2.2 by Aaron Bentley
Update docs
443
    """Determine whether a revision id is reserved
444
445
    :return: True if the revision is is reserved, False otherwise
446
    """
447
    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
448
449
450
def check_not_reserved_id(revision_id):
451
    """Raise ReservedId if the supplied revision_id is reserved"""
452
    if is_reserved_id(revision_id):
453
        raise errors.ReservedId(revision_id)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
454
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
455
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
456
def ensure_null(revision_id):
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
457
    """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
458
    if revision_id is None:
2598.5.16 by Aaron Bentley
Replace exception with deprecation warning
459
        symbol_versioning.warn('NULL_REVISION should be used for the null'
460
            ' revision instead of None, as of bzr 0.91.',
461
            DeprecationWarning, stacklevel=2)
2490.2.5 by Aaron Bentley
Use GraphWalker.unique_ancestor to determine merge base
462
        return NULL_REVISION
463
    else:
464
        return revision_id
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
465
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
466
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
467
def is_null(revision_id):
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
468
    if revision_id is None:
469
        symbol_versioning.warn('NULL_REVISION should be used for the null'
2687.2.2 by Martin Pool
Fix up other references to 0.19
470
            ' revision instead of None, as of bzr 0.90.',
2598.5.5 by Aaron Bentley
Convert assertion to deprecation warning
471
            DeprecationWarning, stacklevel=2)
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
472
    return revision_id in (None, NULL_REVISION)