27
30
def test_shelf(self):
30
def test_shelf_multi(self):
33
def __test_loop(self, count):
34
from bzrlib.branch import Branch
35
b = Branch.initialize('.')
31
from bzrlib.bzrdir import BzrDir
32
tree = BzrDir.create_standalone_workingtree('.')
37
34
# Create a test file and commit it
38
35
file('test_file', 'w').write(self.ORIGINAL)
39
b.working_tree().add('test_file')
40
b.working_tree().commit(message='add test_file')
45
# Modify the test file
46
file('test_file', 'w').write(self.MODIFIED)
48
# Check the diff is right
49
self.assertEqual(self.capture('diff', retcode=1),
50
self.DIFF_HEADER + self.DIFF_1 + '\n')
53
self.run_bzr('shelve', retcode=True)
55
# Make sure there is no diff anymore
56
self.assertEqual(self.capture('diff', retcode=0), '')
58
# Make sure the file is actually back the way it was
59
self.assertEqual(file('test_file').read(), self.ORIGINAL)
61
# Check the shelf is right
62
shelf = b._transport.get('.bzr/x-shelf/default/00').read()
63
self.assertEqual(shelf, self.DIFF_1)
66
self.run_bzr('unshelve', retcode=True)
68
# Check the diff is right again
69
self.assertEqual(self.capture('diff', retcode=1),
70
self.DIFF_HEADER + self.DIFF_1 + '\n')
72
# Make sure the file is back the way it should be
73
self.assertEqual(file('test_file').read(), self.MODIFIED)
37
tree.commit(message='add test_file')
39
# Modify the test file
40
file('test_file', 'w').write(self.MODIFIED)
42
# Check the diff is right
43
self.assertEqual(self.capture('diff', retcode=1),
44
self.DIFF_HEADER + self.DIFF_1 + '\n')
47
self.run_bzr('shelve', '--all', retcode=1)
49
# Make sure there is no diff anymore
50
self.assertEqual(self.capture('diff'), '')
52
# Make sure the file is actually back the way it was
53
self.assertEqual(file('test_file').read(), self.ORIGINAL)
55
# Check the shelf is right
56
shelf = file('.bzr-shelf').read()
57
self.assertEqual(shelf, self.DIFF_1)
60
self.run_bzr('unshelve', retcode=1)
62
# Check the diff is right again
63
self.assertEqual(self.capture('diff', retcode=1),
64
self.DIFF_HEADER + self.DIFF_1 + '\n')
66
# Make sure the file is back the way it should be
67
self.assertEqual(file('test_file').read(), self.MODIFIED)
75
69
def test_shelf_nothing_to_shelve(self):
77
from bzrlib.branch import Branch
78
b = Branch.initialize('.')
71
from bzrlib.bzrdir import BzrDir
72
tree = BzrDir.create_standalone_workingtree('.')
80
74
# Create a test file and commit it
81
75
file('test_file', 'w').write(self.ORIGINAL)
82
b.working_tree().add('test_file')
83
b.working_tree().commit(message='add test_file')
77
tree.commit(message='add test_file')
85
79
# Shelve the changes
86
self.run_bzr('shelve', retcode=True)
80
self.run_bzr('shelve', '--all')
88
if b._transport.has('.bzr/x-shelf/default/00'):
82
if os.path.exists('.bzr-shelf'):
89
83
self.fail("Shelf exists, but it shouldn't")
91
85
def test_shelf_with_revision(self):
92
from bzrlib.branch import Branch
93
b = Branch.initialize('.')
86
from bzrlib.bzrdir import BzrDir
87
tree = BzrDir.create_standalone_workingtree('.')
95
89
# Create a test file and commit it
96
90
file('test_file', 'w').write(self.ORIGINAL)
97
b.working_tree().add('test_file')
98
b.working_tree().commit(message='add test_file')
92
tree.commit(message='add test_file')
100
94
# Modify the test file and commit it
101
95
file('test_file', 'w').write(self.MODIFIED)
102
b.working_tree().commit(message='update test_file')
96
tree.commit(message='update test_file')
104
98
# Shelve the changes
105
self.run_bzr('shelve', '-r', '1', retcode=True)
99
self.run_bzr('shelve', '-r', '1', '--all', retcode=1)
107
101
# Check the diff is right
108
102
self.assertEqual(self.capture('diff', retcode=1),
112
106
self.assertEqual(file('test_file').read(), self.ORIGINAL)
115
self.run_bzr('unshelve', retcode=True)
109
self.run_bzr('unshelve', retcode=1)
117
111
# Make sure the file is back the way it should be
118
112
self.assertEqual(file('test_file').read(), self.MODIFIED)
120
114
def test_shelf_with_two_revisions(self):
121
from bzrlib.branch import Branch
122
b = Branch.initialize('.')
115
from bzrlib.bzrdir import BzrDir
116
tree = BzrDir.create_standalone_workingtree('.')
124
118
cmd = 'shelve -r 1..2'
125
119
(stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
127
121
self.assertEqual(stderr.split('\n')[0],
128
'bzr: ERROR: bzrlib.errors.BzrCommandError: shelve only ' \
129
'accepts a single revision parameter.')
122
'bzr: ERROR: shelve only accepts a single revision parameter.')
124
def test_shelf_with_whitespace(self):
125
"""Shows that bzr doesn't handle whitespace well"""
127
file('file name', 'wb').write('hello')
129
self.run_bzr('commit', '-m', 'added')
130
file('file name', 'wb').write('goodbye')
131
self.run_bzr('shelve', '--all', 'file name', retcode=1)
133
def test_whitespace_branches(self):
134
os.mkdir('name with space')
135
os.chdir('name with space')
137
file('filename', 'wb').write('hello')
139
self.run_bzr('commit', '-m', 'added')
140
file('filename', 'wb').write('goodbye')
141
self.run_bzr('shelve', '--all', 'filename', retcode=1)
144
def test_long_filename(self):
145
"""Regression test for diffstat with long filenames.
147
Create a branch with two files, one of which has a long name. Commit.
148
Modify both files. Shelve the file with the short name. If diffstat
149
has regressed, it will generate a diffstat of the file with the long
154
file(filename, 'wb').write('hello')
155
file('foo', 'wb').write('bar')
157
self.run_bzr('commit', '-m', 'added')
158
file(filename, 'wb').write('goodbye')
159
file('foo', 'wb').write('baz')
160
self.run_bzr('shelve', '--all', 'foo', retcode=1)
added
removed
shelf_tests.py
