/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 olive/branch.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-09-30 13:04:15 UTC
  • mto: (0.14.3 main)
  • mto: This revision was merged to the branch mainline in revision 86.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060930130415-aba4100709e11f0a
Loads of fixes. Pyflakes cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/branch.py
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
 
17
import os
18
18
 
19
19
try:
20
20
    import pygtk
21
21
    pygtk.require("2.0")
22
22
except:
23
23
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
except:
28
 
    sys.exit(1)
29
 
 
 
24
 
 
25
import gtk
 
26
import gtk.glade
 
27
 
 
28
from bzrlib.branch import Branch
30
29
import bzrlib.errors as errors
31
30
 
 
31
from olive import gladefile
 
32
from dialog import error_dialog, info_dialog
 
33
 
32
34
class OliveBranch:
33
35
    """ Display branch dialog and perform the needed operations. """
34
 
    def __init__(self, gladefile, comm, dialog):
 
36
    def __init__(self, path=None):
35
37
        """ Initialize the Branch dialog. """
36
 
        self.gladefile = gladefile
37
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_branch', 'olive-gtk')
38
 
        
39
 
        # Communication object
40
 
        self.comm = comm
41
 
        # Dialog object
42
 
        self.dialog = dialog
43
 
        
 
38
        self.glade = gtk.glade.XML(gladefile, 'window_branch', 'olive-gtk')
 
39
 
44
40
        self.window = self.glade.get_widget('window_branch')
45
41
        
46
42
        # Dictionary for signal_autoconnect
52
48
        
53
49
        # Save FileChooser state
54
50
        self.filechooser = self.glade.get_widget('filechooserbutton_branch')
55
 
        self.filechooser.set_filename(self.comm.get_path())
 
51
        if path is not None:
 
52
            self.filechooser.set_filename(path)
56
53
 
57
54
    def display(self):
58
55
        """ Display the Branch dialog. """
62
59
        entry_location = self.glade.get_widget('entry_branch_location')
63
60
        location = entry_location.get_text()
64
61
        if location is '':
65
 
            self.dialog.error_dialog(_('Missing branch location'),
66
 
                                     _('You must specify a branch location.'))
 
62
            error_dialog(_('Missing branch location'),
 
63
                         _('You must specify a branch location.'))
67
64
            return
68
65
        
69
66
        destination = self.filechooser.get_filename()
70
67
        
71
68
        spinbutton_revno = self.glade.get_widget('spinbutton_branch_revno')
72
69
        revno = spinbutton_revno.get_value_as_int()
73
 
        revision_id = br_from.get_rev_id(revno)
74
70
        
75
 
        self.comm.set_busy(self.window)
76
71
        try:
77
72
            from bzrlib.transport import get_transport
78
73
 
79
74
            br_from = Branch.open(location)
80
 
 
81
75
            br_from.lock_read()
 
76
            
 
77
            revision_id = br_from.get_rev_id(revno)
82
78
 
83
79
            try:
84
80
                destination = destination + '/' + os.path.basename(location.rstrip("/\\"))
85
81
                to_transport = get_transport(destination)
86
 
 
87
82
                to_transport.mkdir('.')
88
83
 
89
84
                try:
90
85
                    dir = br_from.bzrdir.sprout(to_transport.base, revision_id)
91
86
                    branch = dir.open_branch()
92
 
                except NoSuchRevision:
 
87
                    revs = branch.revno()
 
88
                except errors.NoSuchRevision:
93
89
                    to_transport.delete_tree('.')
94
90
                    raise
95
91
 
97
93
                br_from.unlock()
98
94
                
99
95
            self.close()
100
 
            self.dialog.info_dialog(_('Branching successful'),
101
 
                                _('%d revision(s) branched.') % revs)
102
 
            self.comm.refresh_right()
 
96
            info_dialog(_('Branching successful'),
 
97
                        _('%d revision(s) branched.') % revs)
103
98
        except errors.NonExistingSource, errmsg:
104
 
            self.dialog.error_dialog(_('Non existing source'),
105
 
                                     _("The location (%s)\ndoesn't exist.") % errmsg)
106
 
            self.comm.set_busy(self.window, False)
 
99
            error_dialog(_('Non existing source'),
 
100
                         _("The location (%s)\ndoesn't exist.") % errmsg)
107
101
            return
108
102
        except errors.TargetAlreadyExists, errmsg:
109
 
            self.dialog.error_dialog(_('Target already exists'),
110
 
                                     _('Target directory (%s)\nalready exists. Please select another target.') % errmsg)
111
 
            self.comm.set_busy(self.window, False)
 
103
            error_dialog(_('Target already exists'),
 
104
                         _('Target directory (%s)\nalready exists. Please select another target.') % errmsg)
112
105
            return
113
106
        except errors.NonExistingParent, errmsg:
114
 
            self.dialog.error_dialog(_('Non existing parent directory'),
115
 
                                     _("The parent directory (%s)\ndoesn't exist.") % errmsg)
116
 
            self.comm.set_busy(self.window, False)
 
107
            error_dialog(_('Non existing parent directory'),
 
108
                         _("The parent directory (%s)\ndoesn't exist.") % errmsg)
117
109
            return
118
110
        except errors.NonExistingRevision:
119
 
            self.dialog.error_dialog(_('Non existing revision'),
120
 
                                     _("The revision you specified doesn't exist."))
121
 
            self.comm.set_busy(self.window, False)
 
111
            error_dialog(_('Non existing revision'),
 
112
                         _("The revision you specified doesn't exist."))
122
113
            return
123
114
        except errors.NotBranchError, errmsg:
124
 
            self.dialog.error_dialog(_('Location is not a branch'),
125
 
                                     _('The specified location has to be a branch.'))
126
 
            self.comm.set_busy(self.window, False)
 
115
            error_dialog(_('Location is not a branch'),
 
116
                         _('The specified location has to be a branch.'))
127
117
            return
128
118
        
129
 
 
130
119
    def close(self, widget=None):
131
120
        self.window.destroy()