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  | 
| 
0.11.1
by Jelmer Vernooij
 Eliminate olive.backend.errors.  | 
30  | 
import bzrlib.errors as errors  | 
| 
0.8.95
by Szilveszter Farkas (Phanatic)
 Some sensitivity changes; branching (get) fixed.  | 
31  | 
|
| 
153
by Jelmer Vernooij
 Fix references to dialog.  | 
32  | 
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.  | 
33  | 
|
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
34  | 
from branchbox import BranchSelectionBox  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
35  | 
|
36  | 
class BranchDialog(gtk.Dialog):  | 
|
37  | 
""" New implementation of the Branch dialog. """  | 
|
| 
208.2.3
by Robert Collins
 Add a Branch button to commit-notify.  | 
38  | 
|
| 
195.1.21
by Szilveszter Farkas (Phanatic)
 Some small modifications to Branch, Checkout and Info to support remote branches.  | 
39  | 
def __init__(self, path=None, parent=None, remote_path=None):  | 
| 
0.8.16
by Szilveszter Farkas (Phanatic)
 * really finished branch/checkout window  | 
40  | 
""" Initialize the Branch dialog. """  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
41  | 
gtk.Dialog.__init__(self, title="Branch - Olive",  | 
42  | 
parent=parent,  | 
|
43  | 
flags=0,  | 
|
44  | 
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))  | 
|
45  | 
||
46  | 
        # Get arguments
 | 
|
47  | 
self.path = path  | 
|
48  | 
||
49  | 
        # Create the widgets
 | 
|
50  | 
self._button_branch = gtk.Button(_("_Branch"), use_underline=True)  | 
|
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
51  | 
self._remote_branch = BranchSelectionBox()  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
52  | 
self._button_revision = gtk.Button('')  | 
53  | 
self._label_location = gtk.Label(_("Branch location:"))  | 
|
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
54  | 
self._label_location.set_alignment(0, 0.5)  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
55  | 
self._label_destination = gtk.Label(_("Destination:"))  | 
| 
126.1.18
by Szilveszter Farkas (Phanatic)
 Improved Branch dialog. Refactored Checkout dialog.  | 
56  | 
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.  | 
57  | 
self._label_revision = gtk.Label(_("Revision:"))  | 
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
58  | 
self._filechooser = gtk.FileChooserButton(_("Please select a folder"))  | 
59  | 
self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)  | 
|
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
60  | 
self._hbox_revision = gtk.HBox()  | 
61  | 
self._entry_revision = gtk.Entry()  | 
|
| 
126.1.18
by Szilveszter Farkas (Phanatic)
 Improved Branch dialog. Refactored Checkout dialog.  | 
62  | 
self._entry_nick = gtk.Entry()  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
63  | 
|
64  | 
        # Set callbacks
 | 
|
65  | 
self._button_branch.connect('clicked', self._on_branch_clicked)  | 
|
66  | 
self._button_revision.connect('clicked', self._on_revision_clicked)  | 
|
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
67  | 
self._remote_branch.connect('branch-changed', self._on_branch_changed)  | 
68  | 
||
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
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)  | 
|
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
72  | 
self._table.attach(self._remote_branch, 1, 2, 0, 1)  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
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._filechooser, 1, 2, 1, 2)  | 
| 
126.1.18
by Szilveszter Farkas (Phanatic)
 Improved Branch dialog. Refactored Checkout dialog.  | 
77  | 
self._table.attach(self._entry_nick, 1, 2, 2, 3)  | 
78  | 
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.  | 
79  | 
|
80  | 
        # Set properties
 | 
|
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
81  | 
self._image_browse = gtk.Image()  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
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._label_destination.set_alignment(0, 0.5)  | 
|
| 
126.1.18
by Szilveszter Farkas (Phanatic)
 Improved Branch dialog. Refactored Checkout dialog.  | 
