~bzr-pqm/bzr/bzr.dev

0.14.26 by Aaron Bentley
Update copyright
1
# Copyright (C) 2008 Canonical Ltd
0.12.12 by Aaron Bentley
Implement shelf creator
2
#
0.12.80 by Aaron Bentley
Re-format GPL notifications
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.12.12 by Aaron Bentley
Implement shelf creator
16
17
0.12.50 by Aaron Bentley
Improve error handling for non-existant shelf-ids
18
import errno
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
19
import re
0.12.13 by Aaron Bentley
Implement shelving content
20
0.14.19 by Aaron Bentley
Convert bzrlib import to split-line
21
from bzrlib import (
2694.5.4 by Jelmer Vernooij
Move bzrlib.util.bencode to bzrlib._bencode_py.
22
    bencode,
0.15.15 by Aaron Bentley
Merge prepare-shelf into unshelve
23
    errors,
24
    merge,
0.14.19 by Aaron Bentley
Convert bzrlib import to split-line
25
    merge3,
26
    pack,
27
    transform,
28
)
0.12.19 by Aaron Bentley
Add support for writing shelves
29
0.12.12 by Aaron Bentley
Implement shelf creator
30
31
class ShelfCreator(object):
0.14.27 by Aaron Bentley
Update docs
32
    """Create a transform to shelve objects and its inverse."""
0.12.12 by Aaron Bentley
Implement shelf creator
33
0.14.21 by Aaron Bentley
Update to accept a list of files.
34
    def __init__(self, work_tree, target_tree, file_list=None):
0.14.27 by Aaron Bentley
Update docs
35
        """Constructor.
36
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
37
        :param work_tree: The working tree to apply changes to. This is not
38
            required to be locked - a tree_write lock will be taken out.
0.14.27 by Aaron Bentley
Update docs
39
        :param target_tree: The tree to make the working tree more similar to.
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
40
            This is not required to be locked - a read_lock will be taken out.
0.14.27 by Aaron Bentley
Update docs
41
        :param file_list: The files to make more similar to the target.
42
        """
0.12.12 by Aaron Bentley
Implement shelf creator
43
        self.work_tree = work_tree
44
        self.work_transform = transform.TreeTransform(work_tree)
3873.2.1 by Benoît Pierre
Clean-up when an error occurs during the creation of a ShelfCreator: fix
45
        try:
4123.1.3 by Aaron Bentley
Properly handle exceptions during __init__
46
            self.target_tree = target_tree
47
            self.shelf_transform = transform.TransformPreview(self.target_tree)
48
            try:
49
                self.renames = {}
50
                self.creation = {}
51
                self.deletion = {}
52
                self.iter_changes = work_tree.iter_changes(
53
                    self.target_tree, specific_files=file_list)
54
            except:
55
                self.shelf_transform.finalize()
56
                raise
57
        except:
58
            self.work_transform.finalize()
59
            raise
0.12.12 by Aaron Bentley
Implement shelf creator
60
0.14.32 by Aaron Bentley
Replace ShelfCreator.__iter__ with ShelfCreator.iter_shelvable
61
    def iter_shelvable(self):
0.14.27 by Aaron Bentley
Update docs
62
        """Iterable of tuples describing shelvable changes.
63
64
        As well as generating the tuples, this updates several members.
65
        Tuples may be:
66
           ('add file', file_id, work_kind, work_path)
67
           ('delete file', file_id, target_kind, target_path)
68
           ('rename', file_id, target_path, work_path)
69
           ('change kind', file_id, target_kind, work_kind, target_path)
70
           ('modify text', file_id)
4119.5.1 by James Westby
Shelve can now shelve changes to a symlink's target.
71
           ('modify target', file_id, target_target, work_target)
0.14.27 by Aaron Bentley
Update docs
72
        """
0.12.12 by Aaron Bentley
Implement shelf creator
73
        for (file_id, paths, changed, versioned, parents, names, kind,
74
             executable) in self.iter_changes:
4595.9.1 by Aaron Bentley
Fix shelve in uncommitted trees.
75
            # don't shelve add of tree root.  Working tree should never
76
            # lack roots, and bzr misbehaves when they do.
77
            # FIXME ADHB (2009-08-09): should still shelve adds of tree roots
78
            # when a tree root was deleted / renamed.
79
            if kind[0] is None and names[1] == '':
80
                continue
0.12.14 by Aaron Bentley
Add shelving of created files
81
            if kind[0] is None or versioned[0] == False:
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
82
                self.creation[file_id] = (kind[1], names[1], parents[1],
83
                                          versioned)
