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

  • Committer: Jelmer Vernooij
  • Date: 2017-07-30 23:53:38 UTC
  • mfrom: (6734.1.22 move-errors-more)
  • Revision ID: jelmer@jelmer.uk-20170730235338-25jy0lgifkyx796l
Merge lp:~jelmer/brz/move-errors-more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_commit.py
29
29
    transport as _mod_transport,
30
30
    ui,
31
31
    )
 
32
from breezy.commit import (
 
33
    CannotCommitSelectedFileMerge,
 
34
    ExcludesUnsupported,
 
35
    PointlessCommit,
 
36
    )
32
37
from breezy.tests.per_workingtree import TestCaseWithWorkingTree
33
38
from breezy.tests.testui import ProgressRecordingUIFactory
34
39
 
149
154
        wt2.commit('change_right')
150
155
        wt.merge_from_branch(wt2.branch)
151
156
        try:
152
 
            self.assertRaises(errors.CannotCommitSelectedFileMerge,
 
157
            self.assertRaises(CannotCommitSelectedFileMerge,
153
158
                wt.commit, 'test', exclude=['foo'])
154
 
        except errors.ExcludesUnsupported:
 
159
        except ExcludesUnsupported:
155
160
            raise tests.TestNotApplicable("excludes not supported by this "
156
161
                "repository format")
157
162
 
162
167
        tree.commit('setup test')
163
168
        self.build_tree_contents([('a', 'new contents for "a"\n')])
164
169
        try:
165
 
            self.assertRaises(errors.PointlessCommit, tree.commit, 'test',
 
170
            self.assertRaises(PointlessCommit, tree.commit, 'test',
166
171
                exclude=['a'], allow_pointless=False)
167
 
        except errors.ExcludesUnsupported:
 
172
        except ExcludesUnsupported:
168
173
            raise tests.TestNotApplicable("excludes not supported by this "
169
174
                "repository format")
170
175
 
174
179
        tree.smart_add(['.'])
175
180
        try:
176
181
            tree.commit('test', exclude=['b', 'c'])
177
 
        except errors.ExcludesUnsupported:
 
182
        except ExcludesUnsupported:
178
183
            raise tests.TestNotApplicable("excludes not supported by this "
179
184
                "repository format")
180
185
        # If b was excluded it will still be 'added' in status.
458
463
        rev_id = tree.commit('added reference')
459
464
        child_revid = subtree.last_revision()
460
465
        # now do a no-op commit with allow_pointless=False
461
 
        self.assertRaises(errors.PointlessCommit, tree.commit, '',
 
466
        self.assertRaises(PointlessCommit, tree.commit, '',
462
467
            allow_pointless=False)
463
468
        self.assertEqual(child_revid, subtree.last_revision())
464
469
        self.assertEqual(rev_id, tree.last_revision())