/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5387.2.7 by John Arbash Meinel
Merge bzr.dev 5444 to resolve some small text conflicts.
1
# Copyright (C) 2008, 2009, 2010 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
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
0.12.12 by Aaron Bentley
Implement shelf creator
18
0.12.50 by Aaron Bentley
Improve error handling for non-existant shelf-ids
19
import errno
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
20
import re
0.12.13 by Aaron Bentley
Implement shelving content
21
6734.1.1 by Jelmer Vernooij
Fix more imports.
22
from . import errors
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
23
from .lazy_import import lazy_import
5418.4.8 by Parth Malwankar
fixed import tariff
24
lazy_import(globals(), """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
25
from breezy import (
2694.5.4 by Jelmer Vernooij
Move bzrlib.util.bencode to bzrlib._bencode_py.
26
    bencode,
0.15.15 by Aaron Bentley
Merge prepare-shelf into unshelve
27
    merge,
0.14.19 by Aaron Bentley
Convert bzrlib import to split-line
28
    merge3,
29
    transform,
30
)
6670.4.1 by Jelmer Vernooij
Update imports.
31
from breezy.bzr import (
32
    pack,
33
    )
5418.4.8 by Parth Malwankar
fixed import tariff
34
""")
0.12.19 by Aaron Bentley
Add support for writing shelves
35
0.12.12 by Aaron Bentley
Implement shelf creator
36
6734.1.1 by Jelmer Vernooij
Fix more imports.
37
class ShelfCorrupt(errors.BzrError):
38
39
    _fmt = "Shelf corrupt."
40
41
42
class NoSuchShelfId(errors.BzrError):
43
44
    _fmt = 'No changes are shelved with id "%(shelf_id)d".'
45
46
    def __init__(self, shelf_id):
47
        errors.BzrError.__init__(self, shelf_id=shelf_id)
48
49
50
class InvalidShelfId(errors.BzrError):
51
52
    _fmt = '"%(invalid_id)s" is not a valid shelf id, try a number instead.'
53
54
    def __init__(self, invalid_id):
55
        errors.BzrError.__init__(self, invalid_id=invalid_id)
56
57
0.12.12 by Aaron Bentley
Implement shelf creator
58
class ShelfCreator(object):
0.14.27 by Aaron Bentley
Update docs
59
    """Create a transform to shelve objects and its inverse."""
0.12.12 by Aaron Bentley
Implement shelf creator
60
0.14.21 by Aaron Bentley
Update to accept a list of files.
61
    def __init__(self, work_tree, target_tree, file_list=None):
0.14.27 by Aaron Bentley
Update docs
62
        """Constructor.
63
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
64
        :param work_tree: The working tree to apply changes to. This is not
65
            required to be locked - a tree_write lock will be taken out.
0.14.27 by Aaron Bentley
Update docs
66
        :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)
67
            This is not required to be locked - a read_lock will be taken out.
0.14.27 by Aaron Bentley
Update docs
68
        :param file_list: The files to make more similar to the target.
69
        """
0.12.12 by Aaron Bentley
Implement shelf creator
70
        self.work_tree = work_tree
71
        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
72
        try:
4123.1.3 by Aaron Bentley
Properly handle exceptions during __init__
73
            self.target_tree = target_tree
74
            self.shelf_transform = transform.TransformPreview(self.target_tree)
75
            try:
76
                self.renames = {}
77
                self.creation = {}
78
                self.deletion = {}
79
                self.iter_changes = work_tree.iter_changes(
80
                    self.target_tree, specific_files=file_list)
81
            except:
82
                self.shelf_transform.finalize()
83
                raise
84
        except:
85
            self.work_transform.finalize()
86
            raise
0.12.12 by Aaron Bentley
Implement shelf creator
87
0.14.32 by Aaron Bentley
Replace ShelfCreator.__iter__ with ShelfCreator.iter_shelvable
88
    def iter_shelvable(self):
