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

  • Committer: Jelmer Vernooij
  • Date: 2017-11-12 17:14:00 UTC
  • mfrom: (6809.1.1 ws_comma)
  • Revision ID: jelmer@jelmer.uk-20171112171400-x19h7e3vw8t0u3w4
Merge lp:~gz/brz/ws_comma

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_commit.py
46
46
        # If forced, it should succeed, but this is not tested here.
47
47
        self.make_branch_and_tree('.')
48
48
        self.build_tree(['hello.txt'])
49
 
        out,err = self.run_bzr('commit -m empty', retcode=3)
 
49
        out, err = self.run_bzr('commit -m empty', retcode=3)
50
50
        self.assertEqual('', out)
51
51
        # Two ugly bits here.
52
52
        # 1) We really don't want 'aborting commit write group' anymore.
108
108
        tree = self.make_branch_and_tree('.')
109
109
        self.build_tree(['hello.txt'])
110
110
        tree.add("hello.txt")
111
 
        out,err = self.run_bzr('commit -m added')
 
111
        out, err = self.run_bzr('commit -m added')
112
112
        self.assertEqual('', out)
113
113
        self.assertContainsRe(err, '^Committing to: .*\n'
114
114
                              'added hello.txt\n'
228
228
        wt = ControlDir.create_standalone_workingtree('.')
229
229
        self.build_tree(['hello.txt', 'extra.txt'])
230
230
        wt.add(['hello.txt'])
231
 
        out,err = self.run_bzr('commit -m added')
 
231
        out, err = self.run_bzr('commit -m added')
232
232
        self.assertEqual('', out)
233
233
        self.assertContainsRe(err, '^Committing to: .*\n'
234
234
                              'added hello\.txt\n'
241
241
        tree.add('unchanged.txt')
242
242
        self.run_bzr('commit -m unchanged unchanged.txt')
243
243
        tree.add("hello.txt")
244
 
        out,err = self.run_bzr('commit -m added')
 
244
        out, err = self.run_bzr('commit -m added')
245
245
        self.assertEqual('', out)
246
246
        self.assertContainsRe(err, '^Committing to: .*\n'
247
247
                              'added hello\.txt\n'
910
910
        tree.add([u'abc\xa7/', u'abc\xa7/foo'])
911
911
        tree.commit('checkin')
912
912
 
913
 
        tree.rename_one(u'abc\xa7','abc')
 
913
        tree.rename_one(u'abc\xa7', 'abc')
914
914
 
915
915
        self.run_bzr('ci -m "non-ascii mv"')
916
916