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