← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf_ui.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-06-30 17:12:32 UTC
  • mfrom: (4398.3.2 register-serializer9)
  • Revision ID: pqm@pqm.ubuntu.com-20090630171232-h997nd3w5w89v60t
(Jelmer) Pass create_prefix paremeter to BzrDir.push_branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
 
1
# Copyright (C) 2008 Canonical Ltd
 
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
from cStringIO import StringIO
 
19
import shutil
 
20
import sys
 
21
import tempfile
 
22
 
 
23
from bzrlib import (
 
24
    builtins,
 
25
    delta,
 
26
    diff,
 
27
    errors,
 
28
    osutils,
 
29
    patches,
 
30
    shelf,
 
31
    textfile,
 
32
    trace,
 
33
    ui,
 
34
    workingtree,
 
35
)
 
36
 
 
37
 
 
38
class ShelfReporter(object):
 
39
 
 
40
    def __init__(self):
 
41
        self.delta_reporter = delta._ChangeReporter()
 
42
 
 
43
    def no_changes(self):
 
44
        trace.warning('No changes to shelve.')
 
45
 
 
46
    def shelved_id(self, shelf_id):
 
47
        trace.note('Changes shelved with id "%d".' % shelf_id)
 
48
 
 
49
    def selected_changes(self, transform):
 
50
        trace.note("Selected changes:")
 
51
        changes = transform.iter_changes()
 
52
        delta.report_changes(changes, self.delta_reporter)
 
53
 
 
54
 
 
55
class Shelver(object):
 
56
    """Interactively shelve the changes in a working tree."""
 
57
 
 
58
    def __init__(self, work_tree, target_tree, diff_writer=None, auto=False,
 
59
                 auto_apply=False, file_list=None, message=None,
 
60
                 destroy=False, manager=None, reporter=None):
 
61
        """Constructor.
 
62
 
 
63
        :param work_tree: The working tree to shelve changes from.
 
64
        :param target_tree: The "unchanged" / old tree to compare the
 
65
            work_tree to.
 
66
        :param auto: If True, shelve each possible change.
 
67
        :param auto_apply: If True, shelve changes with no final prompt.
 
68
        :param file_list: If supplied, only files in this list may be shelved.
 
69
        :param message: The message to associate with the shelved changes.
 
70
        :param destroy: Change the working tree without storing the shelved
 
71
            changes.
 
72
        :param manager: The shelf manager to use.
 
73
        """
 
74
        self.work_tree = work_tree
 
75
        self.target_tree = target_tree
 
76
        self.diff_writer = diff_writer
 
77
        if self.diff_writer is None:
 
78
            self.diff_writer = sys.stdout
 
79
        if manager is None:
 
80
            manager = work_tree.get_shelf_manager()
 
81
        self.manager = manager
 
82
        self.auto = auto
 
83
        self.auto_apply = auto_apply
 
84
        self.file_list = file_list
 
85
        self.message = message
 
86
        self.destroy = destroy
 
87
        if reporter is None:
 
88
            reporter = ShelfReporter()
 
89
        self.reporter = reporter
 
90
 
 
91
    @classmethod
 
92
    def from_args(klass, diff_writer, revision=None, all=False, file_list=None,
 
93
                  message=None, directory='.', destroy=False):
 
94
        """Create a shelver from commandline arguments.
 
95
 
 
96
        :param revision: RevisionSpec of the revision to compare to.
 
97
        :param all: If True, shelve all changes without prompting.
 
98
        :param file_list: If supplied, only files in this list may be  shelved.
 
99
        :param message: The message to associate with the shelved changes.
 
100
        :param directory: The directory containing the working tree.
 
101
        :param destroy: Change the working tree without storing the shelved
 
102
            changes.
 
103
        """
 
104
        tree, path = workingtree.WorkingTree.open_containing(directory)
 
105
        target_tree = builtins._get_one_revision_tree('shelf2', revision,
 
106
            tree.branch, tree)
 
107
        files = builtins.safe_relpath_files(tree, file_list)
 
108
        return klass(tree, target_tree, diff_writer, all, all, files, message,
 
109
                     destroy)
 
110
 
 
111
    def run(self):
 
112
        """Interactively shelve the changes."""
 
113
        creator = shelf.ShelfCreator(self.work_tree, self.target_tree,
 
114
                                     self.file_list)
 
115
        self.tempdir = tempfile.mkdtemp()
 
116
        changes_shelved = 0
 
117
        try:
 
118
            for change in creator.iter_shelvable():
 
119
                if change[0] == 'modify text':
 
120
                    try:
 
121
                        changes_shelved += self.handle_modify_text(creator,
 
122
                                                                   change[1])
 
123
                    except errors.BinaryFile:
 
124
                        if self.prompt_bool('Shelve binary changes?'):
 
125
                            changes_shelved += 1
 
126
                            creator.shelve_content_change(change[1])
 
127
                if change[0] == 'add file':
 
128
                    if self.prompt_bool('Shelve adding file "%s"?'
 
129
                                        % change[3]):
 
130
                        creator.shelve_creation(change[1])
 
131
                        changes_shelved += 1
 
132
                if change[0] == 'delete file':
 
133
                    if self.prompt_bool('Shelve removing file "%s"?'
 
134
                                        % change[3]):
 
135
                        creator.shelve_deletion(change[1])
 
136
                        changes_shelved += 1
 
137
                if change[0] == 'change kind':
 
138
                    if self.prompt_bool('Shelve changing "%s" from %s to %s? '
 
139
                                        % (change[4], change[2], change[3])):
 
140
                        creator.shelve_content_change(change[1])
 
141
                        changes_shelved += 1
 
142
                if change[0] == 'rename':
 
143
                    if self.prompt_bool('Shelve renaming "%s" => "%s"?' %
 
144
                                   change[2:]):
 
145
                        creator.shelve_rename(change[1])
 
146
                        changes_shelved += 1
 
147
                if change[0] == 'modify target':
 
148
                    if self.prompt_bool('Shelve changing target of "%s" '
 
149
                            'from "%s" to "%s"?' % change[2:]):
 
150
                        creator.shelve_modify_target(change[1])
 
151
                        changes_shelved += 1
 
152
            if changes_shelved > 0:
 
153
                self.reporter.selected_changes(creator.work_transform)
 
154
                if (self.auto_apply or self.prompt_bool(
 
155
                    'Shelve %d change(s)?' % changes_shelved)):
 
156
                    if self.destroy:
 
157
                        creator.transform()
 
158
                        trace.note('Selected changes destroyed.')
 
159
                    else:
 
160
                        shelf_id = self.manager.shelve_changes(creator,
 
161
                                                               self.message)
 
162
                        self.reporter.shelved_id(shelf_id)
 
163
            else:
 
164
                self.reporter.no_changes()
 
165
        finally:
 
166
            shutil.rmtree(self.tempdir)
 
167
            creator.finalize()
 
168
 
 
169
    def get_parsed_patch(self, file_id):
 
170
        """Return a parsed version of a file's patch.
 
171
 
 
172
        :param file_id: The id of the file to generate a patch for.
 
173
        :return: A patches.Patch.
 
174
        """
 
175
        old_path = self.target_tree.id2path(file_id)
 
176
        new_path = self.work_tree.id2path(file_id)
 
177
        diff_file = StringIO()
 
178
        text_differ = diff.DiffText(self.target_tree, self.work_tree,
 
179
                                    diff_file)
 
180
        patch = text_differ.diff(file_id, old_path, new_path, 'file', 'file')
 
181
        diff_file.seek(0)
 
182
        return patches.parse_patch(diff_file)
 
183
 
 
184
    def prompt(self, message):
 
185
        """Prompt the user for a character.
 
186
 
 
187
        :param message: The message to prompt a user with.
 
188
        :return: A character.
 
189
        """
 
190
        sys.stdout.write(message)
 
191
        char = osutils.getchar()
 
192
        sys.stdout.write("\r" + ' ' * len(message) + '\r')
 
193
        sys.stdout.flush()
 
194
        return char
 
195
 
 
196
    def prompt_bool(self, question, long=False):
 
197
        """Prompt the user with a yes/no question.
 
198
 
 
199
        This may be overridden by self.auto.  It may also *set* self.auto.  It
 
200
        may also raise UserAbort.
 
201
        :param question: The question to ask the user.
 
202
        :return: True or False
 
203
        """
 
204
        if self.auto:
 
205
            return True
 
206
        if long:
 
207
            prompt = ' [(y)es, (N)o, (f)inish, or (q)uit]'
 
208
        else:
 
209
            prompt = ' [yNfq?]'
 
210
        char = self.prompt(question + prompt)
 
211
        if char == 'y':
 
212
            return True
 
213
        elif char == 'f':
 
214
            self.auto = True
 
215
            return True
 
216
        elif char == '?':
 
217
            return self.prompt_bool(question, long=True)
 
218
        if char == 'q':
 
219
            raise errors.UserAbort()
 
220
        else:
 
221
            return False
 
222
 
 
223
    def handle_modify_text(self, creator, file_id):
 
224
        """Provide diff hunk selection for modified text.
 
225
 
 
226
        :param creator: a ShelfCreator
 
227
        :param file_id: The id of the file to shelve.
 
228
        :return: number of shelved hunks.
 
229
        """
 
230
        target_lines = self.target_tree.get_file_lines(file_id)
 
231
        textfile.check_text_lines(self.work_tree.get_file_lines(file_id))
 
232
        textfile.check_text_lines(target_lines)
 
233
        parsed = self.get_parsed_patch(file_id)
 
