~bzr-pqm/bzr/bzr.dev

2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
1
# Copyright (C) 2005 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
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
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
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
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
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
1263 by Martin Pool
- clean up imports
17
18
import os
1685.1.67 by Martin Pool
Suppress warning from test of deprecated method
19
import warnings
1263 by Martin Pool
- clean up imports
20
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
21
from bzrlib import (
22
    revision,
23
    )
1263 by Martin Pool
- clean up imports
24
from bzrlib.branch import Branch
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
25
from bzrlib.errors import NoSuchRevision
2490.2.21 by Aaron Bentley
Rename graph to deprecated_graph
26
from bzrlib.deprecated_graph import Graph
1390 by Robert Collins
pair programming worx... merge integration and weave
27
from bzrlib.revision import (find_present_ancestors, combined_graph,
1607.1.12 by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are
28
                             common_ancestor,
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
29
                             is_ancestor, MultipleRevisionSources,
30
                             NULL_REVISION)
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
31
from bzrlib.tests import TestCase, TestCaseWithTransport
1270 by Martin Pool
- fix recording of merged ancestry lines
32
from bzrlib.trace import mutter
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
33
from bzrlib.workingtree import WorkingTree
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
34
1685.1.67 by Martin Pool
Suppress warning from test of deprecated method
35
# We're allowed to test deprecated interfaces
36
warnings.filterwarnings('ignore',
37
        '.*get_intervening_revisions was deprecated',
38
        DeprecationWarning,
39
        r'bzrlib\.tests\.test_revision')
40
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
41
# XXX: Make this a method of a merge base case
42
def make_branches(self):
1392 by Robert Collins
reinstate testfetch test case
43
    """Create two branches
44
45
    branch 1 has 6 commits, branch 2 has 3 commits
1607.1.12 by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are
46
    commit 10 is a ghosted merge merge from branch 1
1392 by Robert Collins
reinstate testfetch test case
47
48
    the object graph is
49
    B:     A:
50
    a..0   a..0 
51
    a..1   a..1
52
    a..2   a..2
53
    b..3   a..3 merges b..4
54
    b..4   a..4
55
    b..5   a..5 merges b..5
1092.2.26 by Robert Collins
fetch should work with ghosts
56
    b..6 merges a4
1392 by Robert Collins
reinstate testfetch test case
57
58
    so A is missing b6 at the start
59
    and B is missing a3, a4, a5
60
    """
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
61
    tree1 = self.make_branch_and_tree("branch1")
62
    br1 = tree1.branch
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
63
    
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
64
    tree1.commit("Commit one", rev_id="a@u-0-0")
65
    tree1.commit("Commit two", rev_id="a@u-0-1")
66
    tree1.commit("Commit three", rev_id="a@u-0-2")
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
67
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
68
    tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
69
    br2 = tree2.branch
70
    tree2.commit("Commit four", rev_id="b@u-0-3")
71
    tree2.commit("Commit five", rev_id="b@u-0-4")
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
72
    revisions_2 = br2.revision_history()
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
73
    self.assertEquals(revisions_2[-1], 'b@u-0-4')
1263 by Martin Pool
- clean up imports
74
    
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
75
    tree1.merge_from_branch(br2)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
76
    tree1.commit("Commit six", rev_id="a@u-0-3")
77
    tree1.commit("Commit seven", rev_id="a@u-0-4")
78
    tree2.commit("Commit eight", rev_id="b@u-0-5")
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
79
    self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
1266 by Martin Pool
- fix up testrevision to fetch revisions before marking them merged
80
    
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
81
    tree1.merge_from_branch(br2)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
82
    tree1.commit("Commit nine", rev_id="a@u-0-5")
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
83
    # DO NOT MERGE HERE - we WANT a GHOST.
84
    tree2.add_parent_tree_id(br1.revision_history()[4])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
85
    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
1266 by Martin Pool
- fix up testrevision to fetch revisions before marking them merged
86
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
87
    return br1, br2
88
89
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
90
class TestIsAncestor(TestCaseWithTransport):
91
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
92
    def test_recorded_ancestry(self):
93
        """Test that commit records all ancestors"""
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
94
        br1, br2 = make_branches(self)
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
95
        d = [('a@u-0-0', ['a@u-0-0']),
96
             ('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
97
             ('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
98
             ('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
1270 by Martin Pool
- fix recording of merged ancestry lines
99
             ('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
100
                          'b@u-0-4']),
101
             ('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
102
                          'a@u-0-3']),
1271 by Martin Pool
- more commit ancestry tests
103
             ('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
104
                          'a@u-0-3', 'a@u-0-4']),
105
             ('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
106
                          'b@u-0-5']),
107
             ('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
108
                          'b@u-0-3', 'b@u-0-4',
109
                          'b@u-0-5', 'a@u-0-5']),
1392 by Robert Collins
reinstate testfetch test case
110
             ('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
1271 by Martin Pool
- more commit ancestry tests
111
                          'b@u-0-3', 'b@u-0-4',
112
                          'b@u-0-5', 'b@u-0-6']),
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
113
             ]
