/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/workingtree_implementations/test_get_parent_ids.py

Update with new parent-ids patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
32
32
        self.assertEqual([rev2_id], t2.get_parent_ids())
33
33
        self.merge(t2.branch, t)
34
34
        self.assertEqual([rev1_id, rev2_id], t.get_parent_ids())
 
35
 
 
36
    def test_pending_merges(self):
 
37
        """Test the correspondence between pending merges and get_parent_ids."""
 
38
        wt = self.make_branch_and_tree('.')
 
39
        self.assertEqual([], wt.get_parent_ids())
 
40
        self.assertEqual([], wt.pending_merges())
 
41
        # the first pending merge replaces the 'last revision' because
 
42
        # 'last revision' is shorthand for 'left most parent'
 
43
        wt.add_pending_merge('foo@azkhazan-123123-abcabc')
 
44
        self.assertEqual([], wt.pending_merges())
 
45
        self.assertEqual(['foo@azkhazan-123123-abcabc'], wt.get_parent_ids())
 
46
        # adding a merge which is already in the parents list gets ignored.
 
47
        wt.add_pending_merge('foo@azkhazan-123123-abcabc')
 
48
        self.assertEqual([], wt.pending_merges())
 
49
        self.assertEqual(['foo@azkhazan-123123-abcabc'], wt.get_parent_ids())
 
50
        # adding a different merge results in it being appended to the list -
 
51
        # order is preserved.
 
52
        wt.add_pending_merge('wibble@fofof--20050401--1928390812')
 
53
        self.assertEqual(['foo@azkhazan-123123-abcabc',
 
54
            'wibble@fofof--20050401--1928390812'],
 
55
            wt.get_parent_ids())
 
56
        self.assertEqual(['wibble@fofof--20050401--1928390812'],
 
57
            wt.pending_merges())