/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-10-17 03:33:08 UTC
  • mfrom: (0.12.68 shelf-manager)
  • mto: This revision was merged to the branch mainline in revision 3823.
  • Revision ID: aaron@aaronbentley.com-20081017033308-dnke9bvbvb5vrys5
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
    patches,
 
29
    shelf,
 
30
    textfile,
 
31
    trace,
 
32
    ui,
 
33
    workingtree)
 
34
from bzrlib.plugins.bzrtools import colordiff
 
35
from bzrlib.plugins.bzrtools.userinteractor import getchar
 
36
 
 
37
 
 
38
class Shelver(object):
 
39
 
 
40
    def __init__(self, work_tree, target_tree, path, auto=False,
 
41
                 auto_apply=False, file_list=None, message=None):
 
42
        self.work_tree = work_tree
 
43
        self.target_tree = target_tree
 
44
        self.path = path
 
45
        self.diff_file = StringIO()
 
46
        self.text_differ = diff.DiffText(self.target_tree, self.work_tree,
 
47
                                         self.diff_file)
 
48
        self.diff_writer = colordiff.DiffWriter(sys.stdout, False)
 
49
        self.manager = work_tree.get_shelf_manager()
 
50
        self.auto = auto
 
51
        self.auto_apply = auto_apply
 
52
        self.file_list = file_list
 
53
        self.message = message
 
54
 
 
55
    @classmethod
 
56
    def from_args(klass, revision=None, all=False, file_list=None,
 
57
                  message=None):
 
58
        tree, path = workingtree.WorkingTree.open_containing('.')
 
59
        target_tree = builtins._get_one_revision_tree('shelf2', revision,
 
60
            tree.branch, tree)
 
61
        return klass(tree, target_tree, path, all, all, file_list, message)
 
62
 
 
63
    def run(self):
 
64
        creator = shelf.ShelfCreator(self.work_tree, self.target_tree,
 
65
                                     self.file_list)
 
66
        self.tempdir = tempfile.mkdtemp()
 
67
        changes_shelved = 0
 
68
        try:
 
69
            for change in creator:
 
70
                if change[0] == 'modify text':
 
71
                    try:
 
72
                        changes_shelved += self.handle_modify_text(creator,
 
73
                                                                   change[1])
 
74
                    except errors.BinaryFile:
 
75
                        if self.prompt_bool('Shelve binary changes?'):
 
76
                            changes_shelved += 1
 
77
                            creator.shelve_content_change(change[1])
 
78
                if change[0] == 'add file':
 
79
                    if self.prompt_bool('Shelve adding file "%s"?'
 
80
                                        % change[3]):
 
81
                        creator.shelve_creation(change[1])
 
82
                        changes_shelved += 1
 
83
                if change[0] == 'delete file':
 
84
                    if self.prompt_bool('Shelve removing file "%s"? '
 
85
                                        % change[3]):
 
86
                        creator.shelve_deletion(change[1])
 
87
                        changes_shelved += 1
 
88
                if change[0] == 'change kind':
 
89
                    if self.prompt_bool('Shelve changing "%s" from %s to %s? '
 
90
                                        % (change[4], change[2], change[3])):
 
91
                        creator.shelve_content_change(change[1])
 
92
                        changes_shelved += 1
 
93
                if change[0] == 'rename':
 
94
                    if self.prompt_bool('Shelve renaming %s => %s?' %
 
95
                                   change[2:]):
 
96
                        creator.shelve_rename(change[1])
 
97
                        changes_shelved += 1
 
98
            if changes_shelved > 0:
 
99
                trace.note("Selected changes:")
 
100
                changes = creator.work_transform.iter_changes()
 
101
                reporter = delta._ChangeReporter()
 
102
                delta.report_changes(changes, reporter)
 
103
                if (self.prompt_bool('Shelve %d change(s)?' %
 
104
                    changes_shelved, auto=self.auto_apply)):
 
105
                    shelf_id = self.manager.shelve_changes(creator,
 
106
                                                           self.message)
 
107
                    trace.note('Changes shelved with id "%d".' % shelf_id)
 
108
            else:
 
109
                trace.warning('No changes to shelve.')
 
110
        finally:
 
111
            shutil.rmtree(self.tempdir)
 
112
            creator.finalize()
 
113
 
 
114
    def get_parsed_patch(self, file_id):
 
115
        old_path = self.work_tree.id2path(file_id)
 
116
        new_path = self.target_tree.id2path(file_id)
 
117
        try:
 
118
            patch = self.text_differ.diff(file_id, old_path, new_path, 'file',
 
119
                                          'file')
 
120
            self.diff_file.seek(0)
 
121
            return patches.parse_patch(self.diff_file)
 
122
        finally:
 
123
            self.diff_file.truncate(0)
 
