/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
0.16.5 by Aaron Bentley
Get text shelving working
19
import shutil
0.16.1 by Aaron Bentley
Begin implementing UI
20
import sys
0.16.5 by Aaron Bentley
Get text shelving working
21
import tempfile
0.16.1 by Aaron Bentley
Begin implementing UI
22
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
23
from . import (
0.16.25 by Aaron Bentley
Show selected changes before shelving
24
    builtins,
25
    delta,
26
    diff,
27
    errors,
0.16.79 by Aaron Bentley
Remove dependencies on bzrtools
28
    osutils,
0.16.25 by Aaron Bentley
Show selected changes before shelving
29
    patches,
4603.1.6 by Aaron Bentley
Provide a reasonable count of changes when file edited.
30
    patiencediff,
0.16.74 by Aaron Bentley
Merge with shelf-manager
31
    shelf,
0.16.72 by Aaron Bentley
Allow shelving binary changes
32
    textfile,
0.16.54 by Aaron Bentley
Inform user about shelf ids.
33
    trace,
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
34
    ui,
0.16.102 by Aaron Bentley
Minor updates
35
    workingtree,
36
)
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
37
from .i18n import gettext
38
from .sixish import (
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
39
    BytesIO,
40
    )
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'
52
             ' to %(this)s?'),
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'
57
             ' "%(path)s" from "%(other)s" to "%(this)s"?'),
58
             'rename': gettext('Shelve renaming "%(other)s" =>'
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'
104
             ' to %(other)s?'),
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'
109
             ' "%(path)s" from "%(this)s" to "%(other)s"?'),
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.
182
        tree.lock_tree_write()
183
        try:
184
            target_tree = builtins._get_one_revision_tree('shelf2', revision,
185
                tree.branch, tree)
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
186
            files = tree.safe_relpath_files(file_list)
4603.1.17 by Aaron Bentley
Fix shelf_ui tests to finalize.
187
            return klass(tree, target_tree, diff_writer, all, all, files,
188
                         message, destroy)
189
        finally:
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
190
            tree.unlock()
0.16.1 by Aaron Bentley
Begin implementing UI
191
192
    def run(self):
0.16.97 by Aaron Bentley
Turn diff_file and text_differ into instance variables.
193
        """Interactively shelve the changes."""
0.16.47 by Aaron Bentley
Support selecting files to shelve
194
        creator = shelf.ShelfCreator(self.work_tree, self.target_tree,
195
                                     self.file_list)
0.16.5 by Aaron Bentley
Get text shelving working
196
        self.tempdir = tempfile.mkdtemp()
0.16.22 by Aaron Bentley
Only prompt when there are changes to shelve.
197
        changes_shelved = 0
0.16.1 by Aaron Bentley
Begin implementing UI
198
        try:
4603.1.7 by Aaron Bentley
Allow configuring change editor.
199
            for change in creator.iter_shelvable():
200
                if change[0] == 'modify text':
201
                    try:
4603.1.9 by Aaron Bentley
Misc cleanup.
202
                        changes_shelved += self.handle_modify_text(creator,
203
                                                                   change[1])
4603.1.7 by Aaron Bentley
Allow configuring change editor.
204
                    except errors.BinaryFile:
205
                        if self.prompt_bool(self.reporter.vocab['binary']):
0.16.72 by Aaron Bentley
Allow shelving binary changes
206
                            changes_shelved += 1
4603.1.7 by Aaron Bentley
Allow configuring change editor.
207
                            creator.shelve_content_change(change[1])
4526.6.1 by Aaron Bentley
Reverse the way changes are described by Shelver.
208
                else:
4603.1.7 by Aaron Bentley
Allow configuring change editor.
209
                    if self.prompt_bool(self.reporter.prompt_change(change)):
210
                        creator.shelve_change(change)
211
                        changes_shelved += 1
212
            if changes_shelved > 0:
213
                self.reporter.selected_changes(creator.work_transform)
214
                if (self.auto_apply or self.prompt_bool(
215
                    self.reporter.vocab['final'] % changes_shelved)):
216
                    if self.destroy:
217
                        creator.transform()
218
                        self.reporter.changes_destroyed()
219
                    else:
220
                        shelf_id = self.manager.shelve_changes(creator,
221
                                                               self.message)
