/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/shelf_ui.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-12-18 10:09:49 UTC
  • mfrom: (4871.5.4 admin-guide-submit)
  • Revision ID: pqm@pqm.ubuntu.com-20091218100949-2c1ityvnbqjtdf3g
(nmb) Add backup section to admin-guide

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,
241
242
            new_tree = self.work_tree
242
243
        old_path = old_tree.id2path(file_id)
243
244
        new_path = new_tree.id2path(file_id)
244
 
        text_differ = diff.DiffText(old_tree, new_tree, diff_file,
245
 
            path_encoding=osutils.get_terminal_encoding())
 
245
        text_differ = diff.DiffText(old_tree, new_tree, diff_file)
246
246
        patch = text_differ.diff(file_id, old_path, new_path, 'file', 'file')
247
247
        diff_file.seek(0)
248
248
        return patches.parse_patch(diff_file)
383
383
    """Unshelve changes into a working tree."""
384
384
 
385
385
    @classmethod
386
 
    def from_args(klass, shelf_id=None, action='apply', directory='.',
387
 
                  write_diff_to=None):
 
386
    def from_args(klass, shelf_id=None, action='apply', directory='.'):
388
387
        """Create an unshelver from commandline arguments.
389
388
 
390
 
        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
391
390
        be unlocked.
392
391
 
393
392
        :param shelf_id: Integer id of the shelf, as a string.
394
393
        :param action: action to perform.  May be 'apply', 'dry-run',
395
 
            'delete', 'preview'.
 
394
            'delete'.
396
395
        :param directory: The directory to unshelve changes into.
397
 
        :param write_diff_to: See Unshelver.__init__().
398
396
        """
399
397
        tree, path = workingtree.WorkingTree.open_containing(directory)
400
398
        tree.lock_tree_write()
412
410
            apply_changes = True
413
411
            delete_shelf = True
414
412
            read_shelf = True
415
 
            show_diff = False
416
413
            if action == 'dry-run':
417
414
                apply_changes = False
418
415
                delete_shelf = False
419
 
            elif action == 'preview':
420
 
                apply_changes = False
421
 
                delete_shelf = False
422
 
                show_diff = True
423
416
            elif action == 'delete-only':
424
417
                apply_changes = False
425
418
                read_shelf = False
430
423
            tree.unlock()
431
424
            raise
432
425
        return klass(tree, manager, shelf_id, apply_changes, delete_shelf,
433
 
                     read_shelf, show_diff, write_diff_to)
 
426
                     read_shelf)
434
427
 
435
428
    def __init__(self, tree, manager, shelf_id, apply_changes=True,
436
 
                 delete_shelf=True, read_shelf=True, show_diff=False,
437
 
                 write_diff_to=None):
 
429
                 delete_shelf=True, read_shelf=True):
438
430
        """Constructor.
439
431
 
440
432
        :param tree: The working tree to unshelve into.
444
436
            working tree.
445
437
        :param delete_shelf: If True, delete the changes from the shelf.
446
438
        :param read_shelf: If True, read the changes from the shelf.
447
 
        :param show_diff: If True, show the diff that would result from
448
 
            unshelving the changes.
449
 
        :param write_diff_to: A file-like object where the diff will be
450
 
            written to. If None, ui.ui_factory.make_output_stream() will
451
 
            be used.
452
439
        """
453
440
        self.tree = tree
454
441
        manager = tree.get_shelf_manager()
457
444
        self.apply_changes = apply_changes
458
445
        self.delete_shelf = delete_shelf
459
446
        self.read_shelf = read_shelf
460
 
        self.show_diff = show_diff
461
 
        self.write_diff_to = write_diff_to
462
447
 
463
448
    def run(self):
464
449
        """Perform the unshelving operation."""
472
457
                if unshelver.message is not None:
473
458
                    trace.note('Message: %s' % unshelver.message)
474
459
                change_reporter = delta._ChangeReporter()
475
 
                merger = unshelver.make_merger(None)
476
 
                merger.change_reporter = change_reporter
477
 
                if self.apply_changes:
478
 
                    merger.do_merge()
479
 
                elif self.show_diff:
480
 
                    self.write_diff(merger)
481
 
                else:
482
 
                    self.show_changes(merger)
 
460
                task = ui.ui_factory.nested_progress_bar()
 
461
                try:
 
462
                    merger = unshelver.make_merger(task)
 
463
                    merger.change_reporter = change_reporter
 
464
                    if self.apply_changes:
 
465
                        merger.do_merge()
 
466
                    else:
 
467
                        self.show_changes(merger)
 
468
                finally:
 
469
                    task.finished()
483
470
            if self.delete_shelf:
484
471
                self.manager.delete_shelf(self.shelf_id)
485
472
                trace.note('Deleted changes with id "%d".' % self.shelf_id)
487
474
            for cleanup in reversed(cleanups):
488
475
                cleanup()
489
476
 
490
 
    def write_diff(self, merger):
491
 
        """Write this operation's diff to self.write_diff_to."""
492
 
        tree_merger = merger.make_merger()
493
 
        tt = tree_merger.make_preview_transform()
494
 
        new_tree = tt.get_preview_tree()
495
 
        if self.write_diff_to is None:
496
 
            self.write_diff_to = ui.ui_factory.make_output_stream()
497
 
        path_encoding = osutils.get_diff_header_encoding()
498
 
        diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to,
499
 
            path_encoding=path_encoding)
500
 
        tt.finalize()
501
 
 
502
477
    def show_changes(self, merger):
503
478
        """Show the changes that this operation specifies."""
504
479
        tree_merger = merger.make_merger()