/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: 2008-06-29 18:31:29 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183129-syqvz3xm5gqagzsx
https://launchpad.net/bugs/244025
Fix use of smart_add.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
30
30
from bzrlib.config import LocationConfig
31
31
import bzrlib.errors as errors
32
32
 
 
33
from bzrlib.plugins.gtk import _i18n
33
34
from dialog import error_dialog, info_dialog, question_dialog
34
35
 
35
36
from history import UrlHistory
49
50
        self.branch = branch
50
51
        
51
52
        # Create the widgets
52
 
        self._label_location = gtk.Label(_("Location:"))
53
 
        self._label_test = gtk.Label(_("(click the Test button to check write access)"))
 
53
        self._label_location = gtk.Label(_i18n("Location:"))
54
54
        self._combo = gtk.ComboBoxEntry()
55
 
        self._button_test = gtk.Button(_("_Test"), use_underline=True)
56
 
        self._button_push = gtk.Button(_("_Push"), use_underline=True)
 
55
        self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
57
56
        self._hbox_location = gtk.HBox()
58
 
        self._hbox_test = gtk.HBox()
59
 
        self._image_test = gtk.Image()
60
57
        
61
58
        # Set callbacks
62
 
        self._button_test.connect('clicked', self._on_test_clicked)
63
59
        self._button_push.connect('clicked', self._on_push_clicked)
64
60
        
65
61
        # Set properties
66
 
        self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
67
62
        self._label_location.set_alignment(0, 0.5)
68
 
        self._label_test.set_alignment(0, 0.5)
69
63
        self._hbox_location.set_spacing(3)
70
 
        self._hbox_test.set_spacing(3)
71
64
        self.vbox.set_spacing(3)
72
65
        
73
66
        # Pack widgets
74
67
        self._hbox_location.pack_start(self._label_location, False, False)
75
68
        self._hbox_location.pack_start(self._combo, True, True)
76
 
        self._hbox_test.pack_start(self._image_test, False, False)
77
 
        self._hbox_test.pack_start(self._label_test, True, True)
78
69
        self.vbox.pack_start(self._hbox_location)
79
 
        self.vbox.pack_start(self._hbox_test)
80
 
        self.action_area.pack_start(self._button_test)
81
70
        self.action_area.pack_end(self._button_push)
82
71
        
83
72
        # Show the dialog
100
89
            if location is not None:
101
90
                self._combo.get_child().set_text(location)
102
91
    
103
 
    def _on_test_clicked(self, widget):
104
 
        """ Test button clicked handler. """
105
 
        import re
106
 
        _urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
107
 
        
108
 
        url = self._combo.get_child().get_text()
109
 
        
110
 
        m = _urlRE.match(url)
111
 
        if m:
112
 
            proto = m.groupdict()['proto']
113
 
            # FIXME: This should ask the transport or branch rather than 
114
 
            # guessing using regular expressions. JRV 20070714
115
 
            if proto in ('sftp', 'file', 'ftp'):
116
 
                # have write access (most probably)
117
 
                self._image_test.set_from_stock(gtk.STOCK_YES, 4)
118
 
                self._label_test.set_markup(_('<b>Write access is probably available</b>'))
119
 
            else:
120
 
                # no write access
121
 
                self._image_test.set_from_stock(gtk.STOCK_NO, 4)
122
 
                self._label_test.set_markup(_('<b>No write access</b>'))
123
 
        else:
124
 
            # couldn't determine
125
 
            self._image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
126
 
            self._label_test.set_markup(_('<b>Could not determine</b>'))
127
 
    
128
92
    @show_bzr_error
129
93
    def _on_push_clicked(self, widget):
130
94
        """ Push button clicked handler. """
131
95
        location = self._combo.get_child().get_text()
132
96
        revs = 0
133
97
        if self.branch is not None and self.branch.get_push_location() is None:
134
 
            response = question_dialog(_('Set default push location'),
135
 
                                       _('There is no default push location set.\nSet %r as default now?') % location)
136
 
            if response == gtk.REPONSE_OK:
 
98
            response = question_dialog(_i18n('Set default push location'),
 
99
                                       _i18n('There is no default push location set.\nSet %r as default now?') % location)
 
100
            if response == gtk.RESPONSE_OK:
137
101
                self.branch.set_push_location(location)
138
102
 
139
103
        try:
140
104
            revs = do_push(self.branch, location=location, overwrite=False)
141
105
        except errors.DivergedBranches:
142
 
            response = question_dialog(_('Branches have been diverged'),
143
 
                                       _('You cannot push if branches have diverged.\nOverwrite?'))
144
 
            if response == gtk.RESPONSE_OK:
 
106
            response = question_dialog(_i18n('Branches have been diverged'),
 
107
                                       _i18n('You cannot push if branches have diverged.\nOverwrite?'))
 
108
            if response == gtk.RESPONSE_YES:
145
109
                revs = do_push(self.branch, location=location, overwrite=True)
146
 
            return
147
110
        
148
111
        self._history.add_entry(location)
149
 
        info_dialog(_('Push successful'),
150
 
                    _("%d revision(s) pushed.") % revs)
 
112
        info_dialog(_i18n('Push successful'),
 
113
                    _i18n("%d revision(s) pushed.") % revs)
151
114
        
152
115
        self.response(gtk.RESPONSE_OK)
153
116
 
180
143
            relurl = transport.relpath(location_url)
181
144
            transport.mkdir(relurl)
182
145
        except errors.NoSuchFile:
183
 
            response = question_dialog(_('Non existing parent directory'),
184
 
                         _("The parent directory (%s)\ndoesn't exist. Create?") % location)
 
146
            response = question_dialog(_i18n('Non existing parent directory'),
 
147
                         _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
185
148
            if response == gtk.RESPONSE_OK:
186
149
                _create_prefix(transport)
187
150
            else: