/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to branch.py

  • Committer: Curtis Hovey
  • Date: 2012-03-11 18:24:06 UTC
  • mto: This revision was merged to the branch mainline in revision 785.
  • Revision ID: sinzui.is@verizon.net-20120311182406-f4jqpff65b30g3al
Create the mnemonic for the button label.

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import sys
18
 
 
19
 
try:
20
 
    import pygtk
21
 
    pygtk.require("2.0")
22
 
except:
23
 
    pass
24
 
 
25
 
import gtk
26
 
import gtk.glade
27
 
 
28
 
import bzrlib.errors as errors
29
 
from __init__ import gladefile
30
 
 
31
 
class OliveBranch:
32
 
    """ Display branch dialog and perform the needed operations. """
33
 
    def __init__(self, path=None):
 
17
import os
 
18
 
 
19
from gi.repository import Gtk
 
20
 
 
21
from bzrlib import (
 
22
    errors,
 
23
    )
 
24
from bzrlib.branch import Branch
 
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
 
29
from bzrlib.plugins.gtk.i18n import _i18n
 
30
from bzrlib.plugins.gtk.branchbox import BranchSelectionBox
 
31
 
 
32
 
 
33
class BranchDialog(Gtk.Dialog):
 
34
    """ New implementation of the Branch dialog. """
 
35
 
 
36
    def __init__(self, path=None, parent=None, remote_path=None):
34
37
        """ Initialize the Branch dialog. """
35
 
        self.glade = gtk.glade.XML(gladefile, 'window_branch', 'olive-gtk')
36
 
 
37
 
        self.window = self.glade.get_widget('window_branch')
38
 
        
39
 
        # Dictionary for signal_autoconnect
40
 
        dic = { "on_button_branch_branch_clicked": self.branch,
41
 
                "on_button_branch_cancel_clicked": self.close }
42
 
        
43
 
        # Connect the signals to the handlers
44
 
        self.glade.signal_autoconnect(dic)
45
 
        
46
 
        # Save FileChooser state
47
 
        self.filechooser = self.glade.get_widget('filechooserbutton_branch')
48
 
        if path is not None:
49
 
            self.filechooser.set_filename(path)
50
 
 
51
 
    def display(self):
52
 
        """ Display the Branch dialog. """
53
 
        self.window.show_all()
54
 
    
55
 
    def branch(self, widget):
56
 
        entry_location = self.glade.get_widget('entry_branch_location')
57
 
        location = entry_location.get_text()
 
38
        super(BranchDialog, self).__init__(
 
39
            title="Branch - Olive", parent=parent, flags=0,
 
40
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
41
 
 
42
        # Get arguments
 
43
        self.path = path
 
44
 
 
45
        # Create the widgets
 
46
        self._button_branch = Gtk.Button(_i18n("_Branch"), use_underline=True)
 
47
        self._remote_branch = BranchSelectionBox()
 
48
        self._button_revision = Gtk.Button('')
 
49
        self._label_location = Gtk.Label(label=_i18n("Branch location:"))
 
50
        self._label_location.set_alignment(0, 0.5)
 
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()
 
59
 
 
60
        # Set callbacks
 
61
        self._button_branch.connect('clicked', self._on_branch_clicked)
 
62
        self._button_revision.connect('clicked', self._on_revision_clicked)
 
63
        self._remote_branch.connect('branch-changed', self._on_branch_changed)
 
64
 
 
65
        # Create the table and pack the widgets into it
 
66
        self._table = Gtk.Table(rows=3, columns=2)
 
67
        self._table.attach(self._label_location, 0, 1, 0, 1)
 
68
        self._table.attach(self._remote_branch, 1, 2, 0, 1)
 
69
        self._table.attach(self._label_destination, 0, 1, 1, 2)
 
70
        self._table.attach(self._label_nick, 0, 1, 2, 3)
 
71
        self._table.attach(self._label_revision, 0, 1, 3, 4)
 
72
        self._table.attach(self._filechooser, 1, 2, 1, 2)
 
73
        self._table.attach(self._entry_nick, 1, 2, 2, 3)
 
74
        self._table.attach(self._hbox_revision, 1, 2, 3, 4)
 
75
 
 
76
        # Set properties
 
77
        self._image_browse = Gtk.Image()
 
78
        self._image_browse.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
 
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)
 
82
        self._label_nick.set_alignment(0, 0.5)
 
83
        self._label_revision.set_alignment(0, 0.5)
 
84
        self._table.set_row_spacings(3)
 
85
        self._table.set_col_spacings(3)
 
86
        self.get_content_area().set_spacing(3)
 
87
        if remote_path is not None:
 
88
            self._remote_branch.set_url(remote_path)
 
89
        if self.path is not None:
 
90
            self._filechooser.set_filename(self.path)
 
91
 
 
92
        # Pack some widgets
 
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)
 
97
 
 
98
        # Show the dialog
 
99
        self.get_content_area().show_all()
 
100
 
 
101
    def _get_last_revno(self):
 
102
        """ Get the revno of the last revision (if any). """
 
103
        try:
 
104
            br = self._remote_branch.get_branch()
 
105
            return br.revno()
 
106
        except:
 
107
            pass
 
108
 
 
109
    def _on_revision_clicked(self, button):
 
