/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-01-31 23:31:20 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-20070131233120-k1tomuzu52rqwpkw
Refactoring the Branch dialog. We also have a Revision Browser now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/branch.py
26
26
import gtk.glade
27
27
 
28
28
from bzrlib.branch import Branch
 
29
from bzrlib.config import GlobalConfig
29
30
import bzrlib.errors as errors
30
31
 
31
32
from dialog import error_dialog, info_dialog
32
 
from guifiles import GLADEFILENAME
33
 
 
34
 
 
35
 
class BranchDialog:
36
 
    """ Display branch dialog and perform the needed operations. """
37
 
    def __init__(self, path=None):
 
33
 
 
34
 
 
35
class BranchDialog(gtk.Dialog):
 
36
    """ New implementation of the Branch dialog. """
 
37
    def __init__(self, path=None, parent=None):
38
38
        """ Initialize the Branch dialog. """
39
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_branch', 'olive-gtk')
40
 
 
41
 
        self.window = self.glade.get_widget('window_branch')
42
 
        
43
 
        # Dictionary for signal_autoconnect
44
 
        dic = { "on_button_branch_branch_clicked": self.branch,
45
 
                "on_button_branch_cancel_clicked": self.close }
46
 
        
47
 
        # Connect the signals to the handlers
48
 
        self.glade.signal_autoconnect(dic)
49
 
        
50
 
        # Save FileChooser state
51
 
        self.filechooser = self.glade.get_widget('filechooserbutton_branch')
52
 
        if path is not None:
53
 
            self.filechooser.set_filename(path)
54
 
 
55
 
    def display(self):
56
 
        """ Display the Branch dialog. """
57
 
        self.window.show_all()
58
 
    
59
 
    def branch(self, widget):
60
 
        entry_location = self.glade.get_widget('entry_branch_location')
61
 
        location = entry_location.get_text()
 
