1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import os
from bzrlib import shelf
from bzrlib.tests import TestCaseWithTransport
from bzrlib.tests.script import ScriptRunner
class TestShelveList(TestCaseWithTransport):
def test_no_shelved_changes(self):
tree = self.make_branch_and_tree('.')
err = self.run_bzr('shelve --list')[1]
self.assertEqual('No shelved changes.\n', err)
def make_creator(self, tree):
creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
self.addCleanup(creator.finalize)
return creator
def test_shelve_one(self):
tree = self.make_branch_and_tree('.')
creator = self.make_creator(tree)
shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
out, err = self.run_bzr('shelve --list', retcode=1)
self.assertEqual('', err)
self.assertEqual(' 1: Foo\n', out)
def test_shelve_list_via_directory(self):
tree = self.make_branch_and_tree('tree')
creator = self.make_creator(tree)
shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
out, err = self.run_bzr('shelve -d tree --list', retcode=1)
self.assertEqual('', err)
self.assertEqual(' 1: Foo\n', out)
def test_shelve_no_message(self):
tree = self.make_branch_and_tree('.')
creator = self.make_creator(tree)
shelf_id = tree.get_shelf_manager().shelve_changes(creator)
out, err = self.run_bzr('shelve --list', retcode=1)
self.assertEqual('', err)
self.assertEqual(' 1: <no message>\n', out)
def test_shelf_order(self):
tree = self.make_branch_and_tree('.')
creator = self.make_creator(tree)
tree.get_shelf_manager().shelve_changes(creator, 'Foo')
creator = self.make_creator(tree)
tree.get_shelf_manager().shelve_changes(creator, 'Bar')
out, err = self.run_bzr('shelve --list', retcode=1)
self.assertEqual('', err)
self.assertEqual(' 2: Bar\n 1: Foo\n', out)
def test_shelve_destroy(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['file'])
tree.add('file')
self.run_bzr('shelve --all --destroy')
self.assertPathDoesNotExist('file')
self.assertIs(None, tree.get_shelf_manager().last_shelf())
def test_unshelve_keep(self):
# https://bugs.launchpad.net/bzr/+bug/492091
tree = self.make_branch_and_tree('.')
# shelve apparently unhappy working with a tree with no root yet
tree.commit('make root')
self.build_tree(['file'])
sr = ScriptRunner()
sr.run_script(self, '''
$ bzr add file
adding file
$ bzr shelve --all -m Foo
2>Selected changes:
2>-D file
2>Changes shelved with id "1".
$ bzr shelve --list
1: Foo
$ bzr unshelve --keep
2>Using changes with id "1".
2>Message: Foo
2>+N file
2>All changes applied successfully.
$ bzr shelve --list
1: Foo
$ cat file
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)
tree = self.make_branch_and_tree('.')
self.build_tree_contents([('a_file', init_content)])
tree.add('a_file')
tree.commit(message='committed')
self.build_tree_contents([('a_file', next_content)])
self.run_bzr(['shelve', '--all'])
out, err = self.run_bzr(['unshelve', '--preview'], encoding='latin-1')
self.assertContainsString(out, diff_part)
class TestShelveRelpath(TestCaseWithTransport):
def test_shelve_in_subdir(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/file', 'tree/dir/'])
tree.add('file')
os.chdir('tree/dir')
self.run_bzr('shelve --all ../file')
def test_shelve_via_directory(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/file', 'tree/dir/'])
tree.add('file')
self.run_bzr('shelve -d tree/dir --all ../file')
class TestShelveUnshelve(TestCaseWithTransport):
def test_directory(self):
"""Test --directory option"""
tree = self.make_branch_and_tree('tree')
self.build_tree_contents([('tree/a', 'initial\n')])
tree.add('a')
tree.commit(message='committed')
self.build_tree_contents([('tree/a', 'initial\nmore\n')])
self.run_bzr('shelve -d tree --all')
self.assertFileEqual('initial\n', 'tree/a')
self.run_bzr('unshelve --directory tree')
self.assertFileEqual('initial\nmore\n', 'tree/a')
|