222
                        self.reporter.shelved_id(shelf_id)
223
            else:
224
                self.reporter.no_changes()
0.16.1 by Aaron Bentley
Begin implementing UI
225
        finally:
0.16.5 by Aaron Bentley
Get text shelving working
226
            shutil.rmtree(self.tempdir)
0.16.1 by Aaron Bentley
Begin implementing UI
227
            creator.finalize()
228
4603.1.11 by Aaron Bentley
Implement shelver.finalize
229
    def finalize(self):
4603.1.17 by Aaron Bentley
Fix shelf_ui tests to finalize.
230
        if self.change_editor is not None:
231
            self.change_editor.finish()
4603.1.14 by Aaron Bentley
Make change editor mandatory
232
        self.work_tree.unlock()
233
4603.1.11 by Aaron Bentley
Implement shelver.finalize
234
4526.6.2 by Aaron Bentley
Fix display of diffs for apply mode
235
    def get_parsed_patch(self, file_id, invert=False):
0.16.98 by Aaron Bentley
Update docs and prompting
236
        """Return a parsed version of a file's patch.
237
238
        :param file_id: The id of the file to generate a patch for.
4526.7.2 by Aaron Bentley
Update docs.
239
        :param invert: If True, provide an inverted patch (insertions displayed
240
            as removals, removals displayed as insertions).
0.16.98 by Aaron Bentley
Update docs and prompting
241
        :return: A patches.Patch.
242
        """
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
243
        diff_file = BytesIO()
4526.6.2 by Aaron Bentley
Fix display of diffs for apply mode
244
        if invert:
245
            old_tree = self.work_tree
246
            new_tree = self.target_tree
247
        else:
248
            old_tree = self.target_tree
249
            new_tree = self.work_tree
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
250
        old_path = old_tree.id2path(file_id)
251
        new_path = new_tree.id2path(file_id)
4797.57.8 by Alexander Belchenko
using appropriate encoing for diff in shelve/unshelve.
252
        text_differ = diff.DiffText(old_tree, new_tree, diff_file,
253
            path_encoding=osutils.get_terminal_encoding())
0.16.97 by Aaron Bentley
Turn diff_file and text_differ into instance variables.
254
        patch = text_differ.diff(file_id, old_path, new_path, 'file', 'file')
255
        diff_file.seek(0)
256
        return patches.parse_patch(diff_file)
0.16.1 by Aaron Bentley
Begin implementing UI
257
6182.2.7 by Benoît Pierre
Update shelf UI to use ui.confirm.
258
    def prompt(self, message, choices, default):
6182.2.13 by Benoît Pierre
Rename ui.confirm to ui.choose.
259
        return ui.ui_factory.choose(message, choices, default=default)
6182.2.7 by Benoît Pierre
Update shelf UI to use ui.confirm.
260
261
    def prompt_bool(self, question, allow_editor=False):
0.16.98 by Aaron Bentley
Update docs and prompting
262
        """Prompt the user with a yes/no question.
263
0.16.102 by Aaron Bentley
Minor updates
264
        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
265
        may also raise UserAbort.
0.16.98 by Aaron Bentley
Update docs and prompting
266
        :param question: The question to ask the user.
267
        :return: True or False
268
        """
269
        if self.auto:
0.16.23 by Aaron Bentley
Improve prompting
270
            return True
6182.2.7 by Benoît Pierre
Update shelf UI to use ui.confirm.
271
        alternatives_chars = 'yn'
272
        alternatives = '&yes\n&No'
273
        if allow_editor:
274
            alternatives_chars += 'e'
275
            alternatives += '\n&edit manually'
276
        alternatives_chars += 'fq'
277
        alternatives += '\n&finish\n&quit'
278
        choice = self.prompt(question, alternatives, 1)
279
        if choice is None:
280
            # EOF.
281
            char = 'n'
3990.4.3 by Daniel Watkins
Added help option to shelve prompt.
282
        else:
6182.2.7 by Benoît Pierre
Update shelf UI to use ui.confirm.
283
            char = alternatives_chars[choice]
0.16.23 by Aaron Bentley
Improve prompting
284
        if char == 'y':
285
            return True
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
286
        elif char == 'e' and allow_editor:
287
            raise UseEditor
