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

  • Committer: Aaron Bentley
  • Date: 2008-11-03 19:01:14 UTC
  • mfrom: (0.12.79 shelf-manager)
  • mto: This revision was merged to the branch mainline in revision 3823.
  • Revision ID: aaron@aaronbentley.com-20081103190114-9ydfkjm80a8kahwx
Merge shelf-manager into shelf-ui

Show diffs side-by-side

added added

removed removed

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