234
        final_hunks = []
 
235
        if not self.auto:
 
236
            offset = 0
 
237
            self.diff_writer.write(parsed.get_header())
 
238
            for hunk in parsed.hunks:
 
239
                self.diff_writer.write(str(hunk))
 
240
                if not self.prompt_bool('Shelve?'):
 
241
                    hunk.mod_pos += offset
 
242
                    final_hunks.append(hunk)
 
243
                else:
 
244
                    offset -= (hunk.mod_range - hunk.orig_range)
 
245
        sys.stdout.flush()
 
246
        if len(parsed.hunks) == len(final_hunks):
 
247
            return 0
 
248
        patched = patches.iter_patched_from_hunks(target_lines, final_hunks)
 
249
        creator.shelve_lines(file_id, list(patched))
 
250
        return len(parsed.hunks) - len(final_hunks)
 
251
 
 
252
 
 
253
class Unshelver(object):
 
254
    """Unshelve changes into a working tree."""
 
255
 
 
256
    @classmethod
 
257
    def from_args(klass, shelf_id=None, action='apply', directory='.'):
 
258
        """Create an unshelver from commandline arguments.
 
259
 
 
260
        :param shelf_id: Integer id of the shelf, as a string.
 
261
        :param action: action to perform.  May be 'apply', 'dry-run',
 
262
            'delete'.
 
263
        :param directory: The directory to unshelve changes into.
 
264
        """
 
265
        tree, path = workingtree.WorkingTree.open_containing(directory)
 
266
        manager = tree.get_shelf_manager()
 
267
        if shelf_id is not None:
 
268
            try:
 
269
                shelf_id = int(shelf_id)
 
270
            except ValueError:
 
271
                raise errors.InvalidShelfId(shelf_id)
 
272
        else:
 
273
            shelf_id = manager.last_shelf()
 
274
            if shelf_id is None:
 
275
                raise errors.BzrCommandError('No changes are shelved.')
 
276
            trace.note('Unshelving changes with id "%d".' % shelf_id)
 
277
        apply_changes = True
 
278
        delete_shelf = True
 
279
        read_shelf = True
 
280
        if action == 'dry-run':
 
281
            apply_changes = False
 
282
            delete_shelf = False
 
283
        if action == 'delete-only':
 
284
            apply_changes = False
 
285
            read_shelf = False
 
286
        return klass(tree, manager, shelf_id, apply_changes, delete_shelf,
 
287
                     read_shelf)
 
288
 
 
289
    def __init__(self, tree, manager, shelf_id, apply_changes=True,
 
290
                 delete_shelf=True, read_shelf=True):
 
291
        """Constructor.
 
292
 
 
293
        :param tree: The working tree to unshelve into.
 
294
        :param manager: The ShelveManager containing the shelved changes.
 
295
        :param shelf_id:
 
296
        :param apply_changes: If True, apply the shelved changes to the
 
297
            working tree.
 
298
        :param delete_shelf: If True, delete the changes from the shelf.
 
299
        :param read_shelf: If True, read the changes from the shelf.
 
300
        """
 
301
        self.tree = tree
 
302
        manager = tree.get_shelf_manager()
 
303
        self.manager = manager
 
304
        self.shelf_id = shelf_id
 
305
        self.apply_changes = apply_changes
 
306
        self.delete_shelf = delete_shelf
 
307
        self.read_shelf = read_shelf
 
308
 
 
309
    def run(self):
 
310
        """Perform the unshelving operation."""
 
311
        self.tree.lock_write()
 
312
        cleanups = [self.tree.unlock]
 
313
        try:
 
314
            if self.read_shelf:
 
315
                unshelver = self.manager.get_unshelver(self.shelf_id)
 
316
                cleanups.append(unshelver.finalize)
 
317
                if unshelver.message is not None:
 
318
                    trace.note('Message: %s' % unshelver.message)
 
319
                change_reporter = delta._ChangeReporter()
 
320
                task = ui.ui_factory.nested_progress_bar()
 
321
                try:
 
322
                    merger = unshelver.make_merger(task)
 
323
                    merger.change_reporter = change_reporter
 
324
                    if self.apply_changes:
 
325
                        merger.do_merge()
 
326
                    else:
 
327
                        self.show_changes(merger)
 
328
                finally:
 
329
                    task.finished()
 
330
            if self.delete_shelf:
 
331
                self.manager.delete_shelf(self.shelf_id)
 
332
        finally:
 
333
            for cleanup in reversed(cleanups):
 
334
                cleanup()
 
335
 
 
336
    def show_changes(self, merger):
 
337
        """Show the changes that this operation specifies."""
 
338
        tree_merger = merger.make_merger()
 
339
        # This implicitly shows the changes via the reporter, so we're done...
 
340
        tt = tree_merger.make_preview_transform()
 
341
        tt.finalize()