/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_init.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
187
187
 
188
188
    def test_init(self):
189
189
        # init on a remote url should succeed.
190
 
        out, err = self.run_bzr(['init', '--pack-0.92', self.get_url()])
 
190
        out, err = self.run_bzr(['init', '--format=pack-0.92', self.get_url()])
191
191
        self.assertEqual(out,
192
192
            """Created a standalone branch (format: pack-0.92)\n""")
193
193
        self.assertEqual('', err)
213
213
        self.run_bzr_error(['Already a branch'], ['init', self.get_url()])
214
214
 
215
215
    def test_init_append_revisions_only(self):
216
 
        self.run_bzr('init --dirstate-tags normal_branch6')
 
216
        self.run_bzr('init --format=dirstate-tags normal_branch6')
217
217
        branch = _mod_branch.Branch.open('normal_branch6')
218
218
        self.assertEqual(None, branch.get_append_revisions_only())
219
 
        self.run_bzr('init --append-revisions-only --dirstate-tags branch6')
 
219
        self.run_bzr('init --append-revisions-only --format=dirstate-tags branch6')
220
220
        branch = _mod_branch.Branch.open('branch6')
221
221
        self.assertEqual(True, branch.get_append_revisions_only())
222
222
        self.run_bzr_error(['cannot be set to append-revisions-only'],
223
 
                           'init --append-revisions-only --knit knit')
 
223
                           'init --append-revisions-only --format=knit knit')
224
224
 
225
225
    def test_init_without_username(self):
226
226
        """Ensure init works if username is not set.