19
from gi.repository import Gtk
27
from errors import show_bzr_error
24
29
from bzrlib.branch import Branch
25
from bzrlib.transport import get_transport
27
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog
28
from bzrlib.plugins.gtk.errors import show_bzr_error
29
from bzrlib.plugins.gtk.i18n import _i18n
30
from bzrlib.plugins.gtk.branchbox import BranchSelectionBox
33
class BranchDialog(Gtk.Dialog):
30
from bzrlib.config import GlobalConfig
31
import bzrlib.errors as errors
33
from dialog import error_dialog, info_dialog
35
from history import UrlHistory
36
from olive import Preferences
38
class BranchDialog(gtk.Dialog):
34
39
""" New implementation of the Branch dialog. """
36
40
def __init__(self, path=None, parent=None, remote_path=None):
37
41
""" Initialize the Branch dialog. """
38
super(BranchDialog, self).__init__(
39
title="Branch - Olive", parent=parent, flags=0,
40
buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
42
gtk.Dialog.__init__(self, title="Branch - Olive",
45
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
45
50
# Create the widgets
46
self._button_branch = Gtk.Button(_i18n("_Branch"), use_underline=True)
47
self._remote_branch = BranchSelectionBox()
48
self._button_revision = Gtk.Button('')
49
self._label_location = Gtk.Label(label=_i18n("Branch location:"))
50
self._label_location.set_alignment(0, 0.5)
51
self._label_destination = Gtk.Label(label=_i18n("Destination:"))
52
self._label_nick = Gtk.Label(label=_i18n("Branck nick:"))
53
self._label_revision = Gtk.Label(label=_i18n("Revision:"))
54
self._filechooser = Gtk.FileChooserButton(_i18n("Please select a folder"))
55
self._filechooser.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
56
self._hbox_revision = Gtk.HBox()
57
self._entry_revision = Gtk.Entry()
58
self._entry_nick = Gtk.Entry()
51
self._button_branch = gtk.Button(_("_Branch"), use_underline=True)
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()
56
self._label_location = gtk.Label(_("Branch location:"))
57
self._label_destination = gtk.Label(_("Destination:"))
58
self._label_nick = gtk.Label(_("Branck nick:"))
59
self._label_revision = gtk.Label(_("Revision:"))
60
self._hbox_revision = gtk.HBox()
61
self._entry_revision = gtk.Entry()
62
self._entry_nick = gtk.Entry()
61
65
self._button_branch.connect('clicked', self._on_branch_clicked)
62
66
self._button_revision.connect('clicked', self._on_revision_clicked)
63
self._remote_branch.connect('branch-changed', self._on_branch_changed)
67
self._combo.child.connect('focus-out-event', self._on_combo_changed)
65
69
# Create the table and pack the widgets into it
66
self._table = Gtk.Table(rows=3, columns=2)
70
self._table = gtk.Table(rows=3, columns=2)
67
71
self._table.attach(self._label_location, 0, 1, 0, 1)
68
self._table.attach(self._remote_branch, 1, 2, 0, 1)
69
72
self._table.attach(self._label_destination, 0, 1, 1, 2)
70
73
self._table.attach(self._label_nick, 0, 1, 2, 3)
71
74
self._table.attach(self._label_revision, 0, 1, 3, 4)
75
self._table.attach(self._combo, 1, 2, 0, 1)
72
76
self._table.attach(self._filechooser, 1, 2, 1, 2)
73
77
self._table.attach(self._entry_nick, 1, 2, 2, 3)
74
78
self._table.attach(self._hbox_revision, 1, 2, 3, 4)
77
self._image_browse = Gtk.Image()
78
self._image_browse.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
81
self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
79
82
self._button_revision.set_image(self._image_browse)
80
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)
81
86
self._label_destination.set_alignment(0, 0.5)
82
87
self._label_nick.set_alignment(0, 0.5)
83
88
self._label_revision.set_alignment(0, 0.5)
84
89
self._table.set_row_spacings(3)
85
90
self._table.set_col_spacings(3)
86
self.get_content_area().set_spacing(3)
87
if remote_path is not None:
88
self._remote_branch.set_url(remote_path)
91
self.vbox.set_spacing(3)
89
92
if self.path is not None:
90
93
self._filechooser.set_filename(self.path)
94
if remote_path is not None:
95
self._combo.child.set_text(remote_path)
92
97
# Pack some widgets
93
self._hbox_revision.pack_start(self._entry_revision, True, True, 0)
94
self._hbox_revision.pack_start(self._button_revision, False, False, 0)
95
self.get_content_area().add(self._table)
96
self.action_area.pack_end(self._button_branch, False, False, 0)
98
self._hbox_revision.pack_start(self._entry_revision, True, True)
99
self._hbox_revision.pack_start(self._button_revision, False, False)
100
self.vbox.add(self._table)
101
self.action_area.pack_end(self._button_branch)
99
self.get_content_area().show_all()
106
# Build branch history
107
self._history = UrlHistory(GlobalConfig(), 'branch_history')
108
self._build_history()
110
def _build_history(self):
111
""" Build up the branch history. """
112
self._combo_model = gtk.ListStore(str)
114
for item in self._history.get_entries():
115
self._combo_model.append([ item ])
118
for item in pref.get_bookmarks():
119
self._combo_model.append([ item ])
121
self._combo.set_model(self._combo_model)
122
self._combo.set_text_column(0)
101
124
def _get_last_revno(self):
102
125
""" Get the revno of the last revision (if any). """
126
location = self._combo.get_child().get_text()
104
br = self._remote_branch.get_branch()
128
br = Branch.open(location)
105
132
return br.revno()
109
134
def _on_revision_clicked(self, button):
110
135
""" Browse for revision button clicked handler. """
111
136
from revbrowser import RevisionBrowser
138
location = self._combo.get_child().get_text()
115
br = self._remote_branch.get_branch()
141
br = Branch.open(location)
118
revb = RevisionBrowser(br, self)
119
response = revb.run()
120
if response != Gtk.ResponseType.NONE:
123
if response == Gtk.ResponseType.OK:
124
if revb.selected_revno is not None:
125
self._entry_revision.set_text(revb.selected_revno)
145
revb = RevisionBrowser(br, self)
146
response = revb.run()
147
if response != gtk.RESPONSE_NONE:
150
if response == gtk.RESPONSE_OK:
151
if revb.selected_revno is not None:
152
self._entry_revision.set_text(revb.selected_revno)
130
157
def _on_branch_clicked(self, button):
131
158
""" Branch button clicked handler. """
132
location = self._remote_branch.get_url()
159
location = self._combo.get_child().get_text()
133
160
if location is '':
134
error_dialog(_i18n('Missing branch location'),
135
_i18n('You must specify a branch location.'))
161
error_dialog(_('Missing branch location'),
162
_('You must specify a branch location.'))
138
165
destination = self._filechooser.get_filename()
140
167
revno = int(self._entry_revision.get_text())
144
171
nick = self._entry_nick.get_text()
146
173
nick = os.path.basename(location.rstrip("/\\"))
148
175
br_from = Branch.open(location)
150
177
br_from.lock_read()
179
from bzrlib.transport import get_transport
152
181
revision_id = br_from.get_rev_id(revno)
156
185
to_location = destination + os.sep + nick
157
186
to_transport = get_transport(to_location)
159
188
to_transport.mkdir('.')
162
191
# preserve whatever source format we have.
163
192
dir = br_from.bzrdir.sprout(to_transport.base,
added
removed
branch.py