0.14.13 by Aaron Bentley
Provide path and kind when deletes/adds are detected.
84
                yield ('add file', file_id, kind[1], paths[1])
0.14.4 by Aaron Bentley
Implement shelving deletion
85
            elif kind[1] is None or versioned[0] == False:
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
86
                self.deletion[file_id] = (kind[0], names[0], parents[0],
87
                                          versioned)
0.14.13 by Aaron Bentley
Provide path and kind when deletes/adds are detected.
88
                yield ('delete file', file_id, kind[0], paths[0])
0.12.14 by Aaron Bentley
Add shelving of created files
89
            else:
90
                if names[0] != names[1] or parents[0] != parents[1]:
91
                    self.renames[file_id] = (names, parents)
92
                    yield ('rename', file_id) + paths
0.14.23 by Aaron Bentley
Allow shelving kind change
93
94
                if kind[0] != kind [1]:
95
                    yield ('change kind', file_id, kind[0], kind[1], paths[0])
4119.5.1 by James Westby
Shelve can now shelve changes to a symlink's target.
96
                elif kind[0] == 'symlink':
97
                    t_target = self.target_tree.get_symlink_target(file_id)
98
                    w_target = self.work_tree.get_symlink_target(file_id)
99
                    yield ('modify target', file_id, paths[0], t_target,
100
                            w_target)
0.14.23 by Aaron Bentley
Allow shelving kind change
101
                elif changed:
0.12.14 by Aaron Bentley
Add shelving of created files
102
                    yield ('modify text', file_id)
0.12.12 by Aaron Bentley
Implement shelf creator
103
4526.6.1 by Aaron Bentley
Reverse the way changes are described by Shelver.
104
    def shelve_change(self, change):
4526.7.2 by Aaron Bentley
Update docs.
105
        """Shelve a change in the iter_shelvable format."""
4526.6.1 by Aaron Bentley
Reverse the way changes are described by Shelver.
106
        if change[0] == 'rename':
107
            self.shelve_rename(change[1])
108
        elif change[0] == 'delete file':
109
            self.shelve_deletion(change[1])
110
        elif change[0] == 'add file':
111
            self.shelve_creation(change[1])
4595.8.1 by Aaron Bentley
shelve_change handles text modification.
112
        elif change[0] in ('change kind', 'modify text'):
4526.6.1 by Aaron Bentley
Reverse the way changes are described by Shelver.
113
            self.shelve_content_change(change[1])
114
        elif change[0] == 'modify target':
115
            self.shelve_modify_target(change[1])
4526.7.3 by Aaron Bentley
Test shelve_change.
116
        else:
117
            raise ValueError('Unknown change kind: "%s"' % change[0])
4526.6.1 by Aaron Bentley
Reverse the way changes are described by Shelver.
118
4595.8.2 by Aaron Bentley
Implement shelve_all
119
    def shelve_all(self):
120
        """Shelve all changes."""
121
        for change in self.iter_shelvable():
122
            self.shelve_change(change)
123
0.12.12 by Aaron Bentley
Implement shelf creator
124
    def shelve_rename(self, file_id):
0.14.27 by Aaron Bentley
Update docs
125
        """Shelve a file rename.
126
127
        :param file_id: The file id of the file to shelve the renaming of.
128
        """
0.12.12 by Aaron Bentley
Implement shelf creator
129
        names, parents = self.renames[file_id]
130
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
131
        work_parent = self.work_transform.trans_id_file_id(parents[0])
132
        self.work_transform.adjust_path(names[0], work_parent, w_trans_id)
133
134
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
135
        shelf_parent = self.shelf_transform.trans_id_file_id(parents[1])
136
        self.shelf_transform.adjust_path(names[1], shelf_parent, s_trans_id)
137
4119.5.1 by James Westby
Shelve can now shelve changes to a symlink's target.
138
    def shelve_modify_target(self, file_id):
139
        """Shelve a change of symlink target.
140
141
        :param file_id: The file id of the symlink which changed target.
142
        :param new_target: The target that the symlink should have due
143
            to shelving.
144
        """
145
        new_target = self.target_tree.get_symlink_target(file_id)
146
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
147
        self.work_transform.delete_contents(w_trans_id)
148
        self.work_transform.create_symlink(new_target, w_trans_id)
149
150
        old_target = self.work_tree.get_symlink_target(file_id)
151
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
152
        self.shelf_transform.delete_contents(s_trans_id)
