← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Basic BzrDir support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1
1
import os
2
2
 
3
3
from bzrlib.branch import Branch
 
4
from bzrlib.builtins import merge
4
5
from bzrlib.commit import commit
5
 
from bzrlib.selftest import TestCaseInTempDir
6
 
from bzrlib.merge import merge
7
 
from bzrlib.errors import UnrelatedBranches, NoCommits
 
6
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
 
7
from bzrlib.fetch import fetch
 
8
from bzrlib.merge import transform_tree
 
9
from bzrlib.osutils import pathjoin
8
10
from bzrlib.revision import common_ancestor
9
 
from bzrlib.fetch import fetch
10
 
 
11
 
 
12
 
class TestMerge(TestCaseInTempDir):
 
11
from bzrlib.tests import TestCaseWithTransport
 
12
from bzrlib.workingtree import WorkingTree
 
13
 
 
14
 
 
15
class TestMerge(TestCaseWithTransport):
13
16
    """Test appending more than one revision"""
 
17
 
14
18
    def test_pending(self):
15
 
        br = Branch.initialize(".")
16
 
        commit(br, "lala!")
17
 
        self.assertEquals(len(br.pending_merges()), 0)
18
 
        merge(['.', -1], [None, None])
19
 
        self.assertEquals(len(br.pending_merges()), 0)
 
19
        wt = self.make_branch_and_tree('.')
 
20
        wt.commit("lala!")
 
21
        self.assertEquals(len(wt.pending_merges()), 0)
 
22
        merge([u'.', -1], [None, None])
 
23
        self.assertEquals(len(wt.pending_merges()), 0)
20
24
 
21
25
    def test_nocommits(self):
22
26
        self.test_pending()
23
 
        os.mkdir('branch2')
24
 
        br2 = Branch.initialize('branch2')
 
27
        wt2 = self.make_branch_and_tree('branch2')
25
28
        self.assertRaises(NoCommits, merge, ['branch2', -1], 
26
29
                          [None, None])
27
 
        return br2
 
30
        return wt2
28
31
 
29
32
    def test_unrelated(self):
30
 
        br2 = self.test_nocommits()
31
 
        commit(br2, "blah")
 
33
        wt2 = self.test_nocommits()
 
34
        wt2.commit("blah")
32
35
        self.assertRaises(UnrelatedBranches, merge, ['branch2', -1], 
33
36
                          [None, None])
34
 
        return br2
 
37
        return wt2
35
38
 
36
39
    def test_pending_with_null(self):
37
40
        """When base is forced to revno 0, pending_merges is set"""
38
 
        br2 = self.test_unrelated()
39
 
        br1 = Branch.open('.')
40
 
        fetch(from_branch=br2, to_branch=br1)
 
41
        wt2 = self.test_unrelated()
 
42
        wt1 = WorkingTree('.')
 
43
        br1 = wt1.branch
 
44
        fetch(from_branch=wt2.branch, to_branch=br1)
41
45
        # merge all of branch 2 into branch 1 even though they 
42
46
        # are not related.
43
 
        merge(['branch2', -1], ['branch2', 0])
44
 
        self.assertEquals(len(br1.pending_merges()), 1)
45
 
        return (br1, br2)
 
47
        self.assertRaises(BzrCommandError, merge, ['branch2', -1], 
 
48
                          ['branch2', 0], reprocess=True, show_base=True)
 
49
        merge(['branch2', -1], ['branch2', 0], reprocess=True)
 
50
        self.assertEquals(len(wt1.pending_merges()), 1)
 
51
        return (wt1, wt2.branch)
46
52
 
47
53
    def test_two_roots(self):
48
54
        """Merge base is sane when two unrelated branches are merged"""
49
 
        br1, br2 = self.test_pending_with_null()
50
 
        commit(br1, "blah")
51
 
        last = br1.last_revision()
52
 
        self.assertEquals(common_ancestor(last, last, br1), last)
 
55
        wt1, br2 = self.test_pending_with_null()
 
56
        wt1.commit("blah")
 
57
        last = wt1.branch.last_revision()
 
58
        self.assertEquals(common_ancestor(last, last, wt1.branch.repository), last)
 
59
 
 
60
    def test_create_rename(self):
 
61
        """Rename an inventory entry while creating the file"""
 
62
        tree =self.make_branch_and_tree('.')
 
63
        file('name1', 'wb').write('Hello')
 
64
        tree.add('name1')
 
65
        tree.commit(message="hello")
 
66
        tree.rename_one('name1', 'name2')
 
67
        os.unlink('name2')
 
68
        transform_tree(tree, tree.branch.basis_tree())
 
69
 
 
70
    def test_layered_rename(self):
 
71
        """Rename both child and parent at same time"""
 
72
        tree =self.make_branch_and_tree('.')
 
73
        os.mkdir('dirname1')
 
74
        tree.add('dirname1')
 
75
        filename = pathjoin('dirname1', 'name1')
 
76
        file(filename, 'wb').write('Hello')
 
77
        tree.add(filename)
 
78
        tree.commit(message="hello")
 
79
        filename2 = pathjoin('dirname1', 'name2')
 
80
        tree.rename_one(filename, filename2)
 
81
        tree.rename_one('dirname1', 'dirname2')
 
82
        transform_tree(tree, tree.branch.basis_tree())