124
 
 
125
    def prompt_bool(self, question, auto=None):
 
126
        if auto is None:
 
127
            auto = self.auto
 
128
        if auto:
 
129
            return True
 
130
        message = question + ' [yNfq]'
 
131
        sys.stdout.write(message)
 
132
        char = getchar()
 
133
        sys.stdout.write("\r" + ' ' * len(message) + '\r')
 
134
        sys.stdout.flush()
 
135
        if char == 'y':
 
136
            return True
 
137
        elif char == 'f':
 
138
            self.auto = True
 
139
            return True
 
140
        if char == 'q':
 
141
            sys.exit(0)
 
142
        else:
 
143
            return False
 
144
 
 
145
    def handle_modify_text(self, creator, file_id):
 
146
        target_lines = self.target_tree.get_file_lines(file_id)
 
147
        work_file = self.work_tree.get_file(file_id)
 
148
        try:
 
149
            textfile.text_file(work_file)
 
150
        finally:
 
151
            work_file.close()
 
152
        textfile.check_text_lines(target_lines)
 
153
        parsed = self.get_parsed_patch(file_id)
 
154
        final_hunks = []
 
155
        if not self.auto:
 
156
            offset = 0
 
157
            self.diff_writer.write(parsed.get_header())
 
158
            for hunk in parsed.hunks:
 
159
                self.diff_writer.write(str(hunk))
 
160
                if not self.prompt_bool('Shelve?'):
 
161
                    hunk.mod_pos += offset
 
162
                    final_hunks.append(hunk)
 
163
                else:
 
164
                    offset -= (hunk.mod_range - hunk.orig_range)
 
165
        sys.stdout.flush()
 
166
        if len(parsed.hunks) == len(final_hunks):
 
167
            return 0
 
168
        patched = patches.iter_patched_from_hunks(target_lines, final_hunks)
 
169
        creator.shelve_lines(file_id, list(patched))
 
170
        return len(parsed.hunks) - len(final_hunks)
 
171
 
 
172
 
 
173
class Unshelver(object):
 
174
 
 
175
    @classmethod
 
176
    def from_args(klass, shelf_id=None, action='apply'):
 
177
        tree, path = workingtree.WorkingTree.open_containing('.')
 
178
        manager = tree.get_shelf_manager()
 
179
        if shelf_id is not None:
 
180
            shelf_id = int(shelf_id)
 
181
        else:
 
182
            shelf_id = manager.last_shelf()
 
183
            if shelf_id is None:
 
184
                raise errors.BzrCommandError('No changes are shelved.')
 
185
            trace.note('Unshelving changes with id "%d".' % shelf_id)
 
186
        apply_changes = True
 
187
        delete_shelf = True
 
188
        read_shelf = True
 
189
        if action == 'dry-run':
 
190
            apply_changes = False
 
191
            delete_shelf = False
 
192
        if action == 'delete-only':
 
193
            apply_changes = False
 
194
            read_shelf = False
 
195
        return klass(tree, manager, shelf_id, apply_changes, delete_shelf,
 
196
                     read_shelf)
 
197
 
 
198
    def __init__(self, tree, manager, shelf_id, apply_changes, delete_shelf,
 
199
                 read_shelf):
 
200
        self.tree = tree
 
201
        self.manager = manager
 
202
        self.shelf_id = shelf_id
 
203
        self.apply_changes = apply_changes
 
204
        self.delete_shelf = delete_shelf
 
205
        self.read_shelf = read_shelf
 
206
 
 
207
    def run(self):
 
208
        self.tree.lock_write()
 
209
        cleanups = [self.tree.unlock]
 
210
        try:
 
211
            if self.read_shelf:
 
212
                unshelver = self.manager.get_unshelver(self.shelf_id)
 
213
                cleanups.append(unshelver.finalize)
 
214
                if unshelver.message is not None:
 
215
                    trace.note('Message: %s' % unshelver.message)
 
216
                change_reporter = delta._ChangeReporter()
 
217
                merger = unshelver.get_merger()
 
218
                merger.change_reporter = change_reporter
 
219
                if self.apply_changes:
 
220
                    pb = ui.ui_factory.nested_progress_bar()
 
221
                    try:
 
222
                        merger.do_merge()
 
223
                    finally:
 
224
                        pb.finished()
 
225
                else:
 
226
                    self.show_changes(merger)
 
227
            if self.delete_shelf:
 
228
                self.manager.delete_shelf(self.shelf_id)
 
229
        finally:
 
230
            for cleanup in reversed(cleanups):
 
231
                cleanup()
 
232
 
 
233
    def show_changes(self, merger):
 
234
        tree_merger = merger.make_merger()
 
235
        # This implicitly shows the changes via the reporter, so we're done...
 
236
        tt = tree_merger.make_preview_transform()
 
237
        tt.finalize()