/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 push.py

  • Committer: Jelmer Vernooij
  • Date: 2007-07-15 15:05:06 UTC
  • Revision ID: jelmer@samba.org-20070715150506-1uemecr5kt7d4kvg
Fix whitespace, add comment.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
21
21
    pass
22
22
    
23
23
import gtk
24
 
import gtk.gdk
25
 
import gtk.glade
26
 
 
 
24
 
 
25
from errors import show_bzr_error
 
26
 
 
27
from bzrlib.config import LocationConfig
27
28
import bzrlib.errors as errors
28
29
 
29
 
from olive import gladefile
30
 
from dialog import error_dialog, info_dialog
31
 
 
32
 
class OlivePush:
33
 
    """ Display Push dialog and perform the needed actions. """
34
 
    def __init__(self, branch):
 
30
from dialog import error_dialog, info_dialog, question_dialog
 
31
 
 
32
from history import UrlHistory
 
33
 
 
34
class PushDialog(gtk.Dialog):
 
35
    """ New implementation of the Push dialog. """
 
36
    def __init__(self, branch, parent=None):
35
37
        """ Initialize the Push dialog. """
36
 
        self.glade = gtk.glade.XML(gladefile, 'window_push')
 
38
        gtk.Dialog.__init__(self, title="Push - Olive",
 
39
                                  parent=parent,
 
40
                                  flags=0,
 
41
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
37
42
        
38
 
        self.window = self.glade.get_widget('window_push')
39
 
 
 
43
        # Get arguments
40
44
        self.branch = branch
41
45
        
42
 
        # Dictionary for signal_autoconnect
43
 
        dic = { "on_button_push_push_clicked": self.push,
44
 
                "on_button_push_cancel_clicked": self.close,
45
 
                "on_button_push_test_clicked": self.test,
46
 
                "on_radiobutton_push_stored_toggled": self.stored_toggled,
47
 
                "on_radiobutton_push_specific_toggled": self.specific_toggled, }
48
 
        
49
 
        # Connect the signals to the handlers
50
 
        self.glade.signal_autoconnect(dic)
51
 
        
52
 
        # Get some useful widgets
53
 
        self.radio_stored = self.glade.get_widget('radiobutton_push_stored')
54
 
        self.radio_specific = self.glade.get_widget('radiobutton_push_specific')
55
 
        self.entry_stored = self.glade.get_widget('entry_push_stored')
56
 
        self.entry_location = self.glade.get_widget('entry_push_location')
57
 
        self.check_remember = self.glade.get_widget('checkbutton_push_remember')
58
 
        self.check_overwrite = self.glade.get_widget('checkbutton_push_overwrite')
59
 
        self.check_create = self.glade.get_widget('checkbutton_push_create')
60
 
        self.label_test = self.glade.get_widget('label_push_test')
61
 
        self.image_test = self.glade.get_widget('image_push_test')
62
 
        
63
 
        # Set initial state
64
 
        self.entry_location.set_sensitive(0)
65
 
        self.check_remember.set_sensitive(0)
66
 
        self.check_create.set_sensitive(0)
67
 
        
68
 
        self.entry_stored.set_text(branch.get_push_location())
69
 
    
70
 
    def display(self):
71
 
        """ Display the Push dialog. """
72
 
        self.window.show()
73
 
        self.width, self.height = self.window.get_size()
74
 
    
75
 
    def stored_toggled(self, widget):
76
 
        if widget.get_active():
77
 
            self.entry_stored.set_sensitive(1)
78
 
            self.entry_location.set_sensitive(0)
79
 
            self.check_remember.set_sensitive(0)
80
 
            self.check_create.set_sensitive(0)
81
 
        else:
82
 
            self.entry_stored.set_sensitive(0)
83
 
            self.entry_location.set_sensitive(1)
84
 
            self.check_remember.set_sensitive(1)
85
 
            self.check_create.set_sensitive(1)
86
 
    
87
 
    def specific_toggled(self, widget):
88
 
        if widget.get_active():
89
 
            self.entry_stored.set_sensitive(0)
90
 
            self.entry_location.set_sensitive(1)
91
 
            self.check_remember.set_sensitive(1)
92
 
            self.check_create.set_sensitive(1)
93
 
        else:
94
 
            self.entry_stored.set_sensitive(1)
95
 
            self.entry_location.set_sensitive(0)
96
 
            self.check_remember.set_sensitive(0)
97
 
            self.check_create.set_sensitive(0)
98
 
    
99
 
    def push(self, widget):
100
 
        revs = 0
101
 
        if self.radio_stored.get_active():
102
 
            try:
103
 
                revs = do_push(self.branch,
104
 
                               overwrite=self.check_overwrite.get_active())
105
 
            except errors.NotBranchError:
106
 
                error_dialog(_('Directory is not a branch'),
107
 
                             _('You can perform this action only in a branch.'))
108
 
                return
109
 
            except errors.DivergedBranches:
110
 
                error_dialog(_('Branches have been diverged'),
111
 
                             _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
112
 
                return
113
 
        elif self.radio_specific.get_active():
114
 
            location = self.entry_location.get_text()
115
 
            if location == '':
116
 
                error_dialog(_('No location specified'),
117
 
                             _('Please specify a location or use the default.'))
118
 
                return
119
 
            
120
 
            try:
121
 
                revs = do_push(self.branch, location,
122
 
                               self.check_remember.get_active(),
123
 
                               self.check_overwrite.get_active(),
124
 
                               self.check_create.get_active())
125
 
            except errors.NotBranchError:
126
 
                error_dialog(_('Directory is not a branch'),
127
 
                             _('You can perform this action only in a branch.'))
128
 
                return
129
 
            except errors.DivergedBranches:
130
 
                error_dialog(_('Branches have been diverged'),
131
 
                             _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
132
 
                return
133
 
        
134
 
        self.close()
135
 
        info_dialog(_('Push successful'),
136
 
                    _('%d revision(s) pushed.') % revs)
137
 
    
138
 
    def test(self, widget):
139
 
        """ Test if write access possible. """
 
46
        # Create the widgets
 
47
        self._label_location = gtk.Label(_("Location:"))
 
48
        self._label_test = gtk.Label(_("(click the Test button to check write access)"))
 
49
        self._check_remember = gtk.CheckButton(_("_Remember as default location"),
 
50
                                               use_underline=True)
 
51
        self._check_prefix = gtk.CheckButton(_("Create the path _leading up to the location"),
 
52
                                             use_underline=True)
 
53
        self._check_overwrite = gtk.CheckButton(_("_Overwrite target if diverged"),
 
54
                                                use_underline=True)
 
55
        self._combo = gtk.ComboBoxEntry()
 
56
        self._button_test = gtk.Button(_("_Test"), use_underline=True)
 
57
        self._button_push = gtk.Button(_("_Push"), use_underline=True)
 
58
        self._hbox_location = gtk.HBox()
 
59
        self._hbox_test = gtk.HBox()
 
60
        self._image_test = gtk.Image()
 
61
        
 
62
        # Set callbacks
 
63
        self._button_test.connect('clicked', self._on_test_clicked)
 
64
        self._button_push.connect('clicked', self._on_push_clicked)
 
65
        
 
66
        # Set properties
 
67
        self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
 
68
        self._label_location.set_alignment(0, 0.5)
 
69
        self._label_test.set_alignment(0, 0.5)
 
70
        self._hbox_location.set_spacing(3)
 
71
        self._hbox_test.set_spacing(3)
 
72
        self.vbox.set_spacing(3)
 
73
        
 
74
        # Pack widgets
 
75
        self._hbox_location.pack_start(self._label_location, False, False)
 
76
        self._hbox_location.pack_start(self._combo, True, True)
 
77
        self._hbox_test.pack_start(self._image_test, False, False)
 
78
        self._hbox_test.pack_start(self._label_test, True, True)
 
79
        self.vbox.pack_start(self._hbox_location)
 
80
        self.vbox.pack_start(self._check_remember)
 
81
        self.vbox.pack_start(self._check_prefix)
 
82
        self.vbox.pack_start(self._check_overwrite)
 
83
        self.vbox.pack_start(self._hbox_test)
 
84
        self.action_area.pack_start(self._button_test)
 
85
        self.action_area.pack_end(self._button_push)
 
86
        
 
87
        # Show the dialog
 
88
        self.vbox.show_all()
 
89
        
 
90
        # Build location history
 
91
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
 
92
        self._build_history()
 
93
        
 
94
    def _build_history(self):
 
95
        """ Build up the location history. """
 
96
        self._combo_model = gtk.ListStore(str)
 
97
        for item in self._history.get_entries():
 
98
            self._combo_model.append([ item ])
 
99
        self._combo.set_model(self._combo_model)
 
100
        self._combo.set_text_column(0)
 
101
        
 
102
        location = self.branch.get_push_location()
 
103
        if location:
 
104
            self._combo.get_child().set_text(location)
 
105
    
 
106
    def _on_test_clicked(self, widget):
 
107
        """ Test button clicked handler. """
140
108
        import re
141
109
        _urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
142
110
        
143
 
        if self.radio_stored.get_active():
144
 
            url = self.entry_stored.get_text()
145
 
        elif self.radio_specific.get_active():
146
 
            url = self.entry_location.get_text()
 
111
        url = self._combo.get_child().get_text()
147
112
        
148
113
        m = _urlRE.match(url)
149
114
        if m:
150
115
            proto = m.groupdict()['proto']
151
 
            if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
152
 
                # have write acces (most probably)
153
 
                self.image_test.set_from_stock(gtk.STOCK_YES, 4)
154
 
                self.label_test.set_markup(_('<b>Write access is probably available</b>'))
 
116
            # FIXME: This should ask the transport or branch rather than 
 
117
            # guessing using regular expressions. JRV 20070714
 
118
            if proto in ('sftp', 'file', 'ftp'):
 
119
                # have write access (most probably)
 
120
                self._image_test.set_from_stock(gtk.STOCK_YES, 4)
 
121
                self._label_test.set_markup(_('<b>Write access is probably available</b>'))
155
122
            else:
156
123
                # no write access
157
 
                self.image_test.set_from_stock(gtk.STOCK_NO, 4)
158
 
                self.label_test.set_markup(_('<b>No write access</b>'))
 
124
                self._image_test.set_from_stock(gtk.STOCK_NO, 4)
 
125
                self._label_test.set_markup(_('<b>No write access</b>'))
159
126
        else:
160
127
            # couldn't determine
161
 
            self.image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
162
 
            self.label_test.set_markup(_('<b>Could not determine</b>'))
 
128
            self._image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
 
129
            self._label_test.set_markup(_('<b>Could not determine</b>'))
163
130
    
164
 
    def close(self, widget=None):
165
 
        self.window.destroy()
 
131
    @show_bzr_error
 
132
    def _on_push_clicked(self, widget):
 
133
        """ Push button clicked handler. """
 
134
        location = self._combo.get_child().get_text()
 
135
        revs = 0
 
136
        try:
 
137
            revs = do_push(self.branch,
 
138
                           location=location,
 
139
                           overwrite=self._check_overwrite.get_active(),
 
140
                           remember=self._check_remember.get_active(),
 
141
                           create_prefix=self._check_prefix.get_active())
 
142
        except errors.DivergedBranches:
 
143
            response = question_dialog(_('Branches have been diverged'),
 
144
                                       _('You cannot push if branches have diverged.\nOverwrite?'))
 
145
            if response == gtk.RESPONSE_OK:
 
146
                revs = do_push(self.branch, overwrite=True)
 
147
            return
 
148
        
 
149
        self._history.add_entry(location)
 
150
        info_dialog(_('Push successful'),
 
151
                    _("%d revision(s) pushed.") % revs)
 
152
        
 
153
        self.response(gtk.RESPONSE_OK)
166
154
 
167
155
def do_push(branch, location=None, remember=False, overwrite=False,
168
156
         create_prefix=False):
180
168
    
181
169
    :return: number of revisions pushed
182
170
    """
183
 
    from bzrlib.branch import Branch
184
171
    from bzrlib.bzrdir import BzrDir
185
172
    from bzrlib.transport import get_transport
186
173
        
187
 
    br_from = Branch.open_containing(branch)[0]
 
174
    br_from = branch
188
175
    
189
176
    stored_loc = br_from.get_push_location()
190
177
    if location is None:
191
178
        if stored_loc is None:
192
179
            error_dialog(_('Push location is unknown'),
193
 
                                     _('Please specify a location manually.'))
 
180
                         _('Please specify a location manually.'))
194
181
            return
195
182
        else:
196
183
            location = stored_loc