0.16.23 by Aaron Bentley
Improve prompting
288
        elif char == 'f':
289
            self.auto = True
290
            return True
0.16.24 by Aaron Bentley
Regularize prompts
291
        if char == 'q':
0.16.103 by Aaron Bentley
raise UserAbort instead of doing sys.exit
292
            raise errors.UserAbort()
0.16.23 by Aaron Bentley
Improve prompting
293
        else:
294
            return False
0.16.1 by Aaron Bentley
Begin implementing UI
295
4603.1.7 by Aaron Bentley
Allow configuring change editor.
296
    def handle_modify_text(self, creator, file_id):
4603.1.9 by Aaron Bentley
Misc cleanup.
297
        """Handle modified text, by using hunk selection or file editing.
298
299
        :param creator: A ShelfCreator.
300
        :param file_id: The id of the file that was modified.
301
        :return: The number of changes.
302
        """
303
        work_tree_lines = self.work_tree.get_file_lines(file_id)
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
304
        try:
4603.1.9 by Aaron Bentley
Misc cleanup.
305
            lines, change_count = self._select_hunks(creator, file_id,
306
                                                     work_tree_lines)
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
307
        except UseEditor:
4603.1.9 by Aaron Bentley
Misc cleanup.
308
            lines, change_count = self._edit_file(file_id, work_tree_lines)
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
309
        if change_count != 0:
310
            creator.shelve_lines(file_id, lines)
311
        return change_count
312
4603.1.9 by Aaron Bentley
Misc cleanup.
313
    def _select_hunks(self, creator, file_id, work_tree_lines):
0.16.98 by Aaron Bentley
Update docs and prompting
314
        """Provide diff hunk selection for modified text.
315
4526.7.2 by Aaron Bentley
Update docs.
316
        If self.reporter.invert_diff is True, the diff is inverted so that
317
        insertions are displayed as removals and vice versa.
318
0.16.98 by Aaron Bentley
Update docs and prompting
319
        :param creator: a ShelfCreator
320
        :param file_id: The id of the file to shelve.
4603.1.9 by Aaron Bentley
Misc cleanup.
321
        :param work_tree_lines: Line contents of the file in the working tree.
0.16.98 by Aaron Bentley
Update docs and prompting
322
        :return: number of shelved hunks.
323
        """
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
324
        if self.reporter.invert_diff:
4603.1.9 by Aaron Bentley
Misc cleanup.
325
            target_lines = work_tree_lines
4526.6.2 by Aaron Bentley
Fix display of diffs for apply mode
326
        else:
327
            target_lines = self.target_tree.get_file_lines(file_id)
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
328
        textfile.check_text_lines(work_tree_lines)
0.16.72 by Aaron Bentley
Allow shelving binary changes
329
        textfile.check_text_lines(target_lines)
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
330
        parsed = self.get_parsed_patch(file_id, self.reporter.invert_diff)
0.16.43 by Aaron Bentley
Reduce API friction.
331
        final_hunks = []
0.16.15 by Aaron Bentley
Implement auto mode
332
        if not self.auto:
0.16.41 by Aaron Bentley
Implement shelving with internal patch
333
            offset = 0
0.16.61 by Aaron Bentley
Show file name when shelving
334
            self.diff_writer.write(parsed.get_header())
0.16.15 by Aaron Bentley
Implement auto mode
335
            for hunk in parsed.hunks:
336
                self.diff_writer.write(str(hunk))
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
337
                selected = self.prompt_bool(self.reporter.vocab['hunk'],
4603.1.7 by Aaron Bentley
Allow configuring change editor.
338
                                            allow_editor=(self.change_editor
339
                                                          is not None))
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
340
                if not self.reporter.invert_diff:
4526.6.2 by Aaron Bentley
Fix display of diffs for apply mode
341
                    selected = (not selected)
342
                if selected:
0.16.41 by Aaron Bentley
Implement shelving with internal patch
343
                    hunk.mod_pos += offset
0.16.43 by Aaron Bentley
Reduce API friction.
344
                    final_hunks.append(hunk)
0.16.41 by Aaron Bentley
Implement shelving with internal patch
345
                else:
346
                    offset -= (hunk.mod_range - hunk.orig_range)
0.16.68 by Aaron Bentley
Avoid having escape codes affect the wrong text.
347
        sys.stdout.flush()
