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

  • Committer: John Ferlito
  • Date: 2009-09-02 04:31:45 UTC
  • mto: (4665.7.1 serve-init)
  • mto: This revision was merged to the branch mainline in revision 4913.
  • Revision ID: johnf@inodes.org-20090902043145-gxdsfw03ilcwbyn5
Add a debian init script for bzr --serve

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008 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
 
17
18
import errno
18
19
import re
19
20
 
20
 
from . import errors
21
 
from .lazy_import import lazy_import
22
 
lazy_import(globals(), """
23
 
from breezy import (
 
21
from bzrlib import (
24
22
    bencode,
 
23
    errors,
25
24
    merge,
26
25
    merge3,
 
26
    osutils,
 
27
    pack,
27
28
    transform,
 
29
    ui,
 
30
    workingtree,
28
31
)
29
 
from breezy.bzr import (
30
 
    pack,
31
 
    )
32
 
""")
33
 
 
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
32
 
55
33
 
56
34
class ShelfCreator(object):
66
44
        :param file_list: The files to make more similar to the target.
67
45
        """
68
46
        self.work_tree = work_tree
69
 
        self.work_transform = work_tree.transform()
 
47
        self.work_transform = transform.TreeTransform(work_tree)
70
48
        try:
71
49
            self.target_tree = target_tree
72
 
            self.shelf_transform = self.target_tree.preview_transform()
 
50
            self.shelf_transform = transform.TransformPreview(self.target_tree)
73
51
            try:
74
52
                self.renames = {}
75
53
                self.creation = {}
87
65
        """Iterable of tuples describing shelvable changes.
88
66
 
89
67
        As well as generating the tuples, this updates several members.
90
 
        Tuples may be::
91
 
 
 
68
        Tuples may be:
92
69
           ('add file', file_id, work_kind, work_path)
93
70
           ('delete file', file_id, target_kind, target_path)
94
71
           ('rename', file_id, target_path, work_path)
96
73
           ('modify text', file_id)
97
74
           ('modify target', file_id, target_target, work_target)
98
75
        """
99
 
        for change in self.iter_changes:
 
76
        for (file_id, paths, changed, versioned, parents, names, kind,
 
77
             executable) in self.iter_changes:
100
78
            # don't shelve add of tree root.  Working tree should never
101
79
            # lack roots, and bzr misbehaves when they do.
102
80
            # FIXME ADHB (2009-08-09): should still shelve adds of tree roots
103
81
            # when a tree root was deleted / renamed.
104
 
            if change.kind[0] is None and change.name[1] == '':
105
 
                continue
106
 
            # Also don't shelve deletion of tree root.
107
 
            if change.kind[1] is None and change.name[0] == '':
108
 
                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])
 
82
            if kind[0] is None and names[1] == '':
 
83
                continue
 
84
            if kind[0] is None or versioned[0] == False:
 
85
                self.creation[file_id] = (kind[1], names[1], parents[1],
 
86
                                          versioned)
 
87
                yield ('add file', file_id, kind[1], paths[1])
 
88
            elif kind[1] is None or versioned[0] == False:
 
89
                self.deletion[file_id] = (kind[0], names[0], parents[0],
 
90
                                          versioned)
 
91
                yield ('delete file', file_id, kind[0], paths[0])
117
92
            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
 
93
                if names[0] != names[1] or parents[0] != parents[1]:
 
94
                    self.renames[file_id] = (names, parents)
 
95
                    yield ('rename', file_id) + paths
121
96
 
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)
 
97
                if kind[0] != kind [1]:
 
98
                    yield ('change kind', file_id, kind[0], kind[1], paths[0])
 
99
                elif kind[0] == 'symlink':
 
100
                    t_target = self.target_tree.get_symlink_target(file_id)
 
101
                    w_target = self.work_tree.get_symlink_target(file_id)
 
102
                    yield ('modify target', file_id, paths[0], t_target,
 
103
                            w_target)
 
104
                elif changed:
 
105
                    yield ('modify text', file_id)
131
106
 
132
107
    def shelve_change(self, change):
133
108
        """Shelve a change in the iter_shelvable format."""
145
120
            raise ValueError('Unknown change kind: "%s"' % change[0])
146
121
 
147
122
    def shelve_all(self):
148
 
        """Shelve all changes.