86  | 
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.  | 
87  | 
self._label_revision.set_alignment(0, 0.5)  | 
88  | 
self._table.set_row_spacings(3)  | 
|
89  | 
self._table.set_col_spacings(3)  | 
|
90  | 
self.vbox.set_spacing(3)  | 
|
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
91  | 
if remote_path is not None:  | 
92  | 
self._remote_branch.set_url(remote_path)  | 
|
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
93  | 
if self.path is not None:  | 
94  | 
self._filechooser.set_filename(self.path)  | 
|
95  | 
||
96  | 
        # Pack some widgets
 | 
|
97  | 
self._hbox_revision.pack_start(self._entry_revision, True, True)  | 
|
98  | 
self._hbox_revision.pack_start(self._button_revision, False, False)  | 
|
99  | 
self.vbox.add(self._table)  | 
|
100  | 
self.action_area.pack_end(self._button_branch)  | 
|
101  | 
||
102  | 
        # Show the dialog
 | 
|
103  | 
self.vbox.show_all()  | 
|
104  | 
||
105  | 
def _get_last_revno(self):  | 
|
106  | 
""" Get the revno of the last revision (if any). """  | 
|
107  | 
try:  | 
|
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
108  | 
br = self._remote_branch.get_branch()  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
109  | 
return br.revno()  | 
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
110  | 
except:  | 
111  | 
            pass
 | 
|
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
112  | 
|
113  | 
def _on_revision_clicked(self, button):  | 
|
114  | 
""" Browse for revision button clicked handler. """  | 
|
115  | 
from revbrowser import RevisionBrowser  | 
|
116  | 
||
| 
126.1.18
by Szilveszter Farkas (Phanatic)
 Improved Branch dialog. Refactored Checkout dialog.  | 
117  | 
|
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
118  | 
try:  | 
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
119  | 
br = self._remote_branch.get_branch()  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
120  | 
except:  | 
121  | 
            return
 | 
|
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
122  | 
revb = RevisionBrowser(br, self)  | 
123  | 
response = revb.run()  | 
|
124  | 
if response != gtk.RESPONSE_NONE:  | 
|
125  | 
revb.hide()  | 
|
126  | 
||
127  | 
if response == gtk.RESPONSE_OK:  | 
|
128  | 
if revb.selected_revno is not None:  | 
|
129  | 
self._entry_revision.set_text(revb.selected_revno)  | 
|
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
130  | 
|
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
131  | 
revb.destroy()  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
132  | 
|
| 
126.1.16
by Szilveszter Farkas (Phanatic)
 Use the decorator in the Branch dialog code.  | 
133  | 
    @show_bzr_error
 | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
134  | 
def _on_branch_clicked(self, button):  | 
135  | 
""" Branch button clicked handler. """  | 
|
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
136  | 
location = self._remote_branch.get_url()  | 
| 
0.8.16
by Szilveszter Farkas (Phanatic)
 * really finished branch/checkout window  | 
137  | 
if location is '':  | 
| 
0.13.6
by Jelmer Vernooij
 Don't pass along dialog context everywhere.  | 
138  | 
error_dialog(_('Missing branch location'),  | 
| 
0.8.95
by Szilveszter Farkas (Phanatic)
 Some sensitivity changes; branching (get) fixed.  | 
139  | 
_('You must specify a branch location.'))  | 
| 
0.8.16
by Szilveszter Farkas (Phanatic)
 * really finished branch/checkout window  | 
140  | 
            return
 | 
141  | 
||
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
142  | 
destination = self._filechooser.get_filename()  | 
| 
126.1.16
by Szilveszter Farkas (Phanatic)
 Use the decorator in the Branch dialog code.  | 
143  | 
try:  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
144  | 
revno = int(self._entry_revision.get_text())  | 
| 
126.1.16
by Szilveszter Farkas (Phanatic)
 Use the decorator in the Branch dialog code.  | 
145  | 
except:  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
146  | 
revno = None  | 
147  | 
||
| 
126.1.18
by Szilveszter Farkas (Phanatic)
 Improved Branch dialog. Refactored Checkout dialog.  | 
