/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: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
16
16
 
17
17
import os
18
18
 
19
 
try:
20
 
    import pygtk
21
 
    pygtk.require("2.0")
22
 
except:
23
 
    pass
24
 
 
25
 
import gtk
26
 
 
27
 
from errors import show_bzr_error
28
 
 
 
19
from gi.repository import Gtk
 
20
 
 
21
from bzrlib import (
 
22
    errors,
 
23
    )
29
24
from bzrlib.branch import Branch
30
 
import bzrlib.errors as errors
31
 
 
32
 
from dialog import error_dialog, info_dialog
33
 
 
34
 
from branchbox import BranchSelectionBox
35
 
 
36
 
class BranchDialog(gtk.Dialog):
 
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):
37
34
    """ New implementation of the Branch dialog. """
38
35
 
39
36
    def __init__(self, path=None, parent=None, remote_path=None):
40
37
        """ Initialize the Branch dialog. """
41
 
        gtk.Dialog.__init__(self, title="Branch - Olive",
42
 
                                  parent=parent,
43
 
                                  flags=0,
44
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
45
 
        
 
38
        super(BranchDialog, self).__init__(
 
39
            title="Branch - Olive", parent=parent, flags=0,
 
40
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
41
 
46
42
        # Get arguments
47
43
        self.path = path
48
 
        
 
44
 
49
45
        # Create the widgets
50
 
        self._button_branch = gtk.Button(_("_Branch"), use_underline=True)
 
46
        self._button_branch = Gtk.Button(_i18n("_Branch"), use_underline=True)
51
47
        self._remote_branch = BranchSelectionBox()
52
 
        self._button_revision = gtk.Button('')
53
 
        self._label_location = gtk.Label(_("Branch location:"))
 
48
        self._button_revision = Gtk.Button('')
 
49
        self._label_location = Gtk.Label(label=_i18n("Branch location:"))
54
50
        self._label_location.set_alignment(0, 0.5)
55
 
        self._label_destination = gtk.Label(_("Destination:"))
56
 
        self._label_nick = gtk.Label(_("Branck nick:"))
57
 
        self._label_revision = gtk.Label(_("Revision:"))
58
 
        self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
59
 
        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
60
 
        self._hbox_revision = gtk.HBox()
61
 
        self._entry_revision = gtk.Entry()
62
 
        self._entry_nick = gtk.Entry()
63
 
        
 
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
 
64
60
        # Set callbacks
65
61
        self._button_branch.connect('clicked', self._on_branch_clicked)
66
62
        self._button_revision.connect('clicked', self._on_revision_clicked)
67
63
        self._remote_branch.connect('branch-changed', self._on_branch_changed)
68
64
 
69
65
        # Create the table and pack the widgets into it
70
 
        self._table = gtk.Table(rows=3, columns=2)
 
66
        self._table = Gtk.Table(rows=3, columns=2)
71
67
        self._table.attach(self._label_location, 0, 1, 0, 1)
72
68
        self._table.attach(self._remote_branch, 1, 2, 0, 1)
73
69
        self._table.attach(self._label_destination, 0, 1, 1, 2)
76
72
        self._table.attach(self._filechooser, 1, 2, 1, 2)
77
73
        self._table.attach(self._entry_nick, 1, 2, 2, 3)
78
74
        self._table.attach(self._hbox_revision, 1, 2, 3, 4)
79
 
        
 
75
 
80
76
        # Set properties
81
 
        self._image_browse = gtk.Image()
82
 
        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
 
77
        self._image_browse = Gtk.Image()
 
78
        self._image_browse.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
83
79
        self._button_revision.set_image(self._image_browse)
84
80
        self._button_revision.set_sensitive(False)
85
81
        self._label_destination.set_alignment(0, 0.5)
87
83
        self._label_revision.set_alignment(0, 0.5)
88
84
        self._table.set_row_spacings(3)
89
85
        self._table.set_col_spacings(3)
90
 
        self.vbox.set_spacing(3)
 
86
        self.get_content_area().set_spacing(3)
91
87
        if remote_path is not None:
92
88
            self._remote_branch.set_url(remote_path)
93
89
        if self.path is not None:
94
90
            self._filechooser.set_filename(self.path)
95
 
        
 
91
 
96
92
        # 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
 
        
 
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
 
102
98
        # Show the dialog
103
 
        self.vbox.show_all()
104
 
    
 
99
        self.get_content_area().show_all()
 
100
 
105
101
    def _get_last_revno(self):
106
102
        """ Get the revno of the last revision (if any). """
107
103
        try:
109
105
            return br.revno()
110
106
        except:
111
107
            pass
112
 
    
 
108
 
113
109
    def _on_revision_clicked(self, button):
114
110
        """ Browse for revision button clicked handler. """
115
111
        from revbrowser import RevisionBrowser
116
 
        
117
 
        
 
112
 
 
113
 
118
114
        try:
119
115
            br = self._remote_branch.get_branch()
120
116
        except:
121
117
            return
122
118
        revb = RevisionBrowser(br, self)
123
119
        response = revb.run()
124
 
        if response != gtk.RESPONSE_NONE:
 
120
        if response != Gtk.ResponseType.NONE:
125
121
            revb.hide()
126
 
    
127
 
            if response == gtk.RESPONSE_OK:
 
122
 
 
123
            if response == Gtk.ResponseType.OK:
128
124
                if revb.selected_revno is not None:
129
125
                    self._entry_revision.set_text(revb.selected_revno)
130
 
        
 
126
 
131
127
            revb.destroy()
132
 
    
 
128
 
133
129
    @show_bzr_error
134
130
    def _on_branch_clicked(self, button):
135
131
        """ Branch button clicked handler. """
136
132
        location = self._remote_branch.get_url()
137
133
        if location is '':
138
 
            error_dialog(_('Missing branch location'),
139
 
                         _('You must specify a branch location.'))
 
134
            error_dialog(_i18n('Missing branch location'),
 
135
                         _i18n('You must specify a branch location.'))
140
136
            return
141
 
        
 
137
 
142
138
        destination = self._filechooser.get_filename()
143
139
        try:
144
140
            revno = int(self._entry_revision.get_text())
145
141
        except:
146
142
            revno = None
147
 
        
 
143
 
148
144
        nick = self._entry_nick.get_text()
149
145
        if nick is '':
150
146
            nick = os.path.basename(location.rstrip("/\\"))
151
 
        
 
147
 
152
148
        br_from = Branch.open(location)
153
 
        
 
149
 
154
150
        br_from.lock_read()
155
151
        try:
156
 
            from bzrlib.transport import get_transport
157
 
 
158
152
            revision_id = br_from.get_rev_id(revno)
159
153
 
160
154
            basis_dir = None
161
 
            
 
155
 
162
156
            to_location = destination + os.sep + nick
163
157
            to_transport = get_transport(to_location)
164
 
            
 
158
 
165
159
            to_transport.mkdir('.')
166
 
            
 
160
 
167
161
            try:
168
162
                # preserve whatever source format we have.
169
163
                dir = br_from.bzrdir.sprout(to_transport.base,
176
170
                raise
177
171
        finally:
178
172
            br_from.unlock()
179
 
                
180
 
        self._history.add_entry(location)
181
 
        info_dialog(_('Branching successful'),
182
 
                    _('%d revision(s) branched.') % revs)
183
 
        
184
 
        self.response(gtk.RESPONSE_OK)
185
 
    
 
173
 
 
174
        info_dialog(_i18n('Branching successful'),
 
175
                    _i18n('%d revision(s) branched.') % revs)
 
176
 
 
177
        self.response(Gtk.ResponseType.OK)
 
178
 
186
179
    def _on_branch_changed(self, widget, event):
187
180
        """ We try to get the last revision if focus lost. """
188
181
        rev = self._get_last_revno()
189
182
        if rev is None:
190
 
            self._entry_revision.set_text(_('N/A'))
 
183
            self._entry_revision.set_text(_i18n('N/A'))
191
184
            self._button_revision.set_sensitive(False)
192
185
        else:
193
186
            self._entry_revision.set_text(str(rev))