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

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-05-17 13:30:19 UTC
  • mto: This revision was merged to the branch mainline in revision 201.
  • Revision ID: szilveszter.farkas@gmail.com-20070517133019-bn3j5rnrfasj0kbb
Make bzrk working with remote branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
27
27
from errors import show_bzr_error
28
28
 
29
29
from bzrlib.branch import Branch
 
30
from bzrlib.config import GlobalConfig
30
31
import bzrlib.errors as errors
31
32
 
32
 
from bzrlib.plugins.gtk import _i18n
33
 
 
34
33
from dialog import error_dialog, info_dialog
35
34
 
36
 
from branchbox import BranchSelectionBox
 
35
from history import UrlHistory
 
36
from olive import Preferences
37
37
 
38
38
class BranchDialog(gtk.Dialog):
39
39
    """ New implementation of the Branch dialog. """
40
 
 
41
 
    def __init__(self, path=None, parent=None, remote_path=None):
 
40
    def __init__(self, path=None, parent=None):
42
41
        """ Initialize the Branch dialog. """
43
42
        gtk.Dialog.__init__(self, title="Branch - Olive",
44
43
                                  parent=parent,
49
48
        self.path = path
50
49
        
51
50
        # Create the widgets
52
 
        self._button_branch = gtk.Button(_i18n("_Branch"), use_underline=True)
53
 
        self._remote_branch = BranchSelectionBox()
 
51
        self._button_branch = gtk.Button(_("_Branch"), use_underline=True)
54
52
        self._button_revision = gtk.Button('')
55
 
        self._label_location = gtk.Label(_i18n("Branch location:"))
56
 
        self._label_location.set_alignment(0, 0.5)
57
 
        self._label_destination = gtk.Label(_i18n("Destination:"))
58
 
        self._label_nick = gtk.Label(_i18n("Branck nick:"))
59
 
        self._label_revision = gtk.Label(_i18n("Revision:"))
60
 
        self._filechooser = gtk.FileChooserButton(_i18n("Please select a folder"))
61
 
        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
 
53
        self._image_browse = gtk.Image()
 
54
        self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
 
55
        self._combo = gtk.ComboBoxEntry()
 
56
        self._label_location = gtk.Label(_("Branch location:"))
 
57
        self._label_destination = gtk.Label(_("Destination:"))
 
58
        self._label_nick = gtk.Label(_("Branck nick:"))
 
59
        self._label_revision = gtk.Label(_("Revision:"))
62
60
        self._hbox_revision = gtk.HBox()
63
61
        self._entry_revision = gtk.Entry()
64
62
        self._entry_nick = gtk.Entry()
66
64
        # Set callbacks
67
65
        self._button_branch.connect('clicked', self._on_branch_clicked)
68
66
        self._button_revision.connect('clicked', self._on_revision_clicked)
69
 
        self._remote_branch.connect('branch-changed', self._on_branch_changed)
70
 
 
 
67
        self._combo.child.connect('focus-out-event', self._on_combo_changed)
 
68
        
71
69
        # Create the table and pack the widgets into it
72
70
        self._table = gtk.Table(rows=3, columns=2)
73
71
        self._table.attach(self._label_location, 0, 1, 0, 1)
74
 
        self._table.attach(self._remote_branch, 1, 2, 0, 1)
75
72
        self._table.attach(self._label_destination, 0, 1, 1, 2)
76
73
        self._table.attach(self._label_nick, 0, 1, 2, 3)
77
74
        self._table.attach(self._label_revision, 0, 1, 3, 4)
 
75
        self._table.attach(self._combo, 1, 2, 0, 1)
78
76
        self._table.attach(self._filechooser, 1, 2, 1, 2)
79
77
        self._table.attach(self._entry_nick, 1, 2, 2, 3)
80
78
        self._table.attach(self._hbox_revision, 1, 2, 3, 4)
81
79
        
82
80
        # Set properties
83
 
        self._image_browse = gtk.Image()
84
81
        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
85
82
        self._button_revision.set_image(self._image_browse)
86
83
        self._button_revision.set_sensitive(False)
 
84
        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
 
85
        self._label_location.set_alignment(0, 0.5)
87
86
        self._label_destination.set_alignment(0, 0.5)
88
87
        self._label_nick.set_alignment(0, 0.5)
89
88
        self._label_revision.set_alignment(0, 0.5)
90
89
        self._table.set_row_spacings(3)
91
90
        self._table.set_col_spacings(3)
92
91
        self.vbox.set_spacing(3)
93
 
        if remote_path is not None:
94
 
            self._remote_branch.set_url(remote_path)
95
92
        if self.path is not None:
96
93
            self._filechooser.set_filename(self.path)
97
94
        
103
100
        
104
101
        # Show the dialog
105
102
        self.vbox.show_all()
 
103
        
 
104
        # Build branch history
 
105
        self._history = UrlHistory(GlobalConfig(), 'branch_history')
 
106
        self._build_history()
 
107
    
 
108
    def _build_history(self):
 
109
        """ Build up the branch history. """
 
110
        self._combo_model = gtk.ListStore(str)
 
111
        
 
112
        for item in self._history.get_entries():
 
113
            self._combo_model.append([ item ])
 
114
        
 
115
        pref = Preferences()
 
116
        for item in pref.get_bookmarks():
 
117
            self._combo_model.append([ item ])
 
118
        
 
119
        self._combo.set_model(self._combo_model)
 
120
        self._combo.set_text_column(0)
106
121
    
107
122
    def _get_last_revno(self):
108
123
        """ Get the revno of the last revision (if any). """
 
124
        location = self._combo.get_child().get_text()
109
125
        try:
110
 
            br = self._remote_branch.get_branch()
 
126
            br = Branch.open(location)
 
127
        except:
 
128
            return None
 
129
        else:
111
130
            return br.revno()
112
 
        except:
113
 
            pass
114
131
    
115
132
    def _on_revision_clicked(self, button):
116
133
        """ Browse for revision button clicked handler. """
117
134
        from revbrowser import RevisionBrowser
118
135
        
 
136
        location = self._combo.get_child().get_text()
119
137
        
120
138
        try:
121
 
            br = self._remote_branch.get_branch()
 
139
            br = Branch.open(location)
122
140
        except:
123
141
            return
124
 
        revb = RevisionBrowser(br, self)
125
 
        response = revb.run()
126
 
        if response != gtk.RESPONSE_NONE:
127
 
            revb.hide()
128
 
    
129
 
            if response == gtk.RESPONSE_OK:
130
 
                if revb.selected_revno is not None:
131
 
                    self._entry_revision.set_text(revb.selected_revno)
 
142
        else:
 
143
            revb = RevisionBrowser(br, self)
 
144
            response = revb.run()
 
145
            if response != gtk.RESPONSE_NONE:
 
146
                revb.hide()
132
147
        
133
 
            revb.destroy()
 
148
                if response == gtk.RESPONSE_OK:
 
149
                    if revb.selected_revno is not None:
 
150
                        self._entry_revision.set_text(revb.selected_revno)
 
151
            
 
152
                revb.destroy()
134
153
    
135
154
    @show_bzr_error
136
155
    def _on_branch_clicked(self, button):
137
156
        """ Branch button clicked handler. """
138
 
        location = self._remote_branch.get_url()
 
157
        location = self._combo.get_child().get_text()
139
158
        if location is '':
140
 
            error_dialog(_i18n('Missing branch location'),
141
 
                         _i18n('You must specify a branch location.'))
 
159
            error_dialog(_('Missing branch location'),
 
160
                         _('You must specify a branch location.'))
142
161
            return
143
162
        
144
163
        destination = self._filechooser.get_filename()
179
198
        finally:
180
199
            br_from.unlock()
181
200
                
182
 
        info_dialog(_i18n('Branching successful'),
183
 
                    _i18n('%d revision(s) branched.') % revs)
 
201
        self._history.add_entry(location)
 
202
        info_dialog(_('Branching successful'),
 
203
                    _('%d revision(s) branched.') % revs)
184
204
        
185
205
        self.response(gtk.RESPONSE_OK)
186
206
    
187
 
    def _on_branch_changed(self, widget, event):
 
207
    def _on_combo_changed(self, widget, event):
188
208
        """ We try to get the last revision if focus lost. """
189
209
        rev = self._get_last_revno()
190
210
        if rev is None:
191
 
            self._entry_revision.set_text(_i18n('N/A'))
 
211
            self._entry_revision.set_text(_('N/A'))
192
212
            self._button_revision.set_sensitive(False)
193
213
        else:
194
214
            self._entry_revision.set_text(str(rev))
195
215
            self._button_revision.set_sensitive(True)
196
216
            if self._entry_nick.get_text() == '':
197
 
                self._entry_nick.set_text(os.path.basename(self._remote_branch.get_url().rstrip("/\\")))
 
217
                self._entry_nick.set_text(os.path.basename(self._combo.get_child().get_text().rstrip("/\\")))