110
        """ Browse for revision button clicked handler. """
 
111
        from revbrowser import RevisionBrowser
 
112
 
 
113
 
 
114
        try:
 
115
            br = self._remote_branch.get_branch()
 
116
        except:
 
117
            return
 
118
        revb = RevisionBrowser(br, self)
 
119
        response = revb.run()
 
120
        if response != Gtk.ResponseType.NONE:
 
121
            revb.hide()
 
122
 
 
123
            if response == Gtk.ResponseType.OK:
 
124
                if revb.selected_revno is not None:
 
125
                    self._entry_revision.set_text(revb.selected_revno)
 
126
 
 
127
            revb.destroy()
 
128
 
 
129
    @show_bzr_error
 
130
    def _on_branch_clicked(self, button):
 
131
        """ Branch button clicked handler. """
 
132
        location = self._remote_branch.get_url()
58
133
        if location is '':
59
 
            error_dialog(_('Missing branch location'),
60
 
                                     _('You must specify a branch location.'))
 
134
            error_dialog(_i18n('Missing branch location'),
 
135
                         _i18n('You must specify a branch location.'))
61
136
            return
62
 
        
63
 
        destination = self.filechooser.get_filename()
64
 
        
65
 
        spinbutton_revno = self.glade.get_widget('spinbutton_branch_revno')
66
 
        revno = spinbutton_revno.get_value_as_int()
67
 
        revision_id = br_from.get_rev_id(revno)
68
 
        
69
 
        try:
70
 
            from bzrlib.transport import get_transport
71
 
 
72
 
            br_from = Branch.open(location)
73
 
            br_from.lock_read()
 
137
 
 
138
        destination = self._filechooser.get_filename()
 
139
        try:
 
140
            revno = int(self._entry_revision.get_text())
 
141
        except:
 
142
            revno = None
 
143
 
 
144
        nick = self._entry_nick.get_text()
 
145
        if nick is '':
 
146
            nick = os.path.basename(location.rstrip("/\\"))
 
147
 
 
148
        br_from = Branch.open(location)
 
149
 
 
150
        br_from.lock_read()
 
151
        try:
 
152
            revision_id = br_from.get_rev_id(revno)
 
153
 
 
154
            basis_dir = None
 
155
 
 
156
            to_location = destination + os.sep + nick
 
157
            to_transport = get_transport(to_location)
 
158
 
 
159
            to_transport.mkdir('.')
74
160
 
75
161
            try:
76
 
                destination = destination + '/' + os.path.basename(location.rstrip("/\\"))
77
 
                to_transport = get_transport(destination)
78
 
                to_transport.mkdir('.')
79
 
 
80
 
                try:
81
 
                    dir = br_from.bzrdir.sprout(to_transport.base, revision_id)
82
 
                    branch = dir.open_branch()
83
 
                except NoSuchRevision:
84
 
                    to_transport.delete_tree('.')
85
 
                    raise
86
 
 
87
 
            finally:
88
 
                br_from.unlock()
89
 
                
90
 
            self.close()
91
 
            info_dialog(_('Branching successful'),
92
 
                        _('%d revision(s) branched.') % revs)
93
 
        except errors.NonExistingSource, errmsg:
94
 
            error_dialog(_('Non existing source'),
95
 
                                     _("The location (%s)\ndoesn't exist.") % errmsg)
96
 
            return
97
 
        except errors.TargetAlreadyExists, errmsg:
98
 
            error_dialog(_('Target already exists'),
99
 
                                     _('Target directory (%s)\nalready exists. Please select another target.') % errmsg)
100
 
            return
101
 
        except errors.NonExistingParent, errmsg:
102
 
            error_dialog(_('Non existing parent directory'),
103
 
                                     _("The parent directory (%s)\ndoesn't exist.") % errmsg)
104
 
            return
105
 
        except errors.NonExistingRevision:
106
 
            error_dialog(_('Non existing revision'),
107
 
                                     _("The revision you specified doesn't exist."))
108
 
            return
109
 
        except errors.NotBranchError, errmsg:
110
 
            error_dialog(_('Location is not a branch'),
111
 
                                     _('The specified location has to be a branch.'))
112
 
            return
113
 
        
114
 
 
115
 
    def close(self, widget=None):
116
 
        self.window.destroy()
 
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('.')
 
170
                raise
 
171
        finally:
 
172
            br_from.unlock()
 
173
 
 
174
        info_dialog(_i18n('Branching successful'),
 
175
                    _i18n('%d revision(s) branched.') % revs)
 
176
 
 
177
        self.response(Gtk.ResponseType.OK)
 
178
 
 
179
    def _on_branch_changed(self, widget, event):
 
180
        """ We try to get the last revision if focus lost. """
 
181
        rev = self._get_last_revno()
 
182
        if rev is None:
 
183
            self._entry_revision.set_text(_i18n('N/A'))
 
184
            self._button_revision.set_sensitive(False)
 
185
        else:
 
186
            self._entry_revision.set_text(str(rev))
 
187
            self._button_revision.set_sensitive(True)
 
188
            if self._entry_nick.get_text() == '':
 
189
                self._entry_nick.set_text(os.path.basename(self._remote_branch.get_url().rstrip("/\\")))