/b-gtk/fix-viz

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