41
41
self.assertEqual('', err)
42
42
self.assertEqual(' 1: Foo\n', out)
44
def test_shelve_list_via_directory(self):
45
tree = self.make_branch_and_tree('tree')
46
creator = self.make_creator(tree)
47
shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
48
out, err = self.run_bzr('shelve -d tree --list', retcode=1)
49
self.assertEqual('', err)
50
self.assertEqual(' 1: Foo\n', out)
44
52
def test_shelve_no_message(self):
45
53
tree = self.make_branch_and_tree('.')
46
54
creator = self.make_creator(tree)
77
85
sr = ScriptRunner()
78
86
sr.run_script(self, '''
80
89
$ bzr shelve --all -m Foo
92
2>Changes shelved with id "1".
81
93
$ bzr shelve --list
83
95
$ bzr unshelve --keep
96
2>Using changes with id "1".
99
2>All changes applied successfully.
84
100
$ bzr shelve --list
106
class TestUnshelvePreview(TestCaseWithTransport):
108
def test_non_ascii(self):
109
"""Test that we can show a non-ascii diff that would result from unshelving"""
111
init_content = u'Initial: \u0418\u0437\u043d\u0430\u0447\n'.encode('utf-8')
112
more_content = u'More: \u0415\u0449\u0451\n'.encode('utf-8')
113
next_content = init_content + more_content
114
diff_part = '@@ -1,1 +1,2 @@\n %s+%s' % (init_content, more_content)
116
tree = self.make_branch_and_tree('.')
117
self.build_tree_contents([('a_file', init_content)])
119
tree.commit(message='committed')
120
self.build_tree_contents([('a_file', next_content)])
121
self.run_bzr(['shelve', '--all'])
122
out, err = self.run_bzr(['unshelve', '--preview'], encoding='latin-1')
124
self.assertContainsString(out, diff_part)
92
127
class TestShelveRelpath(TestCaseWithTransport):
98
133
os.chdir('tree/dir')
99
134
self.run_bzr('shelve --all ../file')
136
def test_shelve_via_directory(self):
137
tree = self.make_branch_and_tree('tree')
138
self.build_tree(['tree/file', 'tree/dir/'])
140
self.run_bzr('shelve -d tree/dir --all ../file')
102
143
class TestShelveUnshelve(TestCaseWithTransport):