/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 brzlib/tests/blackbox/test_versioning.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/blackbox/test_versioning.py
22
22
 
23
23
import os
24
24
 
25
 
from breezy.branch import Branch
26
 
from breezy.osutils import pathjoin
27
 
from breezy.tests import TestCaseInTempDir, TestCaseWithTransport
28
 
from breezy.trace import mutter
29
 
from breezy.workingtree import WorkingTree
 
25
from brzlib.branch import Branch
 
26
from brzlib.osutils import pathjoin
 
27
from brzlib.tests import TestCaseInTempDir, TestCaseWithTransport
 
28
from brzlib.trace import mutter
 
29
from brzlib.workingtree import WorkingTree
30
30
 
31
31
 
32
32
class TestMkdir(TestCaseWithTransport):
42
42
        self.assertPathDoesNotExist('abc')
43
43
 
44
44
    def test_mkdir(self):
45
 
        """Basic 'brz mkdir' operation"""
 
45
        """Basic 'bzr mkdir' operation"""
46
46
 
47
47
        self.make_branch_and_tree('.')
48
48
        self.run_bzr(['mkdir', 'foo'])
57
57
        self.log('delta.added = %r' % delta.added)
58
58
 
59
59
        self.assertEqual(len(delta.added), 1)
60
 
        self.assertEqual(delta.added[0].path[1], 'foo')
 
60
        self.assertEqual(delta.added[0][0], 'foo')
61
61
        self.assertFalse(delta.modified)
62
62
 
63
63
    def test_mkdir_in_subdir(self):
64
 
        """'brz mkdir' operation in subdirectory"""
 
64
        """'bzr mkdir' operation in subdirectory"""
65
65
 
66
66
        self.make_branch_and_tree('.')
67
67
        self.run_bzr(['mkdir', 'dir'])
78
78
        self.log('delta.added = %r' % delta.added)
79
79
 
80
80
        self.assertEqual(len(delta.added), 2)
81
 
        self.assertEqual(delta.added[0].path[1], 'dir')
82
 
        self.assertEqual(delta.added[1].path[1], pathjoin('dir', 'subdir'))
 
81
        self.assertEqual(delta.added[0][0], 'dir')
 
82
        self.assertEqual(delta.added[1][0], pathjoin('dir','subdir'))
83
83
        self.assertFalse(delta.modified)
84
84
 
85
85
    def test_mkdir_w_nested_trees(self):
86
 
        """'brz mkdir' with nested trees"""
 
86
        """'bzr mkdir' with nested trees"""
87
87
 
88
88
        self.make_branch_and_tree('.')
89
89
        self.make_branch_and_tree('a')
100
100
 
101
101
        delta = wt.changes_from(wt.basis_tree())
102
102
        self.assertEqual(len(delta.added), 1)
103
 
        self.assertEqual(delta.added[0].path[1], 'dir')
 
103
        self.assertEqual(delta.added[0][0], 'dir')
104
104
        self.assertFalse(delta.modified)
105
105
 
106
106
        delta = wt_a.changes_from(wt_a.basis_tree())
107
107
        self.assertEqual(len(delta.added), 1)
108
 
        self.assertEqual(delta.added[0].path[1], 'dir')
 
108
        self.assertEqual(delta.added[0][0], 'dir')
109
109
        self.assertFalse(delta.modified)
110
110
 
111
111
        delta = wt_b.changes_from(wt_b.basis_tree())
112
112
        self.assertEqual(len(delta.added), 1)
113
 
        self.assertEqual(delta.added[0].path[1], 'dir')
 
113
        self.assertEqual(delta.added[0][0], 'dir')
114
114
        self.assertFalse(delta.modified)
115
115
 
116
116
    def test_mkdir_quiet(self):
117
 
        """'brz mkdir --quiet' should not print a status message"""
 
117
        """'bzr mkdir --quiet' should not print a status message"""
118
118
 
119
119
        self.make_branch_and_tree('.')
120
120
        out, err = self.run_bzr(['mkdir', '--quiet', 'foo'])
129
129
        tree = self.make_branch_and_tree('.')
130
130
        b = tree.branch
131
131
        self.build_tree(['a/', 'b/'])
132
 
 
133
132
        def set_contents(contents):
134
133
            self.build_tree_contents([
135
134
                ('a/one', contents),
136
135
                ('b/two', contents),
137
136
                ('top', contents),
138
137
                ])
139
 
        set_contents(b'old contents')
 
138
        set_contents('old contents')
140
139
        tree.smart_add(['.'])
141
140
        tree.commit('first revision')
142
 
        set_contents(b'new contents')
 
141
        set_contents('new contents')
143
142
 
144
143
        mutter('start selective subdir commit')
145
144
        self.run_bzr(['commit', 'a', '-m', 'commit a only'])
148
147
        new.lock_read()
149
148
 
150
149
        def get_text_by_path(tree, path):
151
 
            return tree.get_file_text(path)
 
150
            return tree.get_file_text(tree.path2id(path), path)
152
151
 
153
 
        self.assertEqual(get_text_by_path(new, 'b/two'), b'old contents')
154
 
        self.assertEqual(get_text_by_path(new, 'top'), b'old contents')
155
 
        self.assertEqual(get_text_by_path(new, 'a/one'), b'new contents')
 
152
        self.assertEqual(get_text_by_path(new, 'b/two'), 'old contents')
 
153
        self.assertEqual(get_text_by_path(new, 'top'), 'old contents')
 
154
        self.assertEqual(get_text_by_path(new, 'a/one'), 'new contents')
156
155
        new.unlock()
157
156
 
158
157
        # commit from here should do nothing
160
159
                     working_dir='a')
161
160
        v3 = b.repository.revision_tree(b.get_rev_id(3))
162
161
        v3.lock_read()
163
 
        self.assertEqual(get_text_by_path(v3, 'b/two'), b'old contents')
164
 
        self.assertEqual(get_text_by_path(v3, 'top'), b'old contents')
165
 
        self.assertEqual(get_text_by_path(v3, 'a/one'), b'new contents')
 
162
        self.assertEqual(get_text_by_path(v3, 'b/two'), 'old contents')
 
163
        self.assertEqual(get_text_by_path(v3, 'top'), 'old contents')
 
164
        self.assertEqual(get_text_by_path(v3, 'a/one'), 'new contents')
166
165
        v3.unlock()
167
166
 
168
167
        # commit in subdirectory commits whole tree
170
169
                     working_dir='a')
171
170
        v4 = b.repository.revision_tree(b.get_rev_id(4))
172
171
        v4.lock_read()
173
 
        self.assertEqual(get_text_by_path(v4, 'b/two'), b'new contents')
174
 
        self.assertEqual(get_text_by_path(v4, 'top'), b'new contents')
 
172
        self.assertEqual(get_text_by_path(v4, 'b/two'), 'new contents')
 
173
        self.assertEqual(get_text_by_path(v4, 'top'), 'new contents')
175
174
        v4.unlock()
176
175
 
177
176
        # TODO: factor out some kind of assert_tree_state() method