/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: 2018-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

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
45
 
        self.assertEqual(b'foo\n',
46
 
                         self.run_bzr_subprocess(['cat', 'a'],
47
 
                                                 working_dir='branch')[0])
 
44
        # so we need just one test here that 
 
45
        self.assertEqual('foo\n',
 
46
                          self.run_bzr_subprocess(['cat', 'a'],
 
47
                                                  working_dir='branch')[0])
48
48
 
49
49
        tree.commit(message='2')
50
50
        self.assertEqual(
59
59
        rev_id = tree.branch.last_revision()
60
60
 
61
61
        self.assertEqual(
62
 
            'baz\n', self.run_bzr(
63
 
                ['cat', 'a', '-r', 'revid:%s' % rev_id.decode('utf-8')],
64
 
                working_dir='branch')[0])
 
62
            'baz\n', self.run_bzr(['cat', 'a', '-r', 'revid:%s' % rev_id],
 
63
                                  working_dir='branch')[0])
65
64
 
66
65
        self.assertEqual('foo\n',
67
 
                         self.run_bzr(['cat', 'branch/a',
68
 
                                       '-r', 'revno:1:branch'])[0])
 
66
                          self.run_bzr(['cat', 'branch/a',
 
67
                                        '-r', 'revno:1:branch'])[0])
69
68
        self.run_bzr(['cat', 'a'], retcode=3)
70
69
        self.run_bzr(['cat', 'a', '-r', 'revno:1:branch-that-does-not-exist'],
71
70
                     retcode=3)
79
78
        # a-rev-tree is special because it appears in both the revision
80
79
        # tree and the working tree
81
80
        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')])
 
81
            ('c-rev', b'baz\n'), ('d-rev', b'bar\n'), ('e-rev', b'qux\n')])
83
82
        with tree.lock_write():
84
83
            tree.add(['a-rev-tree', 'c-rev', 'd-rev', 'e-rev'])
85
84
            tree.commit('add test files', rev_id=b'first')
104
103
        self.assertEqual('bar\n', out)
105
104
 
106
105
        out, err = \
107
 
            self.run_bzr('cat a-rev-tree --name-from-revision')
 
106
                self.run_bzr('cat a-rev-tree --name-from-revision')
108
107
        self.assertEqual('foo\n', out)
109
108
        self.assertEqual('', err)
110
109
 
168
167
        wt.commit('Making sure there is a basis_tree available')
169
168
        url = self.get_readonly_url() + '/README'
170
169
        real_content_filter_stack = Tree._content_filter_stack
171
 
 
172
170
        def _custom_content_filter_stack(tree, path=None, file_id=None):
173
171
            return _stack_2
174
172
        Tree._content_filter_stack = _custom_content_filter_stack