/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: Mikkel Kamstrup Erlandsen
  • Date: 2011-09-28 07:45:39 UTC
  • mto: This revision was merged to the branch mainline in revision 740.
  • Revision ID: mikkel.kamstrup@gmail.com-20110928074539-qxl1yn1bkjel6ir0
https://launchpad.net/bugs/861201
Add X-GNOME-Autostart-Delay=30 to bzr-notify.desktop

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
 
19
 
from gi.repository import Gtk
 
18
try:
 
19
    import pygtk
 
20
    pygtk.require("2.0")
 
21
except:
 
22
    pass
 
23
 
 
24
import gtk
20
25
 
21
26
from errors import show_bzr_error
22
27
 
23
 
from bzrlib import (
24
 
    errors,
25
 
    ui,
26
 
    )
27
 
from bzrlib.bzrdir import BzrDir
28
 
from bzrlib.transport import get_transport
 
28
import bzrlib.errors as errors
29
29
 
30
30
from bzrlib.plugins.gtk.dialog import (
 
31
    info_dialog,
31
32
    question_dialog,
32
33
    )
 
34
 
33
35
from bzrlib.plugins.gtk.history import UrlHistory
34
36
from bzrlib.plugins.gtk.i18n import _i18n
35
 
from bzrlib.plugins.gtk.ui import ProgressPanel
36
 
 
37
 
 
38
 
class PushDialog(Gtk.Dialog):
 
37
 
 
38
 
 
39
class PushDialog(gtk.Dialog):
39
40
    """New implementation of the Push dialog."""
40
41
 
41
42
    def __init__(self, repository, revid, branch=None, parent=None):
42
43
        """Initialize the Push dialog. """
43
 
        super(PushDialog, self).__init__(
44
 
            title="Push", parent=parent, flags=0, border_width=6,
45
 
            buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE))
46
 
        self.branch = branch
 
44
        gtk.Dialog.__init__(self, title="Push",
 
45
                                  parent=parent,
 
46
                                  flags=0,
 
47
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
47
48
 
48
 
        # Unused arguments
 
49
        # Get arguments
49
50
        self.repository = repository
50
51
        self.revid = revid
 
52
        self.branch = branch
51
53
 
52
54
        # Create the widgets
53
 
        self._label_location = Gtk.Label(label=_i18n("Location:"))
54
 
        self._combo = Gtk.ComboBox.new_with_entry()
55
 
        self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
56
 
        self._hbox_location = Gtk.Box(Gtk.Orientation.HORIZONTAL, 6)
57
 
        self._push_message = Gtk.Label(xalign=0)
58
 
        self._progress_widget = ProgressPanel()
 
55
        self._label_location = gtk.Label(_i18n("Location:"))
 
56
        self._combo = gtk.ComboBoxEntry()
 
57
        self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
 
58
        self._hbox_location = gtk.HBox()
59
59
 
60
60
        # Set callbacks
61
 
        ui.ui_factory.set_progress_bar_widget(self._progress_widget)
62
 
        self.connect('close', self._on_close_clicked)
63
61
        self._button_push.connect('clicked', self._on_push_clicked)
64
62
 
65
63
        # Set properties
66
 
        content_area = self.get_content_area()
67
 
        content_area.set_spacing(6)
 
64
        self._label_location.set_alignment(0, 0.5)
 
65
        self._hbox_location.set_spacing(3)
 
66
        self.vbox.set_spacing(3)
68
67
 
69
68
        # Pack widgets
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)
75
 
        self.get_action_area().pack_end(self._button_push, True, True, 0)
 
69
        self._hbox_location.pack_start(self._label_location, False, False)
 
70
        self._hbox_location.pack_start(self._combo, True, True)
 
71
        self.vbox.pack_start(self._hbox_location)
 
72
        self.action_area.pack_end(self._button_push)
76
73
 
77
74
        # Show the dialog
78
 
        content_area.show_all()
79
 
        self._progress_widget.hide()
80
 
        self._push_message.hide()
 
75
        self.vbox.show_all()
81
76
 
82
77
        # Build location history
83
78
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
85
80
 
86
81
    def _build_history(self):
87
82
        """Build up the location history. """
88
 
        self._combo_model = Gtk.ListStore(str)
 
