/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/remove.py

  • Committer: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/remove.py
 
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.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
import os
 
18
 
 
19
try:
 
20
    import pygtk
 
21
    pygtk.require("2.0")
 
22
except:
 
23
        pass
 
24
 
 
25
import gtk
 
26
import gtk.glade
 
27
 
 
28
import bzrlib.errors as errors
 
29
 
 
30
from bzrlib.plugins.gtk import _i18n
 
31
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
 
32
from guifiles import GLADEFILENAME
 
33
 
 
34
 
 
35
class OliveRemove:
 
36
    """ Display the Remove file(s) dialog and perform the needed actions. """
 
37
    def __init__(self, wt, wtpath, selected=[]):
 
38
        """ Initialize the Remove file(s) dialog. """
 
39
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_remove')
 
40
        
 
41
        self.window = self.glade.get_widget('window_remove')
 
42
        
 
43
        # Dictionary for signal_autoconnect
 
44
        dic = { "on_button_remove_remove_clicked": self.remove,
 
45
                "on_button_remove_cancel_clicked": self.close }
 
46
        
 
47
        # Connect the signals to the handlers
 
48
        self.glade.signal_autoconnect(dic)
 
49
        
 
50
        self.wt = wt
 
51
        self.wtpath = wtpath
 
52
        self.selected = selected
 
53
 
 
54
    def display(self):
 
55
        """ Display the Remove file(s) dialog. """
 
56
        self.window.show_all()
 
57
        
 
58
    @show_bzr_error
 
59
    def remove(self, widget):
 
60
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
 
61
        radio_new = self.glade.get_widget('radiobutton_remove_new')
 
62
        
 
63
        if radio_selected.get_active():
 
64
            # Remove only the selected file
 
65
            filename = self.selected
 
66
            
 
67
            if filename is None:
 
68
                error_dialog(_i18n('No file was selected'),
 
69
                             _i18n('Please select a file from the list,\nor choose the other option.'))
 
70
                return
 
71
            
 
72
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
73
            
 
74
            self.wt.remove(fullpath)
 
75
        elif radio_new.get_active():
 
76
            # Remove added files recursively
 
77
            added = self.wt.changes_from(self.wt.basis_tree()).added
 
78
            file_list = sorted([f[0] for f in added], reverse=True)
 
79
            if len(file_list) == 0:
 
80
                warning_dialog(_i18n('No matching files'),
 
81
                               _i18n('No added files were found in the working tree.'))
 
82
                return
 
83
            self.wt.remove(file_list)
 
84
        
 
85
        self.close()
 
86
    
 
87
    def close(self, widget=None):
 
88
        self.window.destroy()
 
89
 
 
90
class OliveRemoveDialog(gtk.Dialog):
 
91
    """ This class wraps the old Remove window into a gtk.Dialog. """
 
92
    
 
93
    def __init__(self, wt, wtpath, selected=[], parent=None):
 
94
        """ Initialize the Remove file(s) dialog. """
 
95
        gtk.Dialog.__init__(self, title="Remove files - Olive",
 
96
                                  parent=parent,
 
97
                                  flags=0,
 
98
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
99
        
 
100
        # Get arguments
 
101
        self.wt = wt
 
102
        self.wtpath = wtpath
 
103
        self.selected = selected
 
104
        
 
105
        # Create widgets
 
106
        self._label = gtk.Label(_i18n("Which file(s) do you want to remove?"))
 
107
        self._radio_selected = gtk.RadioButton(None, _i18n("Selected only"), False)
 
108
        self._radio_added = gtk.RadioButton(self._radio_selected, _i18n("All files with status 'added'"), False)
 
109
        self._button_remove = gtk.Button(_i18n("_Remove"), use_underline=True)
 
110
        
 
111
        self._button_remove.connect('clicked', self._on_remove_clicked)
 
112
        
 
113
        self.vbox.pack_start(self._label)
 
114
        self.vbox.pack_end(self._radio_added)
 
115
        self.vbox.pack_end(self._radio_selected)
 
116
        
 
117
        self.action_area.pack_end(self._button_remove)
 
118
        
 
119
        self.vbox.set_spacing(3)
 
120
        self.vbox.show_all()
 
121
        
 
122
    @show_bzr_error
 
123
    def _on_remove_clicked(self, button):
 
124
        """ Remove button clicked handler. """
 
125
        if self._radio_selected.get_active():
 
126
            # Remove only the selected file
 
127
            filename = self.selected
 
128
            
 
129
            if filename is None:
 
130
                error_dialog(_i18n('No file was selected'),
 
131
                             _i18n('Please select a file from the list,\nor choose the other option.'))
 
132
                return
 
133
            
 
134
            self.wt.remove(os.path.join(self.wtpath, filename))
 
135
        elif self._radio_added.get_active():
 
136
            # Remove added files recursively
 
137
            added = self.wt.changes_from(self.wt.basis_tree()).added
 
138
            file_list = sorted([f[0] for f in added], reverse=True)
 
139
            if len(file_list) == 0:
 
140
                warning_dialog(_i18n('No matching files'),
 
141
                               _i18n('No added files were found in the working tree.'))
 
142
                return
 
143
            self.wt.remove(file_list)
 
144
        
 
145
        self.response(gtk.RESPONSE_OK)