/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: 2018-02-18 21:42:57 UTC
  • mto: This revision was merged to the branch mainline in revision 6859.
  • Revision ID: jelmer@jelmer.uk-20180218214257-jpevutp1wa30tz3v
Update TODO to reference Breezy, not Bazaar.

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