83
        self._combo_model = gtk.ListStore(str)
89
84
        for item in self._history.get_entries():
90
 
            self._combo_model.append([item])
 
85
            self._combo_model.append([ item ])
91
86
        self._combo.set_model(self._combo_model)
92
 
        self._combo.set_entry_text_column(0)
 
87
        self._combo.set_text_column(0)
93
88
 
94
89
        if self.branch is not None:
95
90
            location = self.branch.get_push_location()
96
91
            if location is not None:
97
92
                self._combo.get_child().set_text(location)
98
93
 
99
 
    def _on_close_clicked(self, widget):
100
 
        """Close dialog handler."""
101
 
        ui.ui_factory.set_progress_bar_widget(None)
102
 
 
103
94
    @show_bzr_error
104
95
    def _on_push_clicked(self, widget):
105
96
        """Push button clicked handler. """
106
 
        self._push_message.hide()
107
 
        self._progress_widget.tick()
108
97
        location = self._combo.get_child().get_text()
 
98
        revs = 0
109
99
 
110
100
        try:
111
 
            message = do_push(self.branch, location, overwrite=False)
 
101
            revs = do_push(self.branch, location=location, overwrite=False)
112
102
        except errors.DivergedBranches:
113
 
            response = question_dialog(
114
 
                _i18n('Branches have been diverged'),
115
 
                _i18n('You cannot push if branches have diverged.\n'
116
 
                      'Overwrite?'))
117
 
            if response == Gtk.ResponseType.YES:
118
 
                message = do_push(self.branch, location, overwrite=True)
119
 
            else:
120
 
                return
 
103
            response = question_dialog(_i18n('Branches have been diverged'),
 
104
                                       _i18n('You cannot push if branches have diverged.\nOverwrite?'))
 
105
            if response == gtk.RESPONSE_YES:
 
106
                revs = do_push(self.branch, location=location, overwrite=True)
 
107
 
 
108
        if self.branch is not None and self.branch.get_push_location() is None:
 
109
            self.branch.set_push_location(location)
 
110
 
121
111
        self._history.add_entry(location)
122
 
        if (self.branch is not None
123
 
            and self.branch.get_push_location() is None):
124
 
            self.branch.set_push_location(location)
125
 
        if message:
126
 
            self._progress_widget.finished()
127
 
            self._push_message.props.label = message
128
 
            self._push_message.show()
 
112
        info_dialog(_i18n('Push successful'),
 
113
                    _i18n("%d revision(s) pushed.") % revs)
 
114
 
 
115
        self.response(gtk.RESPONSE_OK)
129
116
 
130
117
 
131
118
def do_push(br_from, location, overwrite):
136
123
    :param overwrite: overwrite target location if it diverged
137
124
    :return: number of revisions pushed
138
125
    """
 
126
    from bzrlib.bzrdir import BzrDir
 
127
    from bzrlib.transport import get_transport
 
128
 
139
129
    transport = get_transport(location)
140
130
    location_url = transport.base
141
131
 
 
132
    old_rh = []
 
133
 
142
134
    try:
143
135
        dir_to = BzrDir.open(location_url)
144
136
        br_to = dir_to.open_branch()
149
141
            relurl = transport.relpath(location_url)
150
142
            transport.mkdir(relurl)
151
143
        except errors.NoSuchFile:
152
 
            response = question_dialog(
153
 
                _i18n('Non existing parent directory'),
154
 
                _i18n("The parent directory (%s)\ndoesn't exist. Create?") %
155
 
                location)
156
 
            if response == Gtk.ResponseType.OK:
 
144
            response = question_dialog(_i18n('Non existing parent directory'),
 
145
                         _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
 
146
            if response == gtk.RESPONSE_OK:
157
147
                transport.create_prefix()
158
148
            else:
159
149
                return
162
152
        br_to = dir_to.open_branch()
163
153
        count = len(br_to.revision_history())
164
154
    else:
165
 
        br_to.revision_history()
 
155
        old_rh = br_to.revision_history()
166
156
        try:
167
157
            tree_to = dir_to.open_workingtree()
168
158
        except errors.NotLocalUrl:
173
163
        else:
174
164
            count = tree_to.pull(br_from, overwrite)
175
165
 
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)
 
166
    return count