/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: 2020-04-05 19:11:34 UTC
  • mto: (7490.7.16 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200405191134-0aebh8ikiwygxma5
Populate the .gitignore file.

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):
41
68
        :param file_list: The files to make more similar to the target.
42
69
        """
43
70
        self.work_tree = work_tree
44
 
        self.work_transform = transform.TreeTransform(work_tree)
 
71
        self.work_transform = work_tree.get_transform()
45
72
        try:
46
73
            self.target_tree = target_tree
47
74
            self.shelf_transform = transform.TransformPreview(self.target_tree)
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)
70
98
           ('modify text', file_id)
71
99
           ('modify target', file_id, target_target, work_target)
72
100
        """
73
 
        for (file_id, paths, changed, versioned, parents, names, kind,
74
 
             executable) in self.iter_changes:
 
101
        for change in self.iter_changes:
75
102
            # don't shelve add of tree root.  Working tree should never
76
103
            # lack roots, and bzr misbehaves when they do.
77
104
            # FIXME ADHB (2009-08-09): should still shelve adds of tree roots
78
105
            # when a tree root was deleted / renamed.
79
 
            if kind[0] is None and names[1] == '':
80
 
                continue
81
 
            if kind[0] is None or versioned[0] == False:
82
 
                self.creation[file_id] = (kind[1], names[1], parents[1],
83
 
                                          versioned)
84
 
                yield ('add file', file_id, kind[1], paths[1])
85
 
            elif kind[1] is None or versioned[0] == False:
86
 
                self.deletion[file_id] = (kind[0], names[0], parents[0],
87
 
                                          versioned)
88
 
                yield ('delete file', file_id, kind[0], paths[0])
 
106
            if change.kind[0] is None and change.name[1] == '':
 
107
                continue
 
108
            # Also don't shelve deletion of tree root.
 
109
            if change.kind[1] is None and change.name[0] == '':
 
110
                continue
 
111
            if change.kind[0] is None or change.versioned[0] is False:
 
112
                self.creation[change.file_id] = (
 
113
                    change.kind[1], change.name[1], change.parent_id[1], change.versioned)
 
114
                yield ('add file', change.file_id, change.kind[1], change.path[1])
 
115
            elif change.kind[1] is None or change.versioned[0] is False:
 
116
                self.deletion[change.file_id] = (
 
117
                    change.kind[0], change.name[0], change.parent_id[0], change.versioned)
 
118
                yield ('delete file', change.file_id, change.kind[0], change.path[0])
89
119
            else:
90
 
                if names[0] != names[1] or parents[0] != parents[1]:
91
 
                    self.renames[file_id] = (names, parents)
92
 
                    yield ('rename', file_id) + paths
 
120
                if change.name[0] != change.name[1] or change.parent_id[0] != change.parent_id[1]:
 
121
                    self.renames[change.file_id] = (change.name, change.parent_id)
 
122
                    yield ('rename', change.file_id) + change.path
93
123
 
94
 
                if kind[0] != kind [1]:
95
 
                    yield ('change kind', file_id, kind[0], kind[1], paths[0])
96
 
                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)
99
 
                    yield ('modify target', file_id, paths[0], t_target,
100
 
                            w_target)
101
 
                elif changed:
102
 
                    yield ('modify text', file_id)
 
124
                if change.kind[0] != change.kind[1]:
 
125
                    yield ('change kind', change.file_id, change.kind[0], change.kind[1], change.path[0])
 
126
                elif change.kind[0] == 'symlink':
 
127
                    t_target = self.target_tree.get_symlink_target(change.path[0])
 
128
                    w_target = self.work_tree.get_symlink_target(change.path[1])
 
129
                    yield ('modify target', change.file_id, change.path[0], t_target,
 
130
                           w_target)
 
131
                elif change.changed_content:
 
132
                    yield ('modify text', change.file_id)
103
133
 
104
134
    def shelve_change(self, change):
105
135
        """Shelve a change in the iter_shelvable format."""
117
147
            raise ValueError('Unknown change kind: "%s"' % change[0])
118
148
 
119
149
    def shelve_all(self):
120
 
        """Shelve all changes."""
 
150
        """Shelve all changes.
 
151
 
 
152
        :return: ``True`` if changes were shelved, otherwise ``False``.
 
153
        """
 
154
        change = None
121
155
        for change in self.iter_shelvable():
122
156
            self.shelve_change(change)
 
157
        return change is not None
123
158
 
124
159
    def shelve_rename(self, file_id):
125
160
        """Shelve a file rename.
142
177
        :param new_target: The target that the symlink should have due
143
178
            to shelving.
144
179
        """
145
 
        new_target = self.target_tree.get_symlink_target(file_id)
 
180
        new_path = self.target_tree.id2path(file_id)
 
181
        new_target = self.target_tree.get_symlink_target(new_path)
146
182
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
147
183
        self.work_transform.delete_contents(w_trans_id)
148
184
        self.work_transform.create_symlink(new_target, w_trans_id)
149
185
 
150
 
        old_target = self.work_tree.get_symlink_target(file_id)
 
186
        old_path = self.work_tree.id2path(file_id)
 
187
        old_target = self.work_tree.get_symlink_target(old_path)
151
188
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
152
189
        self.shelf_transform.delete_contents(s_trans_id)
153
190
        self.shelf_transform.create_symlink(old_target, s_trans_id)
171
208
    def _content_from_tree(tt, tree, file_id):
172
209
        trans_id = tt.trans_id_file_id(file_id)
173
210
        tt.delete_contents(trans_id)
174
 
        transform.create_from_tree(tt, trans_id, tree, file_id)
 
