/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4902.1.8 by John Arbash Meinel
Delay grabbing an output stream until we actually go to show a diff.
1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
0.16.101 by Aaron Bentley
Update GPL formatting and copyright
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.16.1 by Aaron Bentley
Begin implementing UI
16
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
0.16.1 by Aaron Bentley
Begin implementing UI
18
7290.14.1 by Jelmer Vernooij
Use external patiencediff.
19
import patiencediff
0.16.5 by Aaron Bentley
Get text shelving working
20
import shutil
0.16.1 by Aaron Bentley
Begin implementing UI
21
import sys
0.16.5 by Aaron Bentley
Get text shelving working
22
import tempfile
0.16.1 by Aaron Bentley
Begin implementing UI
23
7045.1.1 by Jelmer Vernooij
Fix another 300 tests.
24
from io import BytesIO
25
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
26
from . import (
0.16.25 by Aaron Bentley
Show selected changes before shelving
27
    builtins,
7356.1.5 by Jelmer Vernooij
Use more ExitStacks.
28
    cleanup,
0.16.25 by Aaron Bentley
Show selected changes before shelving
29
    delta,
30
    diff,
31
    errors,
0.16.79 by Aaron Bentley
Remove dependencies on bzrtools
32
    osutils,
0.16.25 by Aaron Bentley
Show selected changes before shelving
33
    patches,
0.16.74 by Aaron Bentley
Merge with shelf-manager
34
    shelf,
0.16.72 by Aaron Bentley
Allow shelving binary changes
35
    textfile,
0.16.54 by Aaron Bentley
Inform user about shelf ids.
36
    trace,
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
37
    ui,
0.16.102 by Aaron Bentley
Minor updates
38
    workingtree,
39
)
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
40
from .i18n import gettext
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
41
3835.2.6 by Aaron Bentley
Restore vila's colordiff change
42
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
43
class UseEditor(Exception):
44
    """Use an editor instead of selecting hunks."""
45
46
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
47
class ShelfReporter(object):
4526.7.2 by Aaron Bentley
Update docs.
48
6143.1.2 by Jonathan Riddell
gettext() shelf_ui.py
49
    vocab = {'add file': gettext('Shelve adding file "%(path)s"?'),
50
             'binary': gettext('Shelve binary changes?'),
51
             'change kind': gettext('Shelve changing "%s" from %(other)s'
7143.15.2 by Jelmer Vernooij
Run autopep8.
52
                                    ' to %(this)s?'),
6143.1.2 by Jonathan Riddell
gettext() shelf_ui.py
53
             'delete file': gettext('Shelve removing file "%(path)s"?'),
54
             'final': gettext('Shelve %d change(s)?'),
55
             'hunk': gettext('Shelve?'),
56
             'modify target': gettext('Shelve changing target of'
7143.15.2 by Jelmer Vernooij
Run autopep8.
57
                                      ' "%(path)s" from "%(other)s" to "%(this)s"?'),
6143.1.2 by Jonathan Riddell
gettext() shelf_ui.py
58
             'rename': gettext('Shelve renaming "%(other)s" =>'
7143.15.2 by Jelmer Vernooij
Run autopep8.
59
                               ' "%(this)s"?')
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
60
             }
61
62
    invert_diff = False
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
63
64
    def __init__(self):
65
        self.delta_reporter = delta._ChangeReporter()
66
67
    def no_changes(self):
4526.7.2 by Aaron Bentley
Update docs.
68
        """Report that no changes were selected to apply."""
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
69
        trace.warning('No changes to shelve.')
70
71
    def shelved_id(self, shelf_id):
4526.7.2 by Aaron Bentley
Update docs.
72
        """Report the id changes were shelved to."""
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
73
        trace.note(gettext('Changes shelved with id "%d".') % shelf_id)
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
74
4526.6.4 by Aaron Bentley
Remove changes_destroyed message.
75
    def changes_destroyed(self):
4526.7.2 by Aaron Bentley
Update docs.
76
        """Report that changes were made without shelving."""
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
77
        trace.note(gettext('Selected changes destroyed.'))
