← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf_ui.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-05 14:12:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6348.
  • Revision ID: jelmer@samba.org-20111205141223-8qxae4h37satlzgq
Move more functionality to vf_search.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
34
34
    ui,
35
35
    workingtree,
36
36
)
37
 
 
 
37
from bzrlib.i18n import gettext
38
38
 
39
39
class UseEditor(Exception):
40
40
    """Use an editor instead of selecting hunks."""
42
42
 
43
43
class ShelfReporter(object):
44
44
 
45
 
    vocab = {'add file': 'Shelve adding file "%(path)s"?',
46
 
             'binary': 'Shelve binary changes?',
47
 
             'change kind': 'Shelve changing "%s" from %(other)s'
48
 
             ' to %(this)s?',
49
 
             'delete file': 'Shelve removing file "%(path)s"?',
50
 
             'final': 'Shelve %d change(s)?',
51
 
             'hunk': 'Shelve?',
52
 
             'modify target': 'Shelve changing target of'
53
 
             ' "%(path)s" from "%(other)s" to "%(this)s"?',
54
 
             'rename': 'Shelve renaming "%(other)s" =>'
55
 
                        ' "%(this)s"?'
 
45
    vocab = {'add file': gettext('Shelve adding file "%(path)s"?'),
 
46
             'binary': gettext('Shelve binary changes?'),
 
47
             'change kind': gettext('Shelve changing "%s" from %(other)s'
 
48
             ' to %(this)s?'),
 
49
             'delete file': gettext('Shelve removing file "%(path)s"?'),
 
50
             'final': gettext('Shelve %d change(s)?'),
 
51
             'hunk': gettext('Shelve?'),
 
52
             'modify target': gettext('Shelve changing target of'
 
53
             ' "%(path)s" from "%(other)s" to "%(this)s"?'),
 
54
             'rename': gettext('Shelve renaming "%(other)s" =>'
 
55
                        ' "%(this)s"?')
56
56
             }
57
57
 
58
58
    invert_diff = False
66
66
 
67
67
    def shelved_id(self, shelf_id):
68
68
        """Report the id changes were shelved to."""
69
 
        trace.note('Changes shelved with id "%d".' % shelf_id)
 
69
        trace.note(gettext('Changes shelved with id "%d".') % shelf_id)
70
70
 
71
71
    def changes_destroyed(self):
72
72
        """Report that changes were made without shelving."""
73
 
        trace.note('Selected changes destroyed.')
 
73
        trace.note(gettext('Selected changes destroyed.'))
74
74
 
75
75
    def selected_changes(self, transform):
76
76
        """Report the changes that were selected."""
77
 
        trace.note("Selected changes:")
 
77
        trace.note(gettext("Selected changes:"))
78
78
        changes = transform.iter_changes()
79
79
        delta.report_changes(changes, self.delta_reporter)
80
80
 
94
94
 
95
95
class ApplyReporter(ShelfReporter):
96
96
 
97
 
    vocab = {'add file': 'Delete file "%(path)s"?',
98
 
             'binary': 'Apply binary changes?',
99
 
             'change kind': 'Change "%(path)s" from %(this)s'
100
 
             ' to %(other)s?',
101
 
             'delete file': 'Add file "%(path)s"?',
102
 
             'final': 'Apply %d change(s)?',
103
 
             'hunk': 'Apply change?',
104
 
             'modify target': 'Change target of'
105
 
             ' "%(path)s" from "%(this)s" to "%(other)s"?',
106
 
             'rename': 'Rename "%(this)s" => "%(other)s"?',
 
97
    vocab = {'add file': gettext('Delete file "%(path)s"?'),
 
98
             'binary': gettext('Apply binary changes?'),
 
99
             'change kind': gettext('Change "%(path)s" from %(this)s'
 
100
             ' to %(other)s?'),
 
101
             'delete file': gettext('Add file "%(path)s"?'),
 
102
             'final': gettext('Apply %d change(s)?'),
 
103
             'hunk': gettext('Apply change?'),
 
104
             'modify target': gettext('Change target of'
 
105
             ' "%(path)s" from "%(this)s" to "%(other)s"?'),
 
106
             'rename': gettext('Rename "%(this)s" => "%(other)s"?'),
107
107
             }
108
108
 
109
109
    invert_diff = True
154
154
 
155
155
    @classmethod
156
156
    def from_args(klass, diff_writer, revision=None, all=False, file_list=None,
157
 
                  message=None, directory='.', destroy=False):
 
157
                  message=None, directory=None, destroy=False):
158
158
        """Create a shelver from commandline arguments.
159
159
 
160
160
        The returned shelver wil have a work_tree that is locked and should
168
168
        :param destroy: Change the working tree without storing the shelved
169
169
            changes.
170
170
        """
 
171
        if directory is None:
 
172
            directory = u'.'
 
173
        elif file_list:
 
174
            file_list = [osutils.pathjoin(directory, f) for f in file_list]
171
175
        tree, path = workingtree.WorkingTree.open_containing(directory)
172
176
        # Ensure that tree is locked for the lifetime of target_tree, as
173
177
        # target tree may be reading from the same dirstate.
175
179
        try:
176
180
            target_tree = builtins._get_one_revision_tree('shelf2', revision,
177
181
                tree.branch, tree)
178
 
            files = builtins.safe_relpath_files(tree, file_list)
 
182
            files = tree.safe_relpath_files(file_list)
179
183
            return klass(tree, target_tree, diff_writer, all, all, files,
180
184
                         message, destroy)
181
185
        finally:
241
245
            new_tree = self.work_tree
242
246
        old_path = old_tree.id2path(file_id)
243
247
        new_path = new_tree.id2path(file_id)
244
 
        text_differ = diff.DiffText(old_tree, new_tree, diff_file)
 
248
        text_differ = diff.DiffText(old_tree, new_tree, diff_file,
 
249
            path_encoding=osutils.get_terminal_encoding())
245
250
        patch = text_differ.diff(file_id, old_path, new_path, 'file', 'file')
246
251
        diff_file.seek(0)
247
252
        return patches.parse_patch(diff_file)
248
253
 
249
 
    def prompt(self, message):
250
 
        """Prompt the user for a character.
251
 
 
252
 
        :param message: The message to prompt a user with.
253
 
        :return: A character.
254
 
        """
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
 
        sys.stdout.write(message)
262
 
        char = osutils.getchar()
263
 
        sys.stdout.write("\r" + ' ' * len(message) + '\r')
264
 
        sys.stdout.flush()
265
 
        return char
266
 
 
267
 
    def prompt_bool(self, question, long=False, allow_editor=False):
 
254
    def prompt(self, message, choices, default):
 
255
        return ui.ui_factory.choose(message, choices, default=default)
 
256
 
 
257
    def prompt_bool(self, question, allow_editor=False):
268
258
        """Prompt the user with a yes/no question.
269
259
 
270
260
        This may be overridden by self.auto.  It may also *set* self.auto.  It
274
264
        """
275
265
        if self.auto:
276
266
            return True
277
 
        editor_string = ''
278
 
        if long:
279
 
            if allow_editor:
280
 
                editor_string = '(E)dit manually, '
281
 
            prompt = ' [(y)es, (N)o, %s(f)inish, or (q)uit]' % editor_string
 
267
        alternatives_chars = 'yn'
 
268
        alternatives = '&yes\n&No'
 
269
        if allow_editor:
 
270
            alternatives_chars += 'e'
 
271
            alternatives += '\n&edit manually'
 
272
        alternatives_chars += 'fq'
 
273
        alternatives += '\n&finish\n&quit'
 
274
        choice = self.prompt(question, alternatives, 1)
 
275
        if choice is None:
 
276
            # EOF.
 
277
            char = 'n'
282
278
        else:
283
 
            if allow_editor:
284
 
                editor_string = 'e'
285
 
            prompt = ' [yN%sfq?]' % editor_string
286
 
        char = self.prompt(question + prompt)
 
279
            char = alternatives_chars[choice]
287
280
        if char == 'y':
288
281
            return True
289
282
        elif char == 'e' and allow_editor:
291
284
        elif char == 'f':
292
285
            self.auto = True
293
286
            return True
294
 
        elif char == '?':
295
 
            return self.prompt_bool(question, long=True)
296
287
        if char == 'q':
297
288
            raise errors.UserAbort()
298
289
        else:
407
398
            else:
408
399
                shelf_id = manager.last_shelf()
409
400
                if shelf_id is None:
410
 
                    raise errors.BzrCommandError('No changes are shelved.')
 
401
                    raise errors.BzrCommandError(gettext('No changes are shelved.'))
411
402
            apply_changes = True
412
403
            delete_shelf = True
413
404
            read_shelf = True
465
456
        cleanups = [self.tree.unlock]
466
457
        try:
467
458
            if self.read_shelf:
468
 
                trace.note('Using changes with id "%d".' % self.shelf_id)
 
459
                trace.note(gettext('Using changes with id "%d".') % self.shelf_id)
469
460
                unshelver = self.manager.get_unshelver(self.shelf_id)
470
461
                cleanups.append(unshelver.finalize)
471
462
                if unshelver.message is not None:
472
 
                    trace.note('Message: %s' % unshelver.message)
 
463
                    trace.note(gettext('Message: %s') % unshelver.message)
473
464
                change_reporter = delta._ChangeReporter()
474
465
                merger = unshelver.make_merger(None)
475
466
                merger.change_reporter = change_reporter
481
472
                    self.show_changes(merger)
482
473
            if self.delete_shelf:
483
474
                self.manager.delete_shelf(self.shelf_id)
484
 
                trace.note('Deleted changes with id "%d".' % self.shelf_id)
 
475
                trace.note(gettext('Deleted changes with id "%d".') % self.shelf_id)
485
476
        finally:
486
477
            for cleanup in reversed(cleanups):
487
478
                cleanup()
492
483
        tt = tree_merger.make_preview_transform()
493
484
        new_tree = tt.get_preview_tree()
494
485
        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)
 
486
            self.write_diff_to = ui.ui_factory.make_output_stream(encoding_type='exact')
 
487
        path_encoding = osutils.get_diff_header_encoding()
 
488
        diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to,
 
489
            path_encoding=path_encoding)
497
490
        tt.finalize()
498
491
 
499
492
    def show_changes(self, merger):