/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: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/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
22
from .lazy_import import lazy_import
22
23
lazy_import(globals(), """
23
24
from breezy import (
24
25
    bencode,
 
26
    errors,
25
27
    merge,
26
28
    merge3,
27
29
    transform,
32
34
""")
33
35
 
34
36
 
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
37
class ShelfCreator(object):
57
38
    """Create a transform to shelve objects and its inverse."""
58
39
 
66
47
        :param file_list: The files to make more similar to the target.
67
48
        """
68
49
        self.work_tree = work_tree
69
 
        self.work_transform = work_tree.transform()
 
50
        self.work_transform = transform.TreeTransform(work_tree)
70
51
        try:
71
52
            self.target_tree = target_tree
72
 
            self.shelf_transform = self.target_tree.preview_transform()
 
53
            self.shelf_transform = transform.TransformPreview(self.target_tree)
73
54
            try:
74
55
                self.renames = {}
75
56
                self.creation = {}
96
77
           ('modify text', file_id)
97
78
           ('modify target', file_id, target_target, work_target)
98
79
        """
99
 
        for change in self.iter_changes:
 
80
        for (file_id, paths, changed, versioned, parents, names, kind,
 
81
             executable) in self.iter_changes:
100
82
            # don't shelve add of tree root.  Working tree should never
101
83
            # lack roots, and bzr misbehaves when they do.
102
84
            # FIXME ADHB (2009-08-09): should still shelve adds of tree roots
103
85
            # when a tree root was deleted / renamed.
104
 
            if change.kind[0] is None and change.name[1] == '':
 
86
            if kind[0] is None and names[1] == '':
105
87
                continue
106
88
            # Also don't shelve deletion of tree root.
107
 
            if change.kind[1] is None and change.name[0] == '':
 
89
            if kind[1] is None and names[0] == '':
108
90
                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])
 
91
            if kind[0] is None or versioned[0] == False:
 
92
                self.creation[file_id] = (kind[1], names[1], parents[1],
 
93
                                          versioned)
 
94
                yield ('add file', file_id, kind[1], paths[1])
 
95
            elif kind[1] is None or versioned[0] == False:
 
96
                self.deletion[file_id] = (kind[0], names[0], parents[0],
 
97
                                          versioned)
 
98
                yield ('delete file', file_id, kind[0], paths[0])
117
99
            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
 
100
                if names[0] != names[1] or parents[0] != parents[1]:
 
101
                    self.renames[file_id] = (names, parents)
 
102
                    yield ('rename', file_id) + paths
121
103
 
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)
 
104
                if kind[0] != kind [1]:
 
105
                    yield ('change kind', file_id, kind[0], kind[1], paths[0])
 
106
                elif kind[0] == 'symlink':
 
107
                    t_target = self.target_tree.get_symlink_target(file_id)
 
108
                    w_target = self.work_tree.get_symlink_target(file_id)
 
109
                    yield ('modify target', file_id, paths[0], t_target,
 
110
                            w_target)
 
111
                elif changed:
 
112
                    yield ('modify text', file_id)
131
113
 
132
114
    def shelve_change(self, change):
133
115
        """Shelve a change in the iter_shelvable format."""
147
129
    def shelve_all(self):
148
130
        """Shelve all changes.
149
131
 
150
 
        :return: ``True`` if changes were shelved, otherwise ``False``.
 
132
        :return: True if changes were shelved, False if there were no changes.
151
133
        """
152
134
        change = None
153
135
        for change in self.iter_shelvable():
175
157
        :param new_target: The target that the symlink should have due
176
158
            to shelving.
177
159
        """
178
 
        new_path = self.target_tree.id2path(file_id)
179
 
        new_target = self.target_tree.get_symlink_target(new_path)
 
160
        new_target = self.target_tree.get_symlink_target(file_id)
180
161
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
181
162
        self.work_transform.delete_contents(w_trans_id)
182
163
        self.work_transform.create_symlink(new_target, w_trans_id)
183
164
 
184
 
        old_path = self.work_tree.id2path(file_id)
185
 
        old_target = self.work_tree.get_symlink_target(old_path)
 
165
        old_target = self.work_tree.get_symlink_target(file_id)
186
166
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
187
167
        self.shelf_transform.delete_contents(s_trans_id)
188
168
        self.shelf_transform.create_symlink(old_target, s_trans_id)
206
186
    def _content_from_tree(tt, tree, file_id):
207
187
        trans_id = tt.trans_id_file_id(file_id)
208
188
        tt.delete_contents(trans_id)
209
 
        transform.create_from_tree(tt, trans_id, tree, tree.id2path(file_id))
 
189
        transform.create_from_tree(tt, trans_id, tree, file_id)
210
190
 
211
191
    def shelve_content_change(self, file_id):
212
192
        """Shelve a kind change or binary file content change.
