/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 19:52:46 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927195246-9354d7ccf56127f5
Don't pass around gladefile all the time. 
Fix bug in status information when files have been removed.

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