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

  • Committer: Jelmer Vernooij
  • Date: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_shelve.py
103
103
contents of file
104
104
''')
105
105
 
 
106
 
106
107
class TestUnshelvePreview(TestCaseWithTransport):
107
 
    
 
108
 
108
109
    def test_non_ascii(self):
109
110
        """Test that we can show a non-ascii diff that would result from unshelving"""
110
 
        
111
 
        init_content = u'Initial: \u0418\u0437\u043d\u0430\u0447\n'.encode('utf-8')
 
111
 
 
112
        init_content = u'Initial: \u0418\u0437\u043d\u0430\u0447\n'.encode(
 
113
            'utf-8')
112
114
        more_content = u'More: \u0415\u0449\u0451\n'.encode('utf-8')
113
115
        next_content = init_content + more_content
114
 
        diff_part = '@@ -1,1 +1,2 @@\n %s+%s' % (init_content, more_content)
115
 
        
 
116
        diff_part = b'@@ -1,1 +1,2 @@\n %s+%s' % (init_content, more_content)
 
117
 
116
118
        tree = self.make_branch_and_tree('.')
117
119
        self.build_tree_contents([('a_file', init_content)])
118
120
        tree.add('a_file')
119
121
        tree.commit(message='committed')
120
122
        self.build_tree_contents([('a_file', next_content)])
121
123
        self.run_bzr(['shelve', '--all'])
122
 
        out, err = self.run_bzr(['unshelve', '--preview'], encoding='latin-1')
123
 
        
 
124
        out, err = self.run_bzr_raw(
 
125
            ['unshelve', '--preview'], encoding='latin-1')
 
126
 
124
127
        self.assertContainsString(out, diff_part)
125
128
 
126
129
 
145
148
    def test_directory(self):
146
149
        """Test --directory option"""
147
150
        tree = self.make_branch_and_tree('tree')
148
 
        self.build_tree_contents([('tree/a', 'initial\n')])
 
151
        self.build_tree_contents([('tree/a', b'initial\n')])
149
152
        tree.add('a')
150
153
        tree.commit(message='committed')
151
 
        self.build_tree_contents([('tree/a', 'initial\nmore\n')])
 
154
        self.build_tree_contents([('tree/a', b'initial\nmore\n')])
152
155
        self.run_bzr('shelve -d tree --all')
153
 
        self.assertFileEqual('initial\n', 'tree/a')
 
156
        self.assertFileEqual(b'initial\n', 'tree/a')
154
157
        self.run_bzr('unshelve --directory tree')
155
 
        self.assertFileEqual('initial\nmore\n', 'tree/a')
 
158
        self.assertFileEqual(b'initial\nmore\n', 'tree/a')