/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_cat.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_cat.py
36
36
        self.build_tree_contents([('branch/a', b'baz\n')])
37
37
 
38
38
        self.assertEqual('foo\n',
39
 
                          self.run_bzr(['cat', 'a'], working_dir='branch')[0])
 
39
                         self.run_bzr(['cat', 'a'], working_dir='branch')[0])
40
40
 
41
41
        # On Windows, we used to have a bug where newlines got changed into
42
42
        # crlf, whereas cat ought to write out the file exactly as it's
43
43
        # recorded (by default.)  That problem can't be reproduced in-process,
44
 
        # so we need just one test here that 
 
44
        # so we need just one test here that
45
45
        self.assertEqual(b'foo\n',
46
 
                          self.run_bzr_subprocess(['cat', 'a'],
47
 
                                                  working_dir='branch')[0])
 
46
                         self.run_bzr_subprocess(['cat', 'a'],
 
47
                                                 working_dir='branch')[0])
48
48
 
49
49
        tree.commit(message='2')
50
50
        self.assertEqual(
64
64
                working_dir='branch')[0])
65
65
 
66
66
        self.assertEqual('foo\n',
67
 
                          self.run_bzr(['cat', 'branch/a',
68
 
                                        '-r', 'revno:1:branch'])[0])
 
67
                         self.run_bzr(['cat', 'branch/a',
 
68
                                       '-r', 'revno:1:branch'])[0])
69
69
        self.run_bzr(['cat', 'a'], retcode=3)
70
70
        self.run_bzr(['cat', 'a', '-r', 'revno:1:branch-that-does-not-exist'],
71
71
                     retcode=3)
79
79
        # a-rev-tree is special because it appears in both the revision
80
80
        # tree and the working tree
81
81
        self.build_tree_contents([('a-rev-tree', b'foo\n'),
82
 
            ('c-rev', b'baz\n'), ('d-rev', b'bar\n'), ('e-rev', b'qux\n')])
 
82
                                  ('c-rev', b'baz\n'), ('d-rev', b'bar\n'), ('e-rev', b'qux\n')])
83
83
        with tree.lock_write():
84
84
            tree.add(['a-rev-tree', 'c-rev', 'd-rev', 'e-rev'])
85
85
            tree.commit('add test files', rev_id=b'first')
104
104
        self.assertEqual('bar\n', out)
105
105
 
106
106
        out, err = \
107
 
                self.run_bzr('cat a-rev-tree --name-from-revision')
 
107
            self.run_bzr('cat a-rev-tree --name-from-revision')
108
108
        self.assertEqual('foo\n', out)
109
109
        self.assertEqual('', err)
110
110
 
168
168
        wt.commit('Making sure there is a basis_tree available')
169
169
        url = self.get_readonly_url() + '/README'
170
170
        real_content_filter_stack = Tree._content_filter_stack
 
171
 
171
172
        def _custom_content_filter_stack(tree, path=None, file_id=None):
172
173
            return _stack_2
173
174
        Tree._content_filter_stack = _custom_content_filter_stack