/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: 2011-09-07 23:06:39 UTC
  • Revision ID: jelmer@samba.org-20110907230639-822qnzn738as95l4
testfix: Allow registration of error methods when retrieving avatars. This should fix the daily builds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
24
24
 
25
25
import gtk
26
26
 
27
 
from errors import show_bzr_error
28
 
 
 
27
from bzrlib import (
 
28
    errors,
 
29
    )
29
30
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
 
31
from bzrlib.transport import get_transport
 
32
 
 
33
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog
 
34
from bzrlib.plugins.gtk.errors import show_bzr_error
 
35
from bzrlib.plugins.gtk.i18n import _i18n
 
36
from bzrlib.plugins.gtk.branchbox import BranchSelectionBox
 
37
 
37
38
 
38
39
class BranchDialog(gtk.Dialog):
39
40
    """ New implementation of the Branch dialog. """
44
45
                                  parent=parent,
45
46
                                  flags=0,
46
47
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
47
 
        
 
48
 
48
49
        # Get arguments
49
50
        self.path = path
50
 
        
 
51
 
51
52
        # Create the widgets
52
53
        self._button_branch = gtk.Button(_i18n("_Branch"), use_underline=True)
53
54
        self._remote_branch = BranchSelectionBox()
62
63
        self._hbox_revision = gtk.HBox()
63
64
        self._entry_revision = gtk.Entry()
64
65
        self._entry_nick = gtk.Entry()
65
 
        
 
66
 
66
67
        # Set callbacks
67
68
        self._button_branch.connect('clicked', self._on_branch_clicked)
68
69
        self._button_revision.connect('clicked', self._on_revision_clicked)
78
79
        self._table.attach(self._filechooser, 1, 2, 1, 2)
79
80
        self._table.attach(self._entry_nick, 1, 2, 2, 3)
80
81
        self._table.attach(self._hbox_revision, 1, 2, 3, 4)
81
 
        
 
82
 
82
83
        # Set properties
83
84
        self._image_browse = gtk.Image()
84
85
        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
94
95
            self._remote_branch.set_url(remote_path)
95
96
        if self.path is not None:
96
97
            self._filechooser.set_filename(self.path)
97
 
        
 
98
 
98
99
        # Pack some widgets
99
100
        self._hbox_revision.pack_start(self._entry_revision, True, True)
100
101
        self._hbox_revision.pack_start(self._button_revision, False, False)
101
102
        self.vbox.add(self._table)
102
103
        self.action_area.pack_end(self._button_branch)
103
 
        
 
104
 
104
105
        # Show the dialog
105
106
        self.vbox.show_all()
106
 
    
 
107
 
107
108
    def _get_last_revno(self):
108
109
        """ Get the revno of the last revision (if any). """
109
110
        try:
111
112
            return br.revno()
112
113
        except:
113
114
            pass
114
 
    
 
115
 
115
116
    def _on_revision_clicked(self, button):
116
117
        """ Browse for revision button clicked handler. """
117
118
        from revbrowser import RevisionBrowser
118
 
        
119
 
        
 
119
 
 
120
 
120
121
        try:
121
122
            br = self._remote_branch.get_branch()
122
123
        except:
125
126
        response = revb.run()
126
127
        if response != gtk.RESPONSE_NONE:
127
128
            revb.hide()
128
 
    
 
129
 
129
130
            if response == gtk.RESPONSE_OK:
130
131
                if revb.selected_revno is not None:
131
132
                    self._entry_revision.set_text(revb.selected_revno)
132
 
        
 
133
 
133
134
            revb.destroy()
134
 
    
 
135
 
135
136
    @show_bzr_error
136
137
    def _on_branch_clicked(self, button):
137
138
        """ Branch button clicked handler. """
140
141
            error_dialog(_i18n('Missing branch location'),
141
142
                         _i18n('You must specify a branch location.'))
142
143
            return
143
 
        
 
144
 
144
145
        destination = self._filechooser.get_filename()
145
146
        try:
146
147
            revno = int(self._entry_revision.get_text())
147
148
        except:
148
149
            revno = None
149
 
        
 
150
 
150
151
        nick = self._entry_nick.get_text()
151
152
        if nick is '':
152
153
            nick = os.path.basename(location.rstrip("/\\"))
153
 
        
 
154
 
154
155
        br_from = Branch.open(location)
155
 
        
 
156
 
156
157
        br_from.lock_read()
157
158
        try:
158
 
            from bzrlib.transport import get_transport
159
 
 
160
159
            revision_id = br_from.get_rev_id(revno)
161
160
 
162
161
            basis_dir = None
163
 
            
 
162
 
164
163
            to_location = destination + os.sep + nick
165
164
            to_transport = get_transport(to_location)
166
 
            
 
165
 
167
166
            to_transport.mkdir('.')
168
 
            
 
167
 
169
168
            try:
170
169
                # preserve whatever source format we have.
171
170
                dir = br_from.bzrdir.sprout(to_transport.base,
178
177
                raise
179
178
        finally:
180
179
            br_from.unlock()
181
 
                
 
180
 
182
181
        info_dialog(_i18n('Branching successful'),
183
182
                    _i18n('%d revision(s) branched.') % revs)
184
 
        
 
183
 
185
184
        self.response(gtk.RESPONSE_OK)
186
 
    
 
185
 
187
186
    def _on_branch_changed(self, widget, event):
188
187
        """ We try to get the last revision if focus lost. """
189
188
        rev = self._get_last_revno()