0.14.27 by Aaron Bentley
Update docs
89
        """Iterable of tuples describing shelvable changes.
90
91
        As well as generating the tuples, this updates several members.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
92
        Tuples may be::
93
0.14.27 by Aaron Bentley
Update docs
94
           ('add file', file_id, work_kind, work_path)
95
           ('delete file', file_id, target_kind, target_path)
96
           ('rename', file_id, target_path, work_path)
97
           ('change kind', file_id, target_kind, work_kind, target_path)
98
           ('modify text', file_id)
4119.5.1 by James Westby
Shelve can now shelve changes to a symlink's target.
99
           ('modify target', file_id, target_target, work_target)
0.14.27 by Aaron Bentley
Update docs
100
        """
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
101
        for change in self.iter_changes:
4595.9.1 by Aaron Bentley
Fix shelve in uncommitted trees.
102
            # don't shelve add of tree root.  Working tree should never
103
            # lack roots, and bzr misbehaves when they do.
104
            # FIXME ADHB (2009-08-09): should still shelve adds of tree roots
105
            # when a tree root was deleted / renamed.
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
106
            if change.kind[0] is None and change.name[1] == '':
4595.9.1 by Aaron Bentley
Fix shelve in uncommitted trees.
107
                continue
6011.1.2 by Aaron Bentley
Fix shelve to always ignore roots.
108
            # Also don't shelve deletion of tree root.
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
109
            if change.kind[1] is None and change.name[0] == '':
6011.1.2 by Aaron Bentley
Fix shelve to always ignore roots.
110
                continue
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
111
            if change.kind[0] is None or change.versioned[0] is False:
112
                self.creation[change.file_id] = (
113
                    change.kind[1], change.name[1], change.parent_id[1], change.versioned)
114
                yield ('add file', change.file_id, change.kind[1], change.path[1])
115
            elif change.kind[1] is None or change.versioned[0] is False:
116
                self.deletion[change.file_id] = (
117
                    change.kind[0], change.name[0], change.parent_id[0], change.versioned)
118
                yield ('delete file', change.file_id, change.kind[0], change.path[0])
0.12.14 by Aaron Bentley
Add shelving of created files
119
            else:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
120
                if change.name[0] != change.name[1] or change.parent_id[0] != change.parent_id[1]:
121
                    self.renames[change.file_id] = (change.name, change.parent_id)
122
                    yield ('rename', change.file_id) + change.path
0.14.23 by Aaron Bentley
Allow shelving kind change
123
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
124
                if change.kind[0] != change.kind[1]:
125
                    yield ('change kind', change.file_id, change.kind[0], change.kind[1], change.path[0])
126
                elif change.kind[0] == 'symlink':
127
                    t_target = self.target_tree.get_symlink_target(change.path[0])
128
                    w_target = self.work_tree.get_symlink_target(change.path[1])
129
                    yield ('modify target', change.file_id, change.path[0], t_target,
7143.15.2 by Jelmer Vernooij
Run autopep8.
130
                           w_target)
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
131
                elif change.changed_content:
132
                    yield ('modify text', change.file_id)
0.12.12 by Aaron Bentley
Implement shelf creator
133
4526.6.1 by Aaron Bentley
Reverse the way changes are described by Shelver.
134
    def shelve_change(self, change):
4526.7.2 by Aaron Bentley
Update docs.
135
        """Shelve a change in the iter_shelvable format."""
4526.6.1 by Aaron Bentley
Reverse the way changes are described by Shelver.
136
        if change[0] == 'rename':
137
            self.shelve_rename(change[1])
138
        elif change[0] == 'delete file':
139
            self.shelve_deletion(change[1])
140
        elif change[0] == 'add file':
141
            self.shelve_creation(change[1])
4595.8.1 by Aaron Bentley
shelve_change handles text modification.
142
        elif change[0] in ('change kind', 'modify text'):