153
        self.shelf_transform.create_symlink(old_target, s_trans_id)
154
0.14.14 by Aaron Bentley
Change shelf_text to shelve_lines
155
    def shelve_lines(self, file_id, new_lines):
0.14.27 by Aaron Bentley
Update docs
156
        """Shelve text changes to a file, using provided lines.
157
158
        :param file_id: The file id of the file to shelve the text of.
159
        :param new_lines: The lines that the file should have due to shelving.
160
        """
0.12.13 by Aaron Bentley
Implement shelving content
161
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
162
        self.work_transform.delete_contents(w_trans_id)
163
        self.work_transform.create_file(new_lines, w_trans_id)
164
165
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
166
        self.shelf_transform.delete_contents(s_trans_id)
167
        inverse_lines = self._inverse_lines(new_lines, file_id)
168
        self.shelf_transform.create_file(inverse_lines, s_trans_id)
169
0.14.23 by Aaron Bentley
Allow shelving kind change
170
    @staticmethod
171
    def _content_from_tree(tt, tree, file_id):
172
        trans_id = tt.trans_id_file_id(file_id)
173
        tt.delete_contents(trans_id)
174
        transform.create_from_tree(tt, trans_id, tree, file_id)
175
176
    def shelve_content_change(self, file_id):
0.14.27 by Aaron Bentley
Update docs
177
        """Shelve a kind change or binary file content change.
178
179
        :param file_id: The file id of the file to shelve the content change
180
            of.
181
        """
0.14.23 by Aaron Bentley
Allow shelving kind change
182
        self._content_from_tree(self.work_transform, self.target_tree, file_id)
183
        self._content_from_tree(self.shelf_transform, self.work_tree, file_id)
184
0.14.2 by Aaron Bentley
Somewhat clean up shelving
185
    def shelve_creation(self, file_id):
0.14.27 by Aaron Bentley
Update docs
186
        """Shelve creation of a file.
187
188
        This handles content and inventory id.
189
        :param file_id: The file_id of the file to shelve creation of.
190
        """
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
191
        kind, name, parent, versioned = self.creation[file_id]
192
        version = not versioned[0]
0.14.4 by Aaron Bentley
Implement shelving deletion
193
        self._shelve_creation(self.work_tree, file_id, self.work_transform,
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
194
                              self.shelf_transform, kind, name, parent,
195
                              version)
0.14.4 by Aaron Bentley
Implement shelving deletion
196
197
    def shelve_deletion(self, file_id):
0.14.27 by Aaron Bentley
Update docs
198
        """Shelve deletion of a file.
199
200
        This handles content and inventory id.
201
        :param file_id: The file_id of the file to shelve deletion of.
202
        """
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
203
        kind, name, parent, versioned = self.deletion[file_id]
204
        existing_path = self.target_tree.id2path(file_id)
205
        if not self.work_tree.has_filename(existing_path):
206
            existing_path = None
207
        version = not versioned[1]
0.14.4 by Aaron Bentley
Implement shelving deletion
208
        self._shelve_creation(self.target_tree, file_id, self.shelf_transform,
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
209
                              self.work_transform, kind, name, parent,
210
                              version, existing_path=existing_path)
0.14.4 by Aaron Bentley
Implement shelving deletion
211
212
    def _shelve_creation(self, tree, file_id, from_transform, to_transform,
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
213
                         kind, name, parent, version, existing_path=None):
0.14.4 by Aaron Bentley
Implement shelving deletion
214
        w_trans_id = from_transform.trans_id_file_id(file_id)
0.14.12 by Aaron Bentley
Handle new dangling ids
215
        if parent is not None and kind is not None:
0.14.4 by Aaron Bentley
Implement shelving deletion
216
            from_transform.delete_contents(w_trans_id)
217
        from_transform.unversion_file(w_trans_id)
218
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
219
        if existing_path is not None:
220
            s_trans_id = to_transform.trans_id_tree_path(existing_path)
221
        else:
222
            s_trans_id = to_transform.trans_id_file_id(file_id)
0.14.4 by Aaron Bentley
Implement shelving deletion
223
        if parent is not None:
224
            s_parent_id = to_transform.trans_id_file_id(parent)
0.14.9 by Aaron Bentley
Shelve deleted files properly
225
            to_transform.adjust_path(name, s_parent_id, s_trans_id)
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
226
            if existing_path is None:
0.14.18 by Aaron Bentley
Simplify creating files
227
                if kind is None:
0.14.12 by Aaron Bentley
Handle new dangling ids
228
                    to_transform.create_file('', s_trans_id)
0.14.18 by Aaron Bentley
Simplify creating files
229
                else:
230
                    transform.create_from_tree(to_transform, s_trans_id,
231
                                               tree, file_id)
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
232
        if version:
233
            to_transform.version_file(file_id, s_trans_id)
0.12.14 by Aaron Bentley
Add shelving of created files
234
235
    def _inverse_lines(self, new_lines, file_id):
236
        """Produce a version with only those changes removed from new_lines."""
0.14.1 by Aaron Bentley
Use explicit target in ShelfCreator
237
        target_lines = self.target_tree.get_file_lines(file_id)
0.14.37 by Aaron Bentley
Switch from read_tree_lines to tree.get_file_lines.
238
        work_lines = self.work_tree.get_file_lines(file_id)
0.14.1 by Aaron Bentley
Use explicit target in ShelfCreator
239
        return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
0.12.13 by Aaron Bentley
Implement shelving content
240
0.12.12 by Aaron Bentley
Implement shelf creator
241
    def finalize(self):
0.14.27 by Aaron Bentley
Update docs
242
        """Release all resources used by this ShelfCreator."""
0.12.12 by Aaron Bentley
Implement shelf creator
243
        self.work_transform.finalize()
244
        self.shelf_transform.finalize()
0.12.13 by Aaron Bentley
Implement shelving content
245
246
    def transform(self):
0.14.27 by Aaron Bentley
Update docs
247
        """Shelve changes from working tree."""
0.12.13 by Aaron Bentley
Implement shelving content
248
        self.work_transform.apply()
0.12.19 by Aaron Bentley
Add support for writing shelves
249
0.12.51 by Aaron Bentley
Merge unshelve into shelf-manager
250
    def write_shelf(self, shelf_file, message=None):
0.14.27 by Aaron Bentley
Update docs
251
        """Serialize the shelved changes to a file.
252
0.12.66 by Aaron Bentley
Merge with unshelve
253
        :param shelf_file: A file-like object to write the shelf to.
0.15.29 by Aaron Bentley
Merge with prepare-shelf
254
        :param message: An optional message describing the shelved changes.
0.14.27 by Aaron Bentley
Update docs
255
        :return: the filename of the written file.
256
        """
0.12.24 by Aaron Bentley
Get unshelve using merge codepath, not applying transform directly
257
        transform.resolve_conflicts(self.shelf_transform)
0.12.28 by Aaron Bentley
Update for shelf manager
258
        serializer = pack.ContainerSerialiser()
259
        shelf_file.write(serializer.begin())
0.12.51 by Aaron Bentley
Merge unshelve into shelf-manager
260
        metadata = {
261
            'revision_id': self.target_tree.get_revision_id(),
262
        }
263
        if message is not None:
0.12.52 by Aaron Bentley
Merge unshelve into shelf-manager
264
            metadata['message'] = message.encode('utf-8')
0.12.28 by Aaron Bentley
Update for shelf manager
265
        shelf_file.write(serializer.bytes_record(
0.12.51 by Aaron Bentley
Merge unshelve into shelf-manager
266
            bencode.bencode(metadata), (('metadata',),)))
0.12.63 by Aaron Bentley
Merge with unshelve
267
        for bytes in self.shelf_transform.serialize(serializer):
0.12.28 by Aaron Bentley
Update for shelf manager
268
            shelf_file.write(bytes)
269
        shelf_file.write(serializer.end())
0.12.21 by Aaron Bentley
Add failing test of unshelver
270
271
272
class Unshelver(object):
0.15.30 by Aaron Bentley
Update docs.
273
    """Unshelve shelved changes."""
0.12.21 by Aaron Bentley
Add failing test of unshelver
274
0.15.19 by Aaron Bentley
Generalize first record as metadata.
275
    def __init__(self, tree, base_tree, transform, message):
0.15.30 by Aaron Bentley
Update docs.
276
        """Constructor.
277
278
        :param tree: The tree to apply the changes to.
279
        :param base_tree: The basis to apply the tranform to.
280
        :param message: A message from the shelved transform.
281
        """
0.12.21 by Aaron Bentley
Add failing test of unshelver
282
        self.tree = tree
0.12.24 by Aaron Bentley
Get unshelve using merge codepath, not applying transform directly
283
        self.base_tree = base_tree
0.12.21 by Aaron Bentley
Add failing test of unshelver
284
        self.transform = transform