260
240
            to_transform.adjust_path(name, s_parent_id, s_trans_id)
261
241
            if existing_path is None:
262
242
                if kind is None:
263
 
                    to_transform.create_file([b''], s_trans_id)
 
243
                    to_transform.create_file('', s_trans_id)
264
244
                else:
265
 
                    transform.create_from_tree(
266
 
                        to_transform, s_trans_id, tree,
267
 
                        tree.id2path(file_id))
 
245
                    transform.create_from_tree(to_transform, s_trans_id,
 
246
                                               tree, file_id)
268
247
        if version:
269
 
            to_transform.version_file(s_trans_id, file_id=file_id)
 
248
            to_transform.version_file(file_id, s_trans_id)
270
249
 
271
250
    def _inverse_lines(self, new_lines, file_id):
272
251
        """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)
 
252
        target_lines = self.target_tree.get_file_lines(file_id)
 
253
        work_lines = self.work_tree.get_file_lines(file_id)
277
254
        return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
278
255
 
279
256
    def finalize(self):
287
264
 
288
265
    @staticmethod
289
266
    def metadata_record(serializer, revision_id, message=None):
290
 
        metadata = {b'revision_id': revision_id}
 
267
        metadata = {'revision_id': revision_id}
291
268
        if message is not None:
292
 
            metadata[b'message'] = message.encode('utf-8')
 
269
            metadata['message'] = message.encode('utf-8')
293
270
        return serializer.bytes_record(
294
 
            bencode.bencode(metadata), ((b'metadata',),))
 
271
            bencode.bencode(metadata), (('metadata',),))
295
272
 
296
273
    def write_shelf(self, shelf_file, message=None):
297
274
        """Serialize the shelved changes to a file.
340
317
    @staticmethod
341
318
    def parse_metadata(records):
342
319
        names, metadata_bytes = next(records)
343
 
        if names[0] != (b'metadata',):
344
 
            raise ShelfCorrupt
 
320
        if names[0] != ('metadata',):
 
321
            raise errors.ShelfCorrupt
345
322
        metadata = bencode.bdecode(metadata_bytes)
346
 
        message = metadata.get(b'message')
 
323
        message = metadata.get('message')
347
324
        if message is not None:
348
 
            metadata[b'message'] = message.decode('utf-8')
 
325
            metadata['message'] = message.decode('utf-8')
349
326
        return metadata
350
327
 
351
328
    @classmethod
358
335
        """
359
336
        records = klass.iter_records(shelf_file)
360
337
        metadata = klass.parse_metadata(records)
361
 
        base_revision_id = metadata[b'revision_id']
 
338
        base_revision_id = metadata['revision_id']
362
339
        try:
363
340
            base_tree = tree.revision_tree(base_revision_id)
364
341
        except errors.NoSuchRevisionInTree:
365
342
            base_tree = tree.branch.repository.revision_tree(base_revision_id)
366
 
        tt = base_tree.preview_transform()
 
343
        tt = transform.TransformPreview(base_tree)
367
344
        tt.deserialize(records)
368
 
        return klass(tree, base_tree, tt, metadata.get(b'message'))
 
345
        return klass(tree, base_tree, tt, metadata.get('message'))
369
346
 
370
347
    def make_merger(self):
371
348
        """Return a merger that can unshelve the changes."""
372
349
        target_tree = self.transform.get_preview_tree()
373
350
        merger = merge.Merger.from_uncommitted(self.tree, target_tree,
374
 
                                               self.base_tree)
 
351
            self.base_tree)
375
352
        merger.merge_type = merge.Merge3Merger
376
353
        return merger
377
354
 
432
409
        except IOError as e:
433
410
            if e.errno != errno.ENOENT:
434
411
                raise
435
 
            raise NoSuchShelfId(shelf_id)
 
412
            from . import errors
 
413
            raise errors.NoSuchShelfId(shelf_id)
436
414
 
437
415
    def get_unshelver(self, shelf_id):
438
416
        """Return an unshelver for a given shelf_id.