/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

(vila) Fix 199440 by taking allowing no password in a section

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
import os
19
19
import warnings
20
20
 
21
21
from bzrlib import (
22
 
    bugtracker,
23
22
    revision,
24
23
    symbol_versioning,
25
24
    )
26
25
from bzrlib.branch import Branch
27
 
from bzrlib.errors import (
28
 
    InvalidBugStatus,
29
 
    InvalidLineInBugsProperty,
30
 
    NoSuchRevision,
31
 
    )
 
26
from bzrlib.errors import NoSuchRevision
32
27
from bzrlib.deprecated_graph import Graph
33
 
from bzrlib.revision import (find_present_ancestors,
 
28
from bzrlib.revision import (find_present_ancestors, combined_graph,
 
29
                             common_ancestor,
 
30
                             MultipleRevisionSources,
34
31
                             NULL_REVISION)
 
32
from bzrlib.symbol_versioning import one_three
35
33
from bzrlib.tests import TestCase, TestCaseWithTransport
36
34
from bzrlib.trace import mutter
37
35
from bzrlib.workingtree import WorkingTree
51
49
 
52
50
    the object graph is
53
51
    B:     A:
54
 
    a..0   a..0
 
52
    a..0   a..0 
55
53
    a..1   a..1
56
54
    a..2   a..2
57
55
    b..3   a..3 merges b..4
64
62
    """
65
63
    tree1 = self.make_branch_and_tree("branch1", format=format)
66
64
    br1 = tree1.branch
67
 
 
 
65
    
68
66
    tree1.commit("Commit one", rev_id="a@u-0-0")
69
67
    tree1.commit("Commit two", rev_id="a@u-0-1")
70
68
    tree1.commit("Commit three", rev_id="a@u-0-2")
71
69
 
72
 
    tree2 = tree1.bzrdir.sprout("branch2").open_workingtree()
 
70
    tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
73
71
    br2 = tree2.branch
74
72
    tree2.commit("Commit four", rev_id="b@u-0-3")
75
73
    tree2.commit("Commit five", rev_id="b@u-0-4")
76
74
    revisions_2 = br2.revision_history()
77
75
    self.assertEquals(revisions_2[-1], 'b@u-0-4')
78
 
 
 
76
    
79
77
    tree1.merge_from_branch(br2)
80
78
    tree1.commit("Commit six", rev_id="a@u-0-3")
81
79
    tree1.commit("Commit seven", rev_id="a@u-0-4")
82
80
    tree2.commit("Commit eight", rev_id="b@u-0-5")
83
81
    self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
84
 
 
 
82
    
85
83
    tree1.merge_from_branch(br2)
86
84
    tree1.commit("Commit nine", rev_id="a@u-0-5")
87
85
    # DO NOT MERGE HERE - we WANT a GHOST.
88
86
    tree2.add_parent_tree_id(br1.revision_history()[4])
89
87
    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
90
 
 
 
88
    
91
89
    return br1, br2
92
90
 
93
91
 
127
125
                       rev_id, branch.repository.get_ancestry(rev_id))
128
126
                result = sorted(branch.repository.get_ancestry(rev_id))
129
127
                self.assertEquals(result, [None] + sorted(anc))
130
 
 
131
 
 
 
128
    
 
129
    
132
130
class TestIntermediateRevisions(TestCaseWithTransport):
133
131
 
134
132
    def setUp(self):
146
144
        wt2.merge_from_branch(self.br1)
147
145
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
148
146
 
 
147
        from bzrlib.revision import MultipleRevisionSources
 
148
        self.sources = self.applyDeprecated(one_three,
 
149
                        MultipleRevisionSources, self.br1.repository,
 
150
                                                 self.br2.repository)
 
151
 
 
152
 
149
153
 
150
154
class MockRevisionSource(object):
151
155
    """A RevisionSource that takes a pregenerated graph.
165
169
class TestCommonAncestor(TestCaseWithTransport):
166
170
    """Test checking whether a revision is an ancestor of another revision"""
167
171
 
 
172
    def assertCommonAncestorEqual(self, expected, sources, rev_a, rev_b):
 
173
        self.assertEqual(expected,
 
174
                         self.applyDeprecated(one_three, 
 
175
                         common_ancestor, rev_a, rev_b, sources))
 
176
 
 
177
    def assertCommonAncestorIn(self, possible, sources, rev_a, rev_b):
 
178
        """assert that we pick one among multiple possible common ancestors"""
 
179
        self.assertTrue(self.applyDeprecated(one_three, 
 
180
                            common_ancestor, rev_a, rev_b, sources)
 
181
                        in possible)
 
182
 
 
183
    def test_common_ancestor(self):
 
184
        """Pick a reasonable merge base"""
 
185
        br1, br2 = make_branches(self)
 
186
        revisions = br1.revision_history()
 
187
        revisions_2 = br2.revision_history()
 
188
        sources = self.applyDeprecated(one_three, 
 
189
                    MultipleRevisionSources, br1.repository, br2.repository)
 
190
        expected_ancestors_list = {revisions[3]:(0, 0), 
 
191
                                   revisions[2]:(1, 1),
 
192
                                   revisions_2[4]:(2, 1), 
 
193
                                   revisions[1]:(3, 2),
 
194
                                   revisions_2[3]:(4, 2),
 
195
                                   revisions[0]:(5, 3) }
 
196
        ancestors_list = find_present_ancestors(revisions[3], sources)
 
197
        self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
 
198
        for key, value in expected_ancestors_list.iteritems():
 
199
            self.assertEqual(ancestors_list[key], value, 
 
200
                              "key %r, %r != %r" % (key, ancestors_list[key],
 
201
                                                    value))
 
202
        self.assertCommonAncestorEqual(revisions[0], sources,
 
203
                                       revisions[0], revisions[0])
 
204
        self.assertCommonAncestorEqual(revisions[1], sources,
 
205
                                       revisions[1], revisions[2])
 
206
        self.assertCommonAncestorEqual(revisions[1], sources,
 
207
                                       revisions[1], revisions[1])
 
208
        self.assertCommonAncestorEqual(revisions[2], sources,
 
209
                                       revisions[2], revisions_2[4])
 
210
        self.assertCommonAncestorEqual(revisions_2[4], sources,
 
211
                                       revisions[3], revisions_2[4])
 
212
        self.assertCommonAncestorEqual(revisions_2[4], sources,
 
213
                                       revisions[4], revisions_2[5])
 
214
        self.assertCommonAncestorIn((revisions[4], revisions_2[5]), sources,
 
215
                                     revisions[5], revisions_2[6])
 
216
        self.assertCommonAncestorIn((revisions[4], revisions_2[5]), sources,
 
217
                                     revisions_2[6], revisions[5])
 
218
        self.assertCommonAncestorEqual(None, sources,
 
219
                                       None, revisions[5])
 
220
        self.assertCommonAncestorEqual(NULL_REVISION, sources,
 
221
                                       NULL_REVISION, NULL_REVISION)
 
222
        self.assertCommonAncestorEqual(NULL_REVISION, sources,
 
223
                                       revisions[0], NULL_REVISION)
 
224
        self.assertCommonAncestorEqual(NULL_REVISION, sources,
 
225
                                       NULL_REVISION, revisions[0])
 
226
 
 
227
    def test_combined(self):
 
228
        """combined_graph
 
229
        Ensure it's not order-sensitive
 
230
        """
 
231
        br1, br2 = make_branches(self)
 
232
        source = self.applyDeprecated(one_three,
 
233
                    MultipleRevisionSources, br1.repository, br2.repository)
 
234
        combined_1 = self.applyDeprecated(one_three,
 
235
                        combined_graph, br1.last_revision(),
 
236
                                        br2.last_revision(), source)
 
237
        combined_2 = self.applyDeprecated(one_three,
 
238
                        combined_graph, br2.last_revision(),
 
239
                                        br1.last_revision(), source)
 
240
        self.assertEquals(combined_1[1], combined_2[1])
 
241
        self.assertEquals(combined_1[2], combined_2[2])
 
242
        self.assertEquals(combined_1[3], combined_2[3])
 
243
        self.assertEquals(combined_1, combined_2)
 
244
 
168
245
    def test_get_history(self):
169
246
        # TODO: test ghosts on the left hand branch's impact
170
247
        # TODO: test ghosts on all parents, we should get some
184
261
        history = rev.get_history(tree.branch.repository)
185
262
        self.assertEqual([None, '1', '2' ,'3'], history)
186
263
 
 
264
    def test_common_ancestor_rootless_graph(self):
 
265
        # common_ancestor on a graph with no reachable roots - only
 
266
        # ghosts - should still return a useful value.
 
267
        graph = Graph()
 
268
        # add a ghost node which would be a root if it wasn't a ghost.
 
269
        graph.add_ghost('a_ghost')
 
270
        # add a normal commit on top of that
 
271
        graph.add_node('rev1', ['a_ghost'])
 
272
        # add a left-branch revision
 
273
        graph.add_node('left', ['rev1'])
 
274
        # add a right-branch revision
 
275
        graph.add_node('right', ['rev1'])
 
276
        source = MockRevisionSource(graph)
 
277
        self.assertCommonAncestorEqual('rev1', source, 'left', 'right')
 
278
 
 
279
 
 
280
class TestMultipleRevisionSources(TestCaseWithTransport):
 
281
    """Tests for the MultipleRevisionSources adapter."""
 
282
 
 
283
    def test_get_revision_graph_merges_ghosts(self):
 
284
        # when we ask for the revision graph for B, which
 
285
        # is in repo 1 with a ghost of A, and which is not
 
286
        # in repo 2, which has A, the revision_graph()
 
287
        # should return A and B both.
 
288
        tree_1 = self.make_branch_and_tree('1')
 
289
        tree_1.set_parent_ids(['A'], allow_leftmost_as_ghost=True)
 
290
        tree_1.commit('foo', rev_id='B', allow_pointless=True)
 
291
        tree_2 = self.make_branch_and_tree('2')
 
292
        tree_2.commit('bar', rev_id='A', allow_pointless=True)
 
293
        source = self.applyDeprecated(one_three,
 
294
                    MultipleRevisionSources, tree_1.branch.repository,
 
295
                                             tree_2.branch.repository)
 
296
        # get_revision_graph calls the deprecated
 
297
        # get_revision_graph_with_ghosts once for each repository.
 
298
        expected_warning = symbol_versioning.deprecation_string(
 
299
            tree_1.branch.repository.get_revision_graph_with_ghosts,
 
300
            one_three)
 
301
        rev_graph = self.callDeprecated([expected_warning, expected_warning],
 
302
                        source.get_revision_graph, 'B')
 
303
        self.assertEqual({'B':['A'],
 
304
                          'A':[]}, rev_graph)
 
305
 
187
306
 
188
307
class TestReservedId(TestCase):
189
308
 
208
327
        self.assertEqual('a', r.get_summary())
209
328
        r.message = '\na\nb'
210
329
        self.assertEqual('a', r.get_summary())
211
 
        r.message = None
212
 
        self.assertEqual('', r.get_summary())
213
330
 
214
331
    def test_get_apparent_author(self):
215
332
        r = revision.Revision('1')
216
333
        r.committer = 'A'
217
 
        author = self.applyDeprecated(
218
 
                symbol_versioning.deprecated_in((1, 13, 0)),
219
 
                r.get_apparent_author)
220
 
        self.assertEqual('A', author)
221
 
        r.properties['author'] = 'B'
222
 
        author = self.applyDeprecated(
223
 
                symbol_versioning.deprecated_in((1, 13, 0)),
224
 
                r.get_apparent_author)
225
 
        self.assertEqual('B', author)
226
 
        r.properties['authors'] = 'C\nD'
227
 
        author = self.applyDeprecated(
228
 
                symbol_versioning.deprecated_in((1, 13, 0)),
229
 
                r.get_apparent_author)
230
 
        self.assertEqual('C', author)
231
 
 
232
 
    def test_get_apparent_author_none(self):
233
 
        r = revision.Revision('1')
234
 
        author = self.applyDeprecated(
235
 
                symbol_versioning.deprecated_in((1, 13, 0)),
236
 
                r.get_apparent_author)
237
 
        self.assertEqual(None, author)
238
 
 
239
 
    def test_get_apparent_authors(self):
240
 
        r = revision.Revision('1')
241
 
        r.committer = 'A'
242
 
        self.assertEqual(['A'], r.get_apparent_authors())
243
 
        r.properties['author'] = 'B'
244
 
        self.assertEqual(['B'], r.get_apparent_authors())
245
 
        r.properties['authors'] = 'C\nD'
246
 
        self.assertEqual(['C', 'D'], r.get_apparent_authors())
247
 
 
248
 
    def test_get_apparent_authors_no_committer(self):
249
 
        r = revision.Revision('1')
250
 
        self.assertEqual([], r.get_apparent_authors())
251
 
 
252
 
 
253
 
class TestRevisionBugs(TestCase):
254
 
    """Tests for getting the bugs that a revision is linked to."""
255
 
 
256
 
    def test_no_bugs(self):
257
 
        r = revision.Revision('1')
258
 
        self.assertEqual([], list(r.iter_bugs()))
259
 
 
260
 
    def test_some_bugs(self):
261
 
        r = revision.Revision(
262
 
            '1', properties={
263
 
                'bugs': bugtracker.encode_fixes_bug_urls(
264
 
                    ['http://example.com/bugs/1',
265
 
                     'http://launchpad.net/bugs/1234'])})
266
 
        self.assertEqual(
267
 
            [('http://example.com/bugs/1', bugtracker.FIXED),
268
 
             ('http://launchpad.net/bugs/1234', bugtracker.FIXED)],
269
 
            list(r.iter_bugs()))
270
 
 
271
 
    def test_no_status(self):
272
 
        r = revision.Revision(
273
 
            '1', properties={'bugs': 'http://example.com/bugs/1'})
274
 
        self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
275
 
 
276
 
    def test_too_much_information(self):
277
 
        r = revision.Revision(
278
 
            '1', properties={'bugs': 'http://example.com/bugs/1 fixed bar'})
279
 
        self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
280
 
 
281
 
    def test_invalid_status(self):
282
 
        r = revision.Revision(
283
 
            '1', properties={'bugs': 'http://example.com/bugs/1 faxed'})
284
 
        self.assertRaises(InvalidBugStatus, list, r.iter_bugs())
 
334
        self.assertEqual('A', r.get_apparent_author())
 
335
        r.properties['author'] = 'B'
 
336
        self.assertEqual('B', r.get_apparent_author())