27
from errors import show_bzr_error
29
from bzrlib.branch import Branch
30
from bzrlib.config import GlobalConfig
28
31
import bzrlib.errors as errors
29
from olive import gladefile
32
""" Display branch dialog and perform the needed operations. """
33
def __init__(self, comm):
33
from dialog import error_dialog, info_dialog
35
from history import UrlHistory
36
from olive import Preferences
38
class BranchDialog(gtk.Dialog):
39
""" New implementation of the Branch dialog. """
41
def __init__(self, path=None, parent=None, remote_path=None):
34
42
""" Initialize the Branch dialog. """
35
self.glade = gtk.glade.XML(gladefile, 'window_branch', 'olive-gtk')
37
# Communication object
40
self.window = self.glade.get_widget('window_branch')
42
# Dictionary for signal_autoconnect
43
dic = { "on_button_branch_branch_clicked": self.branch,
44
"on_button_branch_cancel_clicked": self.close }
46
# Connect the signals to the handlers
47
self.glade.signal_autoconnect(dic)
49
# Save FileChooser state
50
self.filechooser = self.glade.get_widget('filechooserbutton_branch')
51
self.filechooser.set_filename(self.comm.get_path())
54
""" Display the Branch dialog. """
55
self.window.show_all()
57
def branch(self, widget):
58
entry_location = self.glade.get_widget('entry_branch_location')
59
location = entry_location.get_text()
43
gtk.Dialog.__init__(self, title="Branch - Olive",
46
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
52
self._button_branch = gtk.Button(_("_Branch"), use_underline=True)
53
self._button_revision = gtk.Button('')
54
self._image_browse = gtk.Image()
55
self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
56
self._combo = gtk.ComboBoxEntry()
57
self._label_location = gtk.Label(_("Branch location:"))
58
self._label_destination = gtk.Label(_("Destination:"))
59
self._label_nick = gtk.Label(_("Branck nick:"))
60
self._label_revision = gtk.Label(_("Revision:"))
61
self._hbox_revision = gtk.HBox()
62
self._entry_revision = gtk.Entry()
63
self._entry_nick = gtk.Entry()
66
self._button_branch.connect('clicked', self._on_branch_clicked)
67
self._button_revision.connect('clicked', self._on_revision_clicked)
68
self._combo.child.connect('focus-out-event', self._on_combo_changed)
70
# Create the table and pack the widgets into it
71
self._table = gtk.Table(rows=3, columns=2)
72
self._table.attach(self._label_location, 0, 1, 0, 1)
73
self._table.attach(self._label_destination, 0, 1, 1, 2)
74
self._table.attach(self._label_nick, 0, 1, 2, 3)
75
self._table.attach(self._label_revision, 0, 1, 3, 4)
76
self._table.attach(self._combo, 1, 2, 0, 1)
77
self._table.attach(self._filechooser, 1, 2, 1, 2)
78
self._table.attach(self._entry_nick, 1, 2, 2, 3)
79
self._table.attach(self._hbox_revision, 1, 2, 3, 4)
82
self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
83
self._button_revision.set_image(self._image_browse)
84
self._button_revision.set_sensitive(False)
85
self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
86
self._label_location.set_alignment(0, 0.5)
87
self._label_destination.set_alignment(0, 0.5)
88
self._label_nick.set_alignment(0, 0.5)
89
self._label_revision.set_alignment(0, 0.5)
90
self._table.set_row_spacings(3)
91
self._table.set_col_spacings(3)
92
self.vbox.set_spacing(3)
93
if self.path is not None:
94
self._filechooser.set_filename(self.path)
95
if remote_path is not None:
96
self._combo.child.set_text(remote_path)
99
self._hbox_revision.pack_start(self._entry_revision, True, True)
100
self._hbox_revision.pack_start(self._button_revision, False, False)
101
self.vbox.add(self._table)
102
self.action_area.pack_end(self._button_branch)
107
# Build branch history
108
self._history = UrlHistory(GlobalConfig(), 'branch_history')
109
self._build_history()
111
def _build_history(self):
112
""" Build up the branch history. """
113
self._combo_model = gtk.ListStore(str)
115
for item in self._history.get_entries():
116
self._combo_model.append([ item ])
119
for item in pref.get_bookmarks():
120
self._combo_model.append([ item ])
122
self._combo.set_model(self._combo_model)
123
self._combo.set_text_column(0)
125
def _get_last_revno(self):
126
""" Get the revno of the last revision (if any). """
127
location = self._combo.get_child().get_text()
129
br = Branch.open(location)
135
def _on_revision_clicked(self, button):
136
""" Browse for revision button clicked handler. """
137
from revbrowser import RevisionBrowser
139
location = self._combo.get_child().get_text()
142
br = Branch.open(location)
146
revb = RevisionBrowser(br, self)
147
response = revb.run()
148
if response != gtk.RESPONSE_NONE:
151
if response == gtk.RESPONSE_OK:
152
if revb.selected_revno is not None:
153
self._entry_revision.set_text(revb.selected_revno)
158
def _on_branch_clicked(self, button):
159
""" Branch button clicked handler. """
160
location = self._combo.get_child().get_text()
60
161
if location is '':
61
162
error_dialog(_('Missing branch location'),
62
_('You must specify a branch location.'))
163
_('You must specify a branch location.'))
65
destination = self.filechooser.get_filename()
67
spinbutton_revno = self.glade.get_widget('spinbutton_branch_revno')
68
revno = spinbutton_revno.get_value_as_int()
69
revision_id = br_from.get_rev_id(revno)
71
self.comm.set_busy(self.window)
166
destination = self._filechooser.get_filename()
168
revno = int(self._entry_revision.get_text())
172
nick = self._entry_nick.get_text()
174
nick = os.path.basename(location.rstrip("/\\"))
176
br_from = Branch.open(location)
73
180
from bzrlib.transport import get_transport
75
br_from = Branch.open(location)
182
revision_id = br_from.get_rev_id(revno)
186
to_location = destination + os.sep + nick
187
to_transport = get_transport(to_location)
189
to_transport.mkdir('.')
80
destination = destination + '/' + os.path.basename(location.rstrip("/\\"))
81
to_transport = get_transport(destination)
83
to_transport.mkdir('.')
86
dir = br_from.bzrdir.sprout(to_transport.base, revision_id)
87
branch = dir.open_branch()
88
except NoSuchRevision:
89
to_transport.delete_tree('.')
192
# preserve whatever source format we have.
193
dir = br_from.bzrdir.sprout(to_transport.base,
196
branch = dir.open_branch()
197
revs = branch.revno()
198
except errors.NoSuchRevision:
199
to_transport.delete_tree('.')
96
info_dialog(_('Branching successful'),
97
_('%d revision(s) branched.') % revs)
98
self.comm.refresh_right()
99
except errors.NonExistingSource, errmsg:
100
error_dialog(_('Non existing source'),
101
_("The location (%s)\ndoesn't exist.") % errmsg)
102
self.comm.set_busy(self.window, False)
104
except errors.TargetAlreadyExists, errmsg:
105
error_dialog(_('Target already exists'),
106
_('Target directory (%s)\nalready exists. Please select another target.') % errmsg)
107
self.comm.set_busy(self.window, False)
109
except errors.NonExistingParent, errmsg:
110
error_dialog(_('Non existing parent directory'),
111
_("The parent directory (%s)\ndoesn't exist.") % errmsg)
112
self.comm.set_busy(self.window, False)
114
except errors.NonExistingRevision:
115
error_dialog(_('Non existing revision'),
116
_("The revision you specified doesn't exist."))
117
self.comm.set_busy(self.window, False)
119
except errors.NotBranchError, errmsg:
120
error_dialog(_('Location is not a branch'),
121
_('The specified location has to be a branch.'))
122
self.comm.set_busy(self.window, False)
204
self._history.add_entry(location)
205
info_dialog(_('Branching successful'),
206
_('%d revision(s) branched.') % revs)
126
def close(self, widget=None):
127
self.window.destroy()
208
self.response(gtk.RESPONSE_OK)
210
def _on_combo_changed(self, widget, event):
211
""" We try to get the last revision if focus lost. """
212
rev = self._get_last_revno()
214
self._entry_revision.set_text(_('N/A'))
215
self._button_revision.set_sensitive(False)
217
self._entry_revision.set_text(str(rev))
218
self._button_revision.set_sensitive(True)
219
if self._entry_nick.get_text() == '':
220
self._entry_nick.set_text(os.path.basename(self._combo.get_child().get_text().rstrip("/\\")))
added
removed
branch.py
