← 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: 2008-12-01 20:17:21 UTC
  • mfrom: (3872.2.6 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20081201201721-zconkq0v7pow8nmw
(Marius Kruger) Raise an exception when we encounter an non-existing
        dotted revno.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
from cStringIO import StringIO
39
39
    """Interactively shelve the changes in a working tree."""
40
40
 
41
41
    def __init__(self, work_tree, target_tree, diff_writer=None, auto=False,
42
 
                 auto_apply=False, file_list=None, message=None,
43
 
                 destroy=False):
 
42
                 auto_apply=False, file_list=None, message=None):
44
43
        """Constructor.
45
44
 
46
45
        :param work_tree: The working tree to shelve changes from.
50
49
        :param auto_apply: If True, shelve changes with no final prompt.
51
50
        :param file_list: If supplied, only files in this list may be shelved.
52
51
        :param message: The message to associate with the shelved changes.
53
 
        :param destroy: Change the working tree without storing the shelved
54
 
            changes.
55
52
        """
56
53
        self.work_tree = work_tree
57
54
        self.target_tree = target_tree
63
60
        self.auto_apply = auto_apply
64
61
        self.file_list = file_list
65
62
        self.message = message
66
 
        self.destroy = destroy
67
63
 
68
64
    @classmethod
69
65
    def from_args(klass, diff_writer, revision=None, all=False, file_list=None,
70
 
                  message=None, directory='.', destroy=False):
 
66
                  message=None, directory='.'):
71
67
        """Create a shelver from commandline arguments.
72
68
 
73
69
        :param revision: RevisionSpec of the revision to compare to.
75
71
        :param file_list: If supplied, only files in this list may be  shelved.
76
72
        :param message: The message to associate with the shelved changes.
77
73
        :param directory: The directory containing the working tree.
78
 
        :param destroy: Change the working tree without storing the shelved
79
 
            changes.
80
74
        """
81
75
        tree, path = workingtree.WorkingTree.open_containing(directory)
82
76
        target_tree = builtins._get_one_revision_tree('shelf2', revision,
83
77
            tree.branch, tree)
84
 
        files = builtins.safe_relpath_files(tree, file_list)
85
 
        return klass(tree, target_tree, diff_writer, all, all, files, message,
86
 
                     destroy)
 
78
        return klass(tree, target_tree, diff_writer, all, all, file_list,
 
79
                     message)
87
80
 
88
81
    def run(self):
89
82
        """Interactively shelve the changes."""
121
114
                                   change[2:]):
122
115
                        creator.shelve_rename(change[1])
123
116
                        changes_shelved += 1
124
 
                if change[0] == 'modify target':
125
 
                    if self.prompt_bool('Shelve changing target of "%s" '
126
 
                            'from "%s" to "%s"?' % change[2:]):
127
 
                        creator.shelve_modify_target(change[1])
128
 
                        changes_shelved += 1
129
117
            if changes_shelved > 0:
130
118
                trace.note("Selected changes:")
131
119
                changes = creator.work_transform.iter_changes()
133
121
                delta.report_changes(changes, reporter)
134
122
                if (self.auto_apply or self.prompt_bool(
135
123
                    'Shelve %d change(s)?' % changes_shelved)):
136
 
                    if self.destroy:
137
 
                        creator.transform()
138
 
                        trace.note('Selected changes destroyed.')
139
 
                    else:
140
 
                        shelf_id = self.manager.shelve_changes(creator,
141
 
                                                               self.message)
142
 
                        trace.note('Changes shelved with id "%d".' % shelf_id)
 
124
                    shelf_id = self.manager.shelve_changes(creator,
 
125
                                                           self.message)
 
126
                    trace.note('Changes shelved with id "%d".' % shelf_id)
143
127
            else:
144
128
                trace.warning('No changes to shelve.')
145
129
        finally:
173
157
        sys.stdout.flush()
174
158
        return char
175
159
 
176
 
    def prompt_bool(self, question, long=False):
 
160
    def prompt_bool(self, question):
177
161
        """Prompt the user with a yes/no question.
178
162
 
179
163
        This may be overridden by self.auto.  It may also *set* self.auto.  It
183
167
        """
184
168
        if self.auto:
185
169
            return True
186
 
        if long:
187
 
            prompt = ' [(y)es, (N)o, (f)inish, or (q)uit]'
188
 
        else:
189
 
            prompt = ' [yNfq?]'
190
 
        char = self.prompt(question + prompt)
 
170
        char = self.prompt(question + ' [yNfq]')
191
171
        if char == 'y':
192
172
            return True
193
173
        elif char == 'f':
194
174
            self.auto = True
195
175
            return True
196
 
        elif char == '?':
197
 
            return self.prompt_bool(question, long=True)
198
176
        if char == 'q':
199
177
            raise errors.UserAbort()
200
178
        else:
245
223
        tree, path = workingtree.WorkingTree.open_containing(directory)
246
224
        manager = tree.get_shelf_manager()
247
225
        if shelf_id is not None:
248
 
            try:
249
 
                shelf_id = int(shelf_id)
250
 
            except ValueError:
251
 
                raise errors.InvalidShelfId(shelf_id)
 
226
            shelf_id = int(shelf_id)
252
227
        else:
253
228
            shelf_id = manager.last_shelf()
254
229
            if shelf_id is None:
297
272
                if unshelver.message is not None:
298
273
                    trace.note('Message: %s' % unshelver.message)
299
274
                change_reporter = delta._ChangeReporter()
300
 
                task = ui.ui_factory.nested_progress_bar()
301
 
                try:
302
 
                    merger = unshelver.make_merger(task)
303
 
                    merger.change_reporter = change_reporter
304
 
                    if self.apply_changes:
 
275
                merger = unshelver.make_merger()
 
276
                merger.change_reporter = change_reporter
 
277
                if self.apply_changes:
 
278
                    pb = ui.ui_factory.nested_progress_bar()
 
279
                    try:
305
280
                        merger.do_merge()
306
 
                    else:
307
 
                        self.show_changes(merger)
308
 
                finally:
309
 
                    task.finished()
 
281
                    finally:
 
282
                        pb.finished()
 
283
                else:
 
284
                    self.show_changes(merger)
310
285
            if self.delete_shelf:
311
286
                self.manager.delete_shelf(self.shelf_id)
312
287
        finally: