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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/shelf.py
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
 
18
 
17
19
import errno
18
20
import re
19
21
 
20
 
from . import errors
21
 
from .lazy_import import lazy_import
 
22
from brzlib.lazy_import import lazy_import
22
23
lazy_import(globals(), """
23
 
from breezy import (
 
24
from brzlib import (
24
25
    bencode,
 
26
    errors,
25
27
    merge,
26
28
    merge3,
 
29
    pack,
27
30
    transform,
28
31
)
29
 
from breezy.bzr import (
30
 
    pack,
31
 
    )
32
32
""")
33
33
 
34
34
 
35
 
class ShelfCorrupt(errors.BzrError):
36
 
 
37
 
    _fmt = "Shelf corrupt."
38
 
 
39
 
 
40
 
class NoSuchShelfId(errors.BzrError):
41
 
 
42
 
    _fmt = 'No changes are shelved with id "%(shelf_id)d".'
43
 
 
44
 
    def __init__(self, shelf_id):
45
 
        errors.BzrError.__init__(self, shelf_id=shelf_id)
46
 
 
47
 
 
48
 
class InvalidShelfId(errors.BzrError):
49
 
 
50
 
    _fmt = '"%(invalid_id)s" is not a valid shelf id, try a number instead.'
51
 
 
52
 
    def __init__(self, invalid_id):
53
 
        errors.BzrError.__init__(self, invalid_id=invalid_id)
54
 
 
55
 
 
56
35
class ShelfCreator(object):
57
36
    """Create a transform to shelve objects and its inverse."""
58
37
 
66
45
        :param file_list: The files to make more similar to the target.
67
46
        """
68
47
        self.work_tree = work_tree
69
 
        self.work_transform = work_tree.get_transform()
 
48
        self.work_transform = transform.TreeTransform(work_tree)
70
49
        try:
71
50
            self.target_tree = target_tree
72
51
            self.shelf_transform = transform.TransformPreview(self.target_tree)
96
75
           ('modify text', file_id)
97
76
           ('modify target', file_id, target_target, work_target)
98
77
        """
99
 
        for change in self.iter_changes:
 
78
        for (file_id, paths, changed, versioned, parents, names, kind,
 
79
             executable) in self.iter_changes:
100
80
            # don't shelve add of tree root.  Working tree should never
101
81
            # lack roots, and bzr misbehaves when they do.
102
82
            # FIXME ADHB (2009-08-09): should still shelve adds of tree roots
103
83
            # when a tree root was deleted / renamed.
104
 
            if change.kind[0] is None and change.name[1] == '':
 
84
            if kind[0] is None and names[1] == '':
105
85
                continue
106
86
            # Also don't shelve deletion of tree root.
107
 
            if change.kind[1] is None and change.name[0] == '':
 
87
            if kind[1] is None and names[0] == '':
108
88
                continue
109
 
            if change.kind[0] is None or change.versioned[0] is False:
110
 
                self.creation[change.file_id] = (
111
 
                    change.kind[1], change.name[1], change.parent_id[1], change.versioned)
112
 
                yield ('add file', change.file_id, change.kind[1], change.path[1])
113
 
            elif change.kind[1] is None or change.versioned[0] is False:
114
 
                self.deletion[change.file_id] = (
115
 
                    change.kind[0], change.name[0], change.parent_id[0], change.versioned)
116
 
                yield ('delete file', change.file_id, change.kind[0], change.path[0])
 
89
            if kind[0] is None or versioned[0] == False:
 
90
                self.creation[file_id] = (kind[1], names[1], parents[1],
 
91
                                          versioned)
 
92
                yield ('add file', file_id, kind[1], paths[1])
 
93
            elif kind[1] is None or versioned[0] == False:
 
94
                self.deletion[file_id] = (kind[0], names[0], parents[0],
 
95
                                          versioned)
 
96
                yield ('delete file', file_id, kind[0], paths[0])
117
97
            else:
118
 
                if change.name[0] != change.name[1] or change.parent_id[0] != change.parent_id[1]:
119
 
                    self.renames[change.file_id] = (change.name, change.parent_id)
120
 
                    yield ('rename', change.file_id) + change.path
 
98
                if names[0] != names[1] or parents[0] != parents[1]:
 
99
                    self.renames[file_id] = (names, parents)
 
100
                    yield ('rename', file_id) + paths
121
101
 
122
 
                if change.kind[0] != change.kind[1]:
123
 
                    yield ('change kind', change.file_id, change.kind[0], change.kind[1], change.path[0])
124
 
                elif change.kind[0] == 'symlink':
125
 
                    t_target = self.target_tree.get_symlink_target(change.path[0])
126
 
                    w_target = self.work_tree.get_symlink_target(change.path[1])
127
 
                    yield ('modify target', change.file_id, change.path[0], t_target,
128
 
                           w_target)
129
 
                elif change.changed_content:
130
 
                    yield ('modify text', change.file_id)
 
102
                if kind[0] != kind [1]:
 
103
                    yield ('change kind', file_id, kind[0], kind[1], paths[0])
 
104
                elif kind[0] == 'symlink':
 
105
                    t_target = self.target_tree.get_symlink_target(file_id)
 
106
                    w_target = self.work_tree.get_symlink_target(file_id)
 
107
                    yield ('modify target', file_id, paths[0], t_target,
 
108
                            w_target)
 
109
                elif changed:
 
110
                    yield ('modify text', file_id)
131
111
 
132
112
    def shelve_change(self, change):
133
113
        """Shelve a change in the iter_shelvable format."""
147
127
    def shelve_all(self):
148
128
        """Shelve all changes.
149
129
 
150
 
        :return: ``True`` if changes were shelved, otherwise ``False``.
 
130
        :return: True if changes were shelved, False if there were no changes.
151
131
        """
152
132
        change = None
153
133
        for change in self.iter_shelvable():
175
155
        :param new_target: The target that the symlink should have due
176
156
            to shelving.
177
157
        """
178
 
        new_path = self.target_tree.id2path(file_id)
179
 
        new_target = self.target_tree.get_symlink_target(new_path)
 
158
        new_target = self.target_tree.get_symlink_target(file_id)
180
159
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
181
160
        self.work_transform.delete_contents(w_trans_id)
182
161
        self.work_transform.create_symlink(new_target, w_trans_id)
183
162
 
184
 
        old_path = self.work_tree.id2path(file_id)
185
 
        old_target = self.work_tree.get_symlink_target(old_path)
 
163
        old_target = self.work_tree.get_symlink_target(file_id)
186
164
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
187
165
        self.shelf_transform.delete_contents(s_trans_id)
188
166
        self.shelf_transform.create_symlink(old_target, s_trans_id)
206
184
    def _content_from_tree(tt, tree, file_id):
207
185
        trans_id = tt.trans_id_file_id(file_id)
208
186
        tt.delete_contents(trans_id)
209
 
        transform.create_from_tree(tt, trans_id, tree, tree.id2path(file_id))
 
187
        transform.create_from_tree(tt, trans_id, tree, file_id)
210
188
 
211
189
    def shelve_content_change(self, file_id):
212
190
        """Shelve a kind change or binary file content change.
260
238
            to_transform.adjust_path(name, s_parent_id, s_trans_id)
261
239
            if existing_path is None:
262
240
                if kind is None:
263
 
                    to_transform.create_file([b''], s_trans_id)
 
241
                    to_transform.create_file('', s_trans_id)
264
242
                else:
265
 
                    transform.create_from_tree(
266
 
                        to_transform, s_trans_id, tree,
267
 
                        tree.id2path(file_id))
 
243
                    transform.create_from_tree(to_transform, s_trans_id,
 
244
                                               tree, file_id)
268
245
        if version:
269
246
            to_transform.version_file(file_id, s_trans_id)
270
247
 
271
248
    def _inverse_lines(self, new_lines, file_id):
272
249
        """Produce a version with only those changes removed from new_lines."""
273
 
        target_path = self.target_tree.id2path(file_id)
