27
from olive import delimiter
28
27
from errors import show_bzr_error
30
29
from bzrlib.branch import Branch
31
from bzrlib.config import GlobalConfig
32
30
import bzrlib.errors as errors
34
from olive.dialog import error_dialog, info_dialog
32
from dialog import error_dialog, info_dialog
34
from branchbox import BranchSelectionBox
37
36
class BranchDialog(gtk.Dialog):
38
37
""" New implementation of the Branch dialog. """
39
def __init__(self, path=None, parent=None):
39
def __init__(self, path=None, parent=None, remote_path=None):
40
40
""" Initialize the Branch dialog. """
41
41
gtk.Dialog.__init__(self, title="Branch - Olive",
49
49
# Create the widgets
50
50
self._button_branch = gtk.Button(_("_Branch"), use_underline=True)
51
self._remote_branch = BranchSelectionBox()
51
52
self._button_revision = gtk.Button('')
52
self._image_browse = gtk.Image()
53
self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
54
self._combo = gtk.ComboBoxEntry()
55
53
self._label_location = gtk.Label(_("Branch location:"))
54
self._label_location.set_alignment(0, 0.5)
56
55
self._label_destination = gtk.Label(_("Destination:"))
57
56
self._label_nick = gtk.Label(_("Branck nick:"))
58
57
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)
59
60
self._hbox_revision = gtk.HBox()
60
61
self._entry_revision = gtk.Entry()
61
62
self._entry_nick = gtk.Entry()
64
65
self._button_branch.connect('clicked', self._on_branch_clicked)
65
66
self._button_revision.connect('clicked', self._on_revision_clicked)
66
self._combo.connect('changed', self._on_combo_changed)
67
self._remote_branch.connect('branch-changed', self._on_branch_changed)
68
69
# Create the table and pack the widgets into it
69
70
self._table = gtk.Table(rows=3, columns=2)
70
71
self._table.attach(self._label_location, 0, 1, 0, 1)
72
self._table.attach(self._remote_branch, 1, 2, 0, 1)
71
73
self._table.attach(self._label_destination, 0, 1, 1, 2)
72
74
self._table.attach(self._label_nick, 0, 1, 2, 3)
73
75
self._table.attach(self._label_revision, 0, 1, 3, 4)
74
self._table.attach(self._combo, 1, 2, 0, 1)
75
76
self._table.attach(self._filechooser, 1, 2, 1, 2)
76
77
self._table.attach(self._entry_nick, 1, 2, 2, 3)
77
78
self._table.attach(self._hbox_revision, 1, 2, 3, 4)
81
self._image_browse = gtk.Image()
80
82
self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
81
83
self._button_revision.set_image(self._image_browse)
82
84
self._button_revision.set_sensitive(False)
83
self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
84
self._label_location.set_alignment(0, 0.5)
85
85
self._label_destination.set_alignment(0, 0.5)
86
86
self._label_nick.set_alignment(0, 0.5)
87
87
self._label_revision.set_alignment(0, 0.5)
88
88
self._table.set_row_spacings(3)
89
89
self._table.set_col_spacings(3)
90
90
self.vbox.set_spacing(3)
91
if remote_path is not None:
92
self._remote_branch.set_url(remote_path)
91
93
if self.path is not None:
92
94
self._filechooser.set_filename(self.path)
100
102
# Show the dialog
101
103
self.vbox.show_all()
103
# Build branch history
104
self._build_history()
106
def _build_history(self):
107
""" Build up the branch history. """
108
config = GlobalConfig()
109
history = config.get_user_option('gbranch_history')
110
if history is not None:
111
self._combo_model = gtk.ListStore(str)
112
for item in history.split(delimiter):
113
self._combo_model.append([ item ])
114
self._combo.set_model(self._combo_model)
115
self._combo.set_text_column(0)
117
def _add_to_history(self, location):
118
""" Add specified location to the history (if not yet added). """
119
config = GlobalConfig()
120
history = config.get_user_option('gbranch_history')
122
config.set_user_option('gbranch_history', location)
124
h = history.split(delimiter)
125
if location not in h:
127
config.set_user_option('gbranch_history', delimiter.join(h))
129
105
def _get_last_revno(self):
130
106
""" Get the revno of the last revision (if any). """
131
location = self._combo.get_child().get_text()
133
br = Branch.open(location)
108
br = self._remote_branch.get_branch()
137
109
return br.revno()
139
113
def _on_revision_clicked(self, button):
140
114
""" Browse for revision button clicked handler. """
141
115
from revbrowser import RevisionBrowser
143
location = self._combo.get_child().get_text()
146
br = Branch.open(location)
119
br = self._remote_branch.get_branch()
150
revb = RevisionBrowser(br, self)
151
response = revb.run()
152
if response != gtk.RESPONSE_NONE:
122
revb = RevisionBrowser(br, self)
123
response = revb.run()
124
if response != gtk.RESPONSE_NONE:
127
if response == gtk.RESPONSE_OK:
128
if revb.selected_revno is not None:
129
self._entry_revision.set_text(revb.selected_revno)
155
if response == gtk.RESPONSE_OK:
156
if revb.selected_revno is not None:
157
self._entry_revision.set_text(revb.selected_revno)
162
134
def _on_branch_clicked(self, button):
163
135
""" Branch button clicked handler. """
164
location = self._combo.get_child().get_text()
136
location = self._remote_branch.get_url()
165
137
if location is '':
166
138
error_dialog(_('Missing branch location'),
167
139
_('You must specify a branch location.'))
208
self._add_to_history(location)
180
self._history.add_entry(location)
209
181
info_dialog(_('Branching successful'),
210
182
_('%d revision(s) branched.') % revs)
212
184
self.response(gtk.RESPONSE_OK)
214
def _on_combo_changed(self, widget):
186
def _on_branch_changed(self, widget, event):
215
187
""" We try to get the last revision if focus lost. """
216
188
rev = self._get_last_revno()
added
removed
branch.py
