/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 17:56:26 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927175626-4462e9dc20d422b1
Bunch of random cleanups

Show diffs side-by-side

added added

removed removed

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