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