4526.6.4 by Aaron Bentley
Remove changes_destroyed message.
78
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
79
    def selected_changes(self, transform):
4526.7.2 by Aaron Bentley
Update docs.
80
        """Report the changes that were selected."""
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
81
        trace.note(gettext("Selected changes:"))
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
82
        changes = transform.iter_changes()
83
        delta.report_changes(changes, self.delta_reporter)
84
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
85
    def prompt_change(self, change):
4526.7.2 by Aaron Bentley
Update docs.
86
        """Determine the prompt for a change to apply."""
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
87
        if change[0] == 'rename':
88
            vals = {'this': change[3], 'other': change[2]}
89
        elif change[0] == 'change kind':
90
            vals = {'path': change[4], 'other': change[2], 'this': change[3]}
91
        elif change[0] == 'modify target':
92
            vals = {'path': change[2], 'other': change[3], 'this': change[4]}
93
        else:
94
            vals = {'path': change[3]}
95
        prompt = self.vocab[change[0]] % vals
96
        return prompt
97
98
99
class ApplyReporter(ShelfReporter):
100
6143.1.2 by Jonathan Riddell
gettext() shelf_ui.py
101
    vocab = {'add file': gettext('Delete file "%(path)s"?'),
102
             'binary': gettext('Apply binary changes?'),
103
             'change kind': gettext('Change "%(path)s" from %(this)s'
7143.15.2 by Jelmer Vernooij
Run autopep8.
104
                                    ' to %(other)s?'),
6143.1.2 by Jonathan Riddell
gettext() shelf_ui.py
105
             'delete file': gettext('Add file "%(path)s"?'),
106
             'final': gettext('Apply %d change(s)?'),
107
             'hunk': gettext('Apply change?'),
108
             'modify target': gettext('Change target of'
7143.15.2 by Jelmer Vernooij
Run autopep8.
109
                                      ' "%(path)s" from "%(this)s" to "%(other)s"?'),
6143.1.2 by Jonathan Riddell
gettext() shelf_ui.py
110
             'rename': gettext('Rename "%(this)s" => "%(other)s"?'),
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
111
             }
112
113
    invert_diff = True
114
115
    def changes_destroyed(self):
116
        pass
117
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
118
0.16.1 by Aaron Bentley
Begin implementing UI
119
class Shelver(object):
0.16.97 by Aaron Bentley
Turn diff_file and text_differ into instance variables.
120
    """Interactively shelve the changes in a working tree."""
0.16.1 by Aaron Bentley
Begin implementing UI
121
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
122
    def __init__(self, work_tree, target_tree, diff_writer=None, auto=False,
4100.3.1 by Aaron Bentley
Implement shelve --destroy
123
                 auto_apply=False, file_list=None, message=None,
4603.1.9 by Aaron Bentley
Misc cleanup.
124
                 destroy=False, manager=None, reporter=None):
0.16.97 by Aaron Bentley
Turn diff_file and text_differ into instance variables.
125
        """Constructor.
126
127
        :param work_tree: The working tree to shelve changes from.
128
        :param target_tree: The "unchanged" / old tree to compare the
129
            work_tree to.
130
        :param auto: If True, shelve each possible change.
131
        :param auto_apply: If True, shelve changes with no final prompt.
0.16.102 by Aaron Bentley
Minor updates
132
        :param file_list: If supplied, only files in this list may be shelved.
0.16.97 by Aaron Bentley
Turn diff_file and text_differ into instance variables.
133
        :param message: The message to associate with the shelved changes.
4100.3.2 by Aaron Bentley
Update docs
134
        :param destroy: Change the working tree without storing the shelved
135
            changes.
4465.1.2 by Aaron Bentley
Accept manager as a parameter to Shelver()
136
        :param manager: The shelf manager to use.
4526.7.2 by Aaron Bentley
Update docs.
137
        :param reporter: Object for reporting changes to user.
0.16.97 by Aaron Bentley
Turn diff_file and text_differ into instance variables.
138
        """
0.16.1 by Aaron Bentley
Begin implementing UI
139
        self.work_tree = work_tree
140
        self.target_tree = target_tree
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
141
        self.diff_writer = diff_writer