211
        transform.create_from_tree(tt, trans_id, tree, tree.id2path(file_id))
175
212
 
176
213
    def shelve_content_change(self, file_id):
177
214
        """Shelve a kind change or binary file content change.
225
262
            to_transform.adjust_path(name, s_parent_id, s_trans_id)
226
263
            if existing_path is None:
227
264
                if kind is None:
228
 
                    to_transform.create_file('', s_trans_id)
 
265
                    to_transform.create_file([b''], s_trans_id)
229
266
                else:
230
 
                    transform.create_from_tree(to_transform, s_trans_id,
231
 
                                               tree, file_id)
 
267
                    transform.create_from_tree(
 
268
                        to_transform, s_trans_id, tree,
 
269
                        tree.id2path(file_id))
232
270
        if version:
233
271
            to_transform.version_file(file_id, s_trans_id)
234
272
 
235
273
    def _inverse_lines(self, new_lines, file_id):
236
274
        """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)
 
275
        target_path = self.target_tree.id2path(file_id)
 
276
        target_lines = self.target_tree.get_file_lines(target_path)
 
277
        work_path = self.work_tree.id2path(file_id)
 
278
        work_lines = self.work_tree.get_file_lines(work_path)
239
279
        return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
240
280
 
241
281
    def finalize(self):
247
287
        """Shelve changes from working tree."""
248
288
        self.work_transform.apply()
249
289
 
 
290
    @staticmethod
 
291
    def metadata_record(serializer, revision_id, message=None):
 
292
        metadata = {b'revision_id': revision_id}
 
293
        if message is not None:
 
294
            metadata[b'message'] = message.encode('utf-8')
 
295
        return serializer.bytes_record(
 
296
            bencode.bencode(metadata), ((b'metadata',),))
 
297
 
250
298
    def write_shelf(self, shelf_file, message=None):
251
299
        """Serialize the shelved changes to a file.
252
300
 
255
303
        :return: the filename of the written file.
256
304
        """
257
305
        transform.resolve_conflicts(self.shelf_transform)
 
306
        revision_id = self.target_tree.get_revision_id()
 
307
        return self._write_shelf(shelf_file, self.shelf_transform, revision_id,
 
308
                                 message)
 
309
 
 
310
    @classmethod
 
311
    def _write_shelf(cls, shelf_file, transform, revision_id, message=None):
258
312
        serializer = pack.ContainerSerialiser()
259
313
        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):
 
314
        metadata = cls.metadata_record(serializer, revision_id, message)
 
315
        shelf_file.write(metadata)
 
316
        for bytes in transform.serialize(serializer):
268
317
            shelf_file.write(bytes)
269
318
        shelf_file.write(serializer.end())
270
319
 
292
341
 
293
342
    @staticmethod
294
343
    def parse_metadata(records):
295
 
        names, metadata_bytes = records.next()
296
 
        if names[0] != ('metadata',):
297
 
            raise errors.ShelfCorrupt
 
344
        names, metadata_bytes = next(records)
 
345
        if names[0] != (b'metadata',):
 
346
            raise ShelfCorrupt
298
347
        metadata = bencode.bdecode(metadata_bytes)
299
 
        message = metadata.get('message')
 
348
        message = metadata.get(b'message')
300
349
        if message is not None:
301
 
            metadata['message'] = message.decode('utf-8')
 
350
            metadata[b'message'] = message.decode('utf-8')
302
351
        return metadata
303
352
 
304
353
    @classmethod
311
360
        """
312
361
        records = klass.iter_records(shelf_file)
313
362
        metadata = klass.parse_metadata(records)
314
 
        base_revision_id = metadata['revision_id']
 
363
        base_revision_id = metadata[b'revision_id']
315
364
        try:
316
365
            base_tree = tree.revision_tree(base_revision_id)
317
366
        except errors.NoSuchRevisionInTree:
318
367
            base_tree = tree.branch.repository.revision_tree(base_revision_id)
319
368
        tt = transform.TransformPreview(base_tree)
320
369
        tt.deserialize(records)
321
 
        return klass(tree, base_tree, tt, metadata.get('message'))
 
370
        return klass(tree, base_tree, tt, metadata.get(b'message'))
322
371
 
323
 
    def make_merger(self, task=None):
 
372
    def make_merger(self):
324
373
        """Return a merger that can unshelve the changes."""
325
374
        target_tree = self.transform.get_preview_tree()
326
375
        merger = merge.Merger.from_uncommitted(self.tree, target_tree,
327
 
            task, self.base_tree)
 
376
                                               self.base_tree)
328
377
        merger.merge_type = merge.Merge3Merger
329
378
        return merger
330
379
 
382
431
        filename = self.get_shelf_filename(shelf_id)
383
432
        try:
384
433
            return open(self.transport.local_abspath(filename), 'rb')
385
 
        except IOError, e:
 
434
        except IOError as e:
386
435
            if e.errno != errno.ENOENT:
387
436
                raise
388
 
            from bzrlib import errors
389
 
            raise errors.NoSuchShelfId(shelf_id)
 
437
            raise NoSuchShelfId(shelf_id)
390
438
 
391
439
    def get_unshelver(self, shelf_id):
392
440
        """Return an unshelver for a given shelf_id.
418
466
 
419
467
    def active_shelves(self):
420
468
        """Return a list of shelved changes."""
421
 
        active = self.get_shelf_ids(self.transport.list_dir('.'))
422
 
        active.sort()
 
469
        active = sorted(self.get_shelf_ids(self.transport.list_dir('.')))
423
470
        return active
424
471
 
425
472
    def last_shelf(self):