/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: 2011-04-06 14:50:40 UTC
  • Revision ID: jelmer@samba.org-20110406145040-7u37k9hxkhleiqx2
Cleanups, fix compatibility with older versions of pygtk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
20
20
    pygtk.require("2.0")
21
21
except:
22
22
    pass
23
 
    
 
23
 
24
24
import gtk
25
25
 
26
26
from errors import show_bzr_error
27
27
 
28
 
# FIXME: This needs to be public JRV 20070714
29
 
from bzrlib.builtins import _create_prefix
30
 
from bzrlib.config import LocationConfig
31
28
import bzrlib.errors as errors
32
29
 
33
30
from bzrlib.plugins.gtk import _i18n
34
 
from dialog import error_dialog, info_dialog, question_dialog
 
31
from bzrlib.plugins.gtk.dialog import (
 
32
    info_dialog,
 
33
    question_dialog,
 
34
    )
35
35
 
36
 
from history import UrlHistory
 
36
from bzrlib.plugins.gtk.history import UrlHistory
37
37
 
38
38
class PushDialog(gtk.Dialog):
39
39
    """ New implementation of the Push dialog. """
 
40
 
40
41
    def __init__(self, repository, revid, branch=None, parent=None):
41
42
        """ Initialize the Push dialog. """
42
43
        gtk.Dialog.__init__(self, title="Push - Olive",
43
44
                                  parent=parent,
44
45
                                  flags=0,
45
46
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
46
 
        
 
47
 
47
48
        # Get arguments
48
49
        self.repository = repository
49
50
        self.revid = revid
50
51
        self.branch = branch
51
 
        
 
52
 
52
53
        # Create the widgets
53
54
        self._label_location = gtk.Label(_i18n("Location:"))
54
55
        self._combo = gtk.ComboBoxEntry()
55
56
        self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
56
57
        self._hbox_location = gtk.HBox()
57
 
        
 
58
 
58
59
        # Set callbacks
59
60
        self._button_push.connect('clicked', self._on_push_clicked)
60
 
        
 
61
 
61
62
        # Set properties
62
63
        self._label_location.set_alignment(0, 0.5)
63
64
        self._hbox_location.set_spacing(3)
64
65
        self.vbox.set_spacing(3)
65
 
        
 
66
 
66
67
        # Pack widgets
67
68
        self._hbox_location.pack_start(self._label_location, False, False)
68
69
        self._hbox_location.pack_start(self._combo, True, True)
69
70
        self.vbox.pack_start(self._hbox_location)
70
71
        self.action_area.pack_end(self._button_push)
71
 
        
 
72
 
72
73
        # Show the dialog
73
74
        self.vbox.show_all()
74
 
        
 
75
 
75
76
        # Build location history
76
77
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
77
78
        self._build_history()
78
 
        
 
79
 
79
80
    def _build_history(self):
80
81
        """ Build up the location history. """
81
82
        self._combo_model = gtk.ListStore(str)
83
84
            self._combo_model.append([ item ])
84
85
        self._combo.set_model(self._combo_model)
85
86
        self._combo.set_text_column(0)
86
 
        
 
87
 
87
88
        if self.branch is not None:
88
89
            location = self.branch.get_push_location()
89
90
            if location is not None:
90
91
                self._combo.get_child().set_text(location)
91
 
    
 
92
 
92
93
    @show_bzr_error
93
94
    def _on_push_clicked(self, widget):
94
95
        """ Push button clicked handler. """
95
96
        location = self._combo.get_child().get_text()
96
97
        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
98
 
103
99
        try:
104
100
            revs = do_push(self.branch, location=location, overwrite=False)
107
103
                                       _i18n('You cannot push if branches have diverged.\nOverwrite?'))
108
104
            if response == gtk.RESPONSE_YES:
109
105
                revs = do_push(self.branch, location=location, overwrite=True)
110
 
        
 
106
 
 
107
        if self.branch is not None and self.branch.get_push_location() is None:
 
108
            self.branch.set_push_location(location)
 
109
 
111
110
        self._history.add_entry(location)
112
111
        info_dialog(_i18n('Push successful'),
113
112
                    _i18n("%d revision(s) pushed.") % revs)
114
 
        
 
113
 
115
114
        self.response(gtk.RESPONSE_OK)
116
115
 
 
116
 
117
117
def do_push(br_from, location, overwrite):
118
118
    """ Update a mirror of a branch.
119
 
    
 
119
 
120
120
    :param br_from: the source branch
121
 
    
122
121
    :param location: the location of the branch that you'd like to update
123
 
    
124
122
    :param overwrite: overwrite target location if it diverged
125
 
    
126
123
    :return: number of revisions pushed
127
124
    """
128
125
    from bzrlib.bzrdir import BzrDir
129
126
    from bzrlib.transport import get_transport
130
 
        
 
127
 
131
128
    transport = get_transport(location)
132
129
    location_url = transport.base
133
130
 
146
143
            response = question_dialog(_i18n('Non existing parent directory'),
147
144
                         _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
148
145
            if response == gtk.RESPONSE_OK:
149
 
                _create_prefix(transport)
 
146
                transport.create_prefix()
150
147
            else:
151
148
                return
152
149
        dir_to = br_from.bzrdir.clone(location_url,