4526.6.1 by Aaron Bentley
Reverse the way changes are described by Shelver.
143
            self.shelve_content_change(change[1])
144
        elif change[0] == 'modify target':
6809.4.14 by Jelmer Vernooij
Fix shelf failures.
145
            self.shelve_modify_target(change[1])
4526.7.3 by Aaron Bentley
Test shelve_change.
146
        else:
147
            raise ValueError('Unknown change kind: "%s"' % change[0])
4526.6.1 by Aaron Bentley
Reverse the way changes are described by Shelver.
148
4595.8.2 by Aaron Bentley
Implement shelve_all
149
    def shelve_all(self):
6538.1.7 by Aaron Bentley
Move to shelve_all and improve it.
150
        """Shelve all changes.
151
7183.3.1 by Martin
Fix E71* lint errors
152
        :return: ``True`` if changes were shelved, otherwise ``False``.
6538.1.7 by Aaron Bentley
Move to shelve_all and improve it.
153
        """
154
        change = None
4595.8.2 by Aaron Bentley
Implement shelve_all
155
        for change in self.iter_shelvable():
156
            self.shelve_change(change)
6538.1.7 by Aaron Bentley
Move to shelve_all and improve it.
157
        return change is not None
4595.8.2 by Aaron Bentley
Implement shelve_all
158
0.12.12 by Aaron Bentley
Implement shelf creator
159
    def shelve_rename(self, file_id):
0.14.27 by Aaron Bentley
Update docs
160
        """Shelve a file rename.
161
162
        :param file_id: The file id of the file to shelve the renaming of.
163
        """
0.12.12 by Aaron Bentley
Implement shelf creator
164
        names, parents = self.renames[file_id]
165
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
166
        work_parent = self.work_transform.trans_id_file_id(parents[0])
167
        self.work_transform.adjust_path(names[0], work_parent, w_trans_id)
168
169
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
170
        shelf_parent = self.shelf_transform.trans_id_file_id(parents[1])
171
        self.shelf_transform.adjust_path(names[1], shelf_parent, s_trans_id)
172
6809.4.14 by Jelmer Vernooij
Fix shelf failures.
173
    def shelve_modify_target(self, file_id):
4119.5.1 by James Westby
Shelve can now shelve changes to a symlink's target.
174
        """Shelve a change of symlink target.
175
176
        :param file_id: The file id of the symlink which changed target.
6809.4.14 by Jelmer Vernooij
Fix shelf failures.
177
        :param new_target: The target that the symlink should have due
178
            to shelving.
4119.5.1 by James Westby
Shelve can now shelve changes to a symlink's target.
179
        """
6809.4.14 by Jelmer Vernooij
Fix shelf failures.
180
        new_path = self.target_tree.id2path(file_id)
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
181
        new_target = self.target_tree.get_symlink_target(new_path)
4119.5.1 by James Westby
Shelve can now shelve changes to a symlink's target.
182
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
183
        self.work_transform.delete_contents(w_trans_id)
6809.4.14 by Jelmer Vernooij
Fix shelf failures.
184
        self.work_transform.create_symlink(new_target, w_trans_id)
4119.5.1 by James Westby
Shelve can now shelve changes to a symlink's target.
185
6809.4.14 by Jelmer Vernooij
Fix shelf failures.
186
        old_path = self.work_tree.id2path(file_id)
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
187
        old_target = self.work_tree.get_symlink_target(old_path)
4119.5.1 by James Westby
Shelve can now shelve changes to a symlink's target.
188
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
189
        self.shelf_transform.delete_contents(s_trans_id)
6809.4.14 by Jelmer Vernooij
Fix shelf failures.
190
        self.shelf_transform.create_symlink(old_target, s_trans_id)
4119.5.1 by James Westby
Shelve can now shelve changes to a symlink's target.
191
0.14.14 by Aaron Bentley
Change shelf_text to shelve_lines
192
    def shelve_lines(self, file_id, new_lines):
