← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf_ui.py

  • Committer: Michael Hudson
  • Date: 2009-11-24 02:25:23 UTC
  • mto: This revision was merged to the branch mainline in revision 4822.
  • Revision ID: michael.hudson@canonical.com-20091124022523-0pism3bgkg0ip73t
final tweak

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008 Canonical Ltd
2
2
#
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
22
22
 
23
23
from bzrlib import (
24
24
    builtins,
 
25
    commands,
25
26
    delta,
26
27
    diff,
27
28
    errors,
252
253
        :param message: The message to prompt a user with.
253
254
        :return: A character.
254
255
        """
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
259
 
            # for more context.
260
 
            raise errors.BzrError("You need a controlling terminal.")
261
256
        sys.stdout.write(message)
262
257
        char = osutils.getchar()
263
258
        sys.stdout.write("\r" + ' ' * len(message) + '\r')
382
377
    """Unshelve changes into a working tree."""
383
378
 
384
379
    @classmethod
385
 
    def from_args(klass, shelf_id=None, action='apply', directory='.',
386
 
                  write_diff_to=None):
 
380
    def from_args(klass, shelf_id=None, action='apply', directory='.'):
387
381
        """Create an unshelver from commandline arguments.
388
382
 
389
 
        The returned shelver will have a tree that is locked and should
 
383
        The returned shelver wil have a tree that is locked and should
390
384
        be unlocked.
391
385
 
392
386
        :param shelf_id: Integer id of the shelf, as a string.
393
387
        :param action: action to perform.  May be 'apply', 'dry-run',
394
 
            'delete', 'preview'.
 
388
            'delete'.
395
389
        :param directory: The directory to unshelve changes into.
396
 
        :param write_diff_to: See Unshelver.__init__().
397
390
        """
398
391
        tree, path = workingtree.WorkingTree.open_containing(directory)
399
392
        tree.lock_tree_write()
408
401
                shelf_id = manager.last_shelf()
409
402
                if shelf_id is None:
410
403
                    raise errors.BzrCommandError('No changes are shelved.')
 
404
                trace.note('Unshelving changes with id "%d".' % shelf_id)
411
405
            apply_changes = True
412
406
            delete_shelf = True
413
407
            read_shelf = True
414
 
            show_diff = False
415
408
            if action == 'dry-run':
416
409
                apply_changes = False
417
410
                delete_shelf = False
418
 
            elif action == 'preview':
419
 
                apply_changes = False
420
 
                delete_shelf = False
421
 
                show_diff = True
422
 
            elif action == 'delete-only':
 
411
            if action == 'delete-only':
423
412
                apply_changes = False
424
413
                read_shelf = False
425
 
            elif action == 'keep':
426
 
                apply_changes = True
427
 
                delete_shelf = False
428
414
        except:
429
415
            tree.unlock()
430
416
            raise
431
417
        return klass(tree, manager, shelf_id, apply_changes, delete_shelf,
432
 
                     read_shelf, show_diff, write_diff_to)
 
418
                     read_shelf)
433
419
 
434
420
    def __init__(self, tree, manager, shelf_id, apply_changes=True,
435
 
                 delete_shelf=True, read_shelf=True, show_diff=False,
436
 
                 write_diff_to=None):
 
421
                 delete_shelf=True, read_shelf=True):
437
422
        """Constructor.
438
423
 
439
424
        :param tree: The working tree to unshelve into.
443
428
            working tree.
444
429
        :param delete_shelf: If True, delete the changes from the shelf.
445
430
        :param read_shelf: If True, read the changes from the shelf.
446
 
        :param show_diff: If True, show the diff that would result from
447
 
            unshelving the changes.
448
 
        :param write_diff_to: A file-like object where the diff will be
449
 
            written to. If None, ui.ui_factory.make_output_stream() will
450
 
            be used.
451
431
        """
452
432
        self.tree = tree
453
433
        manager = tree.get_shelf_manager()
456
436
        self.apply_changes = apply_changes
457
437
        self.delete_shelf = delete_shelf
458
438
        self.read_shelf = read_shelf
459
 
        self.show_diff = show_diff
460
 
        self.write_diff_to = write_diff_to
461
439
 
462
440
    def run(self):
463
441
        """Perform the unshelving operation."""
465
443
        cleanups = [self.tree.unlock]
466
444
        try:
467
445
            if self.read_shelf:
468
 
                trace.note('Using changes with id "%d".' % self.shelf_id)
469
446
                unshelver = self.manager.get_unshelver(self.shelf_id)
470
447
                cleanups.append(unshelver.finalize)
471
448
                if unshelver.message is not None:
472
449
                    trace.note('Message: %s' % unshelver.message)
473
450
                change_reporter = delta._ChangeReporter()
474
 
                merger = unshelver.make_merger(None)
475
 
                merger.change_reporter = change_reporter
476
 
                if self.apply_changes:
477
 
                    merger.do_merge()
478
 
                elif self.show_diff:
479
 
                    self.write_diff(merger)
480
 
                else:
481
 
                    self.show_changes(merger)
 
451
                task = ui.ui_factory.nested_progress_bar()
 
452
                try:
 
453
                    merger = unshelver.make_merger(task)
 
454
                    merger.change_reporter = change_reporter
 
455
                    if self.apply_changes:
 
456
                        merger.do_merge()
 
457
                    else:
 
458
                        self.show_changes(merger)
 
459
                finally:
 
460
                    task.finished()
482
461
            if self.delete_shelf:
483
462
                self.manager.delete_shelf(self.shelf_id)
484
 
                trace.note('Deleted changes with id "%d".' % self.shelf_id)
485
463
        finally:
486
464
            for cleanup in reversed(cleanups):
487
465
                cleanup()
488
466
 
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)
497
 
        tt.finalize()
498
 
 
499
467
    def show_changes(self, merger):
500
468
        """Show the changes that this operation specifies."""
501
469
        tree_merger = merger.make_merger()