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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_shelf.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
import os
18
18
 
19
 
from bzrlib import (
 
19
from .. import (
20
20
    errors,
 
21
    ignores,
21
22
    osutils,
22
 
    pack,
23
23
    shelf,
24
24
    tests,
25
25
    transform,
26
26
    workingtree,
27
27
    )
28
 
 
29
 
 
30
 
EMPTY_SHELF = ("Bazaar pack format 1 (introduced in 0.18)\n"
31
 
               "B23\n"
32
 
               "metadata\n\n"
33
 
               "d11:revision_id5:null:e"
34
 
               "B159\n"
35
 
               "attribs\n\n"
36
 
               "d10:_id_numberi0e18:_new_executabilityde7:_new_idde"
37
 
               "9:_new_namede11:_new_parentde16:_non_present_idsde"
38
 
               "17:_removed_contentsle11:_removed_idle14:_tree_path_idsdeeE")
 
28
from ..bzr import (
 
29
    pack,
 
30
    )
 
31
from . import (
 
32
    features,
 
33
    KnownFailure,
 
34
    )
 
35
from ..errors import (
 
36
    MalformedTransform,
 
37
    )
 
38
 
 
39
 
 
40
EMPTY_SHELF = (b"Bazaar pack format 1 (introduced in 0.18)\n"
 
41
               b"B23\n"
 
42
               b"metadata\n\n"
 
43
               b"d11:revision_id5:null:e"
 
44
               b"B159\n"
 
45
               b"attribs\n\n"
 
46
               b"d10:_id_numberi0e18:_new_executabilityde7:_new_idde"
 
47
               b"9:_new_namede11:_new_parentde16:_non_present_idsde"
 
48
               b"17:_removed_contentsle11:_removed_idle14:_tree_path_idsdeeE")
 
49
 
 
50
 
 
51
class TestErrors(tests.TestCase):
 
52
 
 
53
    def test_invalid_shelf_id(self):
 
54
        invalid_id = "foo"
 
55
        err = shelf.InvalidShelfId(invalid_id)
 
56
        self.assertEqual('"foo" is not a valid shelf id, '
 
57
                         'try a number instead.', str(err))
39
58
 
40
59
 
41
60
class TestPrepareShelf(tests.TestCaseWithTransport):
43
62
    def prepare_shelve_rename(self):
44
63
        tree = self.make_branch_and_tree('.')
45
64
        self.build_tree(['foo'])
46
 
        tree.add(['foo'], ['foo-id'])
 
65
        tree.add(['foo'], [b'foo-id'])
47
66
        tree.commit('foo')
48
67
        tree.rename_one('foo', 'bar')
49
68
        tree.lock_tree_write()
50
69
        self.addCleanup(tree.unlock)
51
70
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
52
71
        self.addCleanup(creator.finalize)
53
 
        self.assertEqual([('rename', 'foo-id', 'foo', 'bar')],
 
72
        self.assertEqual([('rename', b'foo-id', 'foo', 'bar')],
54
73
                          list(creator.iter_shelvable()))
55
74
        return creator
56
75
 
57
76
    def check_shelve_rename(self, creator):
58
 
        work_trans_id = creator.work_transform.trans_id_file_id('foo-id')
 
77
        work_trans_id = creator.work_transform.trans_id_file_id(b'foo-id')
59
78
        self.assertEqual('foo', creator.work_transform.final_name(
60
79
                         work_trans_id))
61
 
        shelf_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
80
        shelf_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
62
81
        self.assertEqual('bar', creator.shelf_transform.final_name(
63
82
                         shelf_trans_id))
64
83
 
65
84
    def test_shelve_rename(self):
66
85
        creator = self.prepare_shelve_rename()
67
 
        creator.shelve_rename('foo-id')
 
86
        creator.shelve_rename(b'foo-id')
68
87
        self.check_shelve_rename(creator)
69
88
 
70
89
    def test_shelve_change_handles_rename(self):
71
90
        creator = self.prepare_shelve_rename()
72
 
        creator.shelve_change(('rename', 'foo-id', 'foo', 'bar'))
 
91
        creator.shelve_change(('rename', b'foo-id', 'foo', 'bar'))
73
92
        self.check_shelve_rename(creator)
74
93
 
75
94
    def prepare_shelve_move(self):
76
95
        tree = self.make_branch_and_tree('.')
77
96
        self.build_tree(['foo/', 'bar/', 'foo/baz'])
78
 
        tree.add(['foo', 'bar', 'foo/baz'], ['foo-id', 'bar-id', 'baz-id'])
 
97
        tree.add(['foo', 'bar', 'foo/baz'], [b'foo-id', b'bar-id', b'baz-id'])
79
98
        tree.commit('foo')
80
99
        tree.rename_one('foo/baz', 'bar/baz')
81
100
        tree.lock_tree_write()
82
101
        self.addCleanup(tree.unlock)
83
102
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
84
103
        self.addCleanup(creator.finalize)
85
 
        self.assertEqual([('rename', 'baz-id', 'foo/baz', 'bar/baz')],
 
104
        self.assertEqual([('rename', b'baz-id', 'foo/baz', 'bar/baz')],
86
105
                         list(creator.iter_shelvable()))
87
106
        return creator, tree
88
107
 
89
108
    def check_shelve_move(self, creator, tree):
90
 
        work_trans_id = creator.work_transform.trans_id_file_id('baz-id')
91
 
        work_foo = creator.work_transform.trans_id_file_id('foo-id')
 
109
        work_trans_id = creator.work_transform.trans_id_file_id(b'baz-id')
 
110
        work_foo = creator.work_transform.trans_id_file_id(b'foo-id')
92
111
        self.assertEqual(work_foo, creator.work_transform.final_parent(
93
112
                         work_trans_id))
94
 
        shelf_trans_id = creator.shelf_transform.trans_id_file_id('baz-id')
95
 
        shelf_bar = creator.shelf_transform.trans_id_file_id('bar-id')
 
113
        shelf_trans_id = creator.shelf_transform.trans_id_file_id(b'baz-id')
 
114
        shelf_bar = creator.shelf_transform.trans_id_file_id(b'bar-id')
96
115
        self.assertEqual(shelf_bar, creator.shelf_transform.final_parent(
97
116
                         shelf_trans_id))
98
117
        creator.transform()
99
 
        self.assertEqual('foo/baz', tree.id2path('baz-id'))
 
118
        self.assertEqual('foo/baz', tree.id2path(b'baz-id'))
100
119
 
101
120
    def test_shelve_move(self):
102
121
        creator, tree = self.prepare_shelve_move()
103
 
        creator.shelve_rename('baz-id')
 
122
        creator.shelve_rename(b'baz-id')
104
123
        self.check_shelve_move(creator, tree)
105
124
 
106
125
    def test_shelve_change_handles_move(self):
107
126
        creator, tree = self.prepare_shelve_move()
108
 
        creator.shelve_change(('rename', 'baz-id', 'foo/baz', 'bar/baz'))
 
127
        creator.shelve_change(('rename', b'baz-id', 'foo/baz', 'bar/baz'))
109
128
        self.check_shelve_move(creator, tree)
110
129
 
111
130
    def test_shelve_changed_root_id(self):
112
131
        tree = self.make_branch_and_tree('.')
113
132
        self.build_tree(['foo'])
114
 
        tree.set_root_id('first-root-id')
115
 
        tree.add(['foo'], ['foo-id'])
 
133
        tree.set_root_id(b'first-root-id')
 
134
        tree.add(['foo'], [b'foo-id'])
116
135
        tree.commit('foo')
117
 
        tree.set_root_id('second-root-id')
 
136
        tree.set_root_id(b'second-root-id')
118
137
        tree.lock_tree_write()
119
138
        self.addCleanup(tree.unlock)
120
139
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
121
140
        self.addCleanup(creator.finalize)
122
141
        self.expectFailure('shelf doesn\'t support shelving root changes yet',
123
142
            self.assertEqual, [
124
 
                ('delete file', 'first-root-id', 'directory', ''),
125
 
                ('add file', 'second-root-id', 'directory', ''),
126
 
                ('rename', 'foo-id', u'foo', u'foo'),
 
143
                ('delete file', b'first-root-id', 'directory', ''),
 
144
                ('add file', b'second-root-id', 'directory', ''),
 
145
                ('rename', b'foo-id', u'foo', u'foo'),
127
146
                ], list(creator.iter_shelvable()))
128
147
 
129
 
        self.assertEqual([('delete file', 'first-root-id', 'directory', ''),
130
 
                          ('add file', 'second-root-id', 'directory', ''),
131
 
                          ('rename', 'foo-id', u'foo', u'foo'),
 
148
        self.assertEqual([('delete file', b'first-root-id', 'directory', ''),
 
149
                          ('add file', b'second-root-id', 'directory', ''),
 
150
                          ('rename', b'foo-id', u'foo', u'foo'),
132
151
                         ], list(creator.iter_shelvable()))
133
152
 
134
153
    def assertShelvedFileEqual(self, expected_content, creator, file_id):
140
159
        tree = self.make_branch_and_tree('.')
141
160
        tree.lock_write()
142
161
        self.addCleanup(tree.unlock)
143
 
        self.build_tree_contents([('foo', 'a\n')])
144
 
        tree.add('foo', 'foo-id')
 
162
        self.build_tree_contents([('foo', b'a\n')])
 
163
        tree.add('foo', b'foo-id')
145
164
        tree.commit('Committed foo')
146
 
        self.build_tree_contents([('foo', 'b\na\nc\n')])
 
165
        self.build_tree_contents([('foo', b'b\na\nc\n')])
147
166
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
148
167
        self.addCleanup(creator.finalize)
149
168
        return creator
150
169
 
151
170
    def test_shelve_content_change(self):
152
171
        creator = self.prepare_content_change()
153
 
        self.assertEqual([('modify text', 'foo-id')],
 
172
        self.assertEqual([('modify text', b'foo-id')],
154
173
                         list(creator.iter_shelvable()))
155
 
        creator.shelve_lines('foo-id', ['a\n', 'c\n'])
 
174
        creator.shelve_lines(b'foo-id', [b'a\n', b'c\n'])
156
175
        creator.transform()
157
 
        self.assertFileEqual('a\nc\n', 'foo')
158
 
        self.assertShelvedFileEqual('b\na\n', creator, 'foo-id')
 
176
        self.assertFileEqual(b'a\nc\n', 'foo')
 
177
        self.assertShelvedFileEqual(b'b\na\n', creator, b'foo-id')
159
178
 
160
179
    def test_shelve_change_handles_modify_text(self):
161
180
        creator = self.prepare_content_change()
162
 
        creator.shelve_change(('modify text', 'foo-id'))
 
181
        creator.shelve_change(('modify text', b'foo-id'))
163
182
        creator.transform()
164
 
        self.assertFileEqual('a\n', 'foo')
165
 
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
 
183
        self.assertFileEqual(b'a\n', 'foo')
 
184
        self.assertShelvedFileEqual(b'b\na\nc\n', creator, b'foo-id')
166
185
 
167
186
    def test_shelve_all(self):
168
187
        creator = self.prepare_content_change()
169
188
        creator.shelve_all()
170
189
        creator.transform()
171
 
        self.assertFileEqual('a\n', 'foo')
172
 
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
 
190
        self.assertFileEqual(b'a\n', 'foo')
 
191
        self.assertShelvedFileEqual(b'b\na\nc\n', creator, b'foo-id')
173
192
 
174
193
    def prepare_shelve_creation(self):
175
194
        tree = self.make_branch_and_tree('.')
176
195
        tree.lock_write()
177
196
        self.addCleanup(tree.unlock)
178
197
        tree.commit('Empty tree')
179
 
        self.build_tree_contents([('foo', 'a\n'), ('bar/',)])
180
 
        tree.add(['foo', 'bar'], ['foo-id', 'bar-id'])
 
198
        self.build_tree_contents([('foo', b'a\n'), ('bar/',)])
 
199
        tree.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
181
200
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
182
201
        self.addCleanup(creator.finalize)
183
 
        self.assertEqual([('add file', 'bar-id', 'directory', 'bar'),
184
 
                          ('add file', 'foo-id', 'file', 'foo')],
 
202
        self.assertEqual([('add file', b'bar-id', 'directory', b'bar'),
 
203
                          ('add file', b'foo-id', 'file', b'foo')],
185
204
                          sorted(list(creator.iter_shelvable())))
186
205
        return creator, tree
187
206
 
188
207
    def check_shelve_creation(self, creator, tree):
189
208
        self.assertRaises(StopIteration,
190
 
                          tree.iter_entries_by_dir(['foo-id']).next)
191
 
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
192
 
        self.assertEqual('foo-id',
 
209
                          next, tree.iter_entries_by_dir(specific_files=['foo']))
 
210
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
 
211
        self.assertEqual(b'foo-id',
193
212
                         creator.shelf_transform.final_file_id(s_trans_id))
194
 
        self.failIfExists('foo')
195
 
        self.failIfExists('bar')
196
 
        self.assertShelvedFileEqual('a\n', creator, 'foo-id')
197
 
        s_bar_trans_id = creator.shelf_transform.trans_id_file_id('bar-id')
 
213
        self.assertPathDoesNotExist('foo')
 
214
        self.assertPathDoesNotExist('bar')
 
215
        self.assertShelvedFileEqual('a\n', creator, b'foo-id')
 
216
        s_bar_trans_id = creator.shelf_transform.trans_id_file_id(b'bar-id')
198
217
        self.assertEqual('directory',
199
218
            creator.shelf_transform.final_kind(s_bar_trans_id))
200
219
 
201
220
    def test_shelve_creation(self):
202
221
        creator, tree = self.prepare_shelve_creation()
203
 
        creator.shelve_creation('foo-id')
204
 
        creator.shelve_creation('bar-id')
 
222
        creator.shelve_creation(b'foo-id')
 
223
        creator.shelve_creation(b'bar-id')
205
224
        creator.transform()
206
225
        self.check_shelve_creation(creator, tree)
207
226
 
208
227
    def test_shelve_change_handles_creation(self):
209
228
        creator, tree = self.prepare_shelve_creation()
210
 
        creator.shelve_change(('add file', 'foo-id', 'file', 'foo'))
211
 
        creator.shelve_change(('add file', 'bar-id', 'directory', 'bar'))
 
229
        creator.shelve_change(('add file', b'foo-id', 'file', 'foo'))
 
230
        creator.shelve_change(('add file', b'bar-id', 'directory', 'bar'))
212
231
        creator.transform()
213
232
        self.check_shelve_creation(creator, tree)
214
233
 
 
234
    def test_shelve_directory_with_ignored(self):
 
235
        tree = self.make_branch_and_tree('.')
 
236
        tree.lock_write()
 
237
        self.addCleanup(tree.unlock)
 
238
        tree.commit('Empty tree')
 
239
        self.build_tree_contents([('foo', b'a\n'), ('bar/',), ('bar/ignored', b'ign\n')])
 
240
        tree.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
 
241
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
242
        self.addCleanup(creator.finalize)
 
243
        self.assertEqual([('add file', b'bar-id', 'directory', 'bar'),
 
244
                          ('add file', b'foo-id', 'file', 'foo')],
 
245
                          sorted(list(creator.iter_shelvable())))
 
246
        ignores._set_user_ignores([])
 
247
        in_patterns = ['ignored',]
 
248
        ignores.add_unique_user_ignores(in_patterns)
 
249
 
 
250
        creator.shelve_change(('add file', b'bar-id', 'directory', 'bar'))
 
251
        try:
 
252
            creator.transform()
 
253
            self.check_shelve_creation(creator, tree)
 
254
        except MalformedTransform:
 
255
            raise KnownFailure('shelving directory with ignored file: see bug #611739')
 
256
 
215
257
    def _test_shelve_symlink_creation(self, link_name, link_target,
216
258
                                      shelve_change=False):
217
 
        self.requireFeature(tests.SymlinkFeature)
 
259
        self.requireFeature(features.SymlinkFeature)
218
260
        tree = self.make_branch_and_tree('.')
219
261
        tree.lock_write()
220
262
        self.addCleanup(tree.unlock)
221
263
        tree.commit('Empty tree')
222
264
        os.symlink(link_target, link_name)
223
 
        tree.add(link_name, 'foo-id')
 
265
        tree.add(link_name, b'foo-id')
224
266
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
225
267
        self.addCleanup(creator.finalize)
226
 
        self.assertEqual([('add file', 'foo-id', 'symlink', link_name)],
 
268
        self.assertEqual([('add file', b'foo-id', 'symlink', link_name)],
227
269
                         list(creator.iter_shelvable()))
228
270
        if shelve_change:
229
 
            creator.shelve_change(('add file', 'foo-id', 'symlink', link_name))
 
271
            creator.shelve_change(('add file', b'foo-id', 'symlink', link_name))
230
272
        else:
231
 
            creator.shelve_creation('foo-id')
 
273
            creator.shelve_creation(b'foo-id')
232
274
        creator.transform()
233
 
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
234
 
        self.failIfExists(link_name)
 
275
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
 
276
        self.assertPathDoesNotExist(link_name)
235
277
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
236
278
        self.assertEqual(link_target, osutils.readlink(limbo_name))
237
279
        ptree = creator.shelf_transform.get_preview_tree()
238
 
        self.assertEqual(link_target, ptree.get_symlink_target('foo-id'))
 
280
        self.assertEqual(
 
281
                link_target,
 
282
                ptree.get_symlink_target(ptree.id2path(b'foo-id'), b'foo-id'))
239
283
 
240
284
    def test_shelve_symlink_creation(self):
241
285
        self._test_shelve_symlink_creation('foo', 'bar')
242
286
 
243
287
    def test_shelve_unicode_symlink_creation(self):
244
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
288
        self.requireFeature(features.UnicodeFilenameFeature)
245
289
        self._test_shelve_symlink_creation(u'fo\N{Euro Sign}o',
246
290
                                           u'b\N{Euro Sign}ar')
247
291
 
251
295
    def _test_shelve_symlink_target_change(self, link_name,
252
296
                                           old_target, new_target,
253
297
                                           shelve_change=False):
254
 
        self.requireFeature(tests.SymlinkFeature)
 
298
        self.requireFeature(features.SymlinkFeature)
255
299
        tree = self.make_branch_and_tree('.')
256
300
        tree.lock_write()
257
301
        self.addCleanup(tree.unlock)
258
302
        os.symlink(old_target, link_name)
259
 
        tree.add(link_name, 'foo-id')
 
303
        tree.add(link_name, b'foo-id')
260
304
        tree.commit("commit symlink")
261
305
        os.unlink(link_name)
262
306
        os.symlink(new_target, link_name)
263
307
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
264
308
        self.addCleanup(creator.finalize)
265
 
        self.assertEqual([('modify target', 'foo-id', link_name,
 
309
        self.assertEqual([('modify target', b'foo-id', link_name,
266
310
                           old_target, new_target)],
267
311
                         list(creator.iter_shelvable()))
268
312
        if shelve_change:
269
 
            creator.shelve_change(('modify target', 'foo-id', link_name,
 
313
            creator.shelve_change(('modify target', b'foo-id', link_name,
270
314
                                   old_target, new_target))
271
315
        else:
272
 
            creator.shelve_modify_target('foo-id')
 
316
            creator.shelve_modify_target(b'foo-id')
273
317
        creator.transform()
274
318
        self.assertEqual(old_target, osutils.readlink(link_name))
275
 
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
319
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
276
320
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
277
321
        self.assertEqual(new_target, osutils.readlink(limbo_name))
278
322
        ptree = creator.shelf_transform.get_preview_tree()
279
 
        self.assertEqual(new_target, ptree.get_symlink_target('foo-id'))
 
323
        self.assertEqual(new_target, ptree.get_symlink_target(ptree.id2path(b'foo-id')))
280
324
 
281
325
    def test_shelve_symlink_target_change(self):
282
326
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')
283
327
 
284
328
    def test_shelve_unicode_symlink_target_change(self):
285
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
329
        self.requireFeature(features.UnicodeFilenameFeature)
286
330
        self._test_shelve_symlink_target_change(
287
331
            u'fo\N{Euro Sign}o', u'b\N{Euro Sign}ar', u'b\N{Euro Sign}az')
288
332
 
296
340
        self.addCleanup(tree.unlock)
297
341
        tree.commit('Empty tree')
298
342
        self.build_tree(['foo'])
299
 
        tree.add('foo', 'foo-id')
 
343
        tree.add('foo', b'foo-id')
300
344
        os.unlink('foo')
301
345
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
302
346
        self.addCleanup(creator.finalize)
303
 
        self.assertEqual([('add file', 'foo-id', None, 'foo')],
 
347
        self.assertEqual([('add file', b'foo-id', None, 'foo')],
304
348
                         sorted(list(creator.iter_shelvable())))
305
 
        creator.shelve_creation('foo-id')
 
349
        creator.shelve_creation(b'foo-id')
306
350
        creator.transform()
307
351
        self.assertRaises(StopIteration,
308
 
                          tree.iter_entries_by_dir(['foo-id']).next)
309
 
        self.assertShelvedFileEqual('', creator, 'foo-id')
310
 
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
311
 
        self.assertEqual('foo-id',
 
352
                          next, tree.iter_entries_by_dir(specific_files=['foo']))
 
353
        self.assertShelvedFileEqual('', creator, b'foo-id')
 
354
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
 
355
        self.assertEqual(b'foo-id',
312
356
                         creator.shelf_transform.final_file_id(s_trans_id))
313
 
        self.failIfExists('foo')
 
357
        self.assertPathDoesNotExist('foo')
314
358
 
315
359
    def prepare_shelve_deletion(self):
316
360
        tree = self.make_branch_and_tree('tree')
317
361
        tree.lock_write()
318
362
        self.addCleanup(tree.unlock)
319
 
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', 'baz')])
320
 
        tree.add(['foo', 'foo/bar'], ['foo-id', 'bar-id'])
 
363
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', b'baz')])
 
364
        tree.add(['foo', 'foo/bar'], [b'foo-id', b'bar-id'])
321
365
        tree.commit('Added file and directory')
322
 
        tree.unversion(['foo-id', 'bar-id'])
 
366
        tree.unversion(['foo', 'foo/bar'])
323
367
        os.unlink('tree/foo/bar')
324
368
        os.rmdir('tree/foo')
325
369
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
326
370
        self.addCleanup(creator.finalize)
327
 
        self.assertEqual([('delete file', 'bar-id', 'file', 'foo/bar'),
328
 
                          ('delete file', 'foo-id', 'directory', 'foo')],
 
371
        self.assertEqual([('delete file', b'bar-id', 'file', 'foo/bar'),
 
372
                          ('delete file', b'foo-id', 'directory', 'foo')],
329
373
                          sorted(list(creator.iter_shelvable())))
330
374
        return creator, tree
331
375
 
332
376
    def check_shelve_deletion(self, tree):
333
 
        self.assertTrue('foo-id' in tree)
334
 
        self.assertTrue('bar-id' in tree)
 
377
        self.assertTrue(tree.has_id(b'foo-id'))
 
378
        self.assertTrue(tree.has_id(b'bar-id'))
335
379
        self.assertFileEqual('baz', 'tree/foo/bar')
336
380
 
337
381
    def test_shelve_deletion(self):
338
382
        creator, tree = self.prepare_shelve_deletion()
339
 
        creator.shelve_deletion('foo-id')
340
 
        creator.shelve_deletion('bar-id')
 
383
        creator.shelve_deletion(b'foo-id')
 
384
        creator.shelve_deletion(b'bar-id')
341
385
        creator.transform()
342
386
        self.check_shelve_deletion(tree)
343
387
 
344
388
    def test_shelve_change_handles_deletion(self):
345
389
        creator, tree = self.prepare_shelve_deletion()
346
 
        creator.shelve_change(('delete file', 'foo-id', 'directory', 'foo'))
347
 
        creator.shelve_change(('delete file', 'bar-id', 'file', 'foo/bar'))
 
390
        creator.shelve_change(('delete file', b'foo-id', 'directory', 'foo'))
 
391
        creator.shelve_change(('delete file', b'bar-id', 'file', 'foo/bar'))
348
392
        creator.transform()
349
393
        self.check_shelve_deletion(tree)
350
394
 
351
395
    def test_shelve_delete_contents(self):
352
396
        tree = self.make_branch_and_tree('tree')
353
397
        self.build_tree(['tree/foo',])
354
 
        tree.add('foo', 'foo-id')
 
398
        tree.add('foo', b'foo-id')
355
399
        tree.commit('Added file and directory')
356
400
        os.unlink('tree/foo')
357
401
        tree.lock_tree_write()
358
402
        self.addCleanup(tree.unlock)
359
403
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
360
404
        self.addCleanup(creator.finalize)
361
 
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
 
405
        self.assertEqual([('delete file', b'foo-id', 'file', 'foo')],
362
406
                         sorted(list(creator.iter_shelvable())))
363
 
        creator.shelve_deletion('foo-id')
 
407
        creator.shelve_deletion(b'foo-id')
364
408
        creator.transform()
365
 
        self.failUnlessExists('tree/foo')
 
409
        self.assertPathExists('tree/foo')
366
410
 
367
411
    def prepare_shelve_change_kind(self):
368
412
        tree = self.make_branch_and_tree('tree')
369
 
        self.build_tree_contents([('tree/foo', 'bar')])
370
 
        tree.add('foo', 'foo-id')
 
413
        self.build_tree_contents([('tree/foo', b'bar')])
 
414
        tree.add('foo', b'foo-id')
371
415
        tree.commit('Added file and directory')
372
416
        os.unlink('tree/foo')
373
417
        os.mkdir('tree/foo')
375
419
        self.addCleanup(tree.unlock)
376
420
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
377
421
        self.addCleanup(creator.finalize)
378
 
        self.assertEqual([('change kind', 'foo-id', 'file', 'directory',
 
422
        self.assertEqual([('change kind', b'foo-id', 'file', 'directory',
379
423
                           'foo')], sorted(list(creator.iter_shelvable())))
380
424
        return creator
381
425
 
382
426
    def check_shelve_change_kind(self, creator):
383
427
        self.assertFileEqual('bar', 'tree/foo')
384
 
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
428
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
385
429
        self.assertEqual('directory',
386
430
                         creator.shelf_transform._new_contents[s_trans_id])
387
431
 
388
432
    def test_shelve_change_kind(self):
389
433
        creator = self.prepare_shelve_change_kind()
390
 
        creator.shelve_content_change('foo-id')
 
434
        creator.shelve_content_change(b'foo-id')
391
435
        creator.transform()
392
436
        self.check_shelve_change_kind(creator)
393
437
 
394
438
    def test_shelve_change_handles_change_kind(self):
395
439
        creator = self.prepare_shelve_change_kind()
396
 
        creator.shelve_change(('change kind', 'foo-id', 'file', 'directory',
 
440
        creator.shelve_change(('change kind', b'foo-id', 'file', 'directory',
397
441
                               'foo'))
398
442
        creator.transform()
399
443
        self.check_shelve_change_kind(creator)
410
454
    def test_shelve_unversion(self):
411
455
        tree = self.make_branch_and_tree('tree')
412
456
        self.build_tree(['tree/foo',])
413
 
        tree.add('foo', 'foo-id')
 
457
        tree.add('foo', b'foo-id')
414
458
        tree.commit('Added file and directory')
415
 
        tree.unversion(['foo-id'])
 
459
        tree.unversion(['foo'])
416
460
        tree.lock_tree_write()
417
461
        self.addCleanup(tree.unlock)
418
462
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
419
463
        self.addCleanup(creator.finalize)
420
 
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
 
464
        self.assertEqual([('delete file', b'foo-id', 'file', 'foo')],
421
465
                         sorted(list(creator.iter_shelvable())))
422
 
        creator.shelve_deletion('foo-id')
 
466
        creator.shelve_deletion(b'foo-id')
423
467
        creator.transform()
424
 
        self.failUnlessExists('tree/foo')
 
468
        self.assertPathExists('tree/foo')
425
469
 
426
470
    def test_shelve_serialization(self):
427
471
        tree = self.make_branch_and_tree('.')
440
484
    def test_write_shelf(self):
441
485
        tree = self.make_branch_and_tree('tree')
442
486
        self.build_tree(['tree/foo'])
443
 
        tree.add('foo', 'foo-id')
 
487
        tree.add('foo', b'foo-id')
444
488
        tree.lock_tree_write()
445
489
        self.addCleanup(tree.unlock)
446
490
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
447
491
        self.addCleanup(creator.finalize)
448
492
        list(creator.iter_shelvable())
449
 
        creator.shelve_creation('foo-id')
450
 
        shelf_file = open('shelf', 'wb')
451
 
        try:
 
493
        creator.shelve_creation(b'foo-id')
 
494
        with open('shelf', 'wb') as shelf_file:
452
495
            creator.write_shelf(shelf_file)
453
 
        finally:
454
 
            shelf_file.close()
455
496
        parser = pack.ContainerPushParser()
456
 
        shelf_file = open('shelf', 'rb')
457
 
        try:
 
497
        with open('shelf', 'rb') as shelf_file:
458
498
            parser.accept_bytes(shelf_file.read())
459
 
        finally:
460
 
            shelf_file.close()
461
499
        tt = transform.TransformPreview(tree)
462
500
        self.addCleanup(tt.finalize)
463
501
        records = iter(parser.read_pending_records())
464
502
        #skip revision-id
465
 
        records.next()
 
503
        next(records)
466
504
        tt.deserialize(records)
467
505
 
468
506
    def test_shelve_unversioned(self):
511
549
    def test_make_merger(self):
512
550
        tree = self.make_branch_and_tree('tree')
513
551
        tree.commit('first commit')
514
 
        self.build_tree_contents([('tree/foo', 'bar')])
 
552
        self.build_tree_contents([('tree/foo', b'bar')])
515
553
        tree.lock_write()
516
554
        self.addCleanup(tree.unlock)
517
 
        tree.add('foo', 'foo-id')
 
555
        tree.add('foo', b'foo-id')
518
556
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
519
557
        self.addCleanup(creator.finalize)
520
558
        list(creator.iter_shelvable())
521
 
        creator.shelve_creation('foo-id')
522
 
        shelf_file = open('shelf-file', 'w+b')
523
 
        try:
 
559
        creator.shelve_creation(b'foo-id')
 
560
        with open('shelf-file', 'w+b') as shelf_file:
524
561
            creator.write_shelf(shelf_file)
525
562
            creator.transform()
526
563
            shelf_file.seek(0)
528
565
            unshelver.make_merger().do_merge()
529
566
            self.addCleanup(unshelver.finalize)
530
567
            self.assertFileEqual('bar', 'tree/foo')
531
 
        finally:
532
 
            shelf_file.close()
533
568
 
534
569
    def test_unshelve_changed(self):
535
570
        tree = self.make_branch_and_tree('tree')
536
571
        tree.lock_write()
537
572
        self.addCleanup(tree.unlock)
538
 
        self.build_tree_contents([('tree/foo', 'a\nb\nc\n')])
539
 
        tree.add('foo', 'foo-id')
 
573
        self.build_tree_contents([('tree/foo', b'a\nb\nc\n')])
 
574
        tree.add('foo', b'foo-id')
540
575
        tree.commit('first commit')
541
 
        self.build_tree_contents([('tree/foo', 'a\nb\nd\n')])
 
576
        self.build_tree_contents([('tree/foo', b'a\nb\nd\n')])
542
577
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
543
578
        self.addCleanup(creator.finalize)
544
579
        list(creator.iter_shelvable())
545
 
        creator.shelve_lines('foo-id', ['a\n', 'b\n', 'c\n'])
 
580
        creator.shelve_lines(b'foo-id', ['a\n', 'b\n', 'c\n'])
546
581
        shelf_file = open('shelf', 'w+b')
547
582
        self.addCleanup(shelf_file.close)
548
583
        creator.write_shelf(shelf_file)
549
584
        creator.transform()
550
 
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
 
585
        self.build_tree_contents([('tree/foo', b'z\na\nb\nc\n')])
551
586
        shelf_file.seek(0)
552
587
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
553
588
        self.addCleanup(unshelver.finalize)
558
593
        tree = self.make_branch_and_tree('tree')
559
594
        tree.lock_write()
560
595
        self.addCleanup(tree.unlock)
561
 
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', 'baz')])
562
 
        tree.add(['foo', 'foo/bar'], ['foo-id', 'bar-id'])
 
596
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', b'baz')])
 
597
        tree.add(['foo', 'foo/bar'], [b'foo-id', b'bar-id'])
563
598
        tree.commit('Added file and directory')
564
 
        tree.unversion(['foo-id', 'bar-id'])
 
599
        tree.unversion(['foo', 'foo/bar'])
565
600
        os.unlink('tree/foo/bar')
566
601
        os.rmdir('tree/foo')
567
602
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
568
603
        list(creator.iter_shelvable())
569
 
        creator.shelve_deletion('foo-id')
570
 
        creator.shelve_deletion('bar-id')
571
 
        shelf_file = open('shelf', 'w+b')
572
 
        self.addCleanup(shelf_file.close)
573
 
        creator.write_shelf(shelf_file)
574
 
        creator.transform()
575
 
        creator.finalize()
 
604
        creator.shelve_deletion(b'foo-id')
 
605
        creator.shelve_deletion(b'bar-id')
 
606
        with open('shelf', 'w+b') as shelf_file:
 
607
            creator.write_shelf(shelf_file)
 
608
            creator.transform()
 
609
            creator.finalize()
576
610
        # validate the test setup
577
 
        self.assertTrue('foo-id' in tree)
578
 
        self.assertTrue('bar-id' in tree)
 
611
        self.assertTrue(tree.has_id(b'foo-id'))
 
612
        self.assertTrue(tree.has_id(b'bar-id'))
579
613
        self.assertFileEqual('baz', 'tree/foo/bar')
580
 
        shelf_file.seek(0)
581
 
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
582
 
        self.addCleanup(unshelver.finalize)
583
 
        unshelver.make_merger().do_merge()
584
 
        self.assertFalse('foo-id' in tree)
585
 
        self.assertFalse('bar-id' in tree)
 
614
        with open('shelf', 'r+b') as shelf_file:
 
615
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
616
            self.addCleanup(unshelver.finalize)
 
617
            unshelver.make_merger().do_merge()
 
618
        self.assertFalse(tree.has_id(b'foo-id'))
 
619
        self.assertFalse(tree.has_id(b'bar-id'))
586
620
 
587
621
    def test_unshelve_base(self):
588
622
        tree = self.make_branch_and_tree('tree')
589
623
        tree.lock_write()
590
624
        self.addCleanup(tree.unlock)
591
 
        tree.commit('rev1', rev_id='rev1')
 
625
        tree.commit('rev1', rev_id=b'rev1')
592
626
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
593
627
        self.addCleanup(creator.finalize)
594
628
        manager = tree.get_shelf_manager()
597
631
            creator.write_shelf(shelf_file)
598
632
        finally:
599
633
            shelf_file.close()
600
 
        tree.commit('rev2', rev_id='rev2')
 
634
        tree.commit('rev2', rev_id=b'rev2')
601
635
        shelf_file = manager.read_shelf(1)
602
636
        self.addCleanup(shelf_file.close)
603
637
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
604
638
        self.addCleanup(unshelver.finalize)
605
 
        self.assertEqual('rev1', unshelver.base_tree.get_revision_id())
 
639
        self.assertEqual(b'rev1', unshelver.base_tree.get_revision_id())
606
640
 
607
641
    def test_unshelve_serialization(self):
608
642
        tree = self.make_branch_and_tree('.')
614
648
 
615
649
    def test_corrupt_shelf(self):
616
650
        tree = self.make_branch_and_tree('.')
617
 
        self.build_tree_contents([('shelf', EMPTY_SHELF.replace('metadata',
618
 
                                                                'foo'))])
 
651
        self.build_tree_contents([('shelf', EMPTY_SHELF.replace(b'metadata',
 
652
                                                                b'foo'))])
619
653
        shelf_file = open('shelf', 'rb')
620
654
        self.addCleanup(shelf_file.close)
621
 
        e = self.assertRaises(errors.ShelfCorrupt,
 
655
        e = self.assertRaises(shelf.ShelfCorrupt,
622
656
                              shelf.Unshelver.from_tree_and_shelf, tree,
623
657
                              shelf_file)
624
658
        self.assertEqual('Shelf corrupt.', str(e))
625
659
 
 
660
    def test_unshelve_subdir_in_now_removed_dir(self):
 
661
        tree = self.make_branch_and_tree('.')
 
662
        self.addCleanup(tree.lock_write().unlock)
 
663
        self.build_tree(['dir/', 'dir/subdir/', 'dir/subdir/foo'])
 
664
        tree.add(['dir'], [b'dir-id'])
 
665
        tree.commit('versioned dir')
 
666
        tree.add(['dir/subdir', 'dir/subdir/foo'], [b'subdir-id', b'foo-id'])
 
667
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
668
        self.addCleanup(creator.finalize)
 
669
        for change in creator.iter_shelvable():
 
670
            creator.shelve_change(change)
 
671
        shelf_manager = tree.get_shelf_manager()
 
672
        shelf_id = shelf_manager.shelve_changes(creator)
 
673
        self.assertPathDoesNotExist('dir/subdir')
 
674
        tree.remove(['dir'])
 
675
        unshelver = shelf_manager.get_unshelver(shelf_id)
 
676
        self.addCleanup(unshelver.finalize)
 
677
        unshelver.make_merger().do_merge()
 
678
        self.assertPathExists('dir/subdir/foo')
 
679
        self.assertEqual(b'dir-id', tree.path2id('dir'))
 
680
        self.assertEqual(b'subdir-id', tree.path2id('dir/subdir'))
 
681
        self.assertEqual(b'foo-id', tree.path2id('dir/subdir/foo'))
 
682
 
626
683
 
627
684
class TestShelfManager(tests.TestCaseWithTransport):
628
685
 
685
742
        manager = self.get_manager()
686
743
        shelf_id, shelf_file = manager.new_shelf()
687
744
        try:
688
 
            shelf_file.write('foo')
 
745
            shelf_file.write(b'foo')
689
746
        finally:
690
747
            shelf_file.close()
691
748
        shelf_id, shelf_file = manager.new_shelf()
692
749
        try:
693
 
            shelf_file.write('bar')
 
750
            shelf_file.write(b'bar')
694
751
        finally:
695
752
            shelf_file.close()
696
753
        shelf_file = manager.read_shelf(1)
697
754
        try:
698
 
            self.assertEqual('foo', shelf_file.read())
 
755
            self.assertEqual(b'foo', shelf_file.read())
699
756
        finally:
700
757
            shelf_file.close()
701
758
        shelf_file = manager.read_shelf(2)
702
759
        try:
703
 
            self.assertEqual('bar', shelf_file.read())
 
760
            self.assertEqual(b'bar', shelf_file.read())
704
761
        finally:
705
762
            shelf_file.close()
706
763
 
707
764
    def test_read_non_existant(self):
708
765
        manager = self.get_manager()
709
 
        e = self.assertRaises(errors.NoSuchShelfId, manager.read_shelf, 1)
 
766
        e = self.assertRaises(shelf.NoSuchShelfId, manager.read_shelf, 1)
710
767
        self.assertEqual('No changes are shelved with id "1".', str(e))
711
768
 
712
769
    def test_shelve_changes(self):
714
771
        tree.commit('no-change commit')
715
772
        tree.lock_write()
716
773
        self.addCleanup(tree.unlock)
717
 
        self.build_tree_contents([('tree/foo', 'bar')])
 
774
        self.build_tree_contents([('tree/foo', b'bar')])
718
775
        self.assertFileEqual('bar', 'tree/foo')
719
 
        tree.add('foo', 'foo-id')
 
776
        tree.add('foo', b'foo-id')
720
777
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
721
778
        self.addCleanup(creator.finalize)
722
779
        list(creator.iter_shelvable())
723
 
        creator.shelve_creation('foo-id')
 
780
        creator.shelve_creation(b'foo-id')
724
781
        shelf_manager = tree.get_shelf_manager()
725
782
        shelf_id = shelf_manager.shelve_changes(creator)
726
 
        self.failIfExists('tree/foo')
 
783
        self.assertPathDoesNotExist('tree/foo')
727
784
        unshelver = shelf_manager.get_unshelver(shelf_id)
728
785
        self.addCleanup(unshelver.finalize)
729
786
        unshelver.make_merger().do_merge()