39
        gtk.Dialog.__init__(self, title="Branch - Olive",
 
40
                                  parent=parent,
 
41
                                  flags=0,
 
42
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
43
        
 
44
        # Get arguments
 
45
        self.path = path
 
46
        
 
47
        # Create the widgets
 
48
        self._button_branch = gtk.Button(_("_Branch"), use_underline=True)
 
49
        self._button_revision = gtk.Button('')
 
50
        self._image_browse = gtk.Image()
 
51
        self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
 
52
        self._combo = gtk.ComboBoxEntry()
 
53
        self._label_location = gtk.Label(_("Branch location:"))
 
54
        self._label_destination = gtk.Label(_("Destination:"))
 
55
        self._label_revision = gtk.Label(_("Revision:"))
 
56
        self._hbox_revision = gtk.HBox()
 
57
        self._entry_revision = gtk.Entry()
 
58
        
 
59
        # Set callbacks
 
60
        self._button_branch.connect('clicked', self._on_branch_clicked)
 
61
        self._button_revision.connect('clicked', self._on_revision_clicked)
 
62
        self._combo.connect('changed', self._on_combo_changed)
 
63
        
 
64
        # Create the table and pack the widgets into it
 
65
        self._table = gtk.Table(rows=3, columns=2)
 
66
        self._table.attach(self._label_location, 0, 1, 0, 1)
 
67
        self._table.attach(self._label_destination, 0, 1, 1, 2)
 
68
        self._table.attach(self._label_revision, 0, 1, 2, 3)
 
69
        self._table.attach(self._combo, 1, 2, 0, 1)
 
70
        self._table.attach(self._filechooser, 1, 2, 1, 2)
 
71
        self._table.attach(self._hbox_revision, 1, 2, 2, 3)
 
72
        
 
73
        # Set properties
 
74
        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
 
75
        self._button_revision.set_image(self._image_browse)
 
76
        self._button_revision.set_sensitive(False)
 
77
        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
 
78
        self._label_location.set_alignment(0, 0.5)
 
79
        self._label_destination.set_alignment(0, 0.5)
 
80
        self._label_revision.set_alignment(0, 0.5)
 
81
        self._table.set_row_spacings(3)
 
82
        self._table.set_col_spacings(3)
 
83
        self.vbox.set_spacing(3)
 
84
        if self.path is not None:
 
85
            self._filechooser.set_filename(self.path)
 
86
        
 
87
        # Pack some widgets
 
88
        self._hbox_revision.pack_start(self._entry_revision, True, True)
 
89
        self._hbox_revision.pack_start(self._button_revision, False, False)
 
90
        self.vbox.add(self._table)
 
91
        self.action_area.pack_end(self._button_branch)
 
92
        
 
93
        # Show the dialog
 
94
        self.vbox.show_all()
 
95
        
 
96
        # Build branch history
 
97
        self._build_history()
 
98
    
 
99
    def _build_history(self):
 
100
        """ Build up the branch history. """
 
101
        config = GlobalConfig()
 
102
        history = config.get_user_option('gbranch_history')
 
103
        if history is not None:
 
104
            self._combo_model = gtk.ListStore(str)
 
105
            for item in history.split('|'):
 
106
                self._combo_model.append([ item ])
 
107
            self._combo.set_model(self._combo_model)
 
108
            self._combo.set_text_column(0)
 
109
    
 
110
    def _add_to_history(self, location):
 
111
        """ Add specified location to the history (if not yet added). """
 
112
        config = GlobalConfig()
 
113
        history = config.get_user_option('gbranch_history')
 
114
        if history is None:
 
115
            config.set_user_option('gbranch_history', location)
 
116
        else:
 
117
            h = history.split('|')
 
118
            if location not in h:
 
119
                h.append(location)
 
120
            config.set_user_option('gbranch_history', '|'.join(h))                
 
121
    
 
122
    def _get_last_revno(self):
 
123
        """ Get the revno of the last revision (if any). """
 
124
        location = self._combo.get_child().get_text()
 
125
        try:
 
126
            br = Branch.open(location)
 
127
        except:
 
128
            return None
 
129
        else:
 
130
            return br.revno()
 
131
    
 
132
    def _on_revision_clicked(self, button):
 
133
        """ Browse for revision button clicked handler. """
 
134
        from revbrowser import RevisionBrowser
 
135
        
 
136
        location = self._combo.get_child().get_text()
 
137
        try:
 
138
            br = Branch.open(location)
 
139
        except:
 
140
            return
 
141
        else:
 
142
            revb = RevisionBrowser(br, self)
 
143
            response = revb.run()
 
144
            if response != gtk.RESPONSE_NONE:
 
145
                revb.hide()
 
146
        
 
147
                if response == gtk.RESPONSE_OK:
 
148
                    if revb.selected_revno is not None:
 
149
                        self._entry_revision.set_text(revb.selected_revno)
 
150
            
 
151
                revb.destroy()
 
152
    
 
153
    def _on_branch_clicked(self, button):
 
154
        """ Branch button clicked handler. """
 
155
        location = self._combo.get_child().get_text()
62
156
        if location is '':
63
157
            error_dialog(_('Missing branch location'),
64
158
                         _('You must specify a branch location.'))
65
159
            return
66
160
        
67
 
        destination = self.filechooser.get_filename()
68
 
        
69
 
        spinbutton_revno = self.glade.get_widget('spinbutton_branch_revno')
70
 
        revno = spinbutton_revno.get_value_as_int()
71
 
        
 
161
        destination = self._filechooser.get_filename()
 
162
        if self._button_revision.get_label() != 'N/A':
 
163
            revno = int(self._entry_revision.get_text())
 
164
        else:
 
165
            revno = None
 
166
        
 
167
        try:
 
168
            br_from = Branch.open(location)
 
169
        except errors.NotBranchError:
 
170
            error_dialog(_('Location is not a branch'),
 
171
                         _('The specified location has to be a branch.'))
 
172
            return
 
173
        except OSError, e:
 
174
            if e.errno == errno.ENOENT:
 
175
                error_dialog(_('Non existing source'),
 
176
                             _("The location (%s)\ndoesn't exist.") % location)
 
177
        
 
178
        br_from.lock_read()
72
179
        try:
73
180
            from bzrlib.transport import get_transport
74
181
 
75
 
            br_from = Branch.open(location)
76
 
            br_from.lock_read()
77
 
            
78
 
            revision_id = br_from.get_rev_id(revno)
 
182
            try:
 
183
                revision_id = br_from.get_rev_id(revno)
 
184
            except errors.NoSuchRevision:
 
185
                error_dialog(_('No such revision'),
 
186
                             _("The revision you specified doesn't exist."))
 
187
                return
79
188
 
 
189
            basis_dir = None
 
190
            
 
191
            to_location = destination + '/' + os.path.basename(location.rstrip("/\\"))
 
192
            to_transport = get_transport(to_location)
 
193
            
80
194
            try:
81
 
                destination = destination + '/' + os.path.basename(location.rstrip("/\\"))
82
 
                to_transport = get_transport(destination)
83
195
                to_transport.mkdir('.')
84
 
 
85
 
                try:
86
 
                    dir = br_from.bzrdir.sprout(to_transport.base, revision_id)
87
 
                    branch = dir.open_branch()
88
 
                    revs = branch.revno()
89
 
                except errors.NoSuchRevision:
90
 
                    to_transport.delete_tree('.')
91
 
                    raise
92
 
 
93
 
            finally:
94
 
                br_from.unlock()
 
196
            except errors.FileExists:
 
197
                error_dialog(_('Target already exists'),
 
198
                             _("Target directory (%s)\nalready exists. Please select another target.") % location)
 
199
                return
 
200
            except errors.NoSuchFile:
 
201
                error_dialog(_('Non existing parent directory'),
 
202
                             _("The parent directory of %s\ndoesn't exist.") % location)
 
203
                return
 
204
            
 
205
            try:
 
206
                # preserve whatever source format we have.
 
207
                dir = br_from.bzrdir.sprout(to_transport.base,
 
208
                                            revision_id,
 
209
                                            basis_dir)
 
210
                branch = dir.open_branch()
 
211
                revs = branch.revno()
 
212
            except errors.NoSuchRevision:
 
213
                to_transport.delete_tree('.')
 
214
                error_dialog(_('Non existing revision'),
 
215
                             _("The branch has no revision %s.") % revision[0])
 
216
                return
 
217
        finally:
 
218
            br_from.unlock()
95
219
                
96
 
            self.close()
97
 
            info_dialog(_('Branching successful'),
98
 
                        _('%d revision(s) branched.') % revs)
99
 
        except errors.NonExistingSource, errmsg:
100
 
            error_dialog(_('Non existing source'),
101
 
                         _("The location (%s)\ndoesn't exist.") % errmsg)
102
 
            return
103
 
        except errors.TargetAlreadyExists, errmsg:
104
 
            error_dialog(_('Target already exists'),
105
 
                         _('Target directory (%s)\nalready exists. Please select another target.') % errmsg)
106
 
            return
107
 
        except errors.NonExistingParent, errmsg:
108
 
            error_dialog(_('Non existing parent directory'),
109
 
                         _("The parent directory (%s)\ndoesn't exist.") % errmsg)
110
 
            return
111
 
        except errors.NonExistingRevision:
112
 
            error_dialog(_('Non existing revision'),
113
 
                         _("The revision you specified doesn't exist."))
114
 
            return
115
 
        except errors.NotBranchError, errmsg:
116
 
            error_dialog(_('Location is not a branch'),
117
 
                         _('The specified location has to be a branch.'))
118
 
            return
 
220
        self._add_to_history(location)
 
221
        info_dialog(_('Branching successful'),
 
222
                    _('%d revision(s) branched.') % revs)
119
223
        
120
 
    def close(self, widget=None):
121
 
        self.window.destroy()
 
224
        self.response(gtk.RESPONSE_OK)
 
225
    
 
226
    def _on_combo_changed(self, widget):
 
227
        """ We try to get the last revision if focus lost. """
 
228
        rev = self._get_last_revno()
 
229
        if rev is None:
 
230
            self._entry_revision.set_text(_('N/A'))
 
231
            self._button_revision.set_sensitive(False)
 
232
        else:
 
233
            self._entry_revision.set_text(str(rev))
 
234
            self._button_revision.set_sensitive(True)