/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/checkout.py

  • Committer: Jelmer Vernooij
  • Date: 2006-09-27 20:30:59 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927203059-85792ae0a81db524
Bunch of small fixes, cleanups and simplifications.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/checkout.py
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
import bzrlib.errors as errors
 
29
 
 
30
from olive import gladefile
32
31
 
33
32
class OliveCheckout:
34
33
    """ Display checkout dialog and perform the needed operations. """
35
 
    def __init__(self, gladefile, comm, dialog):
 
34
    def __init__(self, path=None):
36
35
        """ Initialize the Checkout dialog. """
37
 
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_checkout', 'olive-gtk')
39
 
        
40
 
        # Communication object
41
 
        self.comm = comm
42
 
        # Dialog object
43
 
        self.dialog = dialog
 
36
        self.glade = gtk.glade.XML('window_checkout', 'olive-gtk')
44
37
        
45
38
        self.window = self.glade.get_widget('window_checkout')
46
39
        
53
46
        
54
47
        # Save FileChooser state
55
48
        self.filechooser = self.glade.get_widget('filechooserbutton_checkout')
56
 
        self.filechooser.set_filename(self.comm.get_path())
 
49
        if path is not None:
 
50
            self.filechooser.set_filename(path)
57
51
 
58
52
    def display(self):
59
53
        """ Display the Checkout dialog. """
63
57
        entry_location = self.glade.get_widget('entry_checkout_location')
64
58
        location = entry_location.get_text()
65
59
        if location is '':
66
 
            self.dialog.error_dialog(_('Missing branch location'),
 
60
            error_dialog(_('Missing branch location'),
67
61
                                     _('You must specify a branch location.'))
68
62
            return
69
63
        
71
65
        
72
66
        spinbutton_revno = self.glade.get_widget('spinbutton_checkout_revno')
73
67
        revno = spinbutton_revno.get_value_as_int()
74
 
        if revno == 0:
75
 
            revno = None
 
68
        rev_id = source.get_rev_id(revno)
76
69
        
77
70
        checkbutton_lightweight = self.glade.get_widget('checkbutton_checkout_lightweight')
78
71
        lightweight = checkbutton_lightweight.get_active()
79
72
        
80
73
        self.comm.set_busy(self.window)
81
74
        try:
82
 
            init.checkout(location, destination, revno, lightweight)
 
75
            source = Branch.open(location)
 
76
            
 
77
            # if the source and destination are the same, 
 
78
            # and there is no working tree,
 
79
            # then reconstitute a branch
 
80
            if (bzrlib.osutils.abspath(destination) ==
 
81
                bzrlib.osutils.abspath(location)):
 
82
                try:
 
83
                    source.bzrdir.open_workingtree()
 
84
                except NoWorkingTree:
 
85
                    source.bzrdir.create_workingtree()
 
86
                    return
 
87
 
 
88
            destination = destination + '/' + os.path.basename(location.rstrip("/\\"))
 
89
            
 
90
            os.mkdir(destination)
 
91
 
 
92
            old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
 
93
            bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
94
 
 
95
            try:
 
96
                if lightweight:
 
97
                    checkout = bzrdir.BzrDirMetaFormat1().initialize(destination)
 
98
                    bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
 
99
                else:
 
100
                    checkout_branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(
 
101
                        destination, force_new_tree=False)
 
102
                    checkout = checkout_branch.bzrdir
 
103
                    checkout_branch.bind(source)
 
104
                    if rev_id is not None:
 
105
                        rh = checkout_branch.revno_history()
 
106
                        checkout_branch.set_revno_history(rh[:rh.index(rev_id) + 1])
 
107
 
 
108
                checkout.create_workingtree(rev_id)
 
109
            finally:
 
110
                bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
83
111
        except errors.NotBranchError, errmsg:
84
 
            self.dialog.error_dialog(_('Location is not a branch'),
 
112
            error_dialog(_('Location is not a branch'),
85
113
                                     _('The specified location has to be a branch.'))
86
114
            self.comm.set_busy(self.window, False)
87
115
            return
88
116
        except errors.TargetAlreadyExists, errmsg:
89
 
            self.dialog.error_dialog(_('Target already exists'),
 
117
            error_dialog(_('Target already exists'),
90
118
                                     _('Target directory (%s)\nalready exists. Please select another target.') % errmsg)
91
119
            self.comm.set_busy(self.window, False)
92
120
            return
93
121
        except errors.NonExistingParent, errmsg:
94
 
            self.dialog.error_dialog(_('Non existing parent directory'),
 
122
            error_dialog(_('Non existing parent directory'),
95
123
                                     _("The parent directory (%s)\ndoesn't exist.") % errmsg)
96
124
            self.comm.set_busy(self.window, False)
97
125
            return
98
 
        except:
99
 
            raise
100
126
        
101
127
        self.close()
102
128
        self.comm.refresh_right()