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 olive/branch.py
- browse files at revision 85
- compare with another revision
- download diff
- download tarball
- view history from revision 85
- Committer: Jelmer Vernooij
- Date: 2006-09-30 10:21:43 UTC
- Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.
- files added:
- NEWS
- debian
- files removed:
- HACKING
- tests
- files renamed:
- logview.py => annotate/logview.py
- branch.py => olive/branch.py
- checkout.py => olive/checkout.py
- commit.py => olive/commit.py
- dialog.py => olive/dialog.py
- push.py => olive/push.py
- status.py => olive/status.py
- ui.py => olive/ui.py
- diff.py => viz/diffwin.py
- files modified:
- .bzrignore
added
removed
olive/branch.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
import os
17
import sys
18
18
19
19
try:
20
20
import pygtk
23
23
pass
24
24
25
25
import gtk
26
27
from errors import show_bzr_error
28
29
from bzrlib.branch import Branch
30
from bzrlib.config import GlobalConfig
26
import gtk.glade
27
31
28
import bzrlib.errors as errors
32
33
from dialog import error_dialog, info_dialog
34
35
from history import UrlHistory
36
from olive import Preferences
37
38
class BranchDialog(gtk.Dialog):
39
""" New implementation of the Branch dialog. """
40
def __init__(self, path=None, parent=None, remote_path=None):
29
from __init__ import gladefile
30
31
class OliveBranch:
32
""" Display branch dialog and perform the needed operations. """
33
def __init__(self, path=None):
41
34
""" Initialize the Branch dialog. """
42
gtk.Dialog.__init__(self, title="Branch - Olive",
43
parent=parent,
44
flags=0,
45
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
46
47
# Get arguments
48
self.path = path
49
50
# Create the widgets
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()
63
64
# Set callbacks
65
self._button_branch.connect('clicked', self._on_branch_clicked)
66
self._button_revision.connect('clicked', self._on_revision_clicked)
67
self._combo.child.connect('focus-out-event', self._on_combo_changed)
68
69
# Create the table and pack the widgets into it
70
self._table = gtk.Table(rows=3, columns=2)
71
self._table.attach(self._label_location, 0, 1, 0, 1)
72
self._table.attach(self._label_destination, 0, 1, 1, 2)
73
self._table.attach(self._label_nick, 0, 1, 2, 3)
74
self._table.attach(self._label_revision, 0, 1, 3, 4)
75
self._table.attach(self._combo, 1, 2, 0, 1)
76
self._table.attach(self._filechooser, 1, 2, 1, 2)
77
self._table.attach(self._entry_nick, 1, 2, 2, 3)
78
self._table.attach(self._hbox_revision, 1, 2, 3, 4)
79
80
# Set properties
81
self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
82
self._button_revision.set_image(self._image_browse)
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)
86
self._label_destination.set_alignment(0, 0.5)
87
self._label_nick.set_alignment(0, 0.5)
88
self._label_revision.set_alignment(0, 0.5)
89
self._table.set_row_spacings(3)
90
self._table.set_col_spacings(3)
91
self.vbox.set_spacing(3)
92
if self.path is not None:
93
self._filechooser.set_filename(self.path)
94
if remote_path is not None:
95
self._combo.child.set_text(remote_path)
96
97
# Pack some widgets
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)
102
103
# Show the dialog
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)
123
124
def _get_last_revno(self):
125
""" Get the revno of the last revision (if any). """
126
location = self._combo.get_child().get_text()
127
try:
128
br = Branch.open(location)
129
except:
130
return None
131
else:
132
return br.revno()
133
134
def _on_revision_clicked(self, button):
135
""" Browse for revision button clicked handler. """
136
from revbrowser import RevisionBrowser
137
138
location = self._combo.get_child().get_text()
139
140
try:
141
br = Branch.open(location)
142
except:
143
return
144
else:
145
revb = RevisionBrowser(br, self)
146
response = revb.run()
147
if response != gtk.RESPONSE_NONE:
148
revb.hide()
149
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()
155
156
@show_bzr_error
157
def _on_branch_clicked(self, button):
158
""" Branch button clicked handler. """
159
location = self._combo.get_child().get_text()
35
self.glade = gtk.glade.XML(gladefile, 'window_branch', 'olive-gtk')
36
37
self.window = self.glade.get_widget('window_branch')
38
39
# Dictionary for signal_autoconnect
40
dic = { "on_button_branch_branch_clicked": self.branch,
41
"on_button_branch_cancel_clicked": self.close }
42
43
# Connect the signals to the handlers
44
self.glade.signal_autoconnect(dic)
45
46
# Save FileChooser state
47
self.filechooser = self.glade.get_widget('filechooserbutton_branch')
48
if path is not None:
49
self.filechooser.set_filename(path)
50
51
def display(self):
52
""" Display the Branch dialog. """
53
self.window.show_all()
54
55
def branch(self, widget):
56
entry_location = self.glade.get_widget('entry_branch_location')
57
location = entry_location.get_text()
160
58
if location is '':
161
59
error_dialog(_('Missing branch location'),
162
_('You must specify a branch location.'))
60
_('You must specify a branch location.'))
163
61
return
164
62
165
destination = self._filechooser.get_filename()
166
try:
167
revno = int(self._entry_revision.get_text())
168
except:
169
revno = None
170
171
nick = self._entry_nick.get_text()
172
if nick is '':
173
nick = os.path.basename(location.rstrip("/\\"))
174
175
br_from = Branch.open(location)
176
177
br_from.lock_read()
63
destination = self.filechooser.get_filename()
64
65
spinbutton_revno = self.glade.get_widget('spinbutton_branch_revno')
66
revno = spinbutton_revno.get_value_as_int()
67
revision_id = br_from.get_rev_id(revno)
68
178
69
try:
179
70
from bzrlib.transport import get_transport
180
71
181
revision_id = br_from.get_rev_id(revno)
72
br_from = Branch.open(location)
73
br_from.lock_read()
182
74
183
basis_dir = None
184
185
to_location = destination + os.sep + nick
186
to_transport = get_transport(to_location)
187
188
to_transport.mkdir('.')
189
190
75
try:
191
# preserve whatever source format we have.
192
dir = br_from.bzrdir.sprout(to_transport.base,
193
revision_id,
194
basis_dir)
195
branch = dir.open_branch()
196
revs = branch.revno()
197
except errors.NoSuchRevision:
198
to_transport.delete_tree('.')
199
raise
200
finally:
201
br_from.unlock()
76
destination = destination + '/' + os.path.basename(location.rstrip("/\\"))
77
to_transport = get_transport(destination)
78
to_transport.mkdir('.')
79
80
try:
81
dir = br_from.bzrdir.sprout(to_transport.base, revision_id)
82
branch = dir.open_branch()
83
except NoSuchRevision:
84
to_transport.delete_tree('.')
85
raise
86
87
finally:
88
br_from.unlock()
202
89
203
self._history.add_entry(location)
204
info_dialog(_('Branching successful'),
205
_('%d revision(s) branched.') % revs)
90
self.close()
91
info_dialog(_('Branching successful'),
92
_('%d revision(s) branched.') % revs)
93
except errors.NonExistingSource, errmsg:
94
error_dialog(_('Non existing source'),
95
_("The location (%s)\ndoesn't exist.") % errmsg)
96
return
97
except errors.TargetAlreadyExists, errmsg:
98
error_dialog(_('Target already exists'),
99
_('Target directory (%s)\nalready exists. Please select another target.') % errmsg)
100
return
101
except errors.NonExistingParent, errmsg:
102
error_dialog(_('Non existing parent directory'),
103
_("The parent directory (%s)\ndoesn't exist.") % errmsg)
104
return
105
except errors.NonExistingRevision:
106
error_dialog(_('Non existing revision'),
107
_("The revision you specified doesn't exist."))
108
return
109
except errors.NotBranchError, errmsg:
110
error_dialog(_('Location is not a branch'),
111
_('The specified location has to be a branch.'))
112
return
206
113
207
self.response(gtk.RESPONSE_OK)
208
209
def _on_combo_changed(self, widget, event):
210
""" We try to get the last revision if focus lost. """
211
rev = self._get_last_revno()
212
if rev is None:
213
self._entry_revision.set_text(_('N/A'))
214
self._button_revision.set_sensitive(False)
215
else:
216
self._entry_revision.set_text(str(rev))
217
self._button_revision.set_sensitive(True)
218
if self._entry_nick.get_text() == '':
219
self._entry_nick.set_text(os.path.basename(self._combo.get_child().get_text().rstrip("/\\")))
114
115
def close(self, widget=None):
116
self.window.destroy()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0