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

  • Committer: Jelmer Vernooij
  • Date: 2020-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_versioning.py
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][0], 'foo')
 
60
        self.assertEqual(delta.added[0].path[1], 'foo')
61
61
        self.assertFalse(delta.modified)
62
62
 
63
63
    def test_mkdir_in_subdir(self):
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][0], 'dir')
82
 
        self.assertEqual(delta.added[1][0], pathjoin('dir', 'subdir'))
 
81
        self.assertEqual(delta.added[0].path[1], 'dir')
 
82
        self.assertEqual(delta.added[1].path[1], pathjoin('dir', 'subdir'))
83
83
        self.assertFalse(delta.modified)
84
84
 
85
85
    def test_mkdir_w_nested_trees(self):
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][0], 'dir')
 
103
        self.assertEqual(delta.added[0].path[1], '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][0], 'dir')
 
108
        self.assertEqual(delta.added[0].path[1], '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][0], 'dir')
 
113
        self.assertEqual(delta.added[0].path[1], 'dir')
114
114
        self.assertFalse(delta.modified)
115
115
 
116
116
    def test_mkdir_quiet(self):
129
129
        tree = self.make_branch_and_tree('.')
130
130
        b = tree.branch
131
131
        self.build_tree(['a/', 'b/'])
 
132
 
132
133
        def set_contents(contents):
133
134
            self.build_tree_contents([
134
135
                ('a/one', contents),
135
136
                ('b/two', contents),
136
137
                ('top', contents),
137
138
                ])
138
 
        set_contents('old contents')
 
139
        set_contents(b'old contents')
139
140
        tree.smart_add(['.'])
140
141
        tree.commit('first revision')
141
 
        set_contents('new contents')
 
142
        set_contents(b'new contents')
142
143
 
143
144
        mutter('start selective subdir commit')
144
145
        self.run_bzr(['commit', 'a', '-m', 'commit a only'])
149
150
        def get_text_by_path(tree, path):
150
151
            return tree.get_file_text(path)
151
152
 
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')
 
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')
155
156
        new.unlock()
156
157
 
157
158
        # commit from here should do nothing
159
160
                     working_dir='a')
160
161
        v3 = b.repository.revision_tree(b.get_rev_id(3))
161
162
        v3.lock_read()
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')
 
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')
165
166
        v3.unlock()
166
167
 
167
168
        # commit in subdirectory commits whole tree
169
170
                     working_dir='a')
170
171
        v4 = b.repository.revision_tree(b.get_rev_id(4))
171
172
        v4.lock_read()
172
 
        self.assertEqual(get_text_by_path(v4, 'b/two'), 'new contents')
173
 
        self.assertEqual(get_text_by_path(v4, 'top'), 'new contents')
 
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')
174
175
        v4.unlock()
175
176
 
176
177
        # TODO: factor out some kind of assert_tree_state() method