← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
1
 
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
107
107
        tree2.unlock()
108
108
        self.assertEqual('version 2', text)
109
109
 
110
 
    def test_delete_commit(self):
111
 
        """Test a commit with a deleted file"""
 
110
    def test_missing_commit(self):
 
111
        """Test a commit with a missing file"""
112
112
        wt = self.make_branch_and_tree('.')
113
113
        b = wt.branch
114
114
        file('hello', 'w').write('hello world')
274
274
        try:
275
275
            self.check_inventory_shape(wt.read_working_inventory(),
276
276
                                       ['a/', 'a/hello', 'a/b/'])
277
 
            self.check_inventory_shape(b.repository.get_revision_inventory(r3),
 
277
            self.check_inventory_shape(b.repository.get_inventory(r3),
278
278
                                       ['a/', 'a/hello', 'a/b/'])
279
279
        finally:
280
280
            wt.unlock()
289
289
        finally:
290
290
            wt.unlock()
291
291
 
292
 
        inv = b.repository.get_revision_inventory(r4)
 
292
        inv = b.repository.get_inventory(r4)
293
293
        eq(inv['hello-id'].revision, r4)
294
294
        eq(inv['a-id'].revision, r1)
295
295
        eq(inv['b-id'].revision, r3)
484
484
        other_bzrdir = master_branch.bzrdir.sprout('other')
485
485
        other_tree = other_bzrdir.open_workingtree()
486
486
 
487
 
        # do a commit to the the other branch changing the content file so
 
487
        # do a commit to the other branch changing the content file so
488
488
        # that our commit after merging will have a merged revision in the
489
489
        # content file history.
490
490
        self.build_tree_contents([('other/content_file', 'change in other\n')])
550
550
        this_tree.merge_from_branch(other_tree.branch)
551
551
        reporter = CapturingReporter()
552
552
        this_tree.commit('do the commit', reporter=reporter)
553
 
        self.assertEqual([
554
 
            ('change', 'unchanged', ''),
555
 
            ('change', 'unchanged', 'dirtoleave'),
556
 
            ('change', 'unchanged', 'filetoleave'),
 
553
        expected = set([
557
554
            ('change', 'modified', 'filetomodify'),
558
555
            ('change', 'added', 'newdir'),
559
556
            ('change', 'added', 'newfile'),
563
560
            ('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
564
561
            ('deleted', 'dirtoremove'),
565
562
            ('deleted', 'filetoremove'),
566
 
            ],
567
 
            reporter.calls)
 
563
            ])
 
564
        result = set(reporter.calls)
 
565
        missing = expected - result
 
566
        new = result - expected
 
567
        self.assertEqual((set(), set()), (missing, new))
568
568
 
569
569
    def test_commit_removals_respects_filespec(self):
570
570
        """Commit respects the specified_files for removals."""
708
708
        cb = self.Callback(u'commit 2', self)
709
709
        repository = tree.branch.repository
710
710
        # simulate network failure
711
 
        def raise_(self, arg, arg2):
 
711
        def raise_(self, arg, arg2, arg3=None, arg4=None):
712
712
            raise errors.NoSuchFile('foo')
713
713
        repository.add_inventory = raise_
 
714
        repository.add_inventory_by_delta = raise_
714
715
        self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
715
716
        self.assertFalse(cb.called)
716
717