1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
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.
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.
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
34
class ShelfCreator(object):
35
"""Create a transform to shelve objects and its inverse."""
37
def __init__(self, work_tree, target_tree, file_list=None):
40
:param work_tree: The working tree to apply changes to. This is not
41
required to be locked - a tree_write lock will be taken out.
42
:param target_tree: The tree to make the working tree more similar to.
43
This is not required to be locked - a read_lock will be taken out.
44
:param file_list: The files to make more similar to the target.
46
self.work_tree = work_tree
47
self.work_transform = transform.TreeTransform(work_tree)
49
self.target_tree = target_tree
50
self.shelf_transform = transform.TransformPreview(self.target_tree)
55
self.iter_changes = work_tree.iter_changes(
56
self.target_tree, specific_files=file_list)
58
self.shelf_transform.finalize()
61
self.work_transform.finalize()
64
def iter_shelvable(self):
65
"""Iterable of tuples describing shelvable changes.
67
As well as generating the tuples, this updates several members.
70
('add file', file_id, work_kind, work_path)
71
('delete file', file_id, target_kind, target_path)
72
('rename', file_id, target_path, work_path)
73
('change kind', file_id, target_kind, work_kind, target_path)
74
('modify text', file_id)
75
('modify target', file_id, target_target, work_target)
77
for (file_id, paths, changed, versioned, parents, names, kind,
78
executable) in self.iter_changes:
79
# don't shelve add of tree root. Working tree should never
80
# lack roots, and bzr misbehaves when they do.
81
# FIXME ADHB (2009-08-09): should still shelve adds of tree roots
82
# when a tree root was deleted / renamed.
83
if kind[0] is None and names[1] == '':
85
# Also don't shelve deletion of tree root.
86
if kind[1] is None and names[0] == '':
88
if kind[0] is None or versioned[0] == False:
89
self.creation[file_id] = (kind[1], names[1], parents[1],
91
yield ('add file', file_id, kind[1], paths[1])
92
elif kind[1] is None or versioned[0] == False:
93
self.deletion[file_id] = (kind[0], names[0], parents[0],
95
yield ('delete file', file_id, kind[0], paths[0])
97
if names[0] != names[1] or parents[0] != parents[1]:
98
self.renames[file_id] = (names, parents)
99
yield ('rename', file_id) + paths
101
if kind[0] != kind [1]:
102
yield ('change kind', file_id, kind[0], kind[1], paths[0])
103
elif kind[0] == 'symlink':
104
t_target = self.target_tree.get_symlink_target(file_id)
105
w_target = self.work_tree.get_symlink_target(file_id)
106
yield ('modify target', file_id, paths[0], t_target,
109
yield ('modify text', file_id)
111
def shelve_change(self, change):
112
"""Shelve a change in the iter_shelvable format."""
113
if change[0] == 'rename':
114
self.shelve_rename(change[1])
115
elif change[0] == 'delete file':
116
self.shelve_deletion(change[1])
117
elif change[0] == 'add file':
118
self.shelve_creation(change[1])
119
elif change[0] in ('change kind', 'modify text'):
120
self.shelve_content_change(change[1])
121
elif change[0] == 'modify target':
122
self.shelve_modify_target(change[1])
124
raise ValueError('Unknown change kind: "%s"' % change[0])
126
def shelve_all(self):
127
"""Shelve all changes."""
128
for change in self.iter_shelvable():
129
self.shelve_change(change)
131
def shelve_rename(self, file_id):
132
"""Shelve a file rename.
134
:param file_id: The file id of the file to shelve the renaming of.
136
names, parents = self.renames[file_id]
137
w_trans_id = self.work_transform.trans_id_file_id(file_id)
138
work_parent = self.work_transform.trans_id_file_id(parents[0])
139
self.work_transform.adjust_path(names[0], work_parent, w_trans_id)
141
s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
142
shelf_parent = self.shelf_transform.trans_id_file_id(parents[1])
143
self.shelf_transform.adjust_path(names[1], shelf_parent, s_trans_id)
145
def shelve_modify_target(self, file_id):
146
"""Shelve a change of symlink target.
148
:param file_id: The file id of the symlink which changed target.
149
:param new_target: The target that the symlink should have due
152
new_target = self.target_tree.get_symlink_target(file_id)
153
w_trans_id = self.work_transform.trans_id_file_id(file_id)
154
self.work_transform.delete_contents(w_trans_id)
155
self.work_transform.create_symlink(new_target, w_trans_id)
157
old_target = self.work_tree.get_symlink_target(file_id)
158
s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
159
self.shelf_transform.delete_contents(s_trans_id)
160
self.shelf_transform.create_symlink(old_target, s_trans_id)
162
def shelve_lines(self, file_id, new_lines):
163
"""Shelve text changes to a file, using provided lines.
165
:param file_id: The file id of the file to shelve the text of.
166
:param new_lines: The lines that the file should have due to shelving.
168
w_trans_id = self.work_transform.trans_id_file_id(file_id)
169
self.work_transform.delete_contents(w_trans_id)
170
self.work_transform.create_file(new_lines, w_trans_id)
172
s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
173
self.shelf_transform.delete_contents(s_trans_id)
174
inverse_lines = self._inverse_lines(new_lines, file_id)
175
self.shelf_transform.create_file(inverse_lines, s_trans_id)
178
def _content_from_tree(tt, tree, file_id):
179
trans_id = tt.trans_id_file_id(file_id)
180
tt.delete_contents(trans_id)
181
transform.create_from_tree(tt, trans_id, tree, file_id)
183
def shelve_content_change(self, file_id):
184
"""Shelve a kind change or binary file content change.
186
:param file_id: The file id of the file to shelve the content change
189
self._content_from_tree(self.work_transform, self.target_tree, file_id)
190
self._content_from_tree(self.shelf_transform, self.work_tree, file_id)
192
def shelve_creation(self, file_id):
193
"""Shelve creation of a file.
195
This handles content and inventory id.
196
:param file_id: The file_id of the file to shelve creation of.
198
kind, name, parent, versioned = self.creation[file_id]
199
version = not versioned[0]
200
self._shelve_creation(self.work_tree, file_id, self.work_transform,
201
self.shelf_transform, kind, name, parent,
204
def shelve_deletion(self, file_id):
205
"""Shelve deletion of a file.
207
This handles content and inventory id.
208
:param file_id: The file_id of the file to shelve deletion of.
210
kind, name, parent, versioned = self.deletion[file_id]
211
existing_path = self.target_tree.id2path(file_id)
212
if not self.work_tree.has_filename(existing_path):
214
version = not versioned[1]
215
self._shelve_creation(self.target_tree, file_id, self.shelf_transform,
216
self.work_transform, kind, name, parent,
217
version, existing_path=existing_path)
219
def _shelve_creation(self, tree, file_id, from_transform, to_transform,
220
kind, name, parent, version, existing_path=None):
221
w_trans_id = from_transform.trans_id_file_id(file_id)
222
if parent is not None and kind is not None:
223
from_transform.delete_contents(w_trans_id)
224
from_transform.unversion_file(w_trans_id)
226
if existing_path is not None:
227
s_trans_id = to_transform.trans_id_tree_path(existing_path)
229
s_trans_id = to_transform.trans_id_file_id(file_id)
230
if parent is not None:
231
s_parent_id = to_transform.trans_id_file_id(parent)
232
to_transform.adjust_path(name, s_parent_id, s_trans_id)
233
if existing_path is None:
235
to_transform.create_file('', s_trans_id)
237
transform.create_from_tree(to_transform, s_trans_id,
240
to_transform.version_file(file_id, s_trans_id)
242
def _inverse_lines(self, new_lines, file_id):
243
"""Produce a version with only those changes removed from new_lines."""
244
target_lines = self.target_tree.get_file_lines(file_id)
245
work_lines = self.work_tree.get_file_lines(file_id)
246
return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
249
"""Release all resources used by this ShelfCreator."""
250
self.work_transform.finalize()
251
self.shelf_transform.finalize()
254
"""Shelve changes from working tree."""
255
self.work_transform.apply()
257
def write_shelf(self, shelf_file, message=None):
258
"""Serialize the shelved changes to a file.
260
:param shelf_file: A file-like object to write the shelf to.
261
:param message: An optional message describing the shelved changes.
262
:return: the filename of the written file.
264
transform.resolve_conflicts(self.shelf_transform)
265
serializer = pack.ContainerSerialiser()
266
shelf_file.write(serializer.begin())
268
'revision_id': self.target_tree.get_revision_id(),
270
if message is not None:
271
metadata['message'] = message.encode('utf-8')
272
shelf_file.write(serializer.bytes_record(
273
bencode.bencode(metadata), (('metadata',),)))
274
for bytes in self.shelf_transform.serialize(serializer):
275
shelf_file.write(bytes)
276
shelf_file.write(serializer.end())
279
class Unshelver(object):
280
"""Unshelve shelved changes."""
282
def __init__(self, tree, base_tree, transform, message):
285
:param tree: The tree to apply the changes to.
286
:param base_tree: The basis to apply the tranform to.
287
:param message: A message from the shelved transform.
290
self.base_tree = base_tree
291
self.transform = transform
292
self.message = message
295
def iter_records(shelf_file):
296
parser = pack.ContainerPushParser()
297
parser.accept_bytes(shelf_file.read())
298
return iter(parser.read_pending_records())
301
def parse_metadata(records):
302
names, metadata_bytes = records.next()
303
if names[0] != ('metadata',):
304
raise errors.ShelfCorrupt
305
metadata = bencode.bdecode(metadata_bytes)
306
message = metadata.get('message')
307
if message is not None:
308
metadata['message'] = message.decode('utf-8')
312
def from_tree_and_shelf(klass, tree, shelf_file):
313
"""Create an Unshelver from a tree and a shelf file.
315
:param tree: The tree to apply shelved changes to.
316
:param shelf_file: A file-like object containing shelved changes.
317
:return: The Unshelver.
319
records = klass.iter_records(shelf_file)
320
metadata = klass.parse_metadata(records)
321
base_revision_id = metadata['revision_id']
323
base_tree = tree.revision_tree(base_revision_id)
324
except errors.NoSuchRevisionInTree:
325
base_tree = tree.branch.repository.revision_tree(base_revision_id)
326
tt = transform.TransformPreview(base_tree)
327
tt.deserialize(records)
328
return klass(tree, base_tree, tt, metadata.get('message'))
330
def make_merger(self, task=None):
331
"""Return a merger that can unshelve the changes."""
332
target_tree = self.transform.get_preview_tree()
333
merger = merge.Merger.from_uncommitted(self.tree, target_tree,
334
task, self.base_tree)
335
merger.merge_type = merge.Merge3Merger
339
"""Release all resources held by this Unshelver."""
340
self.transform.finalize()
343
class ShelfManager(object):
344
"""Maintain a list of shelved changes."""
346
def __init__(self, tree, transport):
348
self.transport = transport.clone('shelf')
349
self.transport.ensure_base()
351
def get_shelf_filename(self, shelf_id):
352
return 'shelf-%d' % shelf_id
354
def get_shelf_ids(self, filenames):
355
matcher = re.compile('shelf-([1-9][0-9]*)')
357
for filename in filenames:
358
match = matcher.match(filename)
359
if match is not None:
360
shelf_ids.append(int(match.group(1)))
364
"""Return a file object and id for a new set of shelved changes."""
365
last_shelf = self.last_shelf()
366
if last_shelf is None:
369
next_shelf = last_shelf + 1
370
filename = self.get_shelf_filename(next_shelf)
371
shelf_file = open(self.transport.local_abspath(filename), 'wb')
372
return next_shelf, shelf_file
374
def shelve_changes(self, creator, message=None):
375
"""Store the changes in a ShelfCreator on a shelf."""
376
next_shelf, shelf_file = self.new_shelf()
378
creator.write_shelf(shelf_file, message)
384
def read_shelf(self, shelf_id):
385
"""Return the file associated with a shelf_id for reading.
387
:param shelf_id: The id of the shelf to retrive the file for.
389
filename = self.get_shelf_filename(shelf_id)
391
return open(self.transport.local_abspath(filename), 'rb')
393
if e.errno != errno.ENOENT:
395
from bzrlib import errors
396
raise errors.NoSuchShelfId(shelf_id)
398
def get_unshelver(self, shelf_id):
399
"""Return an unshelver for a given shelf_id.
401
:param shelf_id: The shelf id to return the unshelver for.
403
shelf_file = self.read_shelf(shelf_id)
405
return Unshelver.from_tree_and_shelf(self.tree, shelf_file)
409
def get_metadata(self, shelf_id):
410
"""Return the metadata associated with a given shelf_id."""
411
shelf_file = self.read_shelf(shelf_id)
413
records = Unshelver.iter_records(shelf_file)
416
return Unshelver.parse_metadata(records)
418
def delete_shelf(self, shelf_id):
419
"""Delete the shelved changes for a given id.
421
:param shelf_id: id of the shelved changes to delete.
423
filename = self.get_shelf_filename(shelf_id)
424
self.transport.delete(filename)
426
def active_shelves(self):
427
"""Return a list of shelved changes."""
428
active = self.get_shelf_ids(self.transport.list_dir('.'))
432
def last_shelf(self):
433
"""Return the id of the last-created shelved change."""
434
active = self.active_shelves()
added
removed
bzrlib/shelf.py