0.14.27 by Aaron Bentley
Update docs
193
        """Shelve text changes to a file, using provided lines.
194
195
        :param file_id: The file id of the file to shelve the text of.
196
        :param new_lines: The lines that the file should have due to shelving.
197
        """
0.12.13 by Aaron Bentley
Implement shelving content
198
        w_trans_id = self.work_transform.trans_id_file_id(file_id)
199
        self.work_transform.delete_contents(w_trans_id)
200
        self.work_transform.create_file(new_lines, w_trans_id)
201
202
        s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
203
        self.shelf_transform.delete_contents(s_trans_id)
204
        inverse_lines = self._inverse_lines(new_lines, file_id)
205
        self.shelf_transform.create_file(inverse_lines, s_trans_id)
206
0.14.23 by Aaron Bentley
Allow shelving kind change
207
    @staticmethod
208
    def _content_from_tree(tt, tree, file_id):
209
        trans_id = tt.trans_id_file_id(file_id)
210
        tt.delete_contents(trans_id)
6809.4.15 by Jelmer Vernooij
Fix some more tests.
211
        transform.create_from_tree(tt, trans_id, tree, tree.id2path(file_id),
212
                                   file_id)
0.14.23 by Aaron Bentley
Allow shelving kind change
213
214
    def shelve_content_change(self, file_id):
0.14.27 by Aaron Bentley
Update docs
215
        """Shelve a kind change or binary file content change.
216
217
        :param file_id: The file id of the file to shelve the content change
218
            of.
219
        """
0.14.23 by Aaron Bentley
Allow shelving kind change
220
        self._content_from_tree(self.work_transform, self.target_tree, file_id)
221
        self._content_from_tree(self.shelf_transform, self.work_tree, file_id)
222
0.14.2 by Aaron Bentley
Somewhat clean up shelving
223
    def shelve_creation(self, file_id):
0.14.27 by Aaron Bentley
Update docs
224
        """Shelve creation of a file.
225
226
        This handles content and inventory id.
227
        :param file_id: The file_id of the file to shelve creation of.
228
        """
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
229
        kind, name, parent, versioned = self.creation[file_id]
230
        version = not versioned[0]
0.14.4 by Aaron Bentley
Implement shelving deletion
231
        self._shelve_creation(self.work_tree, file_id, self.work_transform,
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
232
                              self.shelf_transform, kind, name, parent,
233
                              version)
0.14.4 by Aaron Bentley
Implement shelving deletion
234
235
    def shelve_deletion(self, file_id):
0.14.27 by Aaron Bentley
Update docs
236
        """Shelve deletion of a file.
237
238
        This handles content and inventory id.
239
        :param file_id: The file_id of the file to shelve deletion of.
240
        """
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
241
        kind, name, parent, versioned = self.deletion[file_id]
242
        existing_path = self.target_tree.id2path(file_id)
243
        if not self.work_tree.has_filename(existing_path):
244
            existing_path = None
245
        version = not versioned[1]
0.14.4 by Aaron Bentley
Implement shelving deletion
246
        self._shelve_creation(self.target_tree, file_id, self.shelf_transform,
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
247
                              self.work_transform, kind, name, parent,
248
                              version, existing_path=existing_path)
0.14.4 by Aaron Bentley
Implement shelving deletion
249
250
    def _shelve_creation(self, tree, file_id, from_transform, to_transform,
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
251
                         kind, name, parent, version, existing_path=None):
0.14.4 by Aaron Bentley
Implement shelving deletion
252
        w_trans_id = from_transform.trans_id_file_id(file_id)
0.14.12 by Aaron Bentley
Handle new dangling ids
253
        if parent is not None and kind is not None:
0.14.4 by Aaron Bentley
Implement shelving deletion
254
            from_transform.delete_contents(w_trans_id)
255
        from_transform.unversion_file(w_trans_id)
256
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
257
        if existing_path is not None:
258
            s_trans_id = to_transform.trans_id_tree_path(existing_path)
259
        else:
260
            s_trans_id = to_transform.trans_id_file_id(file_id)
0.14.4 by Aaron Bentley
Implement shelving deletion
261
        if parent is not None:
262
            s_parent_id = to_transform.trans_id_file_id(parent)
0.14.9 by Aaron Bentley
Shelve deleted files properly
263
            to_transform.adjust_path(name, s_parent_id, s_trans_id)
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
264
            if existing_path is None:
0.14.18 by Aaron Bentley
Simplify creating files
265
                if kind is None:
6973.11.7 by Jelmer Vernooij
Fix more tests.
266
                    to_transform.create_file([b''], s_trans_id)
0.14.18 by Aaron Bentley
Simplify creating files
267
                else:
6809.4.21 by Jelmer Vernooij
Fix long lines.
268
                    transform.create_from_tree(
7143.15.2 by Jelmer Vernooij
Run autopep8.
269
                        to_transform, s_trans_id, tree,
270
                        tree.id2path(file_id), file_id)
0.14.10 by Aaron Bentley
Fix behavior with deletions, unversioning, ...
271
        if version:
272
            to_transform.version_file(file_id, s_trans_id)
0.12.14 by Aaron Bentley
Add shelving of created files
273
274
    def _inverse_lines(self, new_lines, file_id):
275
        """Produce a version with only those changes removed from new_lines."""
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
276
        target_path = self.target_tree.id2path(file_id)
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
277
        target_lines = self.target_tree.get_file_lines(target_path)
6809.4.14 by Jelmer Vernooij
Fix shelf failures.
278
        work_path = self.work_tree.id2path(file_id)
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
279
        work_lines = self.work_tree.get_file_lines(work_path)
0.14.1 by Aaron Bentley
Use explicit target in ShelfCreator
280
        return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
0.12.13 by Aaron Bentley
Implement shelving content
281
0.12.12 by Aaron Bentley
Implement shelf creator
282
    def finalize(self):
0.14.27 by Aaron Bentley
Update docs
283
        """Release all resources used by this ShelfCreator."""
0.12.12 by Aaron Bentley
Implement shelf creator
284
        self.work_transform.finalize()
285
        self.shelf_transform.finalize()
0.12.13 by Aaron Bentley
Implement shelving content
286
287
    def transform(self):
0.14.27 by Aaron Bentley
Update docs
288
        """Shelve changes from working tree."""
0.12.13 by Aaron Bentley
Implement shelving content
289
        self.work_transform.apply()
0.12.19 by Aaron Bentley
Add support for writing shelves
290
6538.1.8 by Aaron Bentley
Implement branch.get_uncommitted_data.
291
    @staticmethod
292
    def metadata_record(serializer, revision_id, message=None):
6855.4.5 by Jelmer Vernooij
Fix more bees, use with rather than try/finally for some files.
293
        metadata = {b'revision_id': revision_id}
6538.1.8 by Aaron Bentley
Implement branch.get_uncommitted_data.
294
        if message is not None:
6855.4.5 by Jelmer Vernooij
Fix more bees, use with rather than try/finally for some files.
295
            metadata[b'message'] = message.encode('utf-8')
6538.1.8 by Aaron Bentley
Implement branch.get_uncommitted_data.
296
        return serializer.bytes_record(
6973.6.2 by Jelmer Vernooij
Fix more tests.
297
            bencode.bencode(metadata), ((b'metadata',),))
6538.1.8 by Aaron Bentley
Implement branch.get_uncommitted_data.
298
0.12.51 by Aaron Bentley
Merge unshelve into shelf-manager
299
    def write_shelf(self, shelf_file, message=None):
