27
from errors import show_bzr_error
29
28
from bzrlib.branch import Branch
29
from bzrlib.config import GlobalConfig
30
30
import bzrlib.errors as errors
32
from bzrlib.plugins.gtk import _i18n
34
32
from dialog import error_dialog, info_dialog
36
from branchbox import BranchSelectionBox
38
35
class BranchDialog(gtk.Dialog):
39
36
""" New implementation of the Branch dialog. """
41
def __init__(self, path=None, parent=None, remote_path=None):
37
def __init__(self, path=None, parent=None):
42
38
""" Initialize the Branch dialog. """
43
39
gtk.Dialog.__init__(self, title="Branch - Olive",
51
47
# Create the widgets
52
self._button_branch = gtk.Button(_i18n("_Branch"), use_underline=True)
53
self._remote_branch = BranchSelectionBox()
48
self._button_branch = gtk.Button(_("_Branch"), use_underline=True)
54
49
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)
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:"))
62
56
self._hbox_revision = gtk.HBox()
63
57
self._entry_revision = gtk.Entry()
64
self._entry_nick = gtk.Entry()
67
60
self._button_branch.connect('clicked', self._on_branch_clicked)
68
61
self._button_revision.connect('clicked', self._on_revision_clicked)
69
self._remote_branch.connect('branch-changed', self._on_branch_changed)
62
self._combo.connect('changed', self._on_combo_changed)
71
64
# Create the table and pack the widgets into it
72
65
self._table = gtk.Table(rows=3, columns=2)
73
66
self._table.attach(self._label_location, 0, 1, 0, 1)
74
self._table.attach(self._remote_branch, 1, 2, 0, 1)
75
67
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)
68
self._table.attach(self._label_revision, 0, 1, 2, 3)
69
self._table.attach(self._combo, 1, 2, 0, 1)
78
70
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)
71
self._table.attach(self._hbox_revision, 1, 2, 2, 3)
83
self._image_browse = gtk.Image()
84
74
self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
85
75
self._button_revision.set_image(self._image_browse)
86
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)
87
79
self._label_destination.set_alignment(0, 0.5)
88
self._label_nick.set_alignment(0, 0.5)
89
80
self._label_revision.set_alignment(0, 0.5)
90
81
self._table.set_row_spacings(3)
91
82
self._table.set_col_spacings(3)
92
83
self.vbox.set_spacing(3)
93
if remote_path is not None:
94
self._remote_branch.set_url(remote_path)
95
84
if self.path is not None:
96
85
self._filechooser.set_filename(self.path)
105
94
self.vbox.show_all()
96
# Build branch history
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)
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')
115
config.set_user_option('gbranch_history', location)
117
h = history.split('|')
118
if location not in h:
120
config.set_user_option('gbranch_history', '|'.join(h))
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()
110
br = self._remote_branch.get_branch()
126
br = Branch.open(location)
111
130
return br.revno()
115
132
def _on_revision_clicked(self, button):
116
133
""" Browse for revision button clicked handler. """
117
134
from revbrowser import RevisionBrowser
136
location = self._combo.get_child().get_text()
121
br = self._remote_branch.get_branch()
138
br = Branch.open(location)
124
revb = RevisionBrowser(br, self)
125
response = revb.run()
126
if response != gtk.RESPONSE_NONE:
129
if response == gtk.RESPONSE_OK:
130
if revb.selected_revno is not None:
131
self._entry_revision.set_text(revb.selected_revno)
142
revb = RevisionBrowser(br, self)
143
response = revb.run()
144
if response != gtk.RESPONSE_NONE:
147
if response == gtk.RESPONSE_OK:
148
if revb.selected_revno is not None:
149
self._entry_revision.set_text(revb.selected_revno)
136
153
def _on_branch_clicked(self, button):
137
154
""" Branch button clicked handler. """
138
location = self._remote_branch.get_url()
155
location = self._combo.get_child().get_text()
139
156
if location is '':
140
error_dialog(_i18n('Missing branch location'),
141
_i18n('You must specify a branch location.'))
157
error_dialog(_('Missing branch location'),
158
_('You must specify a branch location.'))
144
161
destination = self._filechooser.get_filename()
162
if self._button_revision.get_label() != 'N/A':
146
163
revno = int(self._entry_revision.get_text())
150
nick = self._entry_nick.get_text()
152
nick = os.path.basename(location.rstrip("/\\"))
154
br_from = Branch.open(location)
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.'))
174
if e.errno == errno.ENOENT:
175
error_dialog(_('Non existing source'),
176
_("The location (%s)\ndoesn't exist.") % location)
156
178
br_from.lock_read()
158
180
from bzrlib.transport import get_transport
160
revision_id = br_from.get_rev_id(revno)
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."))
164
to_location = destination + os.sep + nick
191
to_location = destination + '/' + os.path.basename(location.rstrip("/\\"))
165
192
to_transport = get_transport(to_location)
167
to_transport.mkdir('.')
195
to_transport.mkdir('.')
196
except errors.FileExists:
197
error_dialog(_('Target already exists'),
198
_("Target directory (%s)\nalready exists. Please select another target.") % location)
200
except errors.NoSuchFile:
201
error_dialog(_('Non existing parent directory'),
202
_("The parent directory of %s\ndoesn't exist.") % location)
170
206
# preserve whatever source format we have.
175
211
revs = branch.revno()
176
212
except errors.NoSuchRevision:
177
213
to_transport.delete_tree('.')
214
error_dialog(_('Non existing revision'),
215
_("The branch has no revision %s.") % revision[0])
182
info_dialog(_i18n('Branching successful'),
183
_i18n('%d revision(s) branched.') % revs)
220
self._add_to_history(location)
221
info_dialog(_('Branching successful'),
222
_('%d revision(s) branched.') % revs)
185
224
self.response(gtk.RESPONSE_OK)
187
def _on_branch_changed(self, widget, event):
226
def _on_combo_changed(self, widget):
188
227
""" We try to get the last revision if focus lost. """
189
228
rev = self._get_last_revno()
191
self._entry_revision.set_text(_i18n('N/A'))
230
self._entry_revision.set_text(_('N/A'))
192
231
self._button_revision.set_sensitive(False)
194
233
self._entry_revision.set_text(str(rev))
195
234
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("/\\")))
added
removed
olive/branch.py
