/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 breezy/shelf_ui.py

  • Committer: Jelmer Vernooij
  • Date: 2019-02-04 01:01:24 UTC
  • mto: This revision was merged to the branch mainline in revision 7268.
  • Revision ID: jelmer@jelmer.uk-20190204010124-ni0i4qc6f5tnbvux
Fix source tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf_ui.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
17
18
 
18
 
from cStringIO import StringIO
19
19
import shutil
20
20
import sys
21
21
import tempfile
22
22
 
23
 
from bzrlib import (
 
23
from io import BytesIO
 
24
 
 
25
from . import (
24
26
    builtins,
25
27
    delta,
26
28
    diff,
34
36
    ui,
35
37
    workingtree,
36
38
)
 
39
from .i18n import gettext
37
40
 
38
41
 
39
42
class UseEditor(Exception):
42
45
 
43
46
class ShelfReporter(object):
44
47
 
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"?'
 
48
    vocab = {'add file': gettext('Shelve adding file "%(path)s"?'),
 
49
             'binary': gettext('Shelve binary changes?'),
 
50
             'change kind': gettext('Shelve changing "%s" from %(other)s'
 
51
                                    ' to %(this)s?'),
 
52
             'delete file': gettext('Shelve removing file "%(path)s"?'),
 
53
             'final': gettext('Shelve %d change(s)?'),
 
54
             'hunk': gettext('Shelve?'),
 
55
             'modify target': gettext('Shelve changing target of'
 
56
                                      ' "%(path)s" from "%(other)s" to "%(this)s"?'),
 
57
             'rename': gettext('Shelve renaming "%(other)s" =>'
 
58
                               ' "%(this)s"?')
56
59
             }
57
60
 
58
61
    invert_diff = False
66
69
 
67
70
    def shelved_id(self, shelf_id):
68
71
        """Report the id changes were shelved to."""
69
 
        trace.note('Changes shelved with id "%d".' % shelf_id)
 
72
        trace.note(gettext('Changes shelved with id "%d".') % shelf_id)
70
73
 
71
74
    def changes_destroyed(self):
72
75
        """Report that changes were made without shelving."""
73
 
        trace.note('Selected changes destroyed.')
 
76
        trace.note(gettext('Selected changes destroyed.'))
74
77
 
75
78
    def selected_changes(self, transform):
76
79
        """Report the changes that were selected."""
77
 
        trace.note("Selected changes:")
 
80
        trace.note(gettext("Selected changes:"))
78
81
        changes = transform.iter_changes()
79
82
        delta.report_changes(changes, self.delta_reporter)
80
83
 
94
97
 
95
98
class ApplyReporter(ShelfReporter):
96
99
 
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"?',
 
100
    vocab = {'add file': gettext('Delete file "%(path)s"?'),
 
101
             'binary': gettext('Apply binary changes?'),
 
102
             'change kind': gettext('Change "%(path)s" from %(this)s'
 
103
                                    ' to %(other)s?'),
 
104
             'delete file': gettext('Add file "%(path)s"?'),
 
105
             'final': gettext('Apply %d change(s)?'),
 
106
             'hunk': gettext('Apply change?'),
 
107
             'modify target': gettext('Change target of'
 
108
                                      ' "%(path)s" from "%(this)s" to "%(other)s"?'),
 
109
             'rename': gettext('Rename "%(this)s" => "%(other)s"?'),
107
110
             }
108
111
 
109
112
    invert_diff = True
154
157
 
155
158
    @classmethod
156
159
    def from_args(klass, diff_writer, revision=None, all=False, file_list=None,
157
 
                  message=None, directory='.', destroy=False):
 
160
                  message=None, directory=None, destroy=False):
158
161
        """Create a shelver from commandline arguments.
159
162
 
160
163
        The returned shelver wil have a work_tree that is locked and should
168
171
        :param destroy: Change the working tree without storing the shelved
169
172
            changes.
170
173
        """
 
174
        if directory is None:
 
175
            directory = u'.'
 
176
        elif file_list:
 
177
            file_list = [osutils.pathjoin(directory, f) for f in file_list]
171
178
        tree, path = workingtree.WorkingTree.open_containing(directory)
172
179
        # Ensure that tree is locked for the lifetime of target_tree, as
173
180
        # target tree may be reading from the same dirstate.
174
181
        tree.lock_tree_write()
175
182
        try:
176
183
            target_tree = builtins._get_one_revision_tree('shelf2', revision,
177
 
                tree.branch, tree)
178
 
            files = builtins.safe_relpath_files(tree, file_list)
 
184
                                                          tree.branch, tree)
 
185
            files = tree.safe_relpath_files(file_list)
179
186
            return klass(tree, target_tree, diff_writer, all, all, files,
180
187
                         message, destroy)
181
188
        finally:
204
211
            if changes_shelved > 0:
205
212
                self.reporter.selected_changes(creator.work_transform)
206
213
                if (self.auto_apply or self.prompt_bool(
207
 
                    self.reporter.vocab['final'] % changes_shelved)):
 
214
                        self.reporter.vocab['final'] % changes_shelved)):
208
215
                    if self.destroy:
209
216
                        creator.transform()
210
217
                        self.reporter.changes_destroyed()
223
230
            self.change_editor.finish()
224
231
        self.work_tree.unlock()
225
232
 
226
 
 
227
233
    def get_parsed_patch(self, file_id, invert=False):
228
234
        """Return a parsed version of a file's patch.
229
235
 
232
238
            as removals, removals displayed as insertions).
233
239
        :return: A patches.Patch.
234
240
        """
235
 
        diff_file = StringIO()
 
241
        diff_file = BytesIO()
236
242
        if invert:
237
243
            old_tree = self.work_tree
238
244
            new_tree = self.target_tree
241
247
            new_tree = self.work_tree
242
248
        old_path = old_tree.id2path(file_id)
243
249
        new_path = new_tree.id2path(file_id)
244
 
        text_differ = diff.DiffText(old_tree, new_tree, diff_file)
245
 
        patch = text_differ.diff(file_id, old_path, new_path, 'file', 'file')
 
250
        path_encoding = osutils.get_terminal_encoding()
 
251
        text_differ = diff.DiffText(old_tree, new_tree, diff_file,
 
252
                                    path_encoding=path_encoding)
 
253
        patch = text_differ.diff(old_path, new_path, 'file', 'file')
246
254
        diff_file.seek(0)
247
255
        return patches.parse_patch(diff_file)
248
256
 
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):
 
257
    def prompt(self, message, choices, default):
 
258
        return ui.ui_factory.choose(message, choices, default=default)
 
259
 
 
260
    def prompt_bool(self, question, allow_editor=False):
268
261
        """Prompt the user with a yes/no question.
269
262
 
270
263
        This may be overridden by self.auto.  It may also *set* self.auto.  It
274
267
        """
275
268
        if self.auto:
276
269
            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
 
270
        alternatives_chars = 'yn'
 
271
        alternatives = '&yes\n&No'
 
272
        if allow_editor:
 
273
            alternatives_chars += 'e'
 
274
            alternatives += '\n&edit manually'
 
275
        alternatives_chars += 'fq'
 
276
        alternatives += '\n&finish\n&quit'
 
277
        choice = self.prompt(question, alternatives, 1)
 
278
        if choice is None:
 
279
            # EOF.
 
280
            char = 'n'
282
281
        else:
283
 
            if allow_editor:
284
 
                editor_string = 'e'
285
 
            prompt = ' [yN%sfq?]' % editor_string
286
 
        char = self.prompt(question + prompt)
 
282
            char = alternatives_chars[choice]
287
283
        if char == 'y':
288
284
            return True
289
285
        elif char == 'e' and allow_editor:
291
287
        elif char == 'f':
292
288
            self.auto = True
293
289
            return True
294
 
        elif char == '?':
295
 
            return self.prompt_bool(question, long=True)
296
290
        if char == 'q':
297
291
            raise errors.UserAbort()
298
292
        else:
305
299
        :param file_id: The id of the file that was modified.
306
300
        :return: The number of changes.
307
301
        """
308
 
        work_tree_lines = self.work_tree.get_file_lines(file_id)
 
302
        path = self.work_tree.id2path(file_id)
 
303
        work_tree_lines = self.work_tree.get_file_lines(path, file_id)
309
304
        try:
310
305
            lines, change_count = self._select_hunks(creator, file_id,
311
306
                                                     work_tree_lines)
329
324
        if self.reporter.invert_diff:
330
325
            target_lines = work_tree_lines
331
326
        else:
332
 
            target_lines = self.target_tree.get_file_lines(file_id)
 
327
            path = self.target_tree.id2path(file_id)
 
328
            target_lines = self.target_tree.get_file_lines(path)
333
329
        textfile.check_text_lines(work_tree_lines)
334
330
        textfile.check_text_lines(target_lines)
335
331
        parsed = self.get_parsed_patch(file_id, self.reporter.invert_diff)
338
334
            offset = 0
339
335
            self.diff_writer.write(parsed.get_header())
340
336
            for hunk in parsed.hunks:
341
 
                self.diff_writer.write(str(hunk))
 
337
                self.diff_writer.write(hunk.as_bytes())
342
338
                selected = self.prompt_bool(self.reporter.vocab['hunk'],
343
339
                                            allow_editor=(self.change_editor
344
340
                                                          is not None))
367
363
            content of the file, and change_region_count is the number of
368
364
            changed regions.
369
365
        """
370
 
        lines = osutils.split_lines(self.change_editor.edit_file(file_id))
 
366
        lines = osutils.split_lines(self.change_editor.edit_file(
 
367
            self.change_editor.old_tree.id2path(file_id),
 
368
            self.change_editor.new_tree.id2path(file_id)))
371
369
        return lines, self._count_changed_regions(work_tree_lines, lines)
372
370
 
373
371
    @staticmethod
403
401
                try:
404
402
                    shelf_id = int(shelf_id)
405
403
                except ValueError:
406
 
                    raise errors.InvalidShelfId(shelf_id)
 
404
                    raise shelf.InvalidShelfId(shelf_id)
407
405
            else:
408
406
                shelf_id = manager.last_shelf()
409
407
                if shelf_id is None:
410
 
                    raise errors.BzrCommandError('No changes are shelved.')
 
408
                    raise errors.BzrCommandError(
 
409
                        gettext('No changes are shelved.'))
411
410
            apply_changes = True
412
411
            delete_shelf = True
413
412
            read_shelf = True
465
464
        cleanups = [self.tree.unlock]
466
465
        try:
467
466
            if self.read_shelf:
468
 
                trace.note('Using changes with id "%d".' % self.shelf_id)
 
467
                trace.note(gettext('Using changes with id "%d".') %
 
468
                           self.shelf_id)
469
469
                unshelver = self.manager.get_unshelver(self.shelf_id)
470
470
                cleanups.append(unshelver.finalize)
471
471
                if unshelver.message is not None:
472
 
                    trace.note('Message: %s' % unshelver.message)
 
472
                    trace.note(gettext('Message: %s') % unshelver.message)
473
473
                change_reporter = delta._ChangeReporter()
474
 
                merger = unshelver.make_merger(None)
 
474
                merger = unshelver.make_merger()
475
475
                merger.change_reporter = change_reporter
476
476
                if self.apply_changes:
477
477
                    merger.do_merge()
481
481
                    self.show_changes(merger)
482
482
            if self.delete_shelf:
483
483
                self.manager.delete_shelf(self.shelf_id)
484
 
                trace.note('Deleted changes with id "%d".' % self.shelf_id)
 
484
                trace.note(gettext('Deleted changes with id "%d".') %
 
485
                           self.shelf_id)
485
486
        finally:
486
487
            for cleanup in reversed(cleanups):
487
488
                cleanup()
492
493
        tt = tree_merger.make_preview_transform()
493
494
        new_tree = tt.get_preview_tree()
494
495
        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)
 
496
            self.write_diff_to = ui.ui_factory.make_output_stream(
 
497
                encoding_type='exact')
 
498
        path_encoding = osutils.get_diff_header_encoding()
 
499
        diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to,
 
500
                             path_encoding=path_encoding)
497
501
        tt.finalize()
498
502
 
499
503
    def show_changes(self, merger):