/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/test_commit_merge.py

  • Committer: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
 
18
18
import os
 
19
import shutil
19
20
 
20
 
from .. import (
21
 
    check,
22
 
    osutils,
23
 
    )
24
 
from ..commit import PointlessCommit
25
 
from . import (
 
21
from bzrlib import check, osutils
 
22
from bzrlib.branch import Branch
 
23
from bzrlib.errors import PointlessCommit, BzrError
 
24
from bzrlib.tests import (
 
25
    SymlinkFeature,
26
26
    TestCaseWithTransport,
27
27
    )
28
 
from .features import (
29
 
    SymlinkFeature,
30
 
    )
31
 
from .matchers import RevisionHistoryMatches
 
28
from bzrlib.tests.test_revision import make_branches
32
29
 
33
30
 
34
31
class TestCommitMerge(TestCaseWithTransport):
43
40
        wtx = self.make_branch_and_tree('x')
44
41
        base_rev = wtx.commit('common parent')
45
42
        bx = wtx.branch
46
 
        wty = wtx.controldir.sprout('y').open_workingtree()
 
43
        wty = wtx.bzrdir.sprout('y').open_workingtree()
47
44
        by = wty.branch
48
45
 
49
 
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
50
 
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
 
46
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
47
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
51
48
 
52
49
        by.fetch(bx)
53
50
        # just having the history there does nothing
54
51
        self.assertRaises(PointlessCommit,
55
52
                          wty.commit,
56
 
                          'no changes yet', rev_id=b'y@u-0-2',
 
53
                          'no changes yet', rev_id='y@u-0-2',
57
54
                          allow_pointless=False)
58
55
        wty.merge_from_branch(bx)
59
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
 
56
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
60
57
 
61
 
        self.assertEqual(by.revno(), 3)
62
 
        graph = wty.branch.repository.get_graph()
63
 
        self.addCleanup(wty.lock_read().unlock)
64
 
        self.assertThat(by,
65
 
                        RevisionHistoryMatches(
66
 
                            [base_rev, b'y@u-0-1', b'y@u-0-2'])
67
 
                        )
68
 
        rev = by.repository.get_revision(b'y@u-0-2')
69
 
        self.assertEqual(rev.parent_ids,
70
 
                         [b'y@u-0-1', b'x@u-0-1'])
 
58
        self.assertEquals(by.revno(), 3)
 
59
        self.assertEquals(list(by.revision_history()),
 
60
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
 
61
        rev = by.repository.get_revision('y@u-0-2')
 
62
        self.assertEquals(rev.parent_ids,
 
63
                          ['y@u-0-1', 'x@u-0-1'])
71
64
 
72
65
    def test_merge_new_file(self):
73
66
        """Commit merge of two trees with no overlapping files."""
75
68
        base_rev = wtx.commit('common parent')
76
69
        bx = wtx.branch
77
70
        wtx.commit('establish root id')
78
 
        wty = wtx.controldir.sprout('y').open_workingtree()
79
 
        self.assertEqual(wtx.path2id(''), wty.path2id(''))
 
71
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
72
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
80
73
        by = wty.branch
81
74
 
82
75
        self.build_tree(['x/ecks', 'y/why'])
83
76
 
84
 
        wtx.add(['ecks'], [b'ecks-id'])
85
 
        wty.add(['why'], [b'why-id'])
 
77
        wtx.add(['ecks'], ['ecks-id'])
 
78
        wty.add(['why'], ['why-id'])
86
79
 
87
 
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
88
 
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
 
80
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
81
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
89
82
 
90
83
        wty.merge_from_branch(bx)
91
84
 
97
90
                          'partial commit', allow_pointless=False,
98
91
                          specific_files=['ecks'])
99
92
 
100
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
101
 
        tree = by.repository.revision_tree(b'y@u-0-2')
102
 
        self.assertEqual(tree.get_file_revision('ecks'), b'x@u-0-1')
103
 
        self.assertEqual(tree.get_file_revision('why'), b'y@u-0-1')
 
93
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
94
        tree = by.repository.revision_tree('y@u-0-2')
 
95
        inv = tree.inventory
 
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
 
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
104
98
 
105
99
        check.check_dwim(bx.base, False, True, True)
106
100
        check.check_dwim(by.base, False, True, True)
111
105
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
112
106
        tree_a.add('link')
113
107
        tree_a.commit('added link')
114
 
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
 
108
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
115
109
        self.build_tree(['tree_a/file'])
116
110
        tree_a.add('file')
117
111
        tree_a.commit('added file')