148  | 
nick = self._entry_nick.get_text()  | 
149  | 
if nick is '':  | 
|
150  | 
nick = os.path.basename(location.rstrip("/\\"))  | 
|
151  | 
||
| 
126.1.16
by Szilveszter Farkas (Phanatic)
 Use the decorator in the Branch dialog code.  | 
152  | 
br_from = Branch.open(location)  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
153  | 
|
154  | 
br_from.lock_read()  | 
|
| 
0.8.22
by Szilveszter Farkas (Phanatic)
 2006-07-31 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>  | 
155  | 
try:  | 
| 
0.11.7
by Jelmer Vernooij
 Integrate olive.backend.init  | 
156  | 
from bzrlib.transport import get_transport  | 
157  | 
||
| 
126.1.16
by Szilveszter Farkas (Phanatic)
 Use the decorator in the Branch dialog code.  | 
158  | 
revision_id = br_from.get_rev_id(revno)  | 
| 
0.11.7
by Jelmer Vernooij
 Integrate olive.backend.init  | 
159  | 
|
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
160  | 
basis_dir = None  | 
161  | 
||
| 
126.1.18
by Szilveszter Farkas (Phanatic)
 Improved Branch dialog. Refactored Checkout dialog.  | 
162  | 
to_location = destination + os.sep + nick  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
163  | 
to_transport = get_transport(to_location)  | 
164  | 
||
| 
126.1.16
by Szilveszter Farkas (Phanatic)
 Use the decorator in the Branch dialog code.  | 
165  | 
to_transport.mkdir('.')  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
166  | 
|
167  | 
try:  | 
|
168  | 
                # preserve whatever source format we have.
 | 
|
169  | 
dir = br_from.bzrdir.sprout(to_transport.base,  | 
|
170  | 
revision_id,  | 
|
171  | 
basis_dir)  | 
|
172  | 
branch = dir.open_branch()  | 
|
173  | 
revs = branch.revno()  | 
|
174  | 
except errors.NoSuchRevision:  | 
|
175  | 
to_transport.delete_tree('.')  | 
|
| 
126.1.16
by Szilveszter Farkas (Phanatic)
 Use the decorator in the Branch dialog code.  | 
176  | 
                raise
 | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
177  | 
finally:  | 
178  | 
br_from.unlock()  | 
|
| 
0.11.7
by Jelmer Vernooij
 Integrate olive.backend.init  | 
179  | 
|
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
180  | 
info_dialog(_('Branching successful'),  | 
181  | 
_('%d revision(s) branched.') % revs)  | 
|
| 
0.8.16
by Szilveszter Farkas (Phanatic)
 * really finished branch/checkout window  | 
182  | 
|
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
183  | 
self.response(gtk.RESPONSE_OK)  | 
184  | 
||
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
185  | 
def _on_branch_changed(self, widget, event):  | 
| 
126.1.15
by Szilveszter Farkas (Phanatic)
 Refactoring the Branch dialog. We also have a Revision Browser now.  | 
186  | 
""" We try to get the last revision if focus lost. """  | 
187  | 
rev = self._get_last_revno()  | 
|
188  | 
if rev is None:  | 
|
189  | 
self._entry_revision.set_text(_('N/A'))  | 
|
190  | 
self._button_revision.set_sensitive(False)  | 
|
191  | 
else:  | 
|
192  | 
self._entry_revision.set_text(str(rev))  | 
|
193  | 
self._button_revision.set_sensitive(True)  | 
|
| 
126.1.18
by Szilveszter Farkas (Phanatic)
 Improved Branch dialog. Refactored Checkout dialog.  | 
194  | 
if self._entry_nick.get_text() == '':  | 
| 
271
by Jelmer Vernooij
 Add common widget for selecting branches.  | 
195  | 
self._entry_nick.set_text(os.path.basename(self._remote_branch.get_url().rstrip("/\\")))  |