1392 by Robert Collins
reinstate testfetch test case
114
        br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
115
        br2_only = ('b@u-0-6',)
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
116
        for branch in br1, br2:
117
            for rev_id, anc in d:
1392 by Robert Collins
reinstate testfetch test case
118
                if rev_id in br1_only and not branch is br1:
119
                    continue
120
                if rev_id in br2_only and not branch is br2:
121
                    continue
1270 by Martin Pool
- fix recording of merged ancestry lines
122
                mutter('ancestry of {%s}: %r',
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
123
                       rev_id, branch.repository.get_ancestry(rev_id))
124
                result = sorted(branch.repository.get_ancestry(rev_id))
125
                self.assertEquals(result, [None] + sorted(anc))
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
126
    
127
    
1272 by Martin Pool
- enable and disable more ancestry tests
128
    def test_is_ancestor(self):
1102 by Martin Pool
- merge test refactoring from robertc
129
        """Test checking whether a revision is an ancestor of another revision"""
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
130
        br1, br2 = make_branches(self)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
131
        revisions = br1.revision_history()
132
        revisions_2 = br2.revision_history()
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
133
        sources = br1
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
134
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
135
        self.assert_(is_ancestor(revisions[0], revisions[0], br1))
136
        self.assert_(is_ancestor(revisions[1], revisions[0], sources))
137
        self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
138
        self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
1390 by Robert Collins
pair programming worx... merge integration and weave
139
        # disabled mbp 20050914, doesn't seem to happen anymore
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
140
        ## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
141
        ##                  revisions[0], br1)        
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
142
        self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
143
        self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
144
        self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
145
        ## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
146
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
147
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
148
class TestIntermediateRevisions(TestCaseWithTransport):
1092.3.2 by Robert Collins
merge from baz2bzr
149
150
    def setUp(self):
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
151
        TestCaseWithTransport.setUp(self)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
152
        self.br1, self.br2 = make_branches(self)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
153
        wt1 = self.br1.bzrdir.open_workingtree()
154
        wt2 = self.br2.bzrdir.open_workingtree()
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
155
        wt2.commit("Commit eleven", rev_id="b@u-0-7")
156
        wt2.commit("Commit twelve", rev_id="b@u-0-8")
157
        wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
158
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
159
        wt1.merge_from_branch(self.br2)
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
160
        wt1.commit("Commit fourtten", rev_id="a@u-0-6")
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
161
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
162
        wt2.merge_from_branch(self.br1)
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
163
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
1092.3.2 by Robert Collins
merge from baz2bzr
164
165
        from bzrlib.revision import MultipleRevisionSources
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
166
        self.sources = MultipleRevisionSources(self.br1.repository,
167
                                               self.br2.repository)
1092.3.2 by Robert Collins
merge from baz2bzr
168
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
169
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
170
1607.1.12 by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are
171
class MockRevisionSource(object):
172
    """A RevisionSource that takes a pregenerated graph.
173
174
    This is useful for testing revision graph algorithms where
175
    the actual branch existing is irrelevant.
176
    """
177
178
    def __init__(self, full_graph):
179
        self._full_graph = full_graph
180
181
    def get_revision_graph_with_ghosts(self, revision_ids):
182
        # This is mocked out to just return a constant graph.
183
        return self._full_graph
184
185
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
186
class TestCommonAncestor(TestCaseWithTransport):
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
187
    """Test checking whether a revision is an ancestor of another revision"""
1092.1.39 by Robert Collins
merge from mpool
188
189
    def test_common_ancestor(self):
974.1.65 by Aaron Bentley
Cleanup and test-fixing
190
        """Pick a reasonable merge base"""
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
191
        br1, br2 = make_branches(self)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
192
        revisions = br1.revision_history()
193
        revisions_2 = br2.revision_history()
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
194
        sources = MultipleRevisionSources(br1.repository, br2.repository)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
195
        expected_ancestors_list = {revisions[3]:(0, 0), 
196
                                   revisions[2]:(1, 1),
197
                                   revisions_2[4]:(2, 1), 
198
                                   revisions[1]:(3, 2),
199
                                   revisions_2[3]:(4, 2),
200
                                   revisions[0]:(5, 3) }
201
        ancestors_list = find_present_ancestors(revisions[3], sources)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
202
        self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
203
        for key, value in expected_ancestors_list.iteritems():
204
            self.assertEqual(ancestors_list[key], value, 
205
                              "key %r, %r != %r" % (key, ancestors_list[key],
206
                                                    value))
207
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
208
                          revisions[0])
209
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
210
                          revisions[1])
211
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
212
                          revisions[1])
213
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
214
                          revisions[2])
215
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
216
                          revisions_2[4])
217
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
218
                          revisions_2[4])
1590.1.1 by Robert Collins
Improve common_ancestor performance.
219
        self.assertTrue(common_ancestor(revisions[5], revisions_2[6], sources) in
220
                        (revisions[4], revisions_2[5]))
221
        self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
