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

  • Committer: Jelmer Vernooij
  • Date: 2019-02-04 01:01:24 UTC
  • mto: This revision was merged to the branch mainline in revision 7268.
  • Revision ID: jelmer@jelmer.uk-20190204010124-ni0i4qc6f5tnbvux
Fix source tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf.py
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2010 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
17
18
 
18
19
import errno
19
20
import re
20
21
 
21
 
from bzrlib import (
 
22
from . import errors
 
23
from .lazy_import import lazy_import
 
24
lazy_import(globals(), """
 
25
from breezy import (
22
26
    bencode,
23
 
    errors,
24
27
    merge,
25
28
    merge3,
26
 
    pack,
27
29
    transform,
28
30
)
 
31
from breezy.bzr import (
 
32
    pack,
 
33
    )
 
34
""")
 
35
 
 
36
 
 
37
class ShelfCorrupt(errors.BzrError):
 
38
 
 
39
    _fmt = "Shelf corrupt."
 
40
 
 
41
 
 
42
class NoSuchShelfId(errors.BzrError):
 
43
 
 
44
    _fmt = 'No changes are shelved with id "%(shelf_id)d".'
 
45
 
 
46
    def __init__(self, shelf_id):
 
47
        errors.BzrError.__init__(self, shelf_id=shelf_id)
 
48
 
 
49
 
 
50
class InvalidShelfId(errors.BzrError):
 
51
 
 
52
    _fmt = '"%(invalid_id)s" is not a valid shelf id, try a number instead.'
 
53
 
 
54
    def __init__(self, invalid_id):
 
55
        errors.BzrError.__init__(self, invalid_id=invalid_id)
29
56
 
30
57
 
31
58
class ShelfCreator(object):
62
89
        """Iterable of tuples describing shelvable changes.
63
90
 
64
91
        As well as generating the tuples, this updates several members.
65
 
        Tuples may be:
 
92
        Tuples may be::
 
93
 
66
94
           ('add file', file_id, work_kind, work_path)
67
95
           ('delete file', file_id, target_kind, target_path)
68
96
           ('rename', file_id, target_path, work_path)
78
106
            # when a tree root was deleted / renamed.
79
107
            if kind[0] is None and names[1] == '':
80
108
                continue
81
 
            if kind[0] is None or versioned[0] == False:
 
109
            # Also don't shelve deletion of tree root.
 
110
            if kind[1] is None and names[0] == '':
 
111
                continue
 
112
            if kind[0] is None or versioned[0] is False:
82
113
                self.creation[file_id] = (kind[1], names[1], parents[1],
83
114
                                          versioned)
84
115
                yield ('add file', file_id, kind[1], paths[1])
85
 
            elif kind[1] is None or versioned[0] == False:
 
116
            elif kind[1] is None or versioned[0] is False:
86
117
                self.deletion[file_id] = (kind[0], names[0], parents[0],
87
118
                                          versioned)
88
119
                yield ('delete file', file_id, kind[0], paths[0])
91
122
                    self.renames[file_id] = (names, parents)
92
123
                    yield ('rename', file_id) + paths
93
124
 
94
 
                if kind[0] != kind [1]:
 
125
                if kind[0] != kind[1]:
95
126
                    yield ('change kind', file_id, kind[0], kind[1], paths[0])
96
127
                elif kind[0] == 'symlink':
97
 
                    t_target = self.target_tree.get_symlink_target(file_id)
98
 
                    w_target = self.work_tree.get_symlink_target(file_id)
 
128
                    t_target = self.target_tree.get_symlink_target(paths[0])
 
129
                    w_target = self.work_tree.get_symlink_target(paths[1])
99
130
                    yield ('modify target', file_id, paths[0], t_target,
100
 
                            w_target)
 
131
                           w_target)
101
132
                elif changed:
102
133
                    yield ('modify text', file_id)
103
134
 
117
148
            raise ValueError('Unknown change kind: "%s"' % change[0])
118
149
 
119
150
    def shelve_all(self):
120
 
        """Shelve all changes."""
 
151
        """Shelve all changes.
 
152
 
 
153
        :return: ``True`` if changes were shelved, otherwise ``False``.
 
154
        """
 
155
        change = None
121
156
        for change in self.iter_shelvable():
122
157
            self.shelve_change(change)
 
158
        return change is not None
123
159
 
124
160
    def shelve_rename(self, file_id):
125
161
        """Shelve a file rename.
142
178
        :param new_target: The target that the symlink should have due
143
179
            to shelving.
144
180
        """
145
 
        new_target = self.target_tree.get_symlink_target(file_id)
 
181
        new_path = self.target_tree.id2path(file_id)
 
182
        new_target = self.target_tree.get_symlink_target(new_path)
146
183
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
147
184
        self.work_transform.delete_contents(w_trans_id)
148
185
        self.work_transform.create_symlink(new_target, w_trans_id)
149
186
 
150
 
        old_target = self.work_tree.get_symlink_target(file_id)
 
187
        old_path = self.work_tree.id2path(file_id)
 
188
        old_target = self.work_tree.get_symlink_target(old_path)
151
189
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
152
190
        self.shelf_transform.delete_contents(s_trans_id)
153
191
        self.shelf_transform.create_symlink(old_target, s_trans_id)
171
209
    def _content_from_tree(tt, tree, file_id):
172
210
        trans_id = tt.trans_id_file_id(file_id)
173
211
        tt.delete_contents(trans_id)
174
 
        transform.create_from_tree(tt, trans_id, tree, file_id)
 
212
        transform.create_from_tree(tt, trans_id, tree, tree.id2path(file_id),
 
213
                                   file_id)
175
214
 
176
215
    def shelve_content_change(self, file_id):
177
216
        """Shelve a kind change or binary file content change.
225
264
            to_transform.adjust_path(name, s_parent_id, s_trans_id)
226
265
            if existing_path is None:
227
266
                if kind is None:
228
 
                    to_transform.create_file('', s_trans_id)
 
267
                    to_transform.create_file([b''], s_trans_id)
229
268
                else:
230
 
                    transform.create_from_tree(to_transform, s_trans_id,
231
 
                                               tree, file_id)
 
269
                    transform.create_from_tree(
 
270
                        to_transform, s_trans_id, tree,
 
271
                        tree.id2path(file_id), file_id)
232
272
        if version:
233
273
            to_transform.version_file(file_id, s_trans_id)
234
274
 
235
275
    def _inverse_lines(self, new_lines, file_id):
236
276
        """Produce a version with only those changes removed from new_lines."""
237
 
        target_lines = self.target_tree.get_file_lines(file_id)
238
 
        work_lines = self.work_tree.get_file_lines(file_id)
 
277
        target_path = self.target_tree.id2path(file_id)
 
278
        target_lines = self.target_tree.get_file_lines(target_path)
 
279
        work_path = self.work_tree.id2path(file_id)
 
280
        work_lines = self.work_tree.get_file_lines(work_path)
239
281
        return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
240
282
 
241
283
    def finalize(self):
247
289
        """Shelve changes from working tree."""
248
290
        self.work_transform.apply()
249
291
 
 
292
    @staticmethod
 
293
    def metadata_record(serializer, revision_id, message=None):
 
294
        metadata = {b'revision_id': revision_id}
 
295
        if message is not None:
 
296
            metadata[b'message'] = message.encode('utf-8')
 
297
        return serializer.bytes_record(
 
298
            bencode.bencode(metadata), ((b'metadata',),))
 
299
 
250
300
    def write_shelf(self, shelf_file, message=None):
251
301
        """Serialize the shelved changes to a file.
252
302
 
255
305
        :return: the filename of the written file.
256
306
        """
257
307
        transform.resolve_conflicts(self.shelf_transform)
 
308
        revision_id = self.target_tree.get_revision_id()
 
309
        return self._write_shelf(shelf_file, self.shelf_transform, revision_id,
 
310
                                 message)
 
311
 
 
312
    @classmethod
 
313
    def _write_shelf(cls, shelf_file, transform, revision_id, message=None):
258
314
        serializer = pack.ContainerSerialiser()
259
315
        shelf_file.write(serializer.begin())
260
 
        metadata = {
261
 
            'revision_id': self.target_tree.get_revision_id(),
262
 
        }
263
 
        if message is not None:
264
 
            metadata['message'] = message.encode('utf-8')
265
 
        shelf_file.write(serializer.bytes_record(
266
 
            bencode.bencode(metadata), (('metadata',),)))
267
 
        for bytes in self.shelf_transform.serialize(serializer):
 
316
        metadata = cls.metadata_record(serializer, revision_id, message)
 
317
        shelf_file.write(metadata)
 
318
        for bytes in transform.serialize(serializer):
268
319
            shelf_file.write(bytes)
269
320
        shelf_file.write(serializer.end())
270
321
 
292
343
 
293
344
    @staticmethod
294
345
    def parse_metadata(records):
295
 
        names, metadata_bytes = records.next()
296
 
        if names[0] != ('metadata',):
297
 
            raise errors.ShelfCorrupt
 
346
        names, metadata_bytes = next(records)
 
347
        if names[0] != (b'metadata',):
 
348
            raise ShelfCorrupt
298
349
        metadata = bencode.bdecode(metadata_bytes)
299
 
        message = metadata.get('message')
 
350
        message = metadata.get(b'message')
300
351
        if message is not None:
301
 
            metadata['message'] = message.decode('utf-8')
 
352
            metadata[b'message'] = message.decode('utf-8')
302
353
        return metadata
303
354
 
304
355
    @classmethod
311
362
        """
312
363
        records = klass.iter_records(shelf_file)
313
364
        metadata = klass.parse_metadata(records)
314
 
        base_revision_id = metadata['revision_id']
 
365
        base_revision_id = metadata[b'revision_id']
315
366
        try:
316
367
            base_tree = tree.revision_tree(base_revision_id)
317
368
        except errors.NoSuchRevisionInTree:
318
369
            base_tree = tree.branch.repository.revision_tree(base_revision_id)
319
370
        tt = transform.TransformPreview(base_tree)
320
371
        tt.deserialize(records)
321
 
        return klass(tree, base_tree, tt, metadata.get('message'))
 
372
        return klass(tree, base_tree, tt, metadata.get(b'message'))
322
373
 
323
 
    def make_merger(self, task=None):
 
374
    def make_merger(self):
324
375
        """Return a merger that can unshelve the changes."""
325
376
        target_tree = self.transform.get_preview_tree()
326
377
        merger = merge.Merger.from_uncommitted(self.tree, target_tree,
327
 
            task, self.base_tree)
 
378
                                               self.base_tree)
328
379
        merger.merge_type = merge.Merge3Merger
329
380
        return merger
330
381
 
382
433
        filename = self.get_shelf_filename(shelf_id)
383
434
        try:
384
435
            return open(self.transport.local_abspath(filename), 'rb')
385
 
        except IOError, e:
 
436
        except IOError as e:
386
437
            if e.errno != errno.ENOENT:
387
438
                raise
388
 
            from bzrlib import errors
389
 
            raise errors.NoSuchShelfId(shelf_id)
 
439
            raise NoSuchShelfId(shelf_id)
390
440
 
391
441
    def get_unshelver(self, shelf_id):
392
442
        """Return an unshelver for a given shelf_id.
418
468
 
419
469
    def active_shelves(self):
420
470
        """Return a list of shelved changes."""
421
 
        active = self.get_shelf_ids(self.transport.list_dir('.'))
422
 
        active.sort()
 
471
        active = sorted(self.get_shelf_ids(self.transport.list_dir('.')))
423
472
        return active
424
473
 
425
474
    def last_shelf(self):