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