~bzr-pqm/bzr/bzr.dev

(gz) Allow arbitrary bytes for unshelve diffs rather than throwing
UnicodeDecodeError on non-ascii contents (Andrej A Antonov)

added added

removed removed

contents of file

''')

class TestUnshelvePreview(TestCaseWithTransport):

def test_non_ascii(self):

"""Test that we can show a non-ascii diff that would result from unshelving"""

init_content = u'Initial: \u0418\u0437\u043d\u0430\u0447\n'.encode('utf-8')

more_content = u'More: \u0415\u0449\u0451\n'.encode('utf-8')

next_content = init_content + more_content

diff_part = '@@ -1,1 +1,2 @@\n %s+%s' % (init_content, more_content)

100

tree = self.make_branch_and_tree('.')

101

self.build_tree_contents([('a_file', init_content)])

102

tree.add('a_file')

103

tree.commit(message='committed')

104

self.build_tree_contents([('a_file', next_content)])

105

self.run_bzr(['shelve', '--all'])

106

out, err = self.run_bzr(['unshelve', '--preview'], encoding='latin-1')

107

108

self.assertContainsString(out, diff_part)

109

110

111

class TestShelveRelpath(TestCaseWithTransport):