0.14.27 by Aaron Bentley
Update docs
300
        """Serialize the shelved changes to a file.
301
0.12.66 by Aaron Bentley
Merge with unshelve
302
        :param shelf_file: A file-like object to write the shelf to.
0.15.29 by Aaron Bentley
Merge with prepare-shelf
303
        :param message: An optional message describing the shelved changes.
0.14.27 by Aaron Bentley
Update docs
304
        :return: the filename of the written file.
305
        """
0.12.24 by Aaron Bentley
Get unshelve using merge codepath, not applying transform directly
306
        transform.resolve_conflicts(self.shelf_transform)
6538.1.10 by Aaron Bentley
Implement WorkingTree.get_uncommitted_data
307
        revision_id = self.target_tree.get_revision_id()
308
        return self._write_shelf(shelf_file, self.shelf_transform, revision_id,
309
                                 message)
310
311
    @classmethod
312
    def _write_shelf(cls, shelf_file, transform, revision_id, message=None):
0.12.28 by Aaron Bentley
Update for shelf manager
313
        serializer = pack.ContainerSerialiser()
314
        shelf_file.write(serializer.begin())
6538.1.10 by Aaron Bentley
Implement WorkingTree.get_uncommitted_data
315
        metadata = cls.metadata_record(serializer, revision_id, message)
6538.1.8 by Aaron Bentley
Implement branch.get_uncommitted_data.
316
        shelf_file.write(metadata)
6538.1.10 by Aaron Bentley
Implement WorkingTree.get_uncommitted_data
317
        for bytes in transform.serialize(serializer):
0.12.28 by Aaron Bentley
Update for shelf manager
318
            shelf_file.write(bytes)
319
        shelf_file.write(serializer.end())
0.12.21 by Aaron Bentley
Add failing test of unshelver
320
321
322
class Unshelver(object):
0.15.30 by Aaron Bentley
Update docs.
323
    """Unshelve shelved changes."""
0.12.21 by Aaron Bentley
Add failing test of unshelver
324
0.15.19 by Aaron Bentley
Generalize first record as metadata.
325
    def __init__(self, tree, base_tree, transform, message):
0.15.30 by Aaron Bentley
Update docs.
326
        """Constructor.
327
328
        :param tree: The tree to apply the changes to.
329
        :param base_tree: The basis to apply the tranform to.
330
        :param message: A message from the shelved transform.
331
        """
0.12.21 by Aaron Bentley
Add failing test of unshelver
332
        self.tree = tree
0.12.24 by Aaron Bentley
Get unshelve using merge codepath, not applying transform directly
333
        self.base_tree = base_tree
0.12.21 by Aaron Bentley
Add failing test of unshelver
334
        self.transform = transform
0.15.19 by Aaron Bentley
Generalize first record as metadata.
335
        self.message = message
0.12.21 by Aaron Bentley
Add failing test of unshelver
336
0.16.110 by Aaron Bentley
Implement ls-shelf command
337
    @staticmethod
338
    def iter_records(shelf_file):
0.12.21 by Aaron Bentley
Add failing test of unshelver
339
        parser = pack.ContainerPushParser()
0.12.28 by Aaron Bentley
Update for shelf manager
340
        parser.accept_bytes(shelf_file.read())
0.16.110 by Aaron Bentley
Implement ls-shelf command
341
        return iter(parser.read_pending_records())
342
343
    @staticmethod
344
    def parse_metadata(records):
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
345
        names, metadata_bytes = next(records)
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
346
        if names[0] != (b'metadata',):
6734.1.1 by Jelmer Vernooij
Fix more imports.
347
            raise ShelfCorrupt
0.15.19 by Aaron Bentley
Generalize first record as metadata.
348
        metadata = bencode.bdecode(metadata_bytes)
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
349
        message = metadata.get(b'message')
0.15.19 by Aaron Bentley
Generalize first record as metadata.
350
        if message is not None:
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
351
            metadata[b'message'] = message.decode('utf-8')
0.16.111 by Aaron Bentley
Return metadata as a dict.
352
        return metadata
