/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: 2012-03-01 21:29:00 UTC
  • mto: This revision was merged to the branch mainline in revision 781.
  • Revision ID: jelmer@samba.org-20120301212900-de4j4ugoxi1sga1g
https://launchpad.net/bugs/281717
Properly handle popup menus when there is no selected revision in 'bzr viz'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
1
 
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic)
2
 
#                       <szilveszter.farkas@gmail.com>
 
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
3
2
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
4
3
#
5
4
# This program is free software; you can redistribute it and/or modify
16
15
# along with this program; if not, write to the Free Software
17
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
17
 
 
18
from gi.repository import GObject
19
19
from gi.repository import Gtk
20
20
 
21
21
from errors import show_bzr_error
22
22
 
23
 
from bzrlib import (
24
 
    errors,
25
 
    ui,
26
 
    )
27
 
from bzrlib.bzrdir import BzrDir
28
 
from bzrlib.transport import get_transport
 
23
import bzrlib.errors as errors
29
24
 
30
25
from bzrlib.plugins.gtk.dialog import (
 
26
    info_dialog,
31
27
    question_dialog,
32
28
    )
 
29
 
33
30
from bzrlib.plugins.gtk.history import UrlHistory
34
31
from bzrlib.plugins.gtk.i18n import _i18n
35
 
from bzrlib.plugins.gtk.ui import ProgressPanel
36
32
 
37
33
 
38
34
class PushDialog(Gtk.Dialog):
39
35
    """New implementation of the Push dialog."""
40
36
 
41
 
    def __init__(self, repository=None, revid=None, branch=None, parent=None):
 
37
    def __init__(self, repository, revid, branch=None, parent=None):
42
38
        """Initialize the Push dialog. """
43
39
        super(PushDialog, self).__init__(
44
 
            title="Push", parent=parent, flags=0, border_width=6,
45
 
            buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE))
46
 
        if repository is None:
47
 
            repository = branch.repository
48
 
        self.branch = branch
49
 
 
50
 
        # Unused arguments
 
40
            title="Push", parent=parent, flags=0,
 
41
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
42
 
 
43
 
 
44
        # Get arguments
51
45
        self.repository = repository
52
 
        if revid is None:
53
 
            revid = branch.last_revision()
54
46
        self.revid = revid
 
47
        self.branch = branch
55
48
 
56
49
        # Create the widgets
57
50
        self._label_location = Gtk.Label(label=_i18n("Location:"))
58
51
        self._combo = Gtk.ComboBox.new_with_entry()
59
52
        self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
60
 
        self._hbox_location = Gtk.Box(Gtk.Orientation.HORIZONTAL, 6)
61
 
        self._push_message = Gtk.Label(xalign=0)
62
 
        self._progress_widget = ProgressPanel()
 
53
        self._hbox_location = Gtk.HBox()
63
54
 
64
55
        # Set callbacks
65
 
        ui.ui_factory.set_progress_bar_widget(self._progress_widget)
66
 
        self.connect('close', self._on_close_clicked)
67
56
        self._button_push.connect('clicked', self._on_push_clicked)
68
57
 
69
58
        # Set properties
70
 
        content_area = self.get_content_area()
71
 
        content_area.set_spacing(6)
 
59
        self._label_location.set_alignment(0, 0.5)
 
60
        self._hbox_location.set_spacing(3)
 
61
        self.get_content_area().set_spacing(3)
72
62
 
73
63
        # Pack widgets
74
 
        self._hbox_location.pack_start(self._label_location, False, False, 0)
75
 
        self._hbox_location.pack_start(self._combo, False, False, 0)
76
 
        content_area.pack_start(self._hbox_location, True, True, 0)
77
 
        content_area.pack_start(self._progress_widget, True, True, 0)
78
 
        content_area.pack_start(self._push_message, True, True, 0)
 
64
        self._hbox_location.pack_start(
 
65
            self._label_location, False, False, 0)
 
66
        self._hbox_location.pack_start(self._combo, True, True, 0)
 
67
        self.get_content_area().pack_start(self._hbox_location, True, True, 0)
 
68
        # XXX sinzui 2011-08-12: maybe False, False, 0
79
69
        self.get_action_area().pack_end(self._button_push, True, True, 0)
80
70
 
81
71
        # Show the dialog
82
 
        content_area.show_all()
83
 
        self._progress_widget.hide()
