/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/selftest/testrevision.py

  • Committer: Martin Pool
  • Date: 2005-08-29 04:05:28 UTC
  • Revision ID: mbp@sourcefrog.net-20050829040528-3fb016af15c4e4c0
- smart_add routine now doesn't print filenames directly, but rather
  returns them to the caller for appropriate display.  the add command
  displays them in the same way as before.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
 
1
# (C) 2005 Canonical Ltd
 
2
 
 
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.
 
7
 
 
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.
 
12
 
 
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
 
 
17
from bzrlib.selftest import InTempDir
 
18
 
 
19
 
 
20
def make_branches():
 
21
    from bzrlib.branch import Branch
 
22
    from bzrlib.commit import commit
 
23
    from bzrlib.revision import validate_revision_id
 
24
    import os
 
25
    os.mkdir("branch1")
 
26
    br1 = Branch("branch1", init=True)
 
27
    
 
28
    commit(br1, "Commit one", rev_id="a@u-0-0")
 
29
    commit(br1, "Commit two", rev_id="a@u-0-1")
 
30
    commit(br1, "Commit three", rev_id="a@u-0-2")
 
31
 
 
32
    os.mkdir("branch2")
 
33
    br2 = Branch("branch2", init=True)
 
34
    br2.update_revisions(br1)
 
35
    commit(br2, "Commit four", rev_id="b@u-0-3")
 
36
    commit(br2, "Commit five", rev_id="b@u-0-4")
 
37
    revisions_2 = br2.revision_history()
 
38
    br1.add_pending_merge(revisions_2[4])
 
39
    commit(br1, "Commit six", rev_id="a@u-0-3")
 
40
    commit(br1, "Commit seven", rev_id="a@u-0-4")
 
41
    commit(br2, "Commit eight", rev_id="b@u-0-5")
 
42
    br1.add_pending_merge(br2.revision_history()[5])
 
43
    commit(br1, "Commit nine", rev_id="a@u-0-5")
 
44
    br2.add_pending_merge(br1.revision_history()[4])
 
45
    commit(br2, "Commit ten", rev_id="b@u-0-6")
 
46
    return br1, br2
 
47
 
 
48
 
 
49
class TestIsAncestor(InTempDir):
 
50
 
 
51
    def test_is_ancestor(self):
 
52
        """Test checking whether a revision is an ancestor of another revision"""
 
53
        from bzrlib.revision import is_ancestor, MultipleRevisionSources
 
54
        from bzrlib.errors import NoSuchRevision
 
55
        br1, br2 = make_branches()
 
56
        revisions = br1.revision_history()
 
57
        revisions_2 = br2.revision_history()
 
58
        sources = MultipleRevisionSources(br1, br2)
 
59
 
 
60
        assert is_ancestor(revisions[0], revisions[0], sources)
 
61
        assert is_ancestor(revisions[1], revisions[0], sources)
 
62
        assert not is_ancestor(revisions[0], revisions[1], sources)
 
63
        assert is_ancestor(revisions_2[3], revisions[0], sources)
 
64
        self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
 
65
                          revisions[0], br1)        
 
66
        assert is_ancestor(revisions[3], revisions_2[4], sources)
 
67
        assert is_ancestor(revisions[3], revisions_2[4], br1)
 
68
        assert is_ancestor(revisions[3], revisions_2[3], sources)
 
69
        assert not is_ancestor(revisions[3], revisions_2[3], br1)
 
70
 
 
71
 
 
72
class TestCommonAncestor(InTempDir):
 
73
    """Test checking whether a revision is an ancestor of another revision"""
 
74
    def runTest(self):
 
75
        from bzrlib.revision import find_present_ancestors, common_ancestor
 
76
        from bzrlib.revision import MultipleRevisionSources
 
77
        br1, br2 = make_branches()
 
78
        revisions = br1.revision_history()
 
79
        revisions_2 = br2.revision_history()
 
80
        sources = MultipleRevisionSources(br1, br2)
 
81
 
 
82
        expected_ancestors_list = {revisions[3]:(0, 0), 
 
83
                                   revisions[2]:(1, 1),
 
84
                                   revisions_2[4]:(2, 1), 
 
85
                                   revisions[1]:(3, 2),
 
86
                                   revisions_2[3]:(4, 2),
 
87
                                   revisions[0]:(5, 3) }
 
88
        ancestors_list = find_present_ancestors(revisions[3], sources)
 
89
        assert len(expected_ancestors_list) == len(ancestors_list)
 
90
        for key, value in expected_ancestors_list.iteritems():
 
91
            self.assertEqual(ancestors_list[key], value, 
 
92
                              "key %r, %r != %r" % (key, ancestors_list[key],
 
93
                                                    value))
 
94
 
 
95
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
 
96
                          revisions[0])
 
97
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
 
98
                          revisions[1])
 
99
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
 
100
                          revisions[1])
 
101
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
 
102
                          revisions[2])
 
103
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
 
104
                          revisions_2[4])
 
105
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
 
106
                          revisions_2[4])
 
107
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
 
108
                          revisions[4])
 
109
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
 
110
                          revisions_2[5])
 
111
 
 
112
TEST_CLASSES = [
 
113
    TestIsAncestor,
 
114
    TestCommonAncestor,
 
115
    ]