0.16.110 by Aaron Bentley
Implement ls-shelf command
353
354
    @classmethod
355
    def from_tree_and_shelf(klass, tree, shelf_file):
356
        """Create an Unshelver from a tree and a shelf file.
357
358
        :param tree: The tree to apply shelved changes to.
359
        :param shelf_file: A file-like object containing shelved changes.
360
        :return: The Unshelver.
361
        """
362
        records = klass.iter_records(shelf_file)
0.16.111 by Aaron Bentley
Return metadata as a dict.
363
        metadata = klass.parse_metadata(records)
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
364
        base_revision_id = metadata[b'revision_id']
0.12.26 by Aaron Bentley
Use correct base for shelving
365
        try:
366
            base_tree = tree.revision_tree(base_revision_id)
367
        except errors.NoSuchRevisionInTree:
368
            base_tree = tree.branch.repository.revision_tree(base_revision_id)
0.15.23 by Aaron Bentley
Use correct tree for desrializing transform
369
        tt = transform.TransformPreview(base_tree)
0.15.26 by Aaron Bentley
Merge with prepare-shelf
370
        tt.deserialize(records)
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
371
        return klass(tree, base_tree, tt, metadata.get(b'message'))
0.12.21 by Aaron Bentley
Add failing test of unshelver
372
6719.1.2 by Jelmer Vernooij
Fix some tests.
373
    def make_merger(self):
0.15.30 by Aaron Bentley
Update docs.
374
        """Return a merger that can unshelve the changes."""
1551.21.7 by Aaron Bentley
Fix progress warning
375
        target_tree = self.transform.get_preview_tree()
376
        merger = merge.Merger.from_uncommitted(self.tree, target_tree,
7143.15.2 by Jelmer Vernooij
Run autopep8.
377
                                               self.base_tree)
1551.21.7 by Aaron Bentley
Fix progress warning
378
        merger.merge_type = merge.Merge3Merger
379
        return merger
0.12.25 by Aaron Bentley
Update to use new from_uncommitted API
380
381
    def finalize(self):
0.15.30 by Aaron Bentley
Update docs.
382
        """Release all resources held by this Unshelver."""
0.12.25 by Aaron Bentley
Update to use new from_uncommitted API
383
        self.transform.finalize()
0.12.27 by Aaron Bentley
Implement shelf manager
384
385
386
class ShelfManager(object):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
387
    """Maintain a list of shelved changes."""
0.12.27 by Aaron Bentley
Implement shelf manager
388
0.12.42 by Aaron Bentley
Get shelf from tree
389
    def __init__(self, tree, transport):
390
        self.tree = tree
0.12.41 by Aaron Bentley
Change shelf to use WT control dir for shelves
391
        self.transport = transport.clone('shelf')
0.12.27 by Aaron Bentley
Implement shelf manager
392
        self.transport.ensure_base()
393
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
394
    def get_shelf_filename(self, shelf_id):
395
        return 'shelf-%d' % shelf_id
396
397
    def get_shelf_ids(self, filenames):
398
        matcher = re.compile('shelf-([1-9][0-9]*)')
399
        shelf_ids = []
400
        for filename in filenames:
401
            match = matcher.match(filename)
402
            if match is not None:
403
                shelf_ids.append(int(match.group(1)))
404
        return shelf_ids
405
0.12.27 by Aaron Bentley
Implement shelf manager
406
    def new_shelf(self):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
407
        """Return a file object and id for a new set of shelved changes."""
0.12.27 by Aaron Bentley
Implement shelf manager
408
        last_shelf = self.last_shelf()
409
        if last_shelf is None:
410
            next_shelf = 1
411
        else:
412
            next_shelf = last_shelf + 1
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
413
        filename = self.get_shelf_filename(next_shelf)
414
        shelf_file = open(self.transport.local_abspath(filename), 'wb')
0.12.27 by Aaron Bentley
Implement shelf manager
415
        return next_shelf, shelf_file