142
        if self.diff_writer is None:
0.16.79 by Aaron Bentley
Remove dependencies on bzrtools
143
            self.diff_writer = sys.stdout
4465.1.2 by Aaron Bentley
Accept manager as a parameter to Shelver()
144
        if manager is None:
145
            manager = work_tree.get_shelf_manager()
146
        self.manager = manager
0.16.15 by Aaron Bentley
Implement auto mode
147
        self.auto = auto
0.16.23 by Aaron Bentley
Improve prompting
148
        self.auto_apply = auto_apply
0.16.47 by Aaron Bentley
Support selecting files to shelve
149
        self.file_list = file_list
0.16.57 by Aaron Bentley
Expose messages in the UI
150
        self.message = message
4100.3.1 by Aaron Bentley
Implement shelve --destroy
151
        self.destroy = destroy
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
152
        if reporter is None:
153
            reporter = ShelfReporter()
154
        self.reporter = reporter
4603.1.14 by Aaron Bentley
Make change editor mandatory
155
        config = self.work_tree.branch.get_config()
156
        self.change_editor = config.get_change_editor(target_tree, work_tree)
4603.2.1 by Benoît Pierre
Lock the work tree in Shelver only after everything else has been setup.
157
        self.work_tree.lock_tree_write()
0.16.1 by Aaron Bentley
Begin implementing UI
158
159
    @classmethod
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
160
    def from_args(klass, diff_writer, revision=None, all=False, file_list=None,
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
161
                  message=None, directory=None, destroy=False):
0.16.97 by Aaron Bentley
Turn diff_file and text_differ into instance variables.
162
        """Create a shelver from commandline arguments.
163
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
164
        The returned shelver wil have a work_tree that is locked and should
165
        be unlocked.
166
0.16.97 by Aaron Bentley
Turn diff_file and text_differ into instance variables.
167
        :param revision: RevisionSpec of the revision to compare to.
168
        :param all: If True, shelve all changes without prompting.
169
        :param file_list: If supplied, only files in this list may be  shelved.
170
        :param message: The message to associate with the shelved changes.
171
        :param directory: The directory containing the working tree.
4100.3.1 by Aaron Bentley
Implement shelve --destroy
172
        :param destroy: Change the working tree without storing the shelved
173
            changes.
0.16.97 by Aaron Bentley
Turn diff_file and text_differ into instance variables.
174
        """
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
175
        if directory is None:
176
            directory = u'.'
177
        elif file_list:
178
            file_list = [osutils.pathjoin(directory, f) for f in file_list]
0.16.94 by Aaron Bentley
Add unshelve tests
179
        tree, path = workingtree.WorkingTree.open_containing(directory)
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
180
        # Ensure that tree is locked for the lifetime of target_tree, as
181
        # target tree may be reading from the same dirstate.
7356.1.5 by Jelmer Vernooij
Use more ExitStacks.
182
        with tree.lock_tree_write():
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
183
            target_tree = builtins._get_one_revision_tree('shelf2', revision,
7143.15.2 by Jelmer Vernooij
Run autopep8.
184
                                                          tree.branch, tree)
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
185
            files = tree.safe_relpath_files(file_list)
4603.1.17 by Aaron Bentley
Fix shelf_ui tests to finalize.
186
            return klass(tree, target_tree, diff_writer, all, all, files,
187
                         message, destroy)
0.16.1 by Aaron Bentley
Begin implementing UI
188
189
    def run(self):
0.16.97 by Aaron Bentley
Turn diff_file and text_differ into instance variables.
190
        """Interactively shelve the changes."""
0.16.47 by Aaron Bentley
Support selecting files to shelve
191
        creator = shelf.ShelfCreator(self.work_tree, self.target_tree,
192
                                     self.file_list)
0.16.5 by Aaron Bentley
Get text shelving working
193
        self.tempdir = tempfile.mkdtemp()
0.16.22 by Aaron Bentley
Only prompt when there are changes to shelve.
194
        changes_shelved = 0
0.16.1 by Aaron Bentley
Begin implementing UI
195
        try:
4603.1.7 by Aaron Bentley
Allow configuring change editor.
196
            for change in creator.iter_shelvable():
197
                if change[0] == 'modify text':
198
                    try:
4603.1.9 by Aaron Bentley
Misc cleanup.
199
                        changes_shelved += self.handle_modify_text(creator,
200
                                                                   change[1])
4603.1.7 by Aaron Bentley
Allow configuring change editor.
201
                    except errors.BinaryFile:
202
                        if self.prompt_bool(self.reporter.vocab['binary']):
0.16.72 by Aaron Bentley
Allow shelving binary changes
203
                            changes_shelved += 1
4603.1.7 by Aaron Bentley
Allow configuring change editor.
204
                            creator.shelve_content_change(change[1])
4526.6.1 by Aaron Bentley
Reverse the way changes are described by Shelver.
205
                else:
4603.1.7 by Aaron Bentley
Allow configuring change editor.
206
                    if self.prompt_bool(self.reporter.prompt_change(change)):
207
                        creator.shelve_change(change)
208
                        changes_shelved += 1
209
            if changes_shelved > 0:
210
                self.reporter.selected_changes(creator.work_transform)
211
                if (self.auto_apply or self.prompt_bool(
7143.15.2 by Jelmer Vernooij
Run autopep8.
212
                        self.reporter.vocab['final'] % changes_shelved)):
4603.1.7 by Aaron Bentley
Allow configuring change editor.
213
                    if self.destroy:
214
                        creator.transform()
215
                        self.reporter.changes_destroyed()
216
                    else:
217
                        shelf_id = self.manager.shelve_changes(creator,
218
                                                               self.message)
219
                        self.reporter.shelved_id(shelf_id)
220
            else:
221
                self.reporter.no_changes()
0.16.1 by Aaron Bentley
Begin implementing UI
222
        finally:
0.16.5 by Aaron Bentley
Get text shelving working
223
            shutil.rmtree(self.tempdir)
0.16.1 by Aaron Bentley
Begin implementing UI
224
            creator.finalize()
225
4603.1.11 by Aaron Bentley
Implement shelver.finalize
226
    def finalize(self):
4603.1.17 by Aaron Bentley
Fix shelf_ui tests to finalize.
227
        if self.change_editor is not None:
228
            self.change_editor.finish()
4603.1.14 by Aaron Bentley
Make change editor mandatory
229
        self.work_tree.unlock()
230
6883.5.11 by Jelmer Vernooij
Fix tests.
231
    def get_parsed_patch(self, file_id, invert=False):
0.16.98 by Aaron Bentley
Update docs and prompting
232
        """Return a parsed version of a file's patch.
233
234
        :param file_id: The id of the file to generate a patch for.
4526.7.2 by Aaron Bentley
Update docs.
235
        :param invert: If True, provide an inverted patch (insertions displayed
236
            as removals, removals displayed as insertions).
0.16.98 by Aaron Bentley
Update docs and prompting
237
        :return: A patches.Patch.
238
        """
7045.1.1 by Jelmer Vernooij
Fix another 300 tests.
239
        diff_file = BytesIO()
4526.6.2 by Aaron Bentley
Fix display of diffs for apply mode
240
        if invert:
241
            old_tree = self.work_tree
242
            new_tree = self.target_tree
243
        else:
244
            old_tree = self.target_tree
245
            new_tree = self.work_tree
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
246
        old_path = old_tree.id2path(file_id)
247
        new_path = new_tree.id2path(file_id)
7045.1.1 by Jelmer Vernooij
Fix another 300 tests.
248
        path_encoding = osutils.get_terminal_encoding()
4797.57.8 by Alexander Belchenko
using appropriate encoing for diff in shelve/unshelve.
249
        text_differ = diff.DiffText(old_tree, new_tree, diff_file,
7143.15.2 by Jelmer Vernooij
Run autopep8.
250
                                    path_encoding=path_encoding)
7206.6.7 by Jelmer Vernooij
Fix tests.
251
        patch = text_differ.diff(old_path, new_path, 'file', 'file')
0.16.97 by Aaron Bentley
Turn diff_file and text_differ into instance variables.
252
        diff_file.seek(0)
253
        return patches.parse_patch(diff_file)
0.16.1 by Aaron Bentley
Begin implementing UI
254
6182.2.7 by Benoît Pierre
Update shelf UI to use ui.confirm.
255
    def prompt(self, message, choices, default):
6182.2.13 by Benoît Pierre
Rename ui.confirm to ui.choose.
256
        return ui.ui_factory.choose(message, choices, default=default)
6182.2.7 by Benoît Pierre
Update shelf UI to use ui.confirm.
257
258
    def prompt_bool(self, question, allow_editor=False):
0.16.98 by Aaron Bentley
Update docs and prompting
259
        """Prompt the user with a yes/no question.
260
0.16.102 by Aaron Bentley
Minor updates
261
        This may be overridden by self.auto.  It may also *set* self.auto.  It
0.16.103 by Aaron Bentley
raise UserAbort instead of doing sys.exit
262
        may also raise UserAbort.
0.16.98 by Aaron Bentley
Update docs and prompting
263
        :param question: The question to ask the user.
264
        :return: True or False
265
        """
266
        if self.auto:
0.16.23 by Aaron Bentley
Improve prompting
267
            return True
6182.2.7 by Benoît Pierre
Update shelf UI to use ui.confirm.
268
        alternatives_chars = 'yn'
269
        alternatives = '&yes\n&No'
270
        if allow_editor:
271
            alternatives_chars += 'e'
272
            alternatives += '\n&edit manually'
273
        alternatives_chars += 'fq'
274
        alternatives += '\n&finish\n&quit'
275
        choice = self.prompt(question, alternatives, 1)
276
        if choice is None:
277
            # EOF.
278
            char = 'n'
3990.4.3 by Daniel Watkins
Added help option to shelve prompt.
279
        else:
6182.2.7 by Benoît Pierre
Update shelf UI to use ui.confirm.
280
            char = alternatives_chars[choice]
0.16.23 by Aaron Bentley
Improve prompting
281
        if char == 'y':
282
            return True
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
283
        elif char == 'e' and allow_editor:
284
            raise UseEditor
0.16.23 by Aaron Bentley
Improve prompting
285
        elif char == 'f':
286
            self.auto = True
287
            return True
0.16.24 by Aaron Bentley
Regularize prompts
288
        if char == 'q':
0.16.103 by Aaron Bentley
raise UserAbort instead of doing sys.exit
289
            raise errors.UserAbort()
0.16.23 by Aaron Bentley
Improve prompting
290
        else:
291
            return False
0.16.1 by Aaron Bentley
Begin implementing UI
292
4603.1.7 by Aaron Bentley
Allow configuring change editor.
293
    def handle_modify_text(self, creator, file_id):
4603.1.9 by Aaron Bentley
Misc cleanup.
294
        """Handle modified text, by using hunk selection or file editing.
295
296
        :param creator: A ShelfCreator.
297
        :param file_id: The id of the file that was modified.
298
        :return: The number of changes.
299
        """
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
300
        path = self.work_tree.id2path(file_id)
301
        work_tree_lines = self.work_tree.get_file_lines(path, file_id)
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
302
        try:
4603.1.9 by Aaron Bentley
Misc cleanup.
303
            lines, change_count = self._select_hunks(creator, file_id,
304
                                                     work_tree_lines)
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
305
        except UseEditor:
4603.1.9 by Aaron Bentley
Misc cleanup.
306
            lines, change_count = self._edit_file(file_id, work_tree_lines)
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
307
        if change_count != 0:
308
            creator.shelve_lines(file_id, lines)
309
        return change_count
310
4603.1.9 by Aaron Bentley
Misc cleanup.
311
    def _select_hunks(self, creator, file_id, work_tree_lines):
0.16.98 by Aaron Bentley
Update docs and prompting
312
        """Provide diff hunk selection for modified text.
313
4526.7.2 by Aaron Bentley
Update docs.
314
        If self.reporter.invert_diff is True, the diff is inverted so that
315
        insertions are displayed as removals and vice versa.
316
0.16.98 by Aaron Bentley
Update docs and prompting
317
        :param creator: a ShelfCreator
318
        :param file_id: The id of the file to shelve.
4603.1.9 by Aaron Bentley
Misc cleanup.
319
        :param work_tree_lines: Line contents of the file in the working tree.
0.16.98 by Aaron Bentley
Update docs and prompting
320
        :return: number of shelved hunks.
321
        """
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
322
        if self.reporter.invert_diff:
4603.1.9 by Aaron Bentley
Misc cleanup.
323
            target_lines = work_tree_lines
4526.6.2 by Aaron Bentley
Fix display of diffs for apply mode
324
        else:
6874.2.1 by Jelmer Vernooij
Make Tree.iter_files_bytes() take paths rather than file_ids.
325
            path = self.target_tree.id2path(file_id)
7141.7.1 by Jelmer Vernooij
Get rid of file_ids in most of Tree.
326
            target_lines = self.target_tree.get_file_lines(path)
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
327
        textfile.check_text_lines(work_tree_lines)
0.16.72 by Aaron Bentley
Allow shelving binary changes
328
        textfile.check_text_lines(target_lines)
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
329
        parsed = self.get_parsed_patch(file_id, self.reporter.invert_diff)
0.16.43 by Aaron Bentley
Reduce API friction.
330
        final_hunks = []
0.16.15 by Aaron Bentley
Implement auto mode
331
        if not self.auto:
0.16.41 by Aaron Bentley
Implement shelving with internal patch
332
            offset = 0
0.16.61 by Aaron Bentley
Show file name when shelving
333
            self.diff_writer.write(parsed.get_header())
0.16.15 by Aaron Bentley
Implement auto mode
334
            for hunk in parsed.hunks:
7116.2.1 by Jelmer Vernooij
Fix displaying of patch hunks in shelf.
335
                self.diff_writer.write(hunk.as_bytes())
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
336
                selected = self.prompt_bool(self.reporter.vocab['hunk'],
4603.1.7 by Aaron Bentley
Allow configuring change editor.
337
                                            allow_editor=(self.change_editor
338
                                                          is not None))
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
339
                if not self.reporter.invert_diff:
4526.6.2 by Aaron Bentley
Fix display of diffs for apply mode
340
                    selected = (not selected)
341
                if selected:
0.16.41 by Aaron Bentley
Implement shelving with internal patch
342
                    hunk.mod_pos += offset
0.16.43 by Aaron Bentley
Reduce API friction.
343
                    final_hunks.append(hunk)
0.16.41 by Aaron Bentley
Implement shelving with internal patch
344
                else:
345
                    offset -= (hunk.mod_range - hunk.orig_range)
0.16.68 by Aaron Bentley
Avoid having escape codes affect the wrong text.
346
        sys.stdout.flush()
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
347
        if self.reporter.invert_diff:
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
348
            change_count = len(final_hunks)
349
        else:
350
            change_count = len(parsed.hunks) - len(final_hunks)
4603.1.2 by Aaron Bentley
Simplify unchanged case.
351
        patched = patches.iter_patched_from_hunks(target_lines,
352
                                                  final_hunks)
353
        lines = list(patched)
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
354
        return lines, change_count
355
4603.1.9 by Aaron Bentley
Misc cleanup.
356
    def _edit_file(self, file_id, work_tree_lines):
357
        """
358
        :param file_id: id of the file to edit.
359
        :param work_tree_lines: Line contents of the file in the working tree.
360
        :return: (lines, change_region_count), where lines is the new line
361
            content of the file, and change_region_count is the number of
362
            changed regions.
363
        """
6809.4.20 by Jelmer Vernooij
Fix tests.
364
        lines = osutils.split_lines(self.change_editor.edit_file(
365
            self.change_editor.old_tree.id2path(file_id),
7206.6.2 by Jelmer Vernooij
Remove file_id from diff API.
366
            self.change_editor.new_tree.id2path(file_id)))
4603.1.6 by Aaron Bentley
Provide a reasonable count of changes when file edited.
367
        return lines, self._count_changed_regions(work_tree_lines, lines)
368
369
    @staticmethod
370
    def _count_changed_regions(old_lines, new_lines):
371
        matcher = patiencediff.PatienceSequenceMatcher(None, old_lines,
372
                                                       new_lines)
