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

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-02-01 09:42:15 UTC
  • mto: (157.1.2 trunk) (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 141.
  • Revision ID: szilveszter.farkas@gmail.com-20070201094215-sev45cvz6xw8x7d6
Forgot to add the Revision Browser.

Show diffs side-by-side

added added

removed removed

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