← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

[merge] jam-integration 1495

Show diffs side-by-side

added added

removed removed

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