← Back to branch summary

~ubuntu-branches/debian/experimental/bzr/experimental

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_commit.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij, James Westby, Jelmer Vernooij
  • Date: 2009-09-08 14:14:23 UTC
  • mfrom: (1.1.59 upstream)
  • Revision ID: james.westby@ubuntu.com-20090908141423-ilpel5hy4vxhzxrl
Tags: 1.18-1
[ James Westby ]
* New upstream release.

[ Jelmer Vernooij ]
* Bump standards version to 3.8.3.
* Remove unused patch system.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_commit.py
49
49
        self.depth = 0
50
50
 
51
51
    def clear(self):
52
 
        """See progress.ProgressBar.clear()."""
 
52
        """See progress.ProgressTask.clear()."""
53
53
 
54
54
    def clear_term(self):
55
 
        """See progress.ProgressBar.clear_term()."""
 
55
        """See progress.ProgressTask.clear_term()."""
56
56
 
57
57
    def finished(self):
58
 
        """See progress.ProgressBar.finished()."""
 
58
        """See progress.ProgressTask.finished()."""
59
59
        self.depth -= 1
60
60
 
61
61
    def note(self, fmt_string, *args, **kwargs):
62
 
        """See progress.ProgressBar.note()."""
 
62
        """See progress.ProgressTask.note()."""
63
63
 
64
64
    def progress_bar(self):
65
65
        return self
69
69
        return self
70
70
 
71
71
    def update(self, message, count=None, total=None):
72
 
        """See progress.ProgressBar.update()."""
 
72
        """See progress.ProgressTask.update()."""
73
73
        if self.depth == 1:
74
74
            self._calls.append(("update", count, total, message))
75
75
 
280
280
        wt2.merge_from_branch(wt.branch)
281
281
        wt2.commit('merged kind change')
282
282
 
 
283
    def test_commit_aborted_does_not_apply_automatic_changes_bug_282402(self):
 
284
        wt = self.make_branch_and_tree('.')
 
285
        wt.add(['a'], ['a-id'], ['file'])
 
286
        def fail_message(obj):
 
287
            raise errors.BzrCommandError("empty commit message")
 
288
        self.assertRaises(errors.BzrCommandError, wt.commit,
 
289
            message_callback=fail_message)
 
290
        self.assertEqual('a', wt.id2path('a-id'))
 
291
 
283
292
    def test_local_commit_ignores_master(self):
284
293
        # a --local commit does not require access to the master branch
285
294
        # at all, or even for it to exist.
602
611
        revid = tree.commit('first post')
603
612
        committed_tree = tree.basis_tree()
604
613
        self.assertTrue(committed_tree.has_filename("newfile"))
605
 
 
606
 
    def test_commit_and_mv_dance_a(self):
607
 
        # should fail because of
608
 
        # <https://bugs.launchpad.net/bzr/+bug/395556> but apparently does
609
 
        # not, while the blackbox.test_commit equivalent does - maybe because
610
 
        # of different format combinations
611
 
        tree = self.make_branch_and_tree(".")
612
 
        self.build_tree(["a"])
613
 
        tree.add("a")
614
 
        tree.rename_one("a", "b")
615
 
        tree.commit("Actually no, b")
616
 
        tree.rename_one("b", "a")
617
 
        tree.commit("No, really, a")
618
 
 
619
 
    def test_commit_and_mv_dance_b(self):
620
 
        # should fail because of
621
 
        # <https://bugs.launchpad.net/bzr/+bug/395556> but apparently does
622
 
        # not, while the blackbox.test_commit equivalent does - maybe because
623
 
        # of different format combinations
624
 
        tree = self.make_branch_and_tree(".")
625
 
        self.build_tree(["b"])
626
 
        tree.add("b")
627
 
        tree.rename_one("b", "a")
628
 
        tree.commit("Actually no, a")
629
 
        tree.rename_one("a", "b")
630
 
        tree.commit("No, really, b")