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

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-07-25 12:38:56 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060725123856-f7b3018de9dc669f
2006-07-25  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * olive-gtk: display error if python 2.4 not available (Mario Đanić)
      (Fixed: #54014)
    * olive-gtk: display error if pygtk2 (and glade) not available (Mario Đanić)
      (Fixed: #54013)

2006-07-24  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * olive/frontend/gtk/push.py: display number of pushed revisions

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/frontend/gtk/push.py
1
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
2
 
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
3
 
#
 
2
 
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
6
5
# the Free Software Foundation; either version 2 of the License, or
7
6
# (at your option) any later version.
8
 
#
 
7
 
9
8
# This program is distributed in the hope that it will be useful,
10
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
11
# GNU General Public License for more details.
13
 
#
 
12
 
14
13
# You should have received a copy of the GNU General Public License
15
14
# along with this program; if not, write to the Free Software
16
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
16
 
 
17
import sys
 
18
 
18
19
try:
19
20
    import pygtk
20
21
    pygtk.require("2.0")
21
22
except:
22
23
    pass
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):
 
24
try:
 
25
    import gtk
 
26
    import gtk.glade
 
27
except:
 
28
    sys.exit(1)
 
29
 
 
30
import olive.backend.commit as commit
 
31
import olive.backend.errors as errors
 
32
 
 
33
class OlivePush:
 
34
    """ Display Push dialog and perform the needed actions. """
 
35
    def __init__(self, gladefile, comm):
41
36
        """ Initialize the Push dialog. """
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()
96
 
        revs = 0
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)
165
 
        else:
166
 
            count = tree_to.pull(br_from, overwrite)
167
 
 
168
 
    return count
 
37
        self.gladefile = gladefile
 
38
        self.glade = gtk.glade.XML(self.gladefile, 'window_push')
 
39
        
 
40
        self.comm = comm
 
41
        
 
42
        self.window = self.glade.get_widget('window_push')
 
43
        
 
44
        # Dictionary for signal_autoconnect
 
45
        dic = { "on_button_push_push_clicked": self.push,
 
46
                "on_button_push_cancel_clicked": self.close,
 
47
                "on_radiobutton_push_stored_toggled": self.stored_toggled,
 
48
                "on_radiobutton_push_specific_toggled": self.specific_toggled, }
 
49
        
 
50
        # Connect the signals to the handlers
 
51
        self.glade.signal_autoconnect(dic)
 
52
        
 
53
        # Get some useful widgets
 
54
        self.entry_location = self.glade.get_widget('entry_push_location')
 
55
        self.check_remember = self.glade.get_widget('checkbutton_push_remember')
 
56
        self.check_overwrite = self.glade.get_widget('checkbutton_push_overwrite')
 
57
        self.check_create = self.glade.get_widget('checkbutton_push_create')
 
58
    
 
59
    def display(self):
 
60
        """ Display the Push dialog. """
 
61
        self.window.show()
 
62
    
 
63
    def stored_toggled(self, widget):
 
64
        if widget.get_active():
 
65
            self.entry_location.hide()
 
66
            self.check_remember.hide()
 
67
            self.check_overwrite.hide()
 
68
            self.check_create.hide()
 
69
        else:
 
70
            self.entry_location.show()
 
71
            self.check_remember.show()
 
72
            self.check_overwrite.show()
 
73
            self.check_create.show()
 
74
    
 
75
    def specific_toggled(self, widget):
 
76
        if widget.get_active():
 
77
            self.entry_location.show()
 
78
            self.check_remember.show()
 
79
            self.check_overwrite.show()
 
80
            self.check_create.show()
 
81
        else:
 
82
            self.entry_location.hide()
 
83
            self.check_remember.hide()
 
84
            self.check_overwrite.hide()
 
85
            self.check_create.hide()
 
86
    
 
87
    def push(self, widget):
 
88
        from dialog import OliveDialog
 
89
        dialog = OliveDialog(self.gladefile)
 
90
        
 
91
        radio_stored = self.glade.get_widget('radiobutton_push_stored')
 
92
        radio_specific = self.glade.get_widget('radiobutton_push_specific')
 
93
        
 
94
        if radio_stored.get_active():
 
95
            try:
 
96
                commit.push(self.comm.get_path())
 
97
            except errors.NotBranchError:
 
98
                dialog.error_dialog('Directory is not a branch.')
 
99
                return
 
100
            except errors.NoLocationKnown:
 
101
                dialog.error_dialog('No location known.')
 
102
                return
 
103
            except errors.NonExistingParent, errmsg:
 
104
                dialog.error_dialog('Parent directory doesn\'t exist: %s', errmsg)
 
105
                return
 
106
            except errors.DivergedBranchesError:
 
107
                dialog.error_dialog('Branches have been diverged.')
 
108
                return
 
109
            except:
 
110
                raise
 
111
        elif radio_specific.get_active():
 
112
            location = self.entry_location.get_text()
 
113
            if location == '':
 
114
                dialog.error_dialog('No location specified.')
 
115
                return
 
116
            
 
117
            try:
 
118
                revs = commit.push(self.comm.get_path(), location,
 
119
                                   self.check_remember.get_active(),
 
120
                                   self.check_overwrite.get_active(),
 
121
                                   self.check_create.get_active())
 
122
            except errors.NotBranchError:
 
123
                dialog.error_dialog('Directory is not a branch.')
 
124
                return
 
125
            except errors.NonExistingParent, errmsg:
 
126
                dialog.error_dialog('Parent directory doesn\'t exist: %s', errmsg)
 
127
                return
 
128
            except errors.DivergedBranchesError:
 
129
                dialog.error_dialog('Branches have been diverged.')
 
130
                return
 
131
            except errors.PathPrefixNotCreated:
 
132
                dialog.error_dialog('Path prefix couldn\'t be created.')
 
133
                return
 
134
            except:
 
135
                raise
 
136
        else:
 
137
            # This should really never happen
 
138
            pass
 
139
        
 
140
        self.close()
 
141
        dialog.info_dialog('%d revision(s) pushed.' % revs)
 
142
    
 
143
    def close(self, widget=None):
 
144
        self.window.destroy()