/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/per_branch/test_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_commit.py
194
194
            dir_id = tree.path2id('dir')
195
195
            tree.add('dir/subfile')
196
196
            dir_subfile_id = tree.path2id('dir/subfile')
197
 
            tree.mkdir('to_be_unversioned')
 
197
            tree.put_file_bytes_non_atomic('to_be_unversioned', 'blah')
 
198
            tree.add(['to_be_unversioned'])
198
199
            to_be_unversioned_id = tree.path2id('to_be_unversioned')
199
200
            tree.put_file_bytes_non_atomic('dir/subfile', 'def')
200
201
            revid1 = tree.commit('first revision')
212
213
            revid2 = tree.commit('second revision')
213
214
 
214
215
        expected_delta = delta.TreeDelta()
215
 
        expected_delta.added = [('added_dir', added_dir_id, 'directory')]
216
 
        expected_delta.removed = [('to_be_unversioned',
217
 
                                   to_be_unversioned_id, 'directory')]
218
 
        expected_delta.renamed = [('dir/subfile', 'dir/subfile_renamed',
219
 
                                   dir_subfile_id, 'file', False, False)]
 
216
        if tree.has_versioned_directories():
 
217
            expected_delta.added.append(('added_dir', added_dir_id, 'directory'))
 
218
        if tree.supports_rename_tracking():
 
219
            expected_delta.removed = [('to_be_unversioned',
 
220
                                       to_be_unversioned_id, 'file')]
 
221
            expected_delta.renamed = [('dir/subfile', 'dir/subfile_renamed',
 
222
                                       dir_subfile_id, 'file', False, False)]
 
223
        else:
 
224
            expected_delta.added.append(('dir/subfile_renamed',
 
225
                                        tree.path2id('dir/subfile_renamed'), 'file'))
 
226
            expected_delta.removed = [
 
227
                    ('dir/subfile', dir_subfile_id, 'file'),
 
228
                    ('to_be_unversioned', to_be_unversioned_id, 'file')]
220
229
        expected_delta.modified=[('rootfile', rootfile_id, 'file', True,
221
230
                                  False)]
222
231
        self.assertEqual([('pre_commit', 1, revid1, 2, revid2,