/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 16:12:27 UTC
  • mto: This revision was merged to the branch mainline in revision 201.
  • Revision ID: szilveszter.farkas@gmail.com-20070517161227-9e37lj2rm2t0cwj6
Some small modifications to Branch, Checkout and Info to support 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
33
from dialog import error_dialog, info_dialog
33
34
 
34
 
from branchbox import BranchSelectionBox
 
35
from history import UrlHistory
 
36
from olive import Preferences
35
37
 
36
38
class BranchDialog(gtk.Dialog):
37
39
    """ New implementation of the Branch dialog. """
38
 
 
39
40
    def __init__(self, path=None, parent=None, remote_path=None):
40
41
        """ Initialize the Branch dialog. """
41
42
        gtk.Dialog.__init__(self, title="Branch - Olive",
48
49
        
49
50
        # Create the widgets
50
51
        self._button_branch = gtk.Button(_("_Branch"), use_underline=True)
51
 
        self._remote_branch = BranchSelectionBox()
52
52
        self._button_revision = gtk.Button('')
 
53
        self._image_browse = gtk.Image()
 
54
        self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
 
55
        self._combo = gtk.ComboBoxEntry()
53
56
        self._label_location = gtk.Label(_("Branch location:"))
54
 
        self._label_location.set_alignment(0, 0.5)
55
57
        self._label_destination = gtk.Label(_("Destination:"))
56
58
        self._label_nick = gtk.Label(_("Branck nick:"))
57
59
        self._label_revision = gtk.Label(_("Revision:"))
58
 
        self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
59
 
        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
60
60
        self._hbox_revision = gtk.HBox()
61
61
        self._entry_revision = gtk.Entry()
62
62
        self._entry_nick = gtk.Entry()
64
64
        # Set callbacks
65
65
        self._button_branch.connect('clicked', self._on_branch_clicked)
66
66
        self._button_revision.connect('clicked', self._on_revision_clicked)
67
 
        self._remote_branch.connect('branch-changed', self._on_branch_changed)
68
 
 
 
67
        self._combo.child.connect('focus-out-event', self._on_combo_changed)
 
68
        
69
69
        # Create the table and pack the widgets into it
70
70
        self._table = gtk.Table(rows=3, columns=2)
71
71
        self._table.attach(self._label_location, 0, 1, 0, 1)
72
 
        self._table.attach(self._remote_branch, 1, 2, 0, 1)
73
72
        self._table.attach(self._label_destination, 0, 1, 1, 2)
74
73
        self._table.attach(self._label_nick, 0, 1, 2, 3)
75
74
        self._table.attach(self._label_revision, 0, 1, 3, 4)
 
75
        self._table.attach(self._combo, 1, 2, 0, 1)
76
76
        self._table.attach(self._filechooser, 1, 2, 1, 2)
77
77
        self._table.attach(self._entry_nick, 1, 2, 2, 3)
78
78
        self._table.attach(self._hbox_revision, 1, 2, 3, 4)
79
79
        
80
80
        # Set properties
81
 
        self._image_browse = gtk.Image()
82
81
        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
83
82
        self._button_revision.set_image(self._image_browse)
84
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)
85
86
        self._label_destination.set_alignment(0, 0.5)
86
87
        self._label_nick.set_alignment(0, 0.5)
87
88
        self._label_revision.set_alignment(0, 0.5)
88
89
        self._table.set_row_spacings(3)
89
90
        self._table.set_col_spacings(3)
90
91
        self.vbox.set_spacing(3)
91
 
        if remote_path is not None:
92
 
            self._remote_branch.set_url(remote_path)
93
92
        if self.path is not None:
94
93
            self._filechooser.set_filename(self.path)
 
94
        if remote_path is not None:
 
95
            self._combo.child.set_text(remote_path)
95
96
        
96
97
        # Pack some widgets
97
98
        self._hbox_revision.pack_start(self._entry_revision, True, True)
101
102
        
102
103
        # Show the dialog
103
104
        self.vbox.show_all()
 
105
        
 
106
        # Build branch history
 
107
        self._history = UrlHistory(GlobalConfig(), 'branch_history')
 
108
        self._build_history()
 
109
    
 
110
    def _build_history(self):
 
111
        """ Build up the branch history. """
 
112
        self._combo_model = gtk.ListStore(str)
 
113
        
 
114
        for item in self._history.get_entries():
 
115
            self._combo_model.append([ item ])
 
116
        
 
117
        pref = Preferences()
 
118
        for item in pref.get_bookmarks():
 
119
            self._combo_model.append([ item ])
 
120
        
 
121
        self._combo.set_model(self._combo_model)
 
122
        self._combo.set_text_column(0)
104
123
    
105
124
    def _get_last_revno(self):
106
125
        """ Get the revno of the last revision (if any). """
 
126
        location = self._combo.get_child().get_text()
107
127
        try:
108
 
            br = self._remote_branch.get_branch()
 
128
            br = Branch.open(location)
 
129
        except:
 
130
            return None
 
131
        else:
109
132
            return br.revno()
110
 
        except:
111
 
            pass
112
133
    
113
134
    def _on_revision_clicked(self, button):
114
135
        """ Browse for revision button clicked handler. """
115
136
        from revbrowser import RevisionBrowser
116
137
        
 
138
        location = self._combo.get_child().get_text()
117
139
        
118
140
        try:
119
 
            br = self._remote_branch.get_branch()
 
141
            br = Branch.open(location)
120
142
        except:
121
143
            return
122
 
        revb = RevisionBrowser(br, self)
123
 
        response = revb.run()
124
 
        if response != gtk.RESPONSE_NONE:
125
 
            revb.hide()
126
 
    
127
 
            if response == gtk.RESPONSE_OK:
128
 
                if revb.selected_revno is not None:
129
 
                    self._entry_revision.set_text(revb.selected_revno)
 
144
        else:
 
145
            revb = RevisionBrowser(br, self)
 
146
            response = revb.run()
 
147
            if response != gtk.RESPONSE_NONE:
 
148
                revb.hide()
130
149
        
131
 
            revb.destroy()
 
150
                if response == gtk.RESPONSE_OK:
 
151
                    if revb.selected_revno is not None:
 
152
                        self._entry_revision.set_text(revb.selected_revno)
 
153
            
 
154
                revb.destroy()
132
155
    
133
156
    @show_bzr_error
134
157
    def _on_branch_clicked(self, button):
135
158
        """ Branch button clicked handler. """
136
 
        location = self._remote_branch.get_url()
 
159
        location = self._combo.get_child().get_text()
137
160
        if location is '':
138
161
            error_dialog(_('Missing branch location'),
139
162
                         _('You must specify a branch location.'))
183
206
        
184
207
        self.response(gtk.RESPONSE_OK)
185
208
    
186
 
    def _on_branch_changed(self, widget, event):
 
209
    def _on_combo_changed(self, widget, event):
187
210
        """ We try to get the last revision if focus lost. """
188
211
        rev = self._get_last_revno()
189
212
        if rev is None:
193
216
            self._entry_revision.set_text(str(rev))
194
217
            self._button_revision.set_sensitive(True)
195
218
            if self._entry_nick.get_text() == '':
196
 
                self._entry_nick.set_text(os.path.basename(self._remote_branch.get_url().rstrip("/\\")))
 
219
                self._entry_nick.set_text(os.path.basename(self._combo.get_child().get_text().rstrip("/\\")))