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

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 15:47:30 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629154730-xfsotoxwkiytf0ph
Pass graph object rather than full repository to linegraph.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
2
 
 
 
2
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
 
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
5
6
# the Free Software Foundation; either version 2 of the License, or
6
7
# (at your option) any later version.
7
 
 
 
8
#
8
9
# This program is distributed in the hope that it will be useful,
9
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
12
# GNU General Public License for more details.
12
 
 
 
13
#
13
14
# You should have received a copy of the GNU General Public License
14
15
# along with this program; if not, write to the Free Software
15
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
 
17
 
import sys
18
 
 
19
18
try:
20
19
    import pygtk
21
20
    pygtk.require("2.0")
22
21
except:
23
22
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.gdk
27
 
    import gtk.glade
28
 
except:
29
 
    sys.exit(1)
30
 
 
31
 
import olive.backend.commit as commit
32
 
import olive.backend.errors as errors
33
 
 
34
 
class OlivePush:
35
 
    """ Display Push dialog and perform the needed actions. """
36
 
    def __init__(self, gladefile, comm):
 
23
    
 
24
import gtk
 
25
 
 
26
from errors import show_bzr_error
 
27
 
 
28
# FIXME: This needs to be public JRV 20070714
 
29
from bzrlib.builtins import _create_prefix
 
30
from bzrlib.config import LocationConfig
 
31
import bzrlib.errors as errors
 
32
 
 
33
from bzrlib.plugins.gtk import _i18n
 
34
from dialog import error_dialog, info_dialog, question_dialog
 
35
 
 
36
from history import UrlHistory
 
37
 
 
38
class PushDialog(gtk.Dialog):
 
39
    """ New implementation of the Push dialog. """
 
40
    def __init__(self, repository, revid, branch=None, parent=None):
37
41
        """ Initialize the Push dialog. """
38
 
        self.gladefile = gladefile
39
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_push')
40
 
        
41
 
        self.comm = comm
42
 
        
43
 
        self.window = self.glade.get_widget('window_push')
44
 
        
45
 
        # Dictionary for signal_autoconnect
46
 
        dic = { "on_button_push_push_clicked": self.push,
47
 
                "on_button_push_cancel_clicked": self.close,
48
 
                "on_radiobutton_push_stored_toggled": self.stored_toggled,
49
 
                "on_radiobutton_push_specific_toggled": self.specific_toggled, }
50
 
        
51
 
        # Connect the signals to the handlers
52
 
        self.glade.signal_autoconnect(dic)
53
 
        
54
 
        # Get some useful widgets
55
 
        self.entry_location = self.glade.get_widget('entry_push_location')
56
 
        self.check_remember = self.glade.get_widget('checkbutton_push_remember')
57
 
        self.check_overwrite = self.glade.get_widget('checkbutton_push_overwrite')
58
 
        self.check_create = self.glade.get_widget('checkbutton_push_create')
59
 
    
60
 
    def display(self):
61
 
        """ Display the Push dialog. """
62
 
        self.window.show()
63
 
        self.width, self.height = self.window.get_size()
64
 
    
65
 
    def stored_toggled(self, widget):
66
 
        if widget.get_active():
67
 
            self.entry_location.hide()
68
 
            self.check_remember.hide()
69
 
            self.check_overwrite.hide()
70
 
            self.check_create.hide()
71
 
            self.window.resize(self.width, self.height)
72
 
        else:
73
 
            self.entry_location.show()
74
 
            self.check_remember.show()
75
 
            self.check_overwrite.show()
76
 
            self.check_create.show()
77
 
    
78
 
    def specific_toggled(self, widget):
79
 
        if widget.get_active():
80
 
            self.entry_location.show()
81
 
            self.check_remember.show()
82
 
            self.check_overwrite.show()
83
 
            self.check_create.show()
84
 
        else:
85
 
            self.entry_location.hide()
86
 
            self.check_remember.hide()
87
 
            self.check_overwrite.hide()
88
 
            self.check_create.hide()
89
 
    
90
 
    def push(self, widget):
91
 
        from dialog import OliveDialog
92
 
        dialog = OliveDialog(self.gladefile)
93
 
        
94
 
        radio_stored = self.glade.get_widget('radiobutton_push_stored')
95
 
        radio_specific = self.glade.get_widget('radiobutton_push_specific')
96
 
        
 
42
        gtk.Dialog.__init__(self, title="Push - Olive",
 
43
                                  parent=parent,
 
44
                                  flags=0,
 
45
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
46
        
 
47
        # Get arguments
 
48
        self.repository = repository
 
49
        self.revid = revid
 
50
        self.branch = branch
 
51
        
 
52
        # Create the widgets
 
53
        self._label_location = gtk.Label(_i18n("Location:"))
 
54
        self._combo = gtk.ComboBoxEntry()
 
55
        self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
 
56
        self._hbox_location = gtk.HBox()
 
57
        
 
58
        # Set callbacks
 
59
        self._button_push.connect('clicked', self._on_push_clicked)
 
60
        
 
61
        # Set properties
 
62
        self._label_location.set_alignment(0, 0.5)
 
63
        self._hbox_location.set_spacing(3)
 
64
        self.vbox.set_spacing(3)
 
65
        
 
66
        # Pack widgets
 
67
        self._hbox_location.pack_start(self._label_location, False, False)
 
68
        self._hbox_location.pack_start(self._combo, True, True)
 
69
        self.vbox.pack_start(self._hbox_location)
 
70
        self.action_area.pack_end(self._button_push)
 
71
        
 
72
        # Show the dialog
 
73
        self.vbox.show_all()
 
74
        
 
75
        # Build location history
 
76
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
 
77
        self._build_history()
 
78
        
 
79
    def _build_history(self):
 
80
        """ Build up the location history. """
 
81
        self._combo_model = gtk.ListStore(str)
 
82
        for item in self._history.get_entries():
 
83
            self._combo_model.append([ item ])
 
84
        self._combo.set_model(self._combo_model)
 
85
        self._combo.set_text_column(0)
 
86
        
 
87
        if self.branch is not None:
 
88
            location = self.branch.get_push_location()
 
89
            if location is not None:
 
90
                self._combo.get_child().set_text(location)
 
91
    
 
92
    @show_bzr_error
 
93
    def _on_push_clicked(self, widget):
 
94
        """ Push button clicked handler. """
 
95
        location = self._combo.get_child().get_text()
97
96
        revs = 0
98
 
        self.comm.set_busy(self.window)
99
 
        if radio_stored.get_active():
100
 
            try:
101
 
                revs = commit.push(self.comm.get_path())
102
 
            except errors.NotBranchError:
103
 
                dialog.error_dialog('Directory is not a branch.')
104
 
                return
105
 
            except errors.NoLocationKnown:
106
 
                dialog.error_dialog('No location known.')
107
 
                return
108
 
            except errors.NonExistingParent, errmsg:
109
 
                dialog.error_dialog('Parent directory doesn\'t exist: %s', errmsg)
110
 
                return
111
 
            except errors.DivergedBranchesError:
112
 
                dialog.error_dialog('Branches have been diverged.')
113
 
                return
114
 
            except:
115
 
                raise
116
 
        elif radio_specific.get_active():
117
 
            location = self.entry_location.get_text()
118
 
            if location == '':
119
 
                dialog.error_dialog('No location specified.')
120
 
                return
121
 
            
122
 
            try:
123
 
                revs = commit.push(self.comm.get_path(), location,
124
 
                                   self.check_remember.get_active(),
125
 
                                   self.check_overwrite.get_active(),
126
 
                                   self.check_create.get_active())
127
 
            except errors.NotBranchError:
128
 
                dialog.error_dialog('Directory is not a branch.')
129
 
                self.comm.set_busy(self.window, False)
130
 
                return
131
 
            except errors.NonExistingParent, errmsg:
132
 
                dialog.error_dialog('Parent directory doesn\'t exist: %s', errmsg)
133
 
                self.comm.set_busy(self.window, False)
134
 
                return
135
 
            except errors.DivergedBranchesError:
136
 
                dialog.error_dialog('Branches have been diverged.')
137
 
                self.comm.set_busy(self.window, False)
138
 
                return
139
 
            except errors.PathPrefixNotCreated:
140
 
                dialog.error_dialog('Path prefix couldn\'t be created.')
141
 
                self.comm.set_busy(self.window, False)
142
 
                return
143
 
            except:
144
 
                raise
 
97
        if self.branch is not None and self.branch.get_push_location() is None:
 
98
            response = question_dialog(_i18n('Set default push location'),
 
99
                                       _i18n('There is no default push location set.\nSet %r as default now?') % location)
 
100
            if response == gtk.RESPONSE_OK:
 
101
                self.branch.set_push_location(location)
 
102
 
 
103
        try:
 
104
            revs = do_push(self.branch, location=location, overwrite=False)
 
105
        except errors.DivergedBranches:
 
106
            response = question_dialog(_i18n('Branches have been diverged'),
 
107
                                       _i18n('You cannot push if branches have diverged.\nOverwrite?'))
 
108
            if response == gtk.RESPONSE_YES:
 
109
                revs = do_push(self.branch, location=location, overwrite=True)
 
110
        
 
111
        self._history.add_entry(location)
 
112
        info_dialog(_i18n('Push successful'),
 
113
                    _i18n("%d revision(s) pushed.") % revs)
 
114
        
 
115
        self.response(gtk.RESPONSE_OK)
 
116
 
 
117
def do_push(br_from, location, overwrite):
 
118
    """ Update a mirror of a branch.
 
119
    
 
120
    :param br_from: the source branch
 
121
    
 
122
    :param location: the location of the branch that you'd like to update
 
123
    
 
124
    :param overwrite: overwrite target location if it diverged
 
125
    
 
126
    :return: number of revisions pushed
 
127
    """
 
128
    from bzrlib.bzrdir import BzrDir
 
129
    from bzrlib.transport import get_transport
 
130
        
 
131
    transport = get_transport(location)
 
132
    location_url = transport.base
 
133
 
 
134
    old_rh = []
 
135
 
 
136
    try:
 
137
        dir_to = BzrDir.open(location_url)
 
138
        br_to = dir_to.open_branch()
 
139
    except errors.NotBranchError:
 
140
        # create a branch.
 
141
        transport = transport.clone('..')
 
142
        try:
 
143
            relurl = transport.relpath(location_url)
 
144
            transport.mkdir(relurl)
 
145
        except errors.NoSuchFile:
 
146
            response = question_dialog(_i18n('Non existing parent directory'),
 
147
                         _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
 
148
            if response == gtk.RESPONSE_OK:
 
149
                _create_prefix(transport)
 
150
            else:
 
151
                return
 
152
        dir_to = br_from.bzrdir.clone(location_url,
 
153
            revision_id=br_from.last_revision())
 
154
        br_to = dir_to.open_branch()
 
155
        count = len(br_to.revision_history())
 
156
    else:
 
157
        old_rh = br_to.revision_history()
 
158
        try:
 
159
            tree_to = dir_to.open_workingtree()
 
160
        except errors.NotLocalUrl:
 
161
            # FIXME - what to do here? how should we warn the user?
 
162
            count = br_to.pull(br_from, overwrite)
 
163
        except errors.NoWorkingTree:
 
164
            count = br_to.pull(br_from, overwrite)
145
165
        else:
146
 
            # This should really never happen
147
 
            pass
148
 
        
149
 
        self.close()
150
 
        dialog.info_dialog('%d revision(s) pushed.' % revs)
151
 
    
152
 
    def close(self, widget=None):
153
 
        self.window.destroy()
 
166
            count = tree_to.pull(br_from, overwrite)
 
167
 
 
168
    return count