/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-11-16 18:15:40 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181116181540-7y2wbhqzjk067mqy
Fix repo acquisition.

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')],
54
 
                          list(creator.iter_shelvable()))
 
72
        self.assertEqual([('rename', b'foo-id', 'foo', 'bar')],
 
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
 
        self.expectFailure('shelf doesn\'t support shelving root changes yet',
 
141
        self.expectFailure(
 
142
            'shelf doesn\'t support shelving root changes yet',
123
143
            self.assertEqual, [
124
 
                ('delete file', 'first-root-id', 'directory', ''),
125
 
                ('add file', 'second-root-id', 'directory', ''),
126
 
                ('rename', 'foo-id', u'foo', u'foo'),
 
144
                ('delete file', b'first-root-id', 'directory', ''),
 
145
                ('add file', b'second-root-id', 'directory', ''),
 
146
                ('rename', b'foo-id', u'foo', u'foo'),
127
147
                ], list(creator.iter_shelvable()))
128
148
 
129
 
        self.assertEqual([('delete file', 'first-root-id', 'directory', ''),
130
 
                          ('add file', 'second-root-id', 'directory', ''),
131
 
                          ('rename', 'foo-id', u'foo', u'foo'),
132
 
                         ], list(creator.iter_shelvable()))
 
149
        self.assertEqual([('delete file', b'first-root-id', 'directory', ''),
 
150
                          ('add file', b'second-root-id', 'directory', ''),
 
151
                          ('rename', b'foo-id', u'foo', u'foo'),
 
152
                          ], list(creator.iter_shelvable()))
133
153
 
134
154
    def assertShelvedFileEqual(self, expected_content, creator, file_id):
135
155
        s_trans_id = creator.shelf_transform.trans_id_file_id(file_id)
140
160
        tree = self.make_branch_and_tree('.')
141
161
        tree.lock_write()
142
162
        self.addCleanup(tree.unlock)
143
 
        self.build_tree_contents([('foo', 'a\n')])
144
 
        tree.add('foo', 'foo-id')
 
163
        self.build_tree_contents([('foo', b'a\n')])
 
164
        tree.add('foo', b'foo-id')
145
165
        tree.commit('Committed foo')
146
 
        self.build_tree_contents([('foo', 'b\na\nc\n')])
 
166
        self.build_tree_contents([('foo', b'b\na\nc\n')])
147
167
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
148
168
        self.addCleanup(creator.finalize)
149
169
        return creator
150
170
 
151
171
    def test_shelve_content_change(self):
152
172
        creator = self.prepare_content_change()
153
 
        self.assertEqual([('modify text', 'foo-id')],
 
173
        self.assertEqual([('modify text', b'foo-id')],
154
174
                         list(creator.iter_shelvable()))
155
 
        creator.shelve_lines('foo-id', ['a\n', 'c\n'])
 
175
        creator.shelve_lines(b'foo-id', [b'a\n', b'c\n'])
156
176
        creator.transform()
157
 
        self.assertFileEqual('a\nc\n', 'foo')
158
 
        self.assertShelvedFileEqual('b\na\n', creator, 'foo-id')
 
177
        self.assertFileEqual(b'a\nc\n', 'foo')
 
178
        self.assertShelvedFileEqual(b'b\na\n', creator, b'foo-id')
159
179
 
160
180
    def test_shelve_change_handles_modify_text(self):
161
181
        creator = self.prepare_content_change()
162
 
        creator.shelve_change(('modify text', 'foo-id'))
 
182
        creator.shelve_change(('modify text', b'foo-id'))
163
183
        creator.transform()
164
 
        self.assertFileEqual('a\n', 'foo')
165
 
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
 
184
        self.assertFileEqual(b'a\n', 'foo')
 
185
        self.assertShelvedFileEqual(b'b\na\nc\n', creator, b'foo-id')
166
186
 
167
187
    def test_shelve_all(self):
168
188
        creator = self.prepare_content_change()
169
189
        creator.shelve_all()
170
190
        creator.transform()
171
 
        self.assertFileEqual('a\n', 'foo')
172
 
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
 
191
        self.assertFileEqual(b'a\n', 'foo')
 
192
        self.assertShelvedFileEqual(b'b\na\nc\n', creator, b'foo-id')
173
193
 
174
194
    def prepare_shelve_creation(self):
175
195
        tree = self.make_branch_and_tree('.')
176
196
        tree.lock_write()
177
197
        self.addCleanup(tree.unlock)
178
198
        tree.commit('Empty tree')
179
 
        self.build_tree_contents([('foo', 'a\n'), ('bar/',)])
180
 
        tree.add(['foo', 'bar'], ['foo-id', 'bar-id'])
 
199
        self.build_tree_contents([('foo', b'a\n'), ('bar/',)])
 
200
        tree.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
181
201
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
182
202
        self.addCleanup(creator.finalize)
183
 
        self.assertEqual([('add file', 'bar-id', 'directory', 'bar'),
184
 
                          ('add file', 'foo-id', 'file', 'foo')],
185
 
                          sorted(list(creator.iter_shelvable())))
 
203
        self.assertEqual([('add file', b'bar-id', 'directory', 'bar'),
 
204
                          ('add file', b'foo-id', 'file', 'foo')],
 
205
                         sorted(list(creator.iter_shelvable())))
186
206
        return creator, tree
187
207
 
188
208
    def check_shelve_creation(self, creator, tree):
189
 
        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
        self.assertRaises(
 
210
            StopIteration, next,
 
211
            tree.iter_entries_by_dir(specific_files=['foo']))
 
212
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
 
213
        self.assertEqual(b'foo-id',
193
214
                         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')
 
215
        self.assertPathDoesNotExist('foo')
 
216
        self.assertPathDoesNotExist('bar')
 
217
        self.assertShelvedFileEqual('a\n', creator, b'foo-id')
 
218
        s_bar_trans_id = creator.shelf_transform.trans_id_file_id(b'bar-id')
198
219
        self.assertEqual('directory',
199
 
            creator.shelf_transform.final_kind(s_bar_trans_id))
 
220
                         creator.shelf_transform.final_kind(s_bar_trans_id))
200
221
 
201
222
    def test_shelve_creation(self):
202
223
        creator, tree = self.prepare_shelve_creation()
203
 
        creator.shelve_creation('foo-id')
204
 
        creator.shelve_creation('bar-id')
 
224
        creator.shelve_creation(b'foo-id')
 
225
        creator.shelve_creation(b'bar-id')
205
226
        creator.transform()
206
227
        self.check_shelve_creation(creator, tree)
207
228
 
208
229
    def test_shelve_change_handles_creation(self):
209
230
        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'))
 
231
        creator.shelve_change(('add file', b'foo-id', 'file', 'foo'))
 
232
        creator.shelve_change(('add file', b'bar-id', 'directory', 'bar'))
212
233
        creator.transform()
213
234
        self.check_shelve_creation(creator, tree)
214
235
 
 
236
    def test_shelve_directory_with_ignored(self):
 
237
        tree = self.make_branch_and_tree('.')
 
238
        tree.lock_write()
 
239
        self.addCleanup(tree.unlock)
 
240
        tree.commit('Empty tree')
 
241
        self.build_tree_contents(
 
242
            [('foo', b'a\n'), ('bar/',), ('bar/ignored', b'ign\n')])
 
243
        tree.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
 
244
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
245
        self.addCleanup(creator.finalize)
 
246
        self.assertEqual([('add file', b'bar-id', 'directory', 'bar'),
 
247
                          ('add file', b'foo-id', 'file', 'foo')],
 
248
                         sorted(list(creator.iter_shelvable())))
 
249
        ignores._set_user_ignores([])
 
250
        in_patterns = ['ignored', ]
 
251
        ignores.add_unique_user_ignores(in_patterns)
 
252
 
 
253
        creator.shelve_change(('add file', b'bar-id', 'directory', 'bar'))
 
254
        try:
 
255
            creator.transform()
 
256
            self.check_shelve_creation(creator, tree)
 
257
        except MalformedTransform:
 
258
            raise KnownFailure(
 
259
                'shelving directory with ignored file: see bug #611739')
 
260
 
215
261
    def _test_shelve_symlink_creation(self, link_name, link_target,
216
262
                                      shelve_change=False):
217
 
        self.requireFeature(tests.SymlinkFeature)
 
263
        self.requireFeature(features.SymlinkFeature)
218
264
        tree = self.make_branch_and_tree('.')
219
265
        tree.lock_write()
220
266
        self.addCleanup(tree.unlock)
221
267
        tree.commit('Empty tree')
222
268
        os.symlink(link_target, link_name)
223
 
        tree.add(link_name, 'foo-id')
 
269
        tree.add(link_name, b'foo-id')
224
270
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
225
271
        self.addCleanup(creator.finalize)
226
 
        self.assertEqual([('add file', 'foo-id', 'symlink', link_name)],
 
272
        self.assertEqual([('add file', b'foo-id', 'symlink', link_name)],
227
273
                         list(creator.iter_shelvable()))
228
274
        if shelve_change:
229
 
            creator.shelve_change(('add file', 'foo-id', 'symlink', link_name))
 
275
            creator.shelve_change(
 
276
                ('add file', b'foo-id', 'symlink', link_name))
230
277
        else:
231
 
            creator.shelve_creation('foo-id')
 
278
            creator.shelve_creation(b'foo-id')
232
279
        creator.transform()
233
 
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
234
 
        self.failIfExists(link_name)
 
280
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
 
281
        self.assertPathDoesNotExist(link_name)
235
282
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
236
283
        self.assertEqual(link_target, osutils.readlink(limbo_name))
237
284
        ptree = creator.shelf_transform.get_preview_tree()
238
 
        self.assertEqual(link_target, ptree.get_symlink_target('foo-id'))
 
285
        self.assertEqual(
 
286
            link_target,
 
287
            ptree.get_symlink_target(ptree.id2path(b'foo-id'), b'foo-id'))
239
288
 
240
289
    def test_shelve_symlink_creation(self):
241
290
        self._test_shelve_symlink_creation('foo', 'bar')
242
291
 
243
292
    def test_shelve_unicode_symlink_creation(self):
244
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
293
        self.requireFeature(features.UnicodeFilenameFeature)
245
294
        self._test_shelve_symlink_creation(u'fo\N{Euro Sign}o',
246
295
                                           u'b\N{Euro Sign}ar')
247
296
 
251
300
    def _test_shelve_symlink_target_change(self, link_name,
252
301
                                           old_target, new_target,
253
302
                                           shelve_change=False):
254
 
        self.requireFeature(tests.SymlinkFeature)
 
303
        self.requireFeature(features.SymlinkFeature)
255
304
        tree = self.make_branch_and_tree('.')
256
305
        tree.lock_write()
257
306
        self.addCleanup(tree.unlock)
258
307
        os.symlink(old_target, link_name)
259
 
        tree.add(link_name, 'foo-id')
 
308
        tree.add(link_name, b'foo-id')
260
309
        tree.commit("commit symlink")
261
310
        os.unlink(link_name)
262
311
        os.symlink(new_target, link_name)
263
312
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
264
313
        self.addCleanup(creator.finalize)
265
 
        self.assertEqual([('modify target', 'foo-id', link_name,
 
314
        self.assertEqual([('modify target', b'foo-id', link_name,
266
315
                           old_target, new_target)],
267
316
                         list(creator.iter_shelvable()))
268
317
        if shelve_change:
269
 
            creator.shelve_change(('modify target', 'foo-id', link_name,
 
318
            creator.shelve_change(('modify target', b'foo-id', link_name,
270
319
                                   old_target, new_target))
271
320
        else:
272
 
            creator.shelve_modify_target('foo-id')
 
321
            creator.shelve_modify_target(b'foo-id')
273
322
        creator.transform()
274
323
        self.assertEqual(old_target, osutils.readlink(link_name))
275
 
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
324
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
276
325
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
277
326
        self.assertEqual(new_target, osutils.readlink(limbo_name))
278
327
        ptree = creator.shelf_transform.get_preview_tree()
279
 
        self.assertEqual(new_target, ptree.get_symlink_target('foo-id'))
 
328
        self.assertEqual(new_target, ptree.get_symlink_target(
 
329
            ptree.id2path(b'foo-id')))
280
330
 
281
331
    def test_shelve_symlink_target_change(self):
282
332
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')
283
333
 
284
334
    def test_shelve_unicode_symlink_target_change(self):
285
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
335
        self.requireFeature(features.UnicodeFilenameFeature)
286
336
        self._test_shelve_symlink_target_change(
287
337
            u'fo\N{Euro Sign}o', u'b\N{Euro Sign}ar', u'b\N{Euro Sign}az')
288
338
 
296
346
        self.addCleanup(tree.unlock)
297
347
        tree.commit('Empty tree')
298
348
        self.build_tree(['foo'])
299
 
        tree.add('foo', 'foo-id')
 
349
        tree.add('foo', b'foo-id')
300
350
        os.unlink('foo')
301
351
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
302
352
        self.addCleanup(creator.finalize)
303
 
        self.assertEqual([('add file', 'foo-id', None, 'foo')],
 
353
        self.assertEqual([('add file', b'foo-id', None, 'foo')],
304
354
                         sorted(list(creator.iter_shelvable())))
305
 
        creator.shelve_creation('foo-id')
 
355
        creator.shelve_creation(b'foo-id')
306
356
        creator.transform()
307
 
        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',
 
357
        self.assertRaises(
 
358
            StopIteration, next,
 
359
            tree.iter_entries_by_dir(specific_files=['foo']))
 
360
        self.assertShelvedFileEqual('', creator, b'foo-id')
 
361
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
 
362
        self.assertEqual(b'foo-id',
312
363
                         creator.shelf_transform.final_file_id(s_trans_id))
313
 
        self.failIfExists('foo')
 
364
        self.assertPathDoesNotExist('foo')
314
365
 
315
366
    def prepare_shelve_deletion(self):
316
367
        tree = self.make_branch_and_tree('tree')
317
368
        tree.lock_write()
318
369
        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'])
 
370
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', b'baz')])
 
371
        tree.add(['foo', 'foo/bar'], [b'foo-id', b'bar-id'])
321
372
        tree.commit('Added file and directory')
322
 
        tree.unversion(['foo-id', 'bar-id'])
 
373
        tree.unversion(['foo', 'foo/bar'])
323
374
        os.unlink('tree/foo/bar')
324
375
        os.rmdir('tree/foo')
325
376
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
326
377
        self.addCleanup(creator.finalize)
327
 
        self.assertEqual([('delete file', 'bar-id', 'file', 'foo/bar'),
328
 
                          ('delete file', 'foo-id', 'directory', 'foo')],
329
 
                          sorted(list(creator.iter_shelvable())))
 
378
        self.assertEqual([('delete file', b'bar-id', 'file', 'foo/bar'),
 
379
                          ('delete file', b'foo-id', 'directory', 'foo')],
 
380
                         sorted(list(creator.iter_shelvable())))
330
381
        return creator, tree
331
382
 
332
383
    def check_shelve_deletion(self, tree):
333
 
        self.assertTrue('foo-id' in tree)
334
 
        self.assertTrue('bar-id' in tree)
335
 
        self.assertFileEqual('baz', 'tree/foo/bar')
 
384
        self.assertTrue(tree.has_id(b'foo-id'))
 
385
        self.assertTrue(tree.has_id(b'bar-id'))
 
386
        self.assertFileEqual(b'baz', 'tree/foo/bar')
336
387
 
337
388
    def test_shelve_deletion(self):
338
389
        creator, tree = self.prepare_shelve_deletion()
339
 
        creator.shelve_deletion('foo-id')
340
 
        creator.shelve_deletion('bar-id')
 
390
        creator.shelve_deletion(b'foo-id')
 
391
        creator.shelve_deletion(b'bar-id')
341
392
        creator.transform()
342
393
        self.check_shelve_deletion(tree)
343
394
 
344
395
    def test_shelve_change_handles_deletion(self):
345
396
        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'))
 
397
        creator.shelve_change(('delete file', b'foo-id', 'directory', 'foo'))
 
398
        creator.shelve_change(('delete file', b'bar-id', 'file', 'foo/bar'))
348
399
        creator.transform()
349
400
        self.check_shelve_deletion(tree)
350
401
 
351
402
    def test_shelve_delete_contents(self):
352
403
        tree = self.make_branch_and_tree('tree')
353
 
        self.build_tree(['tree/foo',])
354
 
        tree.add('foo', 'foo-id')
 
404
        self.build_tree(['tree/foo', ])
 
405
        tree.add('foo', b'foo-id')
355
406
        tree.commit('Added file and directory')
356
407
        os.unlink('tree/foo')
357
408
        tree.lock_tree_write()
358
409
        self.addCleanup(tree.unlock)
359
410
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
360
411
        self.addCleanup(creator.finalize)
361
 
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
 
412
        self.assertEqual([('delete file', b'foo-id', 'file', 'foo')],
362
413
                         sorted(list(creator.iter_shelvable())))
363
 
        creator.shelve_deletion('foo-id')
 
414
        creator.shelve_deletion(b'foo-id')
364
415
        creator.transform()
365
 
        self.failUnlessExists('tree/foo')
 
416
        self.assertPathExists('tree/foo')
366
417
 
367
418
    def prepare_shelve_change_kind(self):
368
419
        tree = self.make_branch_and_tree('tree')
369
 
        self.build_tree_contents([('tree/foo', 'bar')])
370
 
        tree.add('foo', 'foo-id')
 
420
        self.build_tree_contents([('tree/foo', b'bar')])
 
421
        tree.add('foo', b'foo-id')
371
422
        tree.commit('Added file and directory')
372
423
        os.unlink('tree/foo')
373
424
        os.mkdir('tree/foo')
375
426
        self.addCleanup(tree.unlock)
376
427
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
377
428
        self.addCleanup(creator.finalize)
378
 
        self.assertEqual([('change kind', 'foo-id', 'file', 'directory',
 
429
        self.assertEqual([('change kind', b'foo-id', 'file', 'directory',
379
430
                           'foo')], sorted(list(creator.iter_shelvable())))
380
431
        return creator
381
432
 
382
433
    def check_shelve_change_kind(self, creator):
383
 
        self.assertFileEqual('bar', 'tree/foo')
384
 
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
434
        self.assertFileEqual(b'bar', 'tree/foo')
 
435
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
385
436
        self.assertEqual('directory',
386
437
                         creator.shelf_transform._new_contents[s_trans_id])
387
438
 
388
439
    def test_shelve_change_kind(self):
389
440
        creator = self.prepare_shelve_change_kind()
390
 
        creator.shelve_content_change('foo-id')
 
441
        creator.shelve_content_change(b'foo-id')
391
442
        creator.transform()
392
443
        self.check_shelve_change_kind(creator)
393
444
 
394
445
    def test_shelve_change_handles_change_kind(self):
395
446
        creator = self.prepare_shelve_change_kind()
396
 
        creator.shelve_change(('change kind', 'foo-id', 'file', 'directory',
 
447
        creator.shelve_change(('change kind', b'foo-id', 'file', 'directory',
397
448
                               'foo'))
398
449
        creator.transform()
399
450
        self.check_shelve_change_kind(creator)
409
460
 
410
461
    def test_shelve_unversion(self):
411
462
        tree = self.make_branch_and_tree('tree')
412
 
        self.build_tree(['tree/foo',])
413
 
        tree.add('foo', 'foo-id')
 
463
        self.build_tree(['tree/foo', ])
 
464
        tree.add('foo', b'foo-id')
414
465
        tree.commit('Added file and directory')
415
 
        tree.unversion(['foo-id'])
 
466
        tree.unversion(['foo'])
416
467
        tree.lock_tree_write()
417
468
        self.addCleanup(tree.unlock)
418
469
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
419
470
        self.addCleanup(creator.finalize)
420
 
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
 
471
        self.assertEqual([('delete file', b'foo-id', 'file', 'foo')],
421
472
                         sorted(list(creator.iter_shelvable())))
422
 
        creator.shelve_deletion('foo-id')
 
473
        creator.shelve_deletion(b'foo-id')
423
474
        creator.transform()
424
 
        self.failUnlessExists('tree/foo')
 
475
        self.assertPathExists('tree/foo')
425
476
 
426
477
    def test_shelve_serialization(self):
427
478
        tree = self.make_branch_and_tree('.')
440
491
    def test_write_shelf(self):
441
492
        tree = self.make_branch_and_tree('tree')
442
493
        self.build_tree(['tree/foo'])
443
 
        tree.add('foo', 'foo-id')
 
494
        tree.add('foo', b'foo-id')
444
495
        tree.lock_tree_write()
445
496
        self.addCleanup(tree.unlock)
446
497
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
447
498
        self.addCleanup(creator.finalize)
448
499
        list(creator.iter_shelvable())
449
 
        creator.shelve_creation('foo-id')
450
 
        shelf_file = open('shelf', 'wb')
451
 
        try:
 
500
        creator.shelve_creation(b'foo-id')
 
501
        with open('shelf', 'wb') as shelf_file:
452
502
            creator.write_shelf(shelf_file)
453
 
        finally:
454
 
            shelf_file.close()
455
503
        parser = pack.ContainerPushParser()
456
 
        shelf_file = open('shelf', 'rb')
457
 
        try:
 
504
        with open('shelf', 'rb') as shelf_file:
458
505
            parser.accept_bytes(shelf_file.read())
459
 
        finally:
460
 
            shelf_file.close()
461
506
        tt = transform.TransformPreview(tree)
462
507
        self.addCleanup(tt.finalize)
463
508
        records = iter(parser.read_pending_records())
464
 
        #skip revision-id
465
 
        records.next()
 
509
        # skip revision-id
 
510
        next(records)
466
511
        tt.deserialize(records)
467
512
 
468
513
    def test_shelve_unversioned(self):
469
514
        tree = self.make_branch_and_tree('tree')
470
 
        tree.lock_tree_write()
471
 
        try:
 
515
        with tree.lock_tree_write():
472
516
            self.assertRaises(errors.PathsNotVersionedError,
473
 
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
474
 
        finally:
475
 
            tree.unlock()
 
517
                              shelf.ShelfCreator, tree, tree.basis_tree(),
 
518
                              ['foo'])
476
519
        # We should be able to lock/unlock the tree if ShelfCreator cleaned
477
520
        # after itself.
478
521
        wt = workingtree.WorkingTree.open('tree')
480
523
        wt.unlock()
481
524
        # And a second tentative should raise the same error (no
482
525
        # limbo/pending_deletion leftovers).
483
 
        tree.lock_tree_write()
484
 
        try:
 
526
        with tree.lock_tree_write():
485
527
            self.assertRaises(errors.PathsNotVersionedError,
486
 
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
487
 
        finally:
488
 
            tree.unlock()
 
528
                              shelf.ShelfCreator, tree, tree.basis_tree(),
 
529
                              ['foo'])
489
530
 
490
531
    def test_shelve_skips_added_root(self):
491
532
        """Skip adds of the root when iterating through shelvable changes."""
511
552
    def test_make_merger(self):
512
553
        tree = self.make_branch_and_tree('tree')
513
554
        tree.commit('first commit')
514
 
        self.build_tree_contents([('tree/foo', 'bar')])
 
555
        self.build_tree_contents([('tree/foo', b'bar')])
515
556
        tree.lock_write()
516
557
        self.addCleanup(tree.unlock)
517
 
        tree.add('foo', 'foo-id')
 
558
        tree.add('foo', b'foo-id')
518
559
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
519
560
        self.addCleanup(creator.finalize)
520
561
        list(creator.iter_shelvable())
521
 
        creator.shelve_creation('foo-id')
522
 
        shelf_file = open('shelf-file', 'w+b')
523
 
        try:
 
562
        creator.shelve_creation(b'foo-id')
 
563
        with open('shelf-file', 'w+b') as shelf_file:
524
564
            creator.write_shelf(shelf_file)
525
565
            creator.transform()
526
566
            shelf_file.seek(0)
527
567
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
528
568
            unshelver.make_merger().do_merge()
529
569
            self.addCleanup(unshelver.finalize)
530
 
            self.assertFileEqual('bar', 'tree/foo')
531
 
        finally:
532
 
            shelf_file.close()
 
570
            self.assertFileEqual(b'bar', 'tree/foo')
533
571
 
534
572
    def test_unshelve_changed(self):
535
573
        tree = self.make_branch_and_tree('tree')
536
574
        tree.lock_write()
537
575
        self.addCleanup(tree.unlock)
538
 
        self.build_tree_contents([('tree/foo', 'a\nb\nc\n')])
539
 
        tree.add('foo', 'foo-id')
 
576
        self.build_tree_contents([('tree/foo', b'a\nb\nc\n')])
 
577
        tree.add('foo', b'foo-id')
540
578
        tree.commit('first commit')
541
 
        self.build_tree_contents([('tree/foo', 'a\nb\nd\n')])
 
579
        self.build_tree_contents([('tree/foo', b'a\nb\nd\n')])
542
580
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
543
581
        self.addCleanup(creator.finalize)
544
582
        list(creator.iter_shelvable())
545
 
        creator.shelve_lines('foo-id', ['a\n', 'b\n', 'c\n'])
 
583
        creator.shelve_lines(b'foo-id', [b'a\n', b'b\n', b'c\n'])
546
584
        shelf_file = open('shelf', 'w+b')
547
585
        self.addCleanup(shelf_file.close)
548
586
        creator.write_shelf(shelf_file)
549
587
        creator.transform()
550
 
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
 
588
        self.build_tree_contents([('tree/foo', b'z\na\nb\nc\n')])
551
589
        shelf_file.seek(0)
552
590
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
553
591
        self.addCleanup(unshelver.finalize)
554
592
        unshelver.make_merger().do_merge()
555
 
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
 
593
        self.assertFileEqual(b'z\na\nb\nd\n', 'tree/foo')
556
594
 
557
595
    def test_unshelve_deleted(self):
558
596
        tree = self.make_branch_and_tree('tree')
559
597
        tree.lock_write()
560
598
        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'])
 
599
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', b'baz')])
 
600
        tree.add(['foo', 'foo/bar'], [b'foo-id', b'bar-id'])
563
601
        tree.commit('Added file and directory')
564
 
        tree.unversion(['foo-id', 'bar-id'])
 
602
        tree.unversion(['foo', 'foo/bar'])
565
603
        os.unlink('tree/foo/bar')
566
604
        os.rmdir('tree/foo')
567
605
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
568
606
        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()
 
607
        creator.shelve_deletion(b'foo-id')
 
608
        creator.shelve_deletion(b'bar-id')
 
609
        with open('shelf', 'w+b') as shelf_file:
 
610
            creator.write_shelf(shelf_file)
 
611
            creator.transform()
 
612
            creator.finalize()
576
613
        # validate the test setup
577
 
        self.assertTrue('foo-id' in tree)
578
 
        self.assertTrue('bar-id' in tree)
579
 
        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
        self.assertTrue(tree.has_id(b'foo-id'))
 
615
        self.assertTrue(tree.has_id(b'bar-id'))
 
616
        self.assertFileEqual(b'baz', 'tree/foo/bar')
 
617
        with open('shelf', 'r+b') as shelf_file:
 
618
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
619
            self.addCleanup(unshelver.finalize)
 
620
            unshelver.make_merger().do_merge()
 
621
        self.assertFalse(tree.has_id(b'foo-id'))
 
622
        self.assertFalse(tree.has_id(b'bar-id'))
586
623
 
587
624
    def test_unshelve_base(self):
588
625
        tree = self.make_branch_and_tree('tree')
589
626
        tree.lock_write()
590
627
        self.addCleanup(tree.unlock)
591
 
        tree.commit('rev1', rev_id='rev1')
 
628
        tree.commit('rev1', rev_id=b'rev1')
592
629
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
593
630
        self.addCleanup(creator.finalize)
594
631
        manager = tree.get_shelf_manager()
597
634
            creator.write_shelf(shelf_file)
598
635
        finally:
599
636
            shelf_file.close()
600
 
        tree.commit('rev2', rev_id='rev2')
 
637
        tree.commit('rev2', rev_id=b'rev2')
601
638
        shelf_file = manager.read_shelf(1)
602
639
        self.addCleanup(shelf_file.close)
603
640
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
604
641
        self.addCleanup(unshelver.finalize)
605
 
        self.assertEqual('rev1', unshelver.base_tree.get_revision_id())
 
642
        self.assertEqual(b'rev1', unshelver.base_tree.get_revision_id())
606
643
 
607
644
    def test_unshelve_serialization(self):
608
645
        tree = self.make_branch_and_tree('.')
614
651
 
615
652
    def test_corrupt_shelf(self):
616
653
        tree = self.make_branch_and_tree('.')
617
 
        self.build_tree_contents([('shelf', EMPTY_SHELF.replace('metadata',
618
 
                                                                'foo'))])
 
654
        self.build_tree_contents([('shelf', EMPTY_SHELF.replace(b'metadata',
 
655
                                                                b'foo'))])
619
656
        shelf_file = open('shelf', 'rb')
620
657
        self.addCleanup(shelf_file.close)
621
 
        e = self.assertRaises(errors.ShelfCorrupt,
 
658
        e = self.assertRaises(shelf.ShelfCorrupt,
622
659
                              shelf.Unshelver.from_tree_and_shelf, tree,
623
660
                              shelf_file)
624
661
        self.assertEqual('Shelf corrupt.', str(e))
625
662
 
 
663
    def test_unshelve_subdir_in_now_removed_dir(self):
 
664
        tree = self.make_branch_and_tree('.')
 
665
        self.addCleanup(tree.lock_write().unlock)
 
666
        self.build_tree(['dir/', 'dir/subdir/', 'dir/subdir/foo'])
 
667
        tree.add(['dir'], [b'dir-id'])
 
668
        tree.commit('versioned dir')
 
669
        tree.add(['dir/subdir', 'dir/subdir/foo'], [b'subdir-id', b'foo-id'])
 
670
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
671
        self.addCleanup(creator.finalize)
 
672
        for change in creator.iter_shelvable():
 
673
            creator.shelve_change(change)
 
674
        shelf_manager = tree.get_shelf_manager()
 
675
        shelf_id = shelf_manager.shelve_changes(creator)
 
676
        self.assertPathDoesNotExist('dir/subdir')
 
677
        tree.remove(['dir'])
 
678
        unshelver = shelf_manager.get_unshelver(shelf_id)
 
679
        self.addCleanup(unshelver.finalize)
 
680
        unshelver.make_merger().do_merge()
 
681
        self.assertPathExists('dir/subdir/foo')
 
682
        self.assertEqual(b'dir-id', tree.path2id('dir'))
 
683
        self.assertEqual(b'subdir-id', tree.path2id('dir/subdir'))
 
684
        self.assertEqual(b'foo-id', tree.path2id('dir/subdir/foo'))
 
685
 
626
686
 
627
687
class TestShelfManager(tests.TestCaseWithTransport):
628
688
 
685
745
        manager = self.get_manager()
686
746
        shelf_id, shelf_file = manager.new_shelf()
687
747
        try:
688
 
            shelf_file.write('foo')
 
748
            shelf_file.write(b'foo')
689
749
        finally:
690
750
            shelf_file.close()
691
751
        shelf_id, shelf_file = manager.new_shelf()
692
752
        try:
693
 
            shelf_file.write('bar')
 
753
            shelf_file.write(b'bar')
694
754
        finally:
695
755
            shelf_file.close()
696
756
        shelf_file = manager.read_shelf(1)
697
757
        try:
698
 
            self.assertEqual('foo', shelf_file.read())
 
758
            self.assertEqual(b'foo', shelf_file.read())
699
759
        finally:
700
760
            shelf_file.close()
701
761
        shelf_file = manager.read_shelf(2)
702
762
        try:
703
 
            self.assertEqual('bar', shelf_file.read())
 
763
            self.assertEqual(b'bar', shelf_file.read())
704
764
        finally:
705
765
            shelf_file.close()
706
766
 
707
767
    def test_read_non_existant(self):
708
768
        manager = self.get_manager()
709
 
        e = self.assertRaises(errors.NoSuchShelfId, manager.read_shelf, 1)
 
769
        e = self.assertRaises(shelf.NoSuchShelfId, manager.read_shelf, 1)
710
770
        self.assertEqual('No changes are shelved with id "1".', str(e))
711
771
 
712
772
    def test_shelve_changes(self):
714
774
        tree.commit('no-change commit')
715
775
        tree.lock_write()
716
776
        self.addCleanup(tree.unlock)
717
 
        self.build_tree_contents([('tree/foo', 'bar')])
718
 
        self.assertFileEqual('bar', 'tree/foo')
719
 
        tree.add('foo', 'foo-id')
 
777
        self.build_tree_contents([('tree/foo', b'bar')])
 
778
        self.assertFileEqual(b'bar', 'tree/foo')
 
779
        tree.add('foo', b'foo-id')
720
780
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
721
781
        self.addCleanup(creator.finalize)
722
782
        list(creator.iter_shelvable())
723
 
        creator.shelve_creation('foo-id')
 
783
        creator.shelve_creation(b'foo-id')
724
784
        shelf_manager = tree.get_shelf_manager()
725
785
        shelf_id = shelf_manager.shelve_changes(creator)
726
 
        self.failIfExists('tree/foo')
 
786
        self.assertPathDoesNotExist('tree/foo')
727
787
        unshelver = shelf_manager.get_unshelver(shelf_id)
728
788
        self.addCleanup(unshelver.finalize)
729
789
        unshelver.make_merger().do_merge()
730
 
        self.assertFileEqual('bar', 'tree/foo')
 
790
        self.assertFileEqual(b'bar', 'tree/foo')
731
791
 
732
792
    def test_get_metadata(self):
733
793
        tree = self.make_branch_and_tree('.')
738
798
        shelf_manager = tree.get_shelf_manager()
739
799
        shelf_id = shelf_manager.shelve_changes(creator, 'foo')
740
800
        metadata = shelf_manager.get_metadata(shelf_id)
741
 
        self.assertEqual('foo', metadata['message'])
742
 
        self.assertEqual('null:', metadata['revision_id'])
 
801
        self.assertEqual('foo', metadata[b'message'])
 
802
        self.assertEqual(b'null:', metadata[b'revision_id'])