0.15.19 by Aaron Bentley
Generalize first record as metadata.
285
        self.message = message
0.12.21 by Aaron Bentley
Add failing test of unshelver
286
0.16.110 by Aaron Bentley
Implement ls-shelf command
287
    @staticmethod
288
    def iter_records(shelf_file):
0.12.21 by Aaron Bentley
Add failing test of unshelver
289
        parser = pack.ContainerPushParser()
0.12.28 by Aaron Bentley
Update for shelf manager
290
        parser.accept_bytes(shelf_file.read())
0.16.110 by Aaron Bentley
Implement ls-shelf command
291
        return iter(parser.read_pending_records())
292
293
    @staticmethod
294
    def parse_metadata(records):
0.15.19 by Aaron Bentley
Generalize first record as metadata.
295
        names, metadata_bytes = records.next()
0.15.41 by Aaron Bentley
Replace assert with proper error handling
296
        if names[0] != ('metadata',):
297
            raise errors.ShelfCorrupt
0.15.19 by Aaron Bentley
Generalize first record as metadata.
298
        metadata = bencode.bdecode(metadata_bytes)
299
        message = metadata.get('message')
300
        if message is not None:
0.16.111 by Aaron Bentley
Return metadata as a dict.
301
            metadata['message'] = message.decode('utf-8')
302
        return metadata
0.16.110 by Aaron Bentley
Implement ls-shelf command
303
304
    @classmethod
305
    def from_tree_and_shelf(klass, tree, shelf_file):
306
        """Create an Unshelver from a tree and a shelf file.
307
308
        :param tree: The tree to apply shelved changes to.
309
        :param shelf_file: A file-like object containing shelved changes.
310
        :return: The Unshelver.
311
        """
312
        records = klass.iter_records(shelf_file)
0.16.111 by Aaron Bentley
Return metadata as a dict.
313
        metadata = klass.parse_metadata(records)
314
        base_revision_id = metadata['revision_id']
0.12.26 by Aaron Bentley
Use correct base for shelving
315
        try:
316
            base_tree = tree.revision_tree(base_revision_id)
317
        except errors.NoSuchRevisionInTree:
318
            base_tree = tree.branch.repository.revision_tree(base_revision_id)
0.15.23 by Aaron Bentley
Use correct tree for desrializing transform
319
        tt = transform.TransformPreview(base_tree)
0.15.26 by Aaron Bentley
Merge with prepare-shelf
320
        tt.deserialize(records)
0.16.111 by Aaron Bentley
Return metadata as a dict.
321
        return klass(tree, base_tree, tt, metadata.get('message'))
0.12.21 by Aaron Bentley
Add failing test of unshelver
322
1551.21.7 by Aaron Bentley
Fix progress warning
323
    def make_merger(self, task=None):
0.15.30 by Aaron Bentley
Update docs.
324
        """Return a merger that can unshelve the changes."""
1551.21.7 by Aaron Bentley
Fix progress warning
325
        target_tree = self.transform.get_preview_tree()
326
        merger = merge.Merger.from_uncommitted(self.tree, target_tree,
327
            task, self.base_tree)
328
        merger.merge_type = merge.Merge3Merger
329
        return merger
0.12.25 by Aaron Bentley
Update to use new from_uncommitted API
330
331
    def finalize(self):
0.15.30 by Aaron Bentley
Update docs.
332
        """Release all resources held by this Unshelver."""
0.12.25 by Aaron Bentley
Update to use new from_uncommitted API
333
        self.transform.finalize()
0.12.27 by Aaron Bentley
Implement shelf manager
334
335
336
class ShelfManager(object):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
337
    """Maintain a list of shelved changes."""
0.12.27 by Aaron Bentley
Implement shelf manager
338
0.12.42 by Aaron Bentley
Get shelf from tree
339
    def __init__(self, tree, transport):
340
        self.tree = tree
0.12.41 by Aaron Bentley
Change shelf to use WT control dir for shelves
341
        self.transport = transport.clone('shelf')
0.12.27 by Aaron Bentley
Implement shelf manager
342
        self.transport.ensure_base()
343
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
344
    def get_shelf_filename(self, shelf_id):
345
        return 'shelf-%d' % shelf_id
346
347
    def get_shelf_ids(self, filenames):
348
        matcher = re.compile('shelf-([1-9][0-9]*)')
349
        shelf_ids = []
350
        for filename in filenames:
351
            match = matcher.match(filename)
352
            if match is not None:
353
                shelf_ids.append(int(match.group(1)))
