/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-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

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
 
 
19
17
import errno
20
18
import re
21
19
 
68
66
        :param file_list: The files to make more similar to the target.
69
67
        """
70
68
        self.work_tree = work_tree
71
 
        self.work_transform = transform.TreeTransform(work_tree)
 
69
        self.work_transform = work_tree.get_transform()
72
70
        try:
73
71
            self.target_tree = target_tree
74
72
            self.shelf_transform = transform.TransformPreview(self.target_tree)
98
96
           ('modify text', file_id)
99
97
           ('modify target', file_id, target_target, work_target)
100
98
        """
101
 
        for (file_id, paths, changed, versioned, parents, names, kind,
102
 
             executable) in self.iter_changes:
 
99
        for change in self.iter_changes:
103
100
            # don't shelve add of tree root.  Working tree should never
104
101
            # lack roots, and bzr misbehaves when they do.
105
102
            # FIXME ADHB (2009-08-09): should still shelve adds of tree roots
106
103
            # when a tree root was deleted / renamed.
107
 
            if kind[0] is None and names[1] == '':
 
104
            if change.kind[0] is None and change.name[1] == '':
108
105
                continue
109
106
            # Also don't shelve deletion of tree root.
110
 
            if kind[1] is None and names[0] == '':
 
107
            if change.kind[1] is None and change.name[0] == '':
111
108
                continue
112
 
            if kind[0] is None or versioned[0] == False:
113
 
                self.creation[file_id] = (kind[1], names[1], parents[1],
114
 
                                          versioned)
115
 
                yield ('add file', file_id, kind[1], paths[1])
116
 
            elif kind[1] is None or versioned[0] == False:
117
 
                self.deletion[file_id] = (kind[0], names[0], parents[0],
118
 
                                          versioned)
119
 
                yield ('delete file', file_id, kind[0], paths[0])
 
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])
120
117
            else:
121
 
                if names[0] != names[1] or parents[0] != parents[1]:
122
 
                    self.renames[file_id] = (names, parents)
123
 
                    yield ('rename', file_id) + paths
 
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
124
121
 
125
 
                if kind[0] != kind [1]:
126
 
                    yield ('change kind', file_id, kind[0], kind[1], paths[0])
127
 
                elif kind[0] == 'symlink':
128
 
                    t_target = self.target_tree.get_symlink_target(
129
 
                            paths[0], file_id)
130
 
                    w_target = self.work_tree.get_symlink_target(
131
 
                            paths[1], file_id)
132
 
                    yield ('modify target', file_id, paths[0], t_target,
133
 
                            w_target)
134
 
                elif changed:
135
 
                    yield ('modify text', file_id)
 
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)
136
131
 
137
132
    def shelve_change(self, change):
138
133
        """Shelve a change in the iter_shelvable format."""
152
147
    def shelve_all(self):
153
148
        """Shelve all changes.
154
149
 
155
 
        :return: True if changes were shelved, False if there were no changes.
 
150
        :return: ``True`` if changes were shelved, otherwise ``False``.
156
151
        """
157
152
        change = None
158
153
        for change in self.iter_shelvable():
181
176
            to shelving.
182
177
        """
183
178
        new_path = self.target_tree.id2path(file_id)
184
 
        new_target = self.target_tree.get_symlink_target(new_path, file_id)
 
179
        new_target = self.target_tree.get_symlink_target(new_path)
185
180
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
186
181
        self.work_transform.delete_contents(w_trans_id)
187
182
        self.work_transform.create_symlink(new_target, w_trans_id)
188
183
 
189
184
        old_path = self.work_tree.id2path(file_id)
190
 
        old_target = self.work_tree.get_symlink_target(old_path, file_id)
 
185
        old_target = self.work_tree.get_symlink_target(old_path)
191
186
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
192
187
        self.shelf_transform.delete_contents(s_trans_id)
193
188
        self.shelf_transform.create_symlink(old_target, s_trans_id)
211
206
    def _content_from_tree(tt, tree, file_id):
212
207
        trans_id = tt.trans_id_file_id(file_id)
213
208
        tt.delete_contents(trans_id)
214
 
        transform.create_from_tree(tt, trans_id, tree, tree.id2path(file_id),
215
 
                                   file_id)
 
209
        transform.create_from_tree(tt, trans_id, tree, tree.id2path(file_id))
216
210
 
217
211
    def shelve_content_change(self, file_id):
218
212
        """Shelve a kind change or binary file content change.