4526.7.1 by Aaron Bentley
Make vocabulary part of reporter.
348
        if self.reporter.invert_diff:
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
349
            change_count = len(final_hunks)
350
        else:
351
            change_count = len(parsed.hunks) - len(final_hunks)
4603.1.2 by Aaron Bentley
Simplify unchanged case.
352
        patched = patches.iter_patched_from_hunks(target_lines,
353
                                                  final_hunks)
354
        lines = list(patched)
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
355
        return lines, change_count
356
4603.1.9 by Aaron Bentley
Misc cleanup.
357
    def _edit_file(self, file_id, work_tree_lines):
358
        """
359
        :param file_id: id of the file to edit.
360
        :param work_tree_lines: Line contents of the file in the working tree.
361
        :return: (lines, change_region_count), where lines is the new line
362
            content of the file, and change_region_count is the number of
363
            changed regions.
364
        """
4603.1.7 by Aaron Bentley
Allow configuring change editor.
365
        lines = osutils.split_lines(self.change_editor.edit_file(file_id))
4603.1.6 by Aaron Bentley
Provide a reasonable count of changes when file edited.
366
        return lines, self._count_changed_regions(work_tree_lines, lines)
367
368
    @staticmethod
369
    def _count_changed_regions(old_lines, new_lines):
370
        matcher = patiencediff.PatienceSequenceMatcher(None, old_lines,
371
                                                       new_lines)
372
        blocks = matcher.get_matching_blocks()
373
        return len(blocks) - 2
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
374
375
376
class Unshelver(object):
0.16.98 by Aaron Bentley
Update docs and prompting
377
    """Unshelve changes into a working tree."""
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
378
379
    @classmethod
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
380
    def from_args(klass, shelf_id=None, action='apply', directory='.',
381
                  write_diff_to=None):
0.16.98 by Aaron Bentley
Update docs and prompting
382
        """Create an unshelver from commandline arguments.
383
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
384
        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)
385
        be unlocked.
386
0.16.98 by Aaron Bentley
Update docs and prompting
387
        :param shelf_id: Integer id of the shelf, as a string.
388
        :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
389
            'delete', 'preview'.
0.16.98 by Aaron Bentley
Update docs and prompting
390
        :param directory: The directory to unshelve changes into.
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
391
        :param write_diff_to: See Unshelver.__init__().
0.16.98 by Aaron Bentley
Update docs and prompting
392
        """
0.16.94 by Aaron Bentley
Add unshelve tests
393
        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)
394
        tree.lock_tree_write()
395
        try:
396
            manager = tree.get_shelf_manager()
397
            if shelf_id is not None:
398
                try:
399
                    shelf_id = int(shelf_id)
400
                except ValueError:
401
                    raise errors.InvalidShelfId(shelf_id)
402
            else:
403
                shelf_id = manager.last_shelf()
404
                if shelf_id is None:
6138.3.8 by Jonathan Riddell
more error gettext()ing
405
                    raise errors.BzrCommandError(gettext('No changes are shelved.'))
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
406
            apply_changes = True
407
            delete_shelf = True
408
            read_shelf = True
4902.1.2 by Guilherme Salgado
First round of the new approach, using a new action (--preview) on the unshelve command
409
            show_diff = False
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
410
            if action == 'dry-run':
411
                apply_changes = False
412
                delete_shelf = False
4902.1.2 by Guilherme Salgado
First round of the new approach, using a new action (--preview) on the unshelve command
413
            elif action == 'preview':
414
                apply_changes = False
415
                delete_shelf = False
416
                show_diff = True
4889.1.3 by Martin Pool
New option unshelve --keep
417
            elif action == 'delete-only':
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
418
                apply_changes = False
419
                read_shelf = False
4889.1.3 by Martin Pool
New option unshelve --keep
420
            elif action == 'keep':
421
                apply_changes = True
422
                delete_shelf = False
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
423
        except:
424
            tree.unlock()
425
            raise
0.16.65 by Aaron Bentley
Implement unshelve --delete
426
        return klass(tree, manager, shelf_id, apply_changes, delete_shelf,
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
427
                     read_shelf, show_diff, write_diff_to)
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
428
0.16.94 by Aaron Bentley
Add unshelve tests
429
    def __init__(self, tree, manager, shelf_id, apply_changes=True,
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
430
                 delete_shelf=True, read_shelf=True, show_diff=False,
431
                 write_diff_to=None):