354
        return shelf_ids
355
0.12.27 by Aaron Bentley
Implement shelf manager
356
    def new_shelf(self):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
357
        """Return a file object and id for a new set of shelved changes."""
0.12.27 by Aaron Bentley
Implement shelf manager
358
        last_shelf = self.last_shelf()
359
        if last_shelf is None:
360
            next_shelf = 1
361
        else:
362
            next_shelf = last_shelf + 1
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
363
        filename = self.get_shelf_filename(next_shelf)
364
        shelf_file = open(self.transport.local_abspath(filename), 'wb')
0.12.27 by Aaron Bentley
Implement shelf manager
365
        return next_shelf, shelf_file
366
0.12.53 by Aaron Bentley
Allow adding message to shelf
367
    def shelve_changes(self, creator, message=None):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
368
        """Store the changes in a ShelfCreator on a shelf."""
0.12.43 by Aaron Bentley
Make ShelfManager consume ShelfCreator and produce Unshelver
369
        next_shelf, shelf_file = self.new_shelf()
370
        try:
0.12.53 by Aaron Bentley
Allow adding message to shelf
371
            creator.write_shelf(shelf_file, message)
0.12.43 by Aaron Bentley
Make ShelfManager consume ShelfCreator and produce Unshelver
372
        finally:
373
            shelf_file.close()
0.12.44 by Aaron Bentley
Give manager responsibility for applying transform
374
        creator.transform()
0.12.43 by Aaron Bentley
Make ShelfManager consume ShelfCreator and produce Unshelver
375
        return next_shelf
376
0.12.27 by Aaron Bentley
Implement shelf manager
377
    def read_shelf(self, shelf_id):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
378
        """Return the file associated with a shelf_id for reading.
379
380
        :param shelf_id: The id of the shelf to retrive the file for.
381
        """
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
382
        filename = self.get_shelf_filename(shelf_id)
0.12.50 by Aaron Bentley
Improve error handling for non-existant shelf-ids
383
        try:
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
384
            return open(self.transport.local_abspath(filename), 'rb')
0.12.50 by Aaron Bentley
Improve error handling for non-existant shelf-ids
385
        except IOError, e:
386
            if e.errno != errno.ENOENT:
387
                raise
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
388
            from bzrlib import errors
389
            raise errors.NoSuchShelfId(shelf_id)
0.12.27 by Aaron Bentley
Implement shelf manager
390
0.12.43 by Aaron Bentley
Make ShelfManager consume ShelfCreator and produce Unshelver
391
    def get_unshelver(self, shelf_id):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
392
        """Return an unshelver for a given shelf_id.
393
394
        :param shelf_id: The shelf id to return the unshelver for.
395
        """
0.12.43 by Aaron Bentley
Make ShelfManager consume ShelfCreator and produce Unshelver
396
        shelf_file = self.read_shelf(shelf_id)
397
        try:
398
            return Unshelver.from_tree_and_shelf(self.tree, shelf_file)
399
        finally:
400
            shelf_file.close()
401
0.16.112 by Aaron Bentley
Add tests
402
    def get_metadata(self, shelf_id):
403
        """Return the metadata associated with a given shelf_id."""
0.16.110 by Aaron Bentley
Implement ls-shelf command
404
        shelf_file = self.read_shelf(shelf_id)
405
        try:
406
            records = Unshelver.iter_records(shelf_file)
407
        finally:
408
            shelf_file.close()
409
        return Unshelver.parse_metadata(records)
410
0.12.27 by Aaron Bentley
Implement shelf manager
411
    def delete_shelf(self, shelf_id):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
412
        """Delete the shelved changes for a given id.
413
414
        :param shelf_id: id of the shelved changes to delete.
415
        """
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
416
        filename = self.get_shelf_filename(shelf_id)
417
        self.transport.delete(filename)
0.12.27 by Aaron Bentley
Implement shelf manager
418
419
    def active_shelves(self):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
420
        """Return a list of shelved changes."""
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
421
        active = self.get_shelf_ids(self.transport.list_dir('.'))
422
        active.sort()
423
        return active
0.12.27 by Aaron Bentley
Implement shelf manager
424
425
    def last_shelf(self):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
426
        """Return the id of the last-created shelved change."""
0.12.27 by Aaron Bentley
Implement shelf manager
427
        active = self.active_shelves()
428
        if len(active) > 0:
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
429
            return active[-1]
0.12.27 by Aaron Bentley
Implement shelf manager
430
        else:
431
            return None