1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
1
# Copyright (C) 2008 Canonical Ltd
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
156
157
def from_args(klass, diff_writer, revision=None, all=False, file_list=None,
157
message=None, directory=None, destroy=False):
158
message=None, directory='.', destroy=False):
158
159
"""Create a shelver from commandline arguments.
160
161
The returned shelver wil have a work_tree that is locked and should
168
169
:param destroy: Change the working tree without storing the shelved
171
if directory is None:
174
file_list = [osutils.pathjoin(directory, f) for f in file_list]
175
172
tree, path = workingtree.WorkingTree.open_containing(directory)
176
173
# Ensure that tree is locked for the lifetime of target_tree, as
177
174
# target tree may be reading from the same dirstate.
180
177
target_tree = builtins._get_one_revision_tree('shelf2', revision,
181
178
tree.branch, tree)
182
files = tree.safe_relpath_files(file_list)
179
files = builtins.safe_relpath_files(tree, file_list)
183
180
return klass(tree, target_tree, diff_writer, all, all, files,
184
181
message, destroy)
245
242
new_tree = self.work_tree
246
243
old_path = old_tree.id2path(file_id)
247
244
new_path = new_tree.id2path(file_id)
248
text_differ = diff.DiffText(old_tree, new_tree, diff_file,
249
path_encoding=osutils.get_terminal_encoding())
245
text_differ = diff.DiffText(old_tree, new_tree, diff_file)
250
246
patch = text_differ.diff(file_id, old_path, new_path, 'file', 'file')
251
247
diff_file.seek(0)
252
248
return patches.parse_patch(diff_file)
387
383
"""Unshelve changes into a working tree."""
390
def from_args(klass, shelf_id=None, action='apply', directory='.',
386
def from_args(klass, shelf_id=None, action='apply', directory='.'):
392
387
"""Create an unshelver from commandline arguments.
394
The returned shelver will have a tree that is locked and should
389
The returned shelver wil have a tree that is locked and should
397
392
:param shelf_id: Integer id of the shelf, as a string.
398
393
:param action: action to perform. May be 'apply', 'dry-run',
400
395
:param directory: The directory to unshelve changes into.
401
:param write_diff_to: See Unshelver.__init__().
403
397
tree, path = workingtree.WorkingTree.open_containing(directory)
404
398
tree.lock_tree_write()
413
407
shelf_id = manager.last_shelf()
414
408
if shelf_id is None:
415
409
raise errors.BzrCommandError('No changes are shelved.')
410
trace.note('Unshelving changes with id "%d".' % shelf_id)
416
411
apply_changes = True
417
412
delete_shelf = True
418
413
read_shelf = True
420
414
if action == 'dry-run':
421
415
apply_changes = False
422
416
delete_shelf = False
423
elif action == 'preview':
424
apply_changes = False
427
417
elif action == 'delete-only':
428
418
apply_changes = False
429
419
read_shelf = False
436
426
return klass(tree, manager, shelf_id, apply_changes, delete_shelf,
437
read_shelf, show_diff, write_diff_to)
439
429
def __init__(self, tree, manager, shelf_id, apply_changes=True,
440
delete_shelf=True, read_shelf=True, show_diff=False,
430
delete_shelf=True, read_shelf=True):
444
433
:param tree: The working tree to unshelve into.
449
438
:param delete_shelf: If True, delete the changes from the shelf.
450
439
:param read_shelf: If True, read the changes from the shelf.
451
:param show_diff: If True, show the diff that would result from
452
unshelving the changes.
453
:param write_diff_to: A file-like object where the diff will be
454
written to. If None, ui.ui_factory.make_output_stream() will
458
442
manager = tree.get_shelf_manager()
461
445
self.apply_changes = apply_changes
462
446
self.delete_shelf = delete_shelf
463
447
self.read_shelf = read_shelf
464
self.show_diff = show_diff
465
self.write_diff_to = write_diff_to
468
450
"""Perform the unshelving operation."""
470
452
cleanups = [self.tree.unlock]
472
454
if self.read_shelf:
473
trace.note('Using changes with id "%d".' % self.shelf_id)
474
455
unshelver = self.manager.get_unshelver(self.shelf_id)
475
456
cleanups.append(unshelver.finalize)
476
457
if unshelver.message is not None:
477
458
trace.note('Message: %s' % unshelver.message)
478
459
change_reporter = delta._ChangeReporter()
479
merger = unshelver.make_merger(None)
480
merger.change_reporter = change_reporter
481
if self.apply_changes:
484
self.write_diff(merger)
486
self.show_changes(merger)
460
task = ui.ui_factory.nested_progress_bar()
462
merger = unshelver.make_merger(task)
463
merger.change_reporter = change_reporter
464
if self.apply_changes:
467
self.show_changes(merger)
487
470
if self.delete_shelf:
488
471
self.manager.delete_shelf(self.shelf_id)
489
trace.note('Deleted changes with id "%d".' % self.shelf_id)
491
473
for cleanup in reversed(cleanups):
494
def write_diff(self, merger):
495
"""Write this operation's diff to self.write_diff_to."""
496
tree_merger = merger.make_merger()
497
tt = tree_merger.make_preview_transform()
498
new_tree = tt.get_preview_tree()
499
if self.write_diff_to is None:
500
self.write_diff_to = ui.ui_factory.make_output_stream(encoding_type='exact')
501
path_encoding = osutils.get_diff_header_encoding()
502
diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to,
503
path_encoding=path_encoding)
506
476
def show_changes(self, merger):
507
477
"""Show the changes that this operation specifies."""
508
478
tree_merger = merger.make_merger()
added
removed
bzrlib/shelf_ui.py