274
 
        target_lines = self.target_tree.get_file_lines(target_path)
275
 
        work_path = self.work_tree.id2path(file_id)
276
 
        work_lines = self.work_tree.get_file_lines(work_path)
 
250
        target_lines = self.target_tree.get_file_lines(file_id)
 
251
        work_lines = self.work_tree.get_file_lines(file_id)
277
252
        return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
278
253
 
279
254
    def finalize(self):
287
262
 
288
263
    @staticmethod
289
264
    def metadata_record(serializer, revision_id, message=None):
290
 
        metadata = {b'revision_id': revision_id}
 
265
        metadata = {'revision_id': revision_id}
291
266
        if message is not None:
292
 
            metadata[b'message'] = message.encode('utf-8')
 
267
            metadata['message'] = message.encode('utf-8')
293
268
        return serializer.bytes_record(
294
 
            bencode.bencode(metadata), ((b'metadata',),))
 
269
            bencode.bencode(metadata), (('metadata',),))
295
270
 
296
271
    def write_shelf(self, shelf_file, message=None):
297
272
        """Serialize the shelved changes to a file.
339
314
 
340
315
    @staticmethod
341
316
    def parse_metadata(records):
342
 
        names, metadata_bytes = next(records)
343
 
        if names[0] != (b'metadata',):
344
 
            raise ShelfCorrupt
 
317
        names, metadata_bytes = records.next()
 
318
        if names[0] != ('metadata',):
 
319
            raise errors.ShelfCorrupt
345
320
        metadata = bencode.bdecode(metadata_bytes)
346
 
        message = metadata.get(b'message')
 
321
        message = metadata.get('message')
347
322
        if message is not None:
348
 
            metadata[b'message'] = message.decode('utf-8')
 
323
            metadata['message'] = message.decode('utf-8')
349
324
        return metadata
350
325
 
351
326
    @classmethod
358
333
        """
359
334
        records = klass.iter_records(shelf_file)
360
335
        metadata = klass.parse_metadata(records)
361
 
        base_revision_id = metadata[b'revision_id']
 
336
        base_revision_id = metadata['revision_id']
362
337
        try:
363
338
            base_tree = tree.revision_tree(base_revision_id)
364
339
        except errors.NoSuchRevisionInTree:
365
340
            base_tree = tree.branch.repository.revision_tree(base_revision_id)
366
341
        tt = transform.TransformPreview(base_tree)
367
342
        tt.deserialize(records)
368
 
        return klass(tree, base_tree, tt, metadata.get(b'message'))
 
343
        return klass(tree, base_tree, tt, metadata.get('message'))
369
344
 
370
 
    def make_merger(self):
 
345
    def make_merger(self, task=None):
371
346
        """Return a merger that can unshelve the changes."""
372
347
        target_tree = self.transform.get_preview_tree()
373
348
        merger = merge.Merger.from_uncommitted(self.tree, target_tree,
374
 
                                               self.base_tree)
 
349
            task, self.base_tree)
375
350
        merger.merge_type = merge.Merge3Merger
376
351
        return merger
377
352
 
429
404
        filename = self.get_shelf_filename(shelf_id)
430
405
        try:
431
406
            return open(self.transport.local_abspath(filename), 'rb')
432
 
        except IOError as e:
 
407
        except IOError, e:
433
408
            if e.errno != errno.ENOENT:
434
409
                raise
435
 
            raise NoSuchShelfId(shelf_id)
 
410
            from brzlib import errors
 
411
            raise errors.NoSuchShelfId(shelf_id)
436
412
 
437
413
    def get_unshelver(self, shelf_id):
438
414
        """Return an unshelver for a given shelf_id.
464
440
 
465
441
    def active_shelves(self):
466
442
        """Return a list of shelved changes."""
467
 
        active = sorted(self.get_shelf_ids(self.transport.list_dir('.')))
 
443
        active = self.get_shelf_ids(self.transport.list_dir('.'))
 
444
        active.sort()
468
445
        return active
469
446
 
470
447
    def last_shelf(self):