222
                        (revisions[4], revisions_2[5]))
1587.1.11 by Robert Collins
Local commits appear to be working properly.
223
        self.assertEqual(None, common_ancestor(None, revisions[5], sources))
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
224
        self.assertEqual(NULL_REVISION,
225
            common_ancestor(NULL_REVISION, NULL_REVISION, sources))
226
        self.assertEqual(NULL_REVISION,
227
            common_ancestor(revisions[0], NULL_REVISION, sources))
228
        self.assertEqual(NULL_REVISION,
229
            common_ancestor(NULL_REVISION, revisions[0], sources))
974.1.65 by Aaron Bentley
Cleanup and test-fixing
230
1185.8.1 by Aaron Bentley
Ensured combined_graph is order-insensitive
231
    def test_combined(self):
232
        """combined_graph
233
        Ensure it's not order-sensitive
234
        """
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
235
        br1, br2 = make_branches(self)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
236
        source = MultipleRevisionSources(br1.repository, br2.repository)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
237
        combined_1 = combined_graph(br1.last_revision(),
1390 by Robert Collins
pair programming worx... merge integration and weave
238
                                    br2.last_revision(), source)
239
        combined_2 = combined_graph(br2.last_revision(),
240
                                    br1.last_revision(), source)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
241
        self.assertEquals(combined_1[1], combined_2[1])
242
        self.assertEquals(combined_1[2], combined_2[2])
243
        self.assertEquals(combined_1[3], combined_2[3])
244
        self.assertEquals(combined_1, combined_2)
1534.4.49 by Robert Collins
Provide a revision.get_history(repository) method for generating a synthetic revision history.
245
246
    def test_get_history(self):
247
        # TODO: test ghosts on the left hand branch's impact
248
        # TODO: test ghosts on all parents, we should get some
249
        # indicator. i.e. NULL_REVISION
250
        # RBC 20060608
251
        tree = self.make_branch_and_tree('.')
252
        tree.commit('1', rev_id = '1', allow_pointless=True)
253
        tree.commit('2', rev_id = '2', allow_pointless=True)
254
        tree.commit('3', rev_id = '3', allow_pointless=True)
255
        rev = tree.branch.repository.get_revision('1')
256
        history = rev.get_history(tree.branch.repository)
257
        self.assertEqual([None, '1'], history)
258
        rev = tree.branch.repository.get_revision('2')
259
        history = rev.get_history(tree.branch.repository)
260
        self.assertEqual([None, '1', '2'], history)
261
        rev = tree.branch.repository.get_revision('3')
262
        history = rev.get_history(tree.branch.repository)
263
        self.assertEqual([None, '1', '2' ,'3'], history)
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
264
1607.1.12 by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are
265
    def test_common_ancestor_rootless_graph(self):
266
        # common_ancestor on a graph with no reachable roots - only
267
        # ghosts - should still return a useful value.
268
        graph = Graph()
269
        # add a ghost node which would be a root if it wasn't a ghost.
270
        graph.add_ghost('a_ghost')
271
        # add a normal commit on top of that
272
        graph.add_node('rev1', ['a_ghost'])
273
        # add a left-branch revision
274
        graph.add_node('left', ['rev1'])
275
        # add a right-branch revision
276
        graph.add_node('right', ['rev1'])
277
        source = MockRevisionSource(graph)
278
        self.assertEqual('rev1', common_ancestor('left', 'right', source))
279
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
280
281
class TestMultipleRevisionSources(TestCaseWithTransport):
282
    """Tests for the MultipleRevisionSources adapter."""
283
284
    def test_get_revision_graph_merges_ghosts(self):
285
        # when we ask for the revision graph for B, which
286
        # is in repo 1 with a ghost of A, and which is not
287
        # in repo 2, which has A, the revision_graph()
288
        # should return A and B both.
289
        tree_1 = self.make_branch_and_tree('1')
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
290
        tree_1.set_parent_ids(['A'], allow_leftmost_as_ghost=True)
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
291
        tree_1.commit('foo', rev_id='B', allow_pointless=True)
292
        tree_2 = self.make_branch_and_tree('2')
293
        tree_2.commit('bar', rev_id='A', allow_pointless=True)
294
        source = MultipleRevisionSources(tree_1.branch.repository,
295
                                         tree_2.branch.repository)
296
        self.assertEqual({'B':['A'],
297
                          'A':[]},
298
                         source.get_revision_graph('B'))
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
299
300
301
class TestReservedId(TestCase):
302
303
    def test_is_reserved_id(self):
304
        self.assertEqual(True, revision.is_reserved_id(NULL_REVISION))
305
        self.assertEqual(True, revision.is_reserved_id(
306
            revision.CURRENT_REVISION))
307
        self.assertEqual(True, revision.is_reserved_id('arch:'))
308
        self.assertEqual(False, revision.is_reserved_id('null'))
309
        self.assertEqual(False, revision.is_reserved_id(
310
            'arch:a@example.com/c--b--v--r'))
311
        self.assertEqual(False, revision.is_reserved_id(None))