/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: Curtis Hovey
  • Date: 2012-03-05 03:20:12 UTC
  • mfrom: (776.3.18 gpush)
  • Revision ID: sinzui.is@verizon.net-20120305032012-ex7cchd3a0qxfvn5
Merged gpush UI update.

Show diffs side-by-side

added added

removed removed

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