0.16.98 by Aaron Bentley
Update docs and prompting
432
        """Constructor.
433
434
        :param tree: The working tree to unshelve into.
435
        :param manager: The ShelveManager containing the shelved changes.
436
        :param shelf_id:
437
        :param apply_changes: If True, apply the shelved changes to the
438
            working tree.
439
        :param delete_shelf: If True, delete the changes from the shelf.
440
        :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
441
        :param show_diff: If True, show the diff that would result from
442
            unshelving the changes.
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
443
        :param write_diff_to: A file-like object where the diff will be
444
            written to. If None, ui.ui_factory.make_output_stream() will
445
            be used.
0.16.98 by Aaron Bentley
Update docs and prompting
446
        """
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
447
        self.tree = tree
0.16.98 by Aaron Bentley
Update docs and prompting
448
        manager = tree.get_shelf_manager()
0.16.13 by Aaron Bentley
Appy shelve-management updates to shelver
449
        self.manager = manager
450
        self.shelf_id = shelf_id
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
451
        self.apply_changes = apply_changes
452
        self.delete_shelf = delete_shelf
0.16.65 by Aaron Bentley
Implement unshelve --delete
453
        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
454
        self.show_diff = show_diff
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
455
        self.write_diff_to = write_diff_to
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
456
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
457
    def run(self):
0.16.98 by Aaron Bentley
Update docs and prompting
458
        """Perform the unshelving operation."""
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
459
        self.tree.lock_tree_write()
0.16.37 by Aaron Bentley
Use cleanups list to reduce nested try blocks
460
        cleanups = [self.tree.unlock]
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
461
        try:
0.16.65 by Aaron Bentley
Implement unshelve --delete
462
            if self.read_shelf:
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
463
                trace.note(gettext('Using changes with id "%d".') % self.shelf_id)
0.16.65 by Aaron Bentley
Implement unshelve --delete
464
                unshelver = self.manager.get_unshelver(self.shelf_id)
465
                cleanups.append(unshelver.finalize)
466
                if unshelver.message is not None:
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
467
                    trace.note(gettext('Message: %s') % unshelver.message)
0.16.65 by Aaron Bentley
Implement unshelve --delete
468
                change_reporter = delta._ChangeReporter()
4961.2.13 by Martin Pool
Further progress bar string-pulling
469
                merger = unshelver.make_merger(None)
470
                merger.change_reporter = change_reporter
471
                if self.apply_changes:
472
                    merger.do_merge()
473
                elif self.show_diff:
474
                    self.write_diff(merger)
475
                else:
476
                    self.show_changes(merger)
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
477
            if self.delete_shelf:
478
                self.manager.delete_shelf(self.shelf_id)
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
479
                trace.note(gettext('Deleted changes with id "%d".') % self.shelf_id)
0.16.8 by Aaron Bentley
Implement unshelve2, tidy shelve2
480
        finally:
0.16.37 by Aaron Bentley
Use cleanups list to reduce nested try blocks
481
            for cleanup in reversed(cleanups):
482
                cleanup()
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:
5433.2.1 by Andrej A Antonov
fixed bug: `unshelve --preview` fails with unicode error
490
            self.write_diff_to = ui.ui_factory.make_output_stream(encoding_type='exact')
4797.57.10 by Alexander Belchenko
path_encoding selection logic extracted as helper function
491
        path_encoding = osutils.get_diff_header_encoding()
4797.57.8 by Alexander Belchenko
using appropriate encoing for diff in shelve/unshelve.
492
        diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to,
493
            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
494
        tt.finalize()
495
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
496
    def show_changes(self, merger):
0.16.98 by Aaron Bentley
Update docs and prompting
497
        """Show the changes that this operation specifies."""
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
498
        tree_merger = merger.make_merger()
4902.1.3 by Guilherme Salgado
A few tweaks as per John's review
499
        # This implicitly shows the changes via the reporter, so we're done...
0.16.64 by Aaron Bentley
Implement dry-run option for Unshelve
500
        tt = tree_merger.make_preview_transform()
501
        tt.finalize()