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

  • Committer: John Arbash Meinel
  • Date: 2007-07-11 23:45:20 UTC
  • mfrom: (2601 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2643.
  • Revision ID: john@arbash-meinel.com-20070711234520-do3h7zw8skbathpz
[merge] bzr.dev 2601

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
226
226
        wt.lock_read()
227
227
        try:
228
228
            self.check_inventory_shape(wt.read_working_inventory(),
229
 
                                       ['a', 'a/hello', 'b'])
 
229
                                       ['a/', 'a/hello', 'b/'])
230
230
        finally:
231
231
            wt.unlock()
232
232
 
236
236
        wt.lock_read()
237
237
        try:
238
238
            self.check_inventory_shape(wt.read_working_inventory(),
239
 
                                       ['a', 'a/hello', 'a/b'])
 
239
                                       ['a/', 'a/hello', 'a/b/'])
240
240
            self.check_inventory_shape(b.repository.get_revision_inventory(r3),
241
 
                                       ['a', 'a/hello', 'a/b'])
 
241
                                       ['a/', 'a/hello', 'a/b/'])
242
242
        finally:
243
243
            wt.unlock()
244
244
 
248
248
        wt.lock_read()
249
249
        try:
250
250
            self.check_inventory_shape(wt.read_working_inventory(),
251
 
                                       ['a', 'a/b/hello', 'a/b'])
 
251
                                       ['a/', 'a/b/hello', 'a/b/'])
252
252
        finally:
253
253
            wt.unlock()
254
254
 
525
525
            ('change', 'added', 'newdir'),
526
526
            ('change', 'added', 'newfile'),
527
527
            ('renamed', 'renamed', 'dirtorename', 'renameddir'),
 
528
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
528
529
            ('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
529
530
            ('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
530
 
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
531
531
            ('deleted', 'dirtoremove'),
532
532
            ('deleted', 'filetoremove'),
533
533
            ],
681
681
        repository.add_inventory = raise_
682
682
        self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
683
683
        self.assertFalse(cb.called)
 
684
 
 
685
    def test_selected_file_merge_commit(self):
 
686
        """Ensure the correct error is raised"""
 
687
        tree = self.make_branch_and_tree('foo')
 
688
        # pending merge would turn into a left parent
 
689
        tree.commit('commit 1')
 
690
        tree.add_parent_tree_id('example')
 
691
        self.build_tree(['foo/bar', 'foo/baz'])
 
692
        tree.add(['bar', 'baz'])
 
693
        err = self.assertRaises(errors.CannotCommitSelectedFileMerge,
 
694
            tree.commit, 'commit 2', specific_files=['bar', 'baz'])
 
695
        self.assertEqual(['bar', 'baz'], err.files)
 
696
        self.assertEqual('Selected-file commit of merges is not supported'
 
697
                         ' yet: files bar, baz', str(err))
 
698
 
 
699
    def test_commit_ordering(self):
 
700
        """Test of corner-case commit ordering error"""
 
701
        tree = self.make_branch_and_tree('.')
 
702
        self.build_tree(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
 
703
        tree.add(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
 
704
        tree.commit('setup')
 
705
        self.build_tree(['a/c/d/'])
 
706
        tree.add('a/c/d')
 
707
        tree.rename_one('a/z/x', 'a/c/d/x')
 
708
        tree.commit('test', specific_files=['a/z/y'])