373
        blocks = matcher.get_matching_blocks()
374
        return len(blocks) - 2
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
375
376
377
class Unshelver(object):
0.16.98 by Aaron Bentley
Update docs and prompting
378
    """Unshelve changes into a working tree."""
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
379
380
    @classmethod
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
381
    def from_args(klass, shelf_id=None, action='apply', directory='.',
382
                  write_diff_to=None):
0.16.98 by Aaron Bentley
Update docs and prompting
383
        """Create an unshelver from commandline arguments.
384
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
385
        The returned shelver will have a tree that is locked and should
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
386
        be unlocked.
387
0.16.98 by Aaron Bentley
Update docs and prompting
388
        :param shelf_id: Integer id of the shelf, as a string.
389
        :param action: action to perform.  May be 'apply', 'dry-run',
4902.1.2 by Guilherme Salgado
First round of the new approach, using a new action (--preview) on the unshelve command
390
            'delete', 'preview'.
0.16.98 by Aaron Bentley
Update docs and prompting
391
        :param directory: The directory to unshelve changes into.
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
392
        :param write_diff_to: See Unshelver.__init__().
0.16.98 by Aaron Bentley
Update docs and prompting
393
        """
0.16.94 by Aaron Bentley
Add unshelve tests
394
        tree, path = workingtree.WorkingTree.open_containing(directory)
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
395
        tree.lock_tree_write()
396
        try:
397
            manager = tree.get_shelf_manager()
398
            if shelf_id is not None:
399
                try:
400
                    shelf_id = int(shelf_id)
401
                except ValueError:
6734.1.1 by Jelmer Vernooij
Fix more imports.
402
                    raise shelf.InvalidShelfId(shelf_id)
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
403
            else:
404
                shelf_id = manager.last_shelf()
405
                if shelf_id is None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
406
                    raise errors.BzrCommandError(
407
                        gettext('No changes are shelved.'))
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
408
            apply_changes = True
409
            delete_shelf = True
410
            read_shelf = True
4902.1.2 by Guilherme Salgado
First round of the new approach, using a new action (--preview) on the unshelve command
411
            show_diff = False
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
412
            if action == 'dry-run':
413
                apply_changes = False
414
                delete_shelf = False
4902.1.2 by Guilherme Salgado
First round of the new approach, using a new action (--preview) on the unshelve command
415
            elif action == 'preview':
416
                apply_changes = False
417
                delete_shelf = False
418
                show_diff = True
4889.1.3 by Martin Pool
New option unshelve --keep
419
            elif action == 'delete-only':
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
420
                apply_changes = False
421
                read_shelf = False
4889.1.3 by Martin Pool
New option unshelve --keep
422
            elif action == 'keep':
423
                apply_changes = True
424
                delete_shelf = False
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
425
        except:
426
            tree.unlock()
427
            raise
0.16.65 by Aaron Bentley
Implement unshelve --delete
428
        return klass(tree, manager, shelf_id, apply_changes, delete_shelf,
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
429
                     read_shelf, show_diff, write_diff_to)
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
430
0.16.94 by Aaron Bentley
Add unshelve tests
431
    def __init__(self, tree, manager, shelf_id, apply_changes=True,
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
432
                 delete_shelf=True, read_shelf=True, show_diff=False,
433
                 write_diff_to=None):
0.16.98 by Aaron Bentley
Update docs and prompting
434
        """Constructor.
435
436
        :param tree: The working tree to unshelve into.
437
        :param manager: The ShelveManager containing the shelved changes.
438
        :param shelf_id:
439
        :param apply_changes: If True, apply the shelved changes to the
440
            working tree.
441
        :param delete_shelf: If True, delete the changes from the shelf.
442
        :param read_shelf: If True, read the changes from the shelf.
4902.1.2 by Guilherme Salgado
First round of the new approach, using a new action (--preview) on the unshelve command
443
        :param show_diff: If True, show the diff that would result from
444
            unshelving the changes.
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
445
        :param write_diff_to: A file-like object where the diff will be
446
            written to. If None, ui.ui_factory.make_output_stream() will
447
            be used.
0.16.98 by Aaron Bentley
Update docs and prompting
448
        """
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
449
        self.tree = tree