266
260
            to_transform.adjust_path(name, s_parent_id, s_trans_id)
267
261
            if existing_path is None:
268
262
                if kind is None:
269
 
                    to_transform.create_file('', s_trans_id)
 
263
                    to_transform.create_file([b''], s_trans_id)
270
264
                else:
271
265
                    transform.create_from_tree(
272
 
                            to_transform, s_trans_id, tree,
273
 
                            tree.id2path(file_id), file_id)
 
266
                        to_transform, s_trans_id, tree,
 
267
                        tree.id2path(file_id))
274
268
        if version:
275
269
            to_transform.version_file(file_id, s_trans_id)
276
270
 
277
271
    def _inverse_lines(self, new_lines, file_id):
278
272
        """Produce a version with only those changes removed from new_lines."""
279
273
        target_path = self.target_tree.id2path(file_id)
280
 
        target_lines = self.target_tree.get_file_lines(target_path, file_id)
 
274
        target_lines = self.target_tree.get_file_lines(target_path)
281
275
        work_path = self.work_tree.id2path(file_id)
282
 
        work_lines = self.work_tree.get_file_lines(work_path, file_id)
 
276
        work_lines = self.work_tree.get_file_lines(work_path)
283
277
        return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
284
278
 
285
279
    def finalize(self):
293
287
 
294
288
    @staticmethod
295
289
    def metadata_record(serializer, revision_id, message=None):
296
 
        metadata = {'revision_id': revision_id}
 
290
        metadata = {b'revision_id': revision_id}
297
291
        if message is not None:
298
 
            metadata['message'] = message.encode('utf-8')
 
292
            metadata[b'message'] = message.encode('utf-8')
299
293
        return serializer.bytes_record(
300
 
            bencode.bencode(metadata), (('metadata',),))
 
294
            bencode.bencode(metadata), ((b'metadata',),))
301
295
 
302
296
    def write_shelf(self, shelf_file, message=None):
303
297
        """Serialize the shelved changes to a file.
346
340
    @staticmethod
347
341
    def parse_metadata(records):
348
342
        names, metadata_bytes = next(records)
349
 
        if names[0] != ('metadata',):
 
343
        if names[0] != (b'metadata',):
350
344
            raise ShelfCorrupt
351
345
        metadata = bencode.bdecode(metadata_bytes)
352
 
        message = metadata.get('message')
 
346
        message = metadata.get(b'message')
353
347
        if message is not None:
354
 
            metadata['message'] = message.decode('utf-8')
 
348
            metadata[b'message'] = message.decode('utf-8')
355
349
        return metadata
356
350
 
357
351
    @classmethod
364
358
        """
365
359
        records = klass.iter_records(shelf_file)
366
360
        metadata = klass.parse_metadata(records)
367
 
        base_revision_id = metadata['revision_id']
 
361
        base_revision_id = metadata[b'revision_id']
368
362
        try:
369
363
            base_tree = tree.revision_tree(base_revision_id)
370
364
        except errors.NoSuchRevisionInTree:
371
365
            base_tree = tree.branch.repository.revision_tree(base_revision_id)
372
366
        tt = transform.TransformPreview(base_tree)
373
367
        tt.deserialize(records)
374
 
        return klass(tree, base_tree, tt, metadata.get('message'))
 
368
        return klass(tree, base_tree, tt, metadata.get(b'message'))
375
369
 
376
370
    def make_merger(self):
377
371
        """Return a merger that can unshelve the changes."""
378
372
        target_tree = self.transform.get_preview_tree()
379
373
        merger = merge.Merger.from_uncommitted(self.tree, target_tree,
380
 
            self.base_tree)
 
374
                                               self.base_tree)
381
375
        merger.merge_type = merge.Merge3Merger
382
376
        return merger
383
377