← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Vincent Ladeuil
  • Date: 2008-01-03 08:49:38 UTC
  • mfrom: (3111.1.31 175524)
  • mto: This revision was merged to the branch mainline in revision 3158.
  • Revision ID: v.ladeuil+lp@free.fr-20080103084938-7kvurk5uvde2ui54
https://launchpad.net/bugs/175524
Fix bug #175524, http test servers are 1.1 compliant

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
23
23
    )
24
24
from bzrlib.branch import Branch
25
25
from bzrlib.errors import NoSuchRevision
26
 
from bzrlib.graph import Graph
 
26
from bzrlib.deprecated_graph import Graph
27
27
from bzrlib.revision import (find_present_ancestors, combined_graph,
28
28
                             common_ancestor,
29
29
                             is_ancestor, MultipleRevisionSources,
30
30
                             NULL_REVISION)
 
31
from bzrlib.symbol_versioning import one_zero
31
32
from bzrlib.tests import TestCase, TestCaseWithTransport
32
33
from bzrlib.trace import mutter
33
34
from bzrlib.workingtree import WorkingTree
39
40
        r'bzrlib\.tests\.test_revision')
40
41
 
41
42
# XXX: Make this a method of a merge base case
42
 
def make_branches(self):
 
43
def make_branches(self, format=None):
43
44
    """Create two branches
44
45
 
45
46
    branch 1 has 6 commits, branch 2 has 3 commits
58
59
    so A is missing b6 at the start
59
60
    and B is missing a3, a4, a5
60
61
    """
61
 
    tree1 = self.make_branch_and_tree("branch1")
 
62
    tree1 = self.make_branch_and_tree("branch1", format=format)
62
63
    br1 = tree1.branch
63
64
    
64
65
    tree1.commit("Commit one", rev_id="a@u-0-0")
132
133
        revisions_2 = br2.revision_history()
133
134
        sources = br1
134
135
 
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))
 
136
        br1.lock_read()
 
137
        br2.lock_read()
 
138
        self.addCleanup(br1.unlock)
 
139
        br2.lock_read()
 
140
        self.addCleanup(br2.unlock)
 
141
 
 
142
        self.assertTrue(self.applyDeprecated(one_zero,
 
143
                        is_ancestor, revisions[0], revisions[0], br1))
 
144
        self.assertTrue(self.applyDeprecated(one_zero,
 
145
                        is_ancestor, revisions[1], revisions[0], sources))
 
146
        self.assertFalse(self.applyDeprecated(one_zero,
 
147
                         is_ancestor, revisions[0], revisions[1], sources))
 
148
        self.assertTrue(self.applyDeprecated(one_zero,
 
149
                        is_ancestor, revisions_2[3], revisions[0], sources))
139
150
        # disabled mbp 20050914, doesn't seem to happen anymore
140
151
        ## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
141
 
        ##                  revisions[0], br1)        
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))
 
152
        ##                  revisions[0], br1)
 
153
        self.assertTrue(self.applyDeprecated(one_zero,
 
154
                        is_ancestor, revisions[3], revisions_2[4], sources))
 
155
        self.assertTrue(self.applyDeprecated(one_zero,
 
156
                        is_ancestor, revisions[3], revisions_2[4], br1))
 
157
        self.assertTrue(self.applyDeprecated(one_zero,
 
158
                        is_ancestor, revisions[3], revisions_2[3], sources))
145
159
        ## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
146
160
 
147
161
 
309
323
        self.assertEqual(False, revision.is_reserved_id(
310
324
            'arch:a@example.com/c--b--v--r'))
311
325
        self.assertEqual(False, revision.is_reserved_id(None))
 
326
 
 
327
 
 
328
class TestRevisionMethods(TestCase):
 
329
 
 
330
    def test_get_summary(self):
 
331
        r = revision.Revision('1')
 
332
        r.message = 'a'
 
333
        self.assertEqual('a', r.get_summary())
 
334
        r.message = 'a\nb'
 
335
        self.assertEqual('a', r.get_summary())
 
336
        r.message = '\na\nb'
 
337
        self.assertEqual('a', r.get_summary())
 
338
 
 
339
    def test_get_apparent_author(self):
 
340
        r = revision.Revision('1')
 
341
        r.committer = 'A'
 
342
        self.assertEqual('A', r.get_apparent_author())
 
343
        r.properties['author'] = 'B'
 
344
        self.assertEqual('B', r.get_apparent_author())