/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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import sys
 
17
import os
18
18
 
19
19
try:
20
20
    import pygtk
21
21
    pygtk.require("2.0")
22
22
except:
23
 
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
except:
28
 
    sys.exit(1)
 
23
        pass
 
24
 
 
25
import gtk
 
26
import gtk.glade
29
27
 
30
28
import bzrlib.errors as errors
31
 
from bzrlib.workingtree import WorkingTree
 
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
 
32
34
 
33
35
class OliveRemove:
34
36
    """ Display the Remove file(s) dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm):
 
37
    def __init__(self, wt, wtpath, selected=[]):
36
38
        """ Initialize the Remove file(s) dialog. """
37
 
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_remove')
39
 
        
40
 
        # Communication object
41
 
        self.comm = comm
 
39
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_remove')
42
40
        
43
41
        self.window = self.glade.get_widget('window_remove')
44
42
        
48
46
        
49
47
        # Connect the signals to the handlers
50
48
        self.glade.signal_autoconnect(dic)
 
49
        
 
50
        self.wt = wt
 
51
        self.wtpath = wtpath
 
52
        self.selected = selected
51
53
 
52
54
    def display(self):
53
55
        """ Display the Remove file(s) dialog. """
54
56
        self.window.show_all()
55
57
        
 
58
    @show_bzr_error
56
59
    def remove(self, widget):
57
60
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
58
61
        radio_new = self.glade.get_widget('radiobutton_remove_new')
59
62
        
60
 
        directory = self.comm.get_path()
61
 
        
62
 
        self.comm.set_busy(self.window)
63
63
        if radio_selected.get_active():
64
64
            # Remove only the selected file
65
 
            filename = self.comm.get_selected_right()
 
65
            filename = self.selected
66
66
            
67
67
            if filename is None:
68
 
                error_dialog(_('No file was selected'),
69
 
                                         _('Please select a file from the list,\nor choose the other option.'))
70
 
                self.comm.set_busy(self.window, False)
71
 
                return
72
 
            
73
 
            try:
74
 
                wt, path = WorkingTree.open_containing(directory + '/' + filename)
75
 
                wt.remove(path)
76
 
            except errors.NotBranchError:
77
 
                error_dialog(_('Directory is not a branch'),
78
 
                                         _('You can perform this action only in a branch.'))
79
 
                self.comm.set_busy(self.window, False)
80
 
                return
81
 
            except errors.NotVersionedError:
82
 
                error_dialog(_('File not versioned'),
83
 
                                         _('The selected file is not versioned.'))
84
 
                self.comm.set_busy(self.window, False)
85
 
                return
86
 
            except:
87
 
                raise
 
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)
88
75
        elif radio_new.get_active():
89
76
            # Remove added files recursively
90
 
            try:
91
 
                wt, path = WorkingTree.open_containing(directory)
92
 
            except errors.NotBranchError:
93
 
                error_dialog(_('Directory is not a branch'),
94
 
                                         _('You can perform this action only in a branch.'))
95
 
                self.comm.set_busy(self.window, False)
96
 
                return
97
 
            
98
 
            added = wt.changes_from(wt.basis_tree()).added
 
77
            added = self.wt.changes_from(self.wt.basis_tree()).added
99
78
            file_list = sorted([f[0] for f in added], reverse=True)
100
79
            if len(file_list) == 0:
101
 
                dialog.warning_dialog(_('No matching files'),
102
 
                                      _('No added files were found in the working tree.'))
103
 
                self.comm.set_busy(self.window, False)
 
80
                warning_dialog(_i18n('No matching files'),
 
81
                               _i18n('No added files were found in the working tree.'))
104
82
                return
105
 
            wt.remove(file_list)
106
 
        else:
107
 
            # This should really never happen.
108
 
            pass
 
83
            self.wt.remove(file_list)
109
84
        
110
85
        self.close()
111
 
        self.comm.refresh_right()
112
86
    
113
87
    def close(self, widget=None):
114
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)