/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 19:07:23 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629190723-l8mzg9x4oec0lhsl
Return cleartext from seahorse module

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