149
 
 
150
 
        :return: ``True`` if changes were shelved, otherwise ``False``.
151
 
        """
152
 
        change = None
 
123
        """Shelve all changes."""
153
124
        for change in self.iter_shelvable():
154
125
            self.shelve_change(change)
155
 
        return change is not None
156
126
 
157
127
    def shelve_rename(self, file_id):
158
128
        """Shelve a file rename.
175
145
        :param new_target: The target that the symlink should have due
176
146
            to shelving.
177
147
        """
178
 
        new_path = self.target_tree.id2path(file_id)
179
 
        new_target = self.target_tree.get_symlink_target(new_path)
 
148
        new_target = self.target_tree.get_symlink_target(file_id)
180
149
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
181
150
        self.work_transform.delete_contents(w_trans_id)
182
151
        self.work_transform.create_symlink(new_target, w_trans_id)
183
152
 
184
 
        old_path = self.work_tree.id2path(file_id)
185
 
        old_target = self.work_tree.get_symlink_target(old_path)
 
153
        old_target = self.work_tree.get_symlink_target(file_id)
186
154
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
187
155
        self.shelf_transform.delete_contents(s_trans_id)
188
156
        self.shelf_transform.create_symlink(old_target, s_trans_id)
206
174
    def _content_from_tree(tt, tree, file_id):
207
175
        trans_id = tt.trans_id_file_id(file_id)
208
176
        tt.delete_contents(trans_id)
209
 
        transform.create_from_tree(tt, trans_id, tree, tree.id2path(file_id))
 
177
        transform.create_from_tree(tt, trans_id, tree, file_id)
210
178
 
211
179
    def shelve_content_change(self, file_id):
212
180
        """Shelve a kind change or binary file content change.
260
228
            to_transform.adjust_path(name, s_parent_id, s_trans_id)
261
229
            if existing_path is None:
262
230
                if kind is None:
263
 
                    to_transform.create_file([b''], s_trans_id)
 
231
                    to_transform.create_file('', s_trans_id)
264
232
                else:
265
 
                    transform.create_from_tree(
266
 
                        to_transform, s_trans_id, tree,
267
 
                        tree.id2path(file_id))
 
233
                    transform.create_from_tree(to_transform, s_trans_id,
 
234
                                               tree, file_id)
268
235
        if version:
269
 
            to_transform.version_file(s_trans_id, file_id=file_id)
 
236
            to_transform.version_file(file_id, s_trans_id)
270
237
 
271
238
    def _inverse_lines(self, new_lines, file_id):
272
239
        """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)
 
240
        target_lines = self.target_tree.get_file_lines(file_id)
 
241
        work_lines = self.work_tree.get_file_lines(file_id)
277
242
        return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
278
243
 
279
244
    def finalize(self):
285
250
        """Shelve changes from working tree."""
286
251
        self.work_transform.apply()
287
252
 
288
 
    @staticmethod
289
 
    def metadata_record(serializer, revision_id, message=None):
290
 
        metadata = {b'revision_id': revision_id}
291
 
        if message is not None:
292
 
            metadata[b'message'] = message.encode('utf-8')
293
 
        return serializer.bytes_record(
294
 
            bencode.bencode(metadata), ((b'metadata',),))
295
 
 
296
253
    def write_shelf(self, shelf_file, message=None):
297
254
        """Serialize the shelved changes to a file.
298
255
 
301
258
        :return: the filename of the written file.