84
 
        self._push_message.hide()
 
72
        self.get_content_area().show_all()
85
73
 
86
74
        # Build location history
87
75
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
91
79
        """Build up the location history. """
92
80
        self._combo_model = Gtk.ListStore(str)
93
81
        for item in self._history.get_entries():
94
 
            self._combo_model.append([item])
 
82
            self._combo_model.append([ item ])
95
83
        self._combo.set_model(self._combo_model)
96
84
        self._combo.set_entry_text_column(0)
97
85
 
100
88
            if location is not None:
101
89
                self._combo.get_child().set_text(location)
102
90
 
103
 
    def _on_close_clicked(self, widget):
104
 
        """Close dialog handler."""
105
 
        ui.ui_factory.set_progress_bar_widget(None)
106
 
 
107
91
    @show_bzr_error
108
92
    def _on_push_clicked(self, widget):
109
93
        """Push button clicked handler. """
110
 
        self._push_message.hide()
111
 
        self._progress_widget.tick()
112
94
        location = self._combo.get_child().get_text()
 
95
        revs = 0
113
96
 
114
97
        try:
115
 
            message = do_push(self.branch, location, overwrite=False)
 
98
            revs = do_push(self.branch, location=location, overwrite=False)
116
99
        except errors.DivergedBranches:
117
 
            response = question_dialog(
118
 
                _i18n('Branches have been diverged'),
119
 
                _i18n('You cannot push if branches have diverged.\n'
120
 
                      'Overwrite?'))
 
100
            response = question_dialog(_i18n('Branches have been diverged'),
 
101
                                       _i18n('You cannot push if branches have diverged.\nOverwrite?'))
121
102
            if response == Gtk.ResponseType.YES:
122
 
                message = do_push(self.branch, location, overwrite=True)
123
 
            else:
124
 
                return
 
103
                revs = do_push(self.branch, location=location, overwrite=True)
 
104
 
 
105
        if self.branch is not None and self.branch.get_push_location() is None:
 
106
            self.branch.set_push_location(location)
 
107
 
125
108
        self._history.add_entry(location)
126
 
        if (self.branch is not None
127
 
            and self.branch.get_push_location() is None):
128
 
            self.branch.set_push_location(location)
129
 
        if message:
130
 
            self._progress_widget.finished()
131
 
            self._push_message.props.label = message
132
 
            self._push_message.show()
 
109
        info_dialog(_i18n('Push successful'),
 
110
                    _i18n("%d revision(s) pushed.") % revs)
 
111
 
 
112
        self.response(Gtk.ResponseType.OK)
133
113
 
134
114
 
135
115
def do_push(br_from, location, overwrite):
140
120
    :param overwrite: overwrite target location if it diverged
141
121
    :return: number of revisions pushed
142
122
    """
 
123
    from bzrlib.bzrdir import BzrDir
 
124
    from bzrlib.transport import get_transport
 
125
 
143
126
    transport = get_transport(location)
144
127
    location_url = transport.base
145
128
 
 
129
    old_rh = []
 
130
 
146
131
    try:
147
132
        dir_to = BzrDir.open(location_url)
148
133
        br_to = dir_to.open_branch()
153
138
            relurl = transport.relpath(location_url)
154
139
            transport.mkdir(relurl)
155
140
        except errors.NoSuchFile:
156
 
            response = question_dialog(
157
 
                _i18n('Non existing parent directory'),
158
 
                _i18n("The parent directory (%s)\ndoesn't exist. Create?") %
159
 
                location)
 
141
            response = question_dialog(_i18n('Non existing parent directory'),
 
142
                         _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
160
143
            if response == Gtk.ResponseType.OK:
161
144
                transport.create_prefix()
162
145
            else:
166
149
        br_to = dir_to.open_branch()
167
150
        count = len(br_to.revision_history())
168
151
    else:
169
 
        br_to.revision_history()
 
152
        old_rh = br_to.revision_history()
170
153
        try:
171
154
            tree_to = dir_to.open_workingtree()
172
155
        except errors.NotLocalUrl:
177
160
        else:
178
161
            count = tree_to.pull(br_from, overwrite)
179
162
 
180
 
    # The count var is either an int or a PushResult. PushResult is being
181
 
    # coerced into an int, but the method is deprecated.
182
 
    return _i18n("%d revision(s) pushed.") % int(count)
 
163
    return count