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