416
0.12.53 by Aaron Bentley
Allow adding message to shelf
417
    def shelve_changes(self, creator, message=None):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
418
        """Store the changes in a ShelfCreator on a shelf."""
0.12.43 by Aaron Bentley
Make ShelfManager consume ShelfCreator and produce Unshelver
419
        next_shelf, shelf_file = self.new_shelf()
420
        try:
0.12.53 by Aaron Bentley
Allow adding message to shelf
421
            creator.write_shelf(shelf_file, message)
0.12.43 by Aaron Bentley
Make ShelfManager consume ShelfCreator and produce Unshelver
422
        finally:
423
            shelf_file.close()
0.12.44 by Aaron Bentley
Give manager responsibility for applying transform
424
        creator.transform()
0.12.43 by Aaron Bentley
Make ShelfManager consume ShelfCreator and produce Unshelver
425
        return next_shelf
426
0.12.27 by Aaron Bentley
Implement shelf manager
427
    def read_shelf(self, shelf_id):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
428
        """Return the file associated with a shelf_id for reading.
429
430
        :param shelf_id: The id of the shelf to retrive the file for.
431
        """
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
432
        filename = self.get_shelf_filename(shelf_id)
0.12.50 by Aaron Bentley
Improve error handling for non-existant shelf-ids
433
        try:
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
434
            return open(self.transport.local_abspath(filename), 'rb')
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
435
        except IOError as e:
0.12.50 by Aaron Bentley
Improve error handling for non-existant shelf-ids
436
            if e.errno != errno.ENOENT:
437
                raise
6734.1.1 by Jelmer Vernooij
Fix more imports.
438
            raise NoSuchShelfId(shelf_id)
0.12.27 by Aaron Bentley
Implement shelf manager
439
0.12.43 by Aaron Bentley
Make ShelfManager consume ShelfCreator and produce Unshelver
440
    def get_unshelver(self, shelf_id):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
441
        """Return an unshelver for a given shelf_id.
442
443
        :param shelf_id: The shelf id to return the unshelver for.
444
        """
0.12.43 by Aaron Bentley
Make ShelfManager consume ShelfCreator and produce Unshelver
445
        shelf_file = self.read_shelf(shelf_id)
446
        try:
447
            return Unshelver.from_tree_and_shelf(self.tree, shelf_file)
448
        finally:
449
            shelf_file.close()
450
0.16.112 by Aaron Bentley
Add tests
451
    def get_metadata(self, shelf_id):
452
        """Return the metadata associated with a given shelf_id."""
0.16.110 by Aaron Bentley
Implement ls-shelf command
453
        shelf_file = self.read_shelf(shelf_id)
454
        try:
455
            records = Unshelver.iter_records(shelf_file)
456
        finally:
457
            shelf_file.close()
458
        return Unshelver.parse_metadata(records)
459
0.12.27 by Aaron Bentley
Implement shelf manager
460
    def delete_shelf(self, shelf_id):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
461
        """Delete the shelved changes for a given id.
462
463
        :param shelf_id: id of the shelved changes to delete.
464
        """
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
465
        filename = self.get_shelf_filename(shelf_id)
466
        self.transport.delete(filename)
0.12.27 by Aaron Bentley
Implement shelf manager
467
468
    def active_shelves(self):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
469
        """Return a list of shelved changes."""
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
470
        active = sorted(self.get_shelf_ids(self.transport.list_dir('.')))
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
471
        return active
0.12.27 by Aaron Bentley
Implement shelf manager
472
473
    def last_shelf(self):
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
474
        """Return the id of the last-created shelved change."""
0.12.27 by Aaron Bentley
Implement shelf manager
475
        active = self.active_shelves()
476
        if len(active) > 0:
0.12.77 by Aaron Bentley
Use names of the form shelf-5 for shelves
477
            return active[-1]
0.12.27 by Aaron Bentley
Implement shelf manager
478
        else:
479
            return None