61
55
self.delta_reporter = delta._ChangeReporter()
63
57
def no_changes(self):
64
"""Report that no changes were selected to apply."""
65
58
trace.warning('No changes to shelve.')
67
60
def shelved_id(self, shelf_id):
68
"""Report the id changes were shelved to."""
69
61
trace.note('Changes shelved with id "%d".' % shelf_id)
71
63
def changes_destroyed(self):
72
"""Report that changes were made without shelving."""
73
64
trace.note('Selected changes destroyed.')
75
66
def selected_changes(self, transform):
76
"""Report the changes that were selected."""
77
67
trace.note("Selected changes:")
78
68
changes = transform.iter_changes()
79
69
delta.report_changes(changes, self.delta_reporter)
81
71
def prompt_change(self, change):
82
"""Determine the prompt for a change to apply."""
83
72
if change[0] == 'rename':
84
73
vals = {'this': change[3], 'other': change[2]}
85
74
elif change[0] == 'change kind':
148
136
if reporter is None:
149
137
reporter = ShelfReporter()
150
138
self.reporter = reporter
151
config = self.work_tree.branch.get_config()
152
self.change_editor = config.get_change_editor(target_tree, work_tree)
153
self.work_tree.lock_tree_write()
156
141
def from_args(klass, diff_writer, revision=None, all=False, file_list=None,
157
142
message=None, directory='.', destroy=False):
158
143
"""Create a shelver from commandline arguments.
160
The returned shelver wil have a work_tree that is locked and should
163
145
:param revision: RevisionSpec of the revision to compare to.
164
146
:param all: If True, shelve all changes without prompting.
165
147
:param file_list: If supplied, only files in this list may be shelved.
171
153
tree, path = workingtree.WorkingTree.open_containing(directory)
172
# Ensure that tree is locked for the lifetime of target_tree, as
173
# target tree may be reading from the same dirstate.
174
tree.lock_tree_write()
176
target_tree = builtins._get_one_revision_tree('shelf2', revision,
178
files = builtins.safe_relpath_files(tree, file_list)
179
return klass(tree, target_tree, diff_writer, all, all, files,
154
target_tree = builtins._get_one_revision_tree('shelf2', revision,
156
files = builtins.safe_relpath_files(tree, file_list)
157
return klass(tree, target_tree, diff_writer, all, all, files, message,
185
161
"""Interactively shelve the changes."""
218
194
shutil.rmtree(self.tempdir)
219
195
creator.finalize()
222
if self.change_editor is not None:
223
self.change_editor.finish()
224
self.work_tree.unlock()
227
197
def get_parsed_patch(self, file_id, invert=False):
228
198
"""Return a parsed version of a file's patch.
230
200
:param file_id: The id of the file to generate a patch for.
231
:param invert: If True, provide an inverted patch (insertions displayed
232
as removals, removals displayed as insertions).
233
201
:return: A patches.Patch.
235
203
diff_file = StringIO()
252
220
:param message: The message to prompt a user with.
253
221
:return: A character.
255
if not sys.stdin.isatty():
256
# Since there is no controlling terminal we will hang when trying
257
# to prompt the user, better abort now. See
258
# https://code.launchpad.net/~bialix/bzr/shelve-no-tty/+merge/14905
260
raise errors.BzrError("You need a controlling terminal.")
261
223
sys.stdout.write(message)
262
224
char = osutils.getchar()
263
225
sys.stdout.write("\r" + ' ' * len(message) + '\r')
264
226
sys.stdout.flush()
267
def prompt_bool(self, question, long=False, allow_editor=False):
229
def prompt_bool(self, question, long=False):
268
230
"""Prompt the user with a yes/no question.
270
232
This may be overridden by self.auto. It may also *set* self.auto. It
301
256
def handle_modify_text(self, creator, file_id):
302
"""Handle modified text, by using hunk selection or file editing.
304
:param creator: A ShelfCreator.
305
:param file_id: The id of the file that was modified.
306
:return: The number of changes.
308
work_tree_lines = self.work_tree.get_file_lines(file_id)
310
lines, change_count = self._select_hunks(creator, file_id,
313
lines, change_count = self._edit_file(file_id, work_tree_lines)
314
if change_count != 0:
315
creator.shelve_lines(file_id, lines)
318
def _select_hunks(self, creator, file_id, work_tree_lines):
319
257
"""Provide diff hunk selection for modified text.
321
If self.reporter.invert_diff is True, the diff is inverted so that
322
insertions are displayed as removals and vice versa.
324
259
:param creator: a ShelfCreator
325
260
:param file_id: The id of the file to shelve.
326
:param work_tree_lines: Line contents of the file in the working tree.
327
261
:return: number of shelved hunks.
329
263
if self.reporter.invert_diff:
330
target_lines = work_tree_lines
264
target_lines = self.work_tree.get_file_lines(file_id)
332
266
target_lines = self.target_tree.get_file_lines(file_id)
333
textfile.check_text_lines(work_tree_lines)
267
textfile.check_text_lines(self.work_tree.get_file_lines(file_id))
334
268
textfile.check_text_lines(target_lines)
335
269
parsed = self.get_parsed_patch(file_id, self.reporter.invert_diff)
351
283
offset -= (hunk.mod_range - hunk.orig_range)
352
284
sys.stdout.flush()
285
if not self.reporter.invert_diff and (
286
len(parsed.hunks) == len(final_hunks)):
288
if self.reporter.invert_diff and len(final_hunks) == 0:
290
patched = patches.iter_patched_from_hunks(target_lines, final_hunks)
291
creator.shelve_lines(file_id, list(patched))
353
292
if self.reporter.invert_diff:
354
change_count = len(final_hunks)
356
change_count = len(parsed.hunks) - len(final_hunks)
357
patched = patches.iter_patched_from_hunks(target_lines,
359
lines = list(patched)
360
return lines, change_count
362
def _edit_file(self, file_id, work_tree_lines):
364
:param file_id: id of the file to edit.
365
:param work_tree_lines: Line contents of the file in the working tree.
366
:return: (lines, change_region_count), where lines is the new line
367
content of the file, and change_region_count is the number of
370
lines = osutils.split_lines(self.change_editor.edit_file(file_id))
371
return lines, self._count_changed_regions(work_tree_lines, lines)
374
def _count_changed_regions(old_lines, new_lines):
375
matcher = patiencediff.PatienceSequenceMatcher(None, old_lines,
377
blocks = matcher.get_matching_blocks()
378
return len(blocks) - 2
293
return len(final_hunks)
294
return len(parsed.hunks) - len(final_hunks)
381
297
class Unshelver(object):
382
298
"""Unshelve changes into a working tree."""
385
def from_args(klass, shelf_id=None, action='apply', directory='.',
301
def from_args(klass, shelf_id=None, action='apply', directory='.'):
387
302
"""Create an unshelver from commandline arguments.
389
The returned shelver will have a tree that is locked and should
392
304
:param shelf_id: Integer id of the shelf, as a string.
393
305
:param action: action to perform. May be 'apply', 'dry-run',
395
307
:param directory: The directory to unshelve changes into.
396
:param write_diff_to: See Unshelver.__init__().
398
309
tree, path = workingtree.WorkingTree.open_containing(directory)
399
tree.lock_tree_write()
401
manager = tree.get_shelf_manager()
402
if shelf_id is not None:
404
shelf_id = int(shelf_id)
406
raise errors.InvalidShelfId(shelf_id)
408
shelf_id = manager.last_shelf()
410
raise errors.BzrCommandError('No changes are shelved.')
415
if action == 'dry-run':
416
apply_changes = False
418
elif action == 'preview':
419
apply_changes = False
422
elif action == 'delete-only':
423
apply_changes = False
425
elif action == 'keep':
310
manager = tree.get_shelf_manager()
311
if shelf_id is not None:
313
shelf_id = int(shelf_id)
315
raise errors.InvalidShelfId(shelf_id)
317
shelf_id = manager.last_shelf()
319
raise errors.BzrCommandError('No changes are shelved.')
320
trace.note('Unshelving changes with id "%d".' % shelf_id)
324
if action == 'dry-run':
325
apply_changes = False
327
if action == 'delete-only':
328
apply_changes = False
431
330
return klass(tree, manager, shelf_id, apply_changes, delete_shelf,
432
read_shelf, show_diff, write_diff_to)
434
333
def __init__(self, tree, manager, shelf_id, apply_changes=True,
435
delete_shelf=True, read_shelf=True, show_diff=False,
334
delete_shelf=True, read_shelf=True):
439
337
:param tree: The working tree to unshelve into.
456
349
self.apply_changes = apply_changes
457
350
self.delete_shelf = delete_shelf
458
351
self.read_shelf = read_shelf
459
self.show_diff = show_diff
460
self.write_diff_to = write_diff_to
463
354
"""Perform the unshelving operation."""
464
self.tree.lock_tree_write()
355
self.tree.lock_write()
465
356
cleanups = [self.tree.unlock]
467
358
if self.read_shelf:
468
trace.note('Using changes with id "%d".' % self.shelf_id)
469
359
unshelver = self.manager.get_unshelver(self.shelf_id)
470
360
cleanups.append(unshelver.finalize)
471
361
if unshelver.message is not None:
472
362
trace.note('Message: %s' % unshelver.message)
473
363
change_reporter = delta._ChangeReporter()
474
merger = unshelver.make_merger(None)
475
merger.change_reporter = change_reporter
476
if self.apply_changes:
479
self.write_diff(merger)
481
self.show_changes(merger)
364
task = ui.ui_factory.nested_progress_bar()
366
merger = unshelver.make_merger(task)
367
merger.change_reporter = change_reporter
368
if self.apply_changes:
371
self.show_changes(merger)
482
374
if self.delete_shelf:
483
375
self.manager.delete_shelf(self.shelf_id)
484
trace.note('Deleted changes with id "%d".' % self.shelf_id)
486
377
for cleanup in reversed(cleanups):
489
def write_diff(self, merger):
490
"""Write this operation's diff to self.write_diff_to."""
491
tree_merger = merger.make_merger()
492
tt = tree_merger.make_preview_transform()
493
new_tree = tt.get_preview_tree()
494
if self.write_diff_to is None:
495
self.write_diff_to = ui.ui_factory.make_output_stream()
496
diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to)
499
380
def show_changes(self, merger):
500
381
"""Show the changes that this operation specifies."""
501
382
tree_merger = merger.make_merger()
added
removed
bzrlib/shelf_ui.py