302
259
        """
303
260
        transform.resolve_conflicts(self.shelf_transform)
304
 
        revision_id = self.target_tree.get_revision_id()
305
 
        return self._write_shelf(shelf_file, self.shelf_transform, revision_id,
306
 
                                 message)
307
 
 
308
 
    @classmethod
309
 
    def _write_shelf(cls, shelf_file, transform, revision_id, message=None):
310
261
        serializer = pack.ContainerSerialiser()
311
262
        shelf_file.write(serializer.begin())
312
 
        metadata = cls.metadata_record(serializer, revision_id, message)
313
 
        shelf_file.write(metadata)
314
 
        for bytes in transform.serialize(serializer):
 
263
        metadata = {
 
264
            'revision_id': self.target_tree.get_revision_id(),
 
265
        }
 
266
        if message is not None:
 
267
            metadata['message'] = message.encode('utf-8')
 
268
        shelf_file.write(serializer.bytes_record(
 
269
            bencode.bencode(metadata), (('metadata',),)))
 
270
        for bytes in self.shelf_transform.serialize(serializer):
315
271
            shelf_file.write(bytes)
316
272
        shelf_file.write(serializer.end())
317
273
 
339
295
 
340
296
    @staticmethod
341
297
    def parse_metadata(records):
342
 
        names, metadata_bytes = next(records)
343
 
        if names[0] != (b'metadata',):
344
 
            raise ShelfCorrupt
 
298
        names, metadata_bytes = records.next()
 
299
        if names[0] != ('metadata',):
 
300
            raise errors.ShelfCorrupt
345
301
        metadata = bencode.bdecode(metadata_bytes)
346
 
        message = metadata.get(b'message')
 
302
        message = metadata.get('message')
347
303
        if message is not None:
348
 
            metadata[b'message'] = message.decode('utf-8')
 
304
            metadata['message'] = message.decode('utf-8')
349
305
        return metadata
350
306
 
351
307
    @classmethod
358
314
        """
359
315
        records = klass.iter_records(shelf_file)
360
316
        metadata = klass.parse_metadata(records)
361
 
        base_revision_id = metadata[b'revision_id']
 
317
        base_revision_id = metadata['revision_id']
362
318
        try:
363
319
            base_tree = tree.revision_tree(base_revision_id)
364
320
        except errors.NoSuchRevisionInTree:
365
321
            base_tree = tree.branch.repository.revision_tree(base_revision_id)
366
 
        tt = base_tree.preview_transform()
 
322
        tt = transform.TransformPreview(base_tree)
367
323
        tt.deserialize(records)
368
 
        return klass(tree, base_tree, tt, metadata.get(b'message'))
 
324
        return klass(tree, base_tree, tt, metadata.get('message'))
369
325
 
370
 
    def make_merger(self):
 
326
    def make_merger(self, task=None):
371
327
        """Return a merger that can unshelve the changes."""
372
328
        target_tree = self.transform.get_preview_tree()
373
329
        merger = merge.Merger.from_uncommitted(self.tree, target_tree,
374
 
                                               self.base_tree)
 
330
            task, self.base_tree)
375
331
        merger.merge_type = merge.Merge3Merger
376
332
        return merger
377
333
 
429
385
        filename = self.get_shelf_filename(shelf_id)
430
386
        try:
431
387
            return open(self.transport.local_abspath(filename), 'rb')
432
 
        except IOError as e:
 
388
        except IOError, e:
433
389
            if e.errno != errno.ENOENT:
434
390
                raise
435
 
            raise NoSuchShelfId(shelf_id)
 
391
            from bzrlib import errors
 
392
            raise errors.NoSuchShelfId(shelf_id)
436
393
 
437
394
    def get_unshelver(self, shelf_id):
438
395
        """Return an unshelver for a given shelf_id.
464
421
 
465
422
    def active_shelves(self):
466
423
        """Return a list of shelved changes."""
467
 
        active = sorted(self.get_shelf_ids(self.transport.list_dir('.')))
 
424
        active = self.get_shelf_ids(self.transport.list_dir('.'))
 
425
        active.sort()
468
426
        return active
469
427
 
470
428
    def last_shelf(self):