/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: 2011-07-31 16:50:29 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731165029-9gixuqypi3lwapzm
Removed import_pygtk because gi does not impicitly call Main(). Inlined checks for gtk availablility.

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