0.16.98 by Aaron Bentley
Update docs and prompting
450
        manager = tree.get_shelf_manager()
0.16.13 by Aaron Bentley
Appy shelve-management updates to shelver
451
        self.manager = manager
452
        self.shelf_id = shelf_id
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
453
        self.apply_changes = apply_changes
454
        self.delete_shelf = delete_shelf
0.16.65 by Aaron Bentley
Implement unshelve --delete
455
        self.read_shelf = read_shelf
4902.1.2 by Guilherme Salgado
First round of the new approach, using a new action (--preview) on the unshelve command
456
        self.show_diff = show_diff
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
457
        self.write_diff_to = write_diff_to
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
458
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
459
    def run(self):
0.16.98 by Aaron Bentley
Update docs and prompting
460
        """Perform the unshelving operation."""
7356.1.5 by Jelmer Vernooij
Use more ExitStacks.
461
        with cleanup.ExitStack() as exit_stack:
462
            exit_stack.enter_context(self.tree.lock_tree_write())
0.16.65 by Aaron Bentley
Implement unshelve --delete
463
            if self.read_shelf:
7143.15.2 by Jelmer Vernooij
Run autopep8.
464
                trace.note(gettext('Using changes with id "%d".') %
465
                           self.shelf_id)
0.16.65 by Aaron Bentley
Implement unshelve --delete
466
                unshelver = self.manager.get_unshelver(self.shelf_id)
7356.1.5 by Jelmer Vernooij
Use more ExitStacks.
467
                exit_stack.callback(unshelver.finalize)
0.16.65 by Aaron Bentley
Implement unshelve --delete
468
                if unshelver.message is not None:
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
469
                    trace.note(gettext('Message: %s') % unshelver.message)
0.16.65 by Aaron Bentley
Implement unshelve --delete
470
                change_reporter = delta._ChangeReporter()
6719.1.2 by Jelmer Vernooij
Fix some tests.
471
                merger = unshelver.make_merger()
4961.2.13 by Martin Pool
Further progress bar string-pulling
472
                merger.change_reporter = change_reporter
473
                if self.apply_changes:
474
                    merger.do_merge()
475
                elif self.show_diff:
476
                    self.write_diff(merger)
477
                else:
478
                    self.show_changes(merger)
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
479
            if self.delete_shelf:
480
                self.manager.delete_shelf(self.shelf_id)
7143.15.2 by Jelmer Vernooij
Run autopep8.
481
                trace.note(gettext('Deleted changes with id "%d".') %
482
                           self.shelf_id)
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
483
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
484
    def write_diff(self, merger):
485
        """Write this operation's diff to self.write_diff_to."""
4902.1.2 by Guilherme Salgado
First round of the new approach, using a new action (--preview) on the unshelve command
486
        tree_merger = merger.make_merger()
487
        tt = tree_merger.make_preview_transform()
488
        new_tree = tt.get_preview_tree()
4902.1.8 by John Arbash Meinel
Delay grabbing an output stream until we actually go to show a diff.
489
        if self.write_diff_to is None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
490
            self.write_diff_to = ui.ui_factory.make_output_stream(
491
                encoding_type='exact')
4797.57.10 by Alexander Belchenko
path_encoding selection logic extracted as helper function
492
        path_encoding = osutils.get_diff_header_encoding()
4797.57.8 by Alexander Belchenko
using appropriate encoing for diff in shelve/unshelve.
493
        diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to,
7143.15.2 by Jelmer Vernooij
Run autopep8.
494
                             path_encoding=path_encoding)
4902.1.2 by Guilherme Salgado
First round of the new approach, using a new action (--preview) on the unshelve command
495
        tt.finalize()
496
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
497
    def show_changes(self, merger):
0.16.98 by Aaron Bentley
Update docs and prompting
498
        """Show the changes that this operation specifies."""
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
499
        tree_merger = merger.make_merger()
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
500
        # This implicitly shows the changes via the reporter, so we're done...
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
501
        tt = tree_merger.make_preview_transform()
502
        tt.finalize()