bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
0.8.16
by Szilveszter Farkas (Phanatic)
* really finished branch/checkout window |
1 |
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
|
0.8.46
by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups. |
2 |
#
|
0.8.16
by Szilveszter Farkas (Phanatic)
* really finished branch/checkout window |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
0.8.46
by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups. |
7 |
#
|
0.8.16
by Szilveszter Farkas (Phanatic)
* really finished branch/checkout window |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
0.8.46
by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups. |
12 |
#
|
0.8.16
by Szilveszter Farkas (Phanatic)
* really finished branch/checkout window |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
0.8.95
by Szilveszter Farkas (Phanatic)
Some sensitivity changes; branching (get) fixed. |
17 |
import os |
0.8.16
by Szilveszter Farkas (Phanatic)
* really finished branch/checkout window |
18 |
|
19 |
try: |
|
20 |
import pygtk |
|
21 |
pygtk.require("2.0") |
|
22 |
except: |
|
23 |
pass
|
|
0.13.10
by Jelmer Vernooij
Don't pass around gladefile all the time. |
24 |
|
25 |
import gtk |
|
0.8.16
by Szilveszter Farkas (Phanatic)
* really finished branch/checkout window |
26 |
|
126.1.16
by Szilveszter Farkas (Phanatic)
Use the decorator in the Branch dialog code. |
27 |
from errors import show_bzr_error |
28 |
||
0.8.95
by Szilveszter Farkas (Phanatic)
Some sensitivity changes; branching (get) fixed. |
29 |
from bzrlib.branch import Branch |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
30 |
from bzrlib.config import GlobalConfig |
0.11.1
by Jelmer Vernooij
Eliminate olive.backend.errors. |
31 |
import bzrlib.errors as errors |
0.8.95
by Szilveszter Farkas (Phanatic)
Some sensitivity changes; branching (get) fixed. |
32 |
|
153
by Jelmer Vernooij
Fix references to dialog. |
33 |
from dialog import error_dialog, info_dialog |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
34 |
|
154
by Jelmer Vernooij
Add trivial generic class for storing URL history. |
35 |
from history import UrlHistory |
195.7.1
by Szilveszter Farkas (Phanatic)
Add bookmarked locations to the branch history. |
36 |
from olive import Preferences |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
37 |
|
38 |
class BranchDialog(gtk.Dialog): |
|
39 |
""" New implementation of the Branch dialog. """ |
|
208.2.3
by Robert Collins
Add a Branch button to commit-notify. |
40 |
|
195.1.21
by Szilveszter Farkas (Phanatic)
Some small modifications to Branch, Checkout and Info to support remote branches. |
41 |
def __init__(self, path=None, parent=None, remote_path=None): |
0.8.16
by Szilveszter Farkas (Phanatic)
* really finished branch/checkout window |
42 |
""" Initialize the Branch dialog. """ |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
43 |
gtk.Dialog.__init__(self, title="Branch - Olive", |
44 |
parent=parent, |
|
45 |
flags=0, |
|
46 |
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) |
|
47 |
||
48 |
# Get arguments
|
|
49 |
self.path = path |
|
50 |
||
51 |
# Create the widgets
|
|
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:")) |
|
126.1.18
by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog. |
59 |
self._label_nick = gtk.Label(_("Branck nick:")) |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
60 |
self._label_revision = gtk.Label(_("Revision:")) |
61 |
self._hbox_revision = gtk.HBox() |
|
62 |
self._entry_revision = gtk.Entry() |
|
126.1.18
by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog. |
63 |
self._entry_nick = gtk.Entry() |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
64 |
|
65 |
# Set callbacks
|
|
66 |
self._button_branch.connect('clicked', self._on_branch_clicked) |
|
67 |
self._button_revision.connect('clicked', self._on_revision_clicked) |
|
195.5.1
by Szilveszter Farkas (Phanatic)
Scan the branch only if the entry has lost the focus. (Fixed: #93653) |
68 |
self._combo.child.connect('focus-out-event', self._on_combo_changed) |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
69 |
|
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) |
|
126.1.18
by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog. |
74 |
self._table.attach(self._label_nick, 0, 1, 2, 3) |
75 |
self._table.attach(self._label_revision, 0, 1, 3, 4) |
|
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
76 |
self._table.attach(self._combo, 1, 2, 0, 1) |
77 |
self._table.attach(self._filechooser, 1, 2, 1, 2) |
|
126.1.18
by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog. |
78 |
self._table.attach(self._entry_nick, 1, 2, 2, 3) |
79 |
self._table.attach(self._hbox_revision, 1, 2, 3, 4) |
|
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
80 |
|
81 |
# Set properties
|
|
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) |
|
126.1.18
by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog. |
88 |
self._label_nick.set_alignment(0, 0.5) |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
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) |
|
195.1.21
by Szilveszter Farkas (Phanatic)
Some small modifications to Branch, Checkout and Info to support remote branches. |
95 |
if remote_path is not None: |
96 |
self._combo.child.set_text(remote_path) |
|
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
97 |
|
98 |
# Pack some widgets
|
|
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) |
|
103 |
||
104 |
# Show the dialog
|
|
105 |
self.vbox.show_all() |
|
106 |
||
107 |
# Build branch history
|
|
154
by Jelmer Vernooij
Add trivial generic class for storing URL history. |
108 |
self._history = UrlHistory(GlobalConfig(), 'branch_history') |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
109 |
self._build_history() |
110 |
||
111 |
def _build_history(self): |
|
112 |
""" Build up the branch history. """ |
|
154
by Jelmer Vernooij
Add trivial generic class for storing URL history. |
113 |
self._combo_model = gtk.ListStore(str) |
195.7.1
by Szilveszter Farkas (Phanatic)
Add bookmarked locations to the branch history. |
114 |
|
154
by Jelmer Vernooij
Add trivial generic class for storing URL history. |
115 |
for item in self._history.get_entries(): |
116 |
self._combo_model.append([ item ]) |
|
195.7.1
by Szilveszter Farkas (Phanatic)
Add bookmarked locations to the branch history. |
117 |
|
118 |
pref = Preferences() |
|
119 |
for item in pref.get_bookmarks(): |
|
120 |
self._combo_model.append([ item ]) |
|
121 |
||
154
by Jelmer Vernooij
Add trivial generic class for storing URL history. |
122 |
self._combo.set_model(self._combo_model) |
123 |
self._combo.set_text_column(0) |
|
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
124 |
|
125 |
def _get_last_revno(self): |
|
126 |
""" Get the revno of the last revision (if any). """ |
|
127 |
location = self._combo.get_child().get_text() |
|
128 |
try: |
|
129 |
br = Branch.open(location) |
|
130 |
except: |
|
131 |
return None |
|
132 |
else: |
|
133 |
return br.revno() |
|
134 |
||
135 |
def _on_revision_clicked(self, button): |
|
136 |
""" Browse for revision button clicked handler. """ |
|
137 |
from revbrowser import RevisionBrowser |
|
138 |
||
139 |
location = self._combo.get_child().get_text() |
|
126.1.18
by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog. |
140 |
|
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
141 |
try: |
142 |
br = Branch.open(location) |
|
143 |
except: |
|
144 |
return
|
|
145 |
else: |
|
146 |
revb = RevisionBrowser(br, self) |
|
147 |
response = revb.run() |
|
148 |
if response != gtk.RESPONSE_NONE: |
|
149 |
revb.hide() |
|
150 |
||
151 |
if response == gtk.RESPONSE_OK: |
|
152 |
if revb.selected_revno is not None: |
|
153 |
self._entry_revision.set_text(revb.selected_revno) |
|
154 |
||
155 |
revb.destroy() |
|
156 |
||
126.1.16
by Szilveszter Farkas (Phanatic)
Use the decorator in the Branch dialog code. |
157 |
@show_bzr_error
|
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
158 |
def _on_branch_clicked(self, button): |
159 |
""" Branch button clicked handler. """ |
|
160 |
location = self._combo.get_child().get_text() |
|
0.8.16
by Szilveszter Farkas (Phanatic)
* really finished branch/checkout window |
161 |
if location is '': |
0.13.6
by Jelmer Vernooij
Don't pass along dialog context everywhere. |
162 |
error_dialog(_('Missing branch location'), |
0.8.95
by Szilveszter Farkas (Phanatic)
Some sensitivity changes; branching (get) fixed. |
163 |
_('You must specify a branch location.')) |
0.8.16
by Szilveszter Farkas (Phanatic)
* really finished branch/checkout window |
164 |
return
|
165 |
||
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
166 |
destination = self._filechooser.get_filename() |
126.1.16
by Szilveszter Farkas (Phanatic)
Use the decorator in the Branch dialog code. |
167 |
try: |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
168 |
revno = int(self._entry_revision.get_text()) |
126.1.16
by Szilveszter Farkas (Phanatic)
Use the decorator in the Branch dialog code. |
169 |
except: |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
170 |
revno = None |
171 |
||
126.1.18
by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog. |
172 |
nick = self._entry_nick.get_text() |
173 |
if nick is '': |
|
174 |
nick = os.path.basename(location.rstrip("/\\")) |
|
175 |
||
126.1.16
by Szilveszter Farkas (Phanatic)
Use the decorator in the Branch dialog code. |
176 |
br_from = Branch.open(location) |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
177 |
|
178 |
br_from.lock_read() |
|
0.8.22
by Szilveszter Farkas (Phanatic)
2006-07-31 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
179 |
try: |
0.11.7
by Jelmer Vernooij
Integrate olive.backend.init |
180 |
from bzrlib.transport import get_transport |
181 |
||
126.1.16
by Szilveszter Farkas (Phanatic)
Use the decorator in the Branch dialog code. |
182 |
revision_id = br_from.get_rev_id(revno) |
0.11.7
by Jelmer Vernooij
Integrate olive.backend.init |
183 |
|
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
184 |
basis_dir = None |
185 |
||
126.1.18
by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog. |
186 |
to_location = destination + os.sep + nick |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
187 |
to_transport = get_transport(to_location) |
188 |
||
126.1.16
by Szilveszter Farkas (Phanatic)
Use the decorator in the Branch dialog code. |
189 |
to_transport.mkdir('.') |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
190 |
|
191 |
try: |
|
192 |
# preserve whatever source format we have.
|
|
193 |
dir = br_from.bzrdir.sprout(to_transport.base, |
|
194 |
revision_id, |
|
195 |
basis_dir) |
|
196 |
branch = dir.open_branch() |
|
197 |
revs = branch.revno() |
|
198 |
except errors.NoSuchRevision: |
|
199 |
to_transport.delete_tree('.') |
|
126.1.16
by Szilveszter Farkas (Phanatic)
Use the decorator in the Branch dialog code. |
200 |
raise
|
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
201 |
finally: |
202 |
br_from.unlock() |
|
0.11.7
by Jelmer Vernooij
Integrate olive.backend.init |
203 |
|
154
by Jelmer Vernooij
Add trivial generic class for storing URL history. |
204 |
self._history.add_entry(location) |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
205 |
info_dialog(_('Branching successful'), |
206 |
_('%d revision(s) branched.') % revs) |
|
0.8.16
by Szilveszter Farkas (Phanatic)
* really finished branch/checkout window |
207 |
|
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
208 |
self.response(gtk.RESPONSE_OK) |
209 |
||
195.5.1
by Szilveszter Farkas (Phanatic)
Scan the branch only if the entry has lost the focus. (Fixed: #93653) |
210 |
def _on_combo_changed(self, widget, event): |
126.1.15
by Szilveszter Farkas (Phanatic)
Refactoring the Branch dialog. We also have a Revision Browser now. |
211 |
""" We try to get the last revision if focus lost. """ |
212 |
rev = self._get_last_revno() |
|
213 |
if rev is None: |
|
214 |
self._entry_revision.set_text(_('N/A')) |
|
215 |
self._button_revision.set_sensitive(False) |
|
216 |
else: |
|
217 |
self._entry_revision.set_text(str(rev)) |
|
218 |
self._button_revision.set_sensitive(True) |
|
126.1.18
by Szilveszter Farkas (Phanatic)
Improved Branch dialog. Refactored Checkout dialog. |
219 |
if self._entry_nick.get_text() == '': |
220 |
self._entry_nick.set_text(os.path.basename(self._combo.get_child().get_text().rstrip("/\\"))) |