/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-10 18:44:39 UTC
  • mto: This revision was merged to the branch mainline in revision 730.
  • Revision ID: jelmer@samba.org-20110410184439-g7hqaacexqtviq13
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.

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.controldir import ControlDir
28
 
from bzrlib.push import PushResult
29
 
from bzrlib.transport import get_transport
 
28
import bzrlib.errors as errors
30
29
 
31
30
from bzrlib.plugins.gtk.dialog import (
 
31
    info_dialog,
32
32
    question_dialog,
33
33
    )
 
34
 
34
35
from bzrlib.plugins.gtk.history import UrlHistory
35
36
from bzrlib.plugins.gtk.i18n import _i18n
36
 
from bzrlib.plugins.gtk.ui import ProgressPanel
37
 
 
38
 
 
39
 
class PushDialog(Gtk.Dialog):
 
37
 
 
38
 
 
39
class PushDialog(gtk.Dialog):
40
40
    """New implementation of the Push dialog."""
41
41
 
42
 
    def __init__(self, repository=None, revid=None, branch=None, parent=None):
 
42
    def __init__(self, repository, revid, branch=None, parent=None):
43
43
        """Initialize the Push dialog. """
44
 
        super(PushDialog, self).__init__(
45
 
            title="Push", parent=parent, flags=0, border_width=6,
46
 
            buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE))
47
 
        if repository is None:
48
 
            repository = branch.repository
49
 
        self.branch = branch
 
44
        gtk.Dialog.__init__(self, title="Push",
 
45
                                  parent=parent,
 
46
                                  flags=0,
 
47
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
50
48
 
51
 
        # Unused arguments
 
49
        # Get arguments
52
50
        self.repository = repository
53
 
        if revid is None:
54
 
            revid = branch.last_revision()
55
51
        self.revid = revid
 
52
        self.branch = branch
56
53
 
57
54
        # Create the widgets
58
 
        self._label_location = Gtk.Label(label=_i18n("Location:"))
59
 
        self._combo = Gtk.ComboBox.new_with_entry()
60
 
        self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
61
 
        self._hbox_location = Gtk.Box(Gtk.Orientation.HORIZONTAL, 6)
62
 
        self._push_message = Gtk.Label(xalign=0)
63
 
        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()
64
59
 
65
60
        # Set callbacks
66
 
        ui.ui_factory.set_progress_bar_widget(self._progress_widget)
67
 
        self.connect('close', self._on_close_clicked)
68
61
        self._button_push.connect('clicked', self._on_push_clicked)
69
62
 
70
63
        # Set properties
71
 
        content_area = self.get_content_area()
72
 
        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)
73
67
 
74
68
        # Pack widgets
75
 
        self._hbox_location.pack_start(self._label_location, False, False, 0)
76
 
        self._hbox_location.pack_start(self._combo, False, False, 0)
77
 
        content_area.pack_start(self._hbox_location, True, True, 0)
78
 
        content_area.pack_start(self._progress_widget, True, True, 0)
79
 
        content_area.pack_start(self._push_message, True, True, 0)
80
 
        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)
81
73
 
82
74
        # Show the dialog
83
 
        content_area.show_all()
84
 
        self._progress_widget.hide()
85
 
        self._push_message.hide()
 
75
        self.vbox.show_all()
86
76
 
87
77
        # Build location history
88
78
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
90
80
 
91
81
    def _build_history(self):
92
82
        """Build up the location history. """
93
 
        self._combo_model = Gtk.ListStore(str)
 
83
        self._combo_model = gtk.ListStore(str)
94
84
        for item in self._history.get_entries():
95
 
            self._combo_model.append([item])
 
85
            self._combo_model.append([ item ])
96
86
        self._combo.set_model(self._combo_model)
97
 
        self._combo.set_entry_text_column(0)
 
87
        self._combo.set_text_column(0)
98
88
 
99
89
        if self.branch is not None:
100
90
            location = self.branch.get_push_location()
101
91
            if location is not None:
102
92
                self._combo.get_child().set_text(location)
103
93
 
104
 
    def _on_close_clicked(self, widget):
105
 
        """Close dialog handler."""
106
 
        ui.ui_factory.set_progress_bar_widget(None)
107
 
 
108
94
    @show_bzr_error
109
95
    def _on_push_clicked(self, widget):
110
96
        """Push button clicked handler. """
111
 
        self._push_message.hide()
112
 
        self._progress_widget.tick()
113
97
        location = self._combo.get_child().get_text()
 
98
        revs = 0
114
99
 
115
100
        try:
116
 
            message = do_push(self.branch, location, overwrite=False)
 
101
            revs = do_push(self.branch, location=location, overwrite=False)
117
102
        except errors.DivergedBranches:
118
 
            response = question_dialog(
119
 
                _i18n('Branches have been diverged'),
120
 
                _i18n('You cannot push if branches have diverged.\n'
121
 
                      'Overwrite?'))
122
 
            if response == Gtk.ResponseType.YES:
123
 
                message = do_push(self.branch, location, overwrite=True)
124
 
            else:
125
 
                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
 
126
111
        self._history.add_entry(location)
127
 
        if (self.branch is not None
128
 
            and self.branch.get_push_location() is None):
129
 
            self.branch.set_push_location(location)
130
 
        if message:
131
 
            self._progress_widget.finished()
132
 
            self._push_message.props.label = message
133
 
            self._push_message.show()
 
112
        info_dialog(_i18n('Push successful'),
 
113
                    _i18n("%d revision(s) pushed.") % revs)
 
114
 
 
115
        self.response(gtk.RESPONSE_OK)
134
116
 
135
117
 
136
118
def do_push(br_from, location, overwrite):
141
123
    :param overwrite: overwrite target location if it diverged
142
124
    :return: number of revisions pushed
143
125
    """
144
 
    revision_id = None
145
 
    to_transport = get_transport(location)
 
126
    from bzrlib.bzrdir import BzrDir
 
127
    from bzrlib.transport import get_transport
 
128
 
 
129
    transport = get_transport(location)
 
130
    location_url = transport.base
 
131
 
 
132
    old_rh = []
 
133
 
146
134
    try:
147
 
        dir_to = ControlDir.open_from_transport(to_transport)
 
135
        dir_to = BzrDir.open(location_url)
 
136
        br_to = dir_to.open_branch()
148
137
    except errors.NotBranchError:
149
 
        dir_to = None
150
 
 
151
 
    if dir_to is None:
 
138
        # create a branch.
 
139
        transport = transport.clone('..')
152
140
        try:
153
 
            br_to = br_from.create_clone_on_transport(
154
 
                to_transport, revision_id=revision_id)
 
141
            relurl = transport.relpath(location_url)
 
142
            transport.mkdir(relurl)
155
143
        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)
160
 
            if response == Gtk.ResponseType.OK:
161
 
                br_to = br_from.create_clone_on_transport(
162
 
                    to_transport, revision_id=revision_id, create_prefix=True)
 
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:
 
147
                transport.create_prefix()
163
148
            else:
164
 
                return _i18n("Push aborted.")
165
 
        push_result = create_push_result(br_from, br_to)
 
149
                return
 
150
        dir_to = br_from.bzrdir.clone(location_url,
 
151
            revision_id=br_from.last_revision())
 
152
        br_to = dir_to.open_branch()
 
153
        count = len(br_to.revision_history())
166
154
    else:
167
 
        push_result = dir_to.push_branch(br_from, revision_id, overwrite)
168
 
    message = create_push_message(br_from, push_result)
169
 
    return message
170
 
 
171
 
 
172
 
def create_push_message(br_from, push_result):
173
 
    """Return a mesage explaining what happened during the push."""
174
 
    messages = []
175
 
    rev_count = br_from.revno() - push_result.old_revno
176
 
    messages.append(_i18n("%d revision(s) pushed.") % rev_count)
177
 
    if push_result.stacked_on is not None:
178
 
        messages.append(_i18n("Stacked on %s.") % push_result.stacked_on)
179
 
    if push_result.workingtree_updated is False:
180
 
        messages.append(_i18n(
181
 
            "\nThe working tree was not updated:"
182
 
            "\nSee 'bzr help working-trees' for more information."))
183
 
    return '\n'.join(messages)
184
 
 
185
 
 
186
 
def create_push_result(br_from, br_to):
187
 
    """Return a PushResult like one created by ControlDir.push_branch()."""
188
 
    push_result = PushResult()
189
 
    push_result.source_branch = br_from
190
 
    push_result.target_branch = br_to
191
 
    push_result.branch_push_result = None
192
 
    push_result.master_branch = None
193
 
    push_result.old_revno = 0
194
 
    push_result.old_revid = br_to.last_revision()
195
 
    push_result.workingtree_updated = None  # Not applicable to this case.
196
 
    try:
197
 
        push_result.stacked_on = br_to.get_stacked_on_url()
198
 
    except (errors.UnstackableBranchFormat,
199
 
            errors.UnstackableRepositoryFormat,
200
 
            errors.NotStacked):
201
 
        push_result.stacked_on = None
202
 
    return push_result
 
155
        old_rh = br_to.revision_history()
 
156
        try:
 
157
            tree_to = dir_to.open_workingtree()
 
158
        except errors.NotLocalUrl:
 
159
            # FIXME - what to do here? how should we warn the user?
 
160
            count = br_to.pull(br_from, overwrite)
 
161
        except errors.NoWorkingTree:
 
162
            count = br_to.pull(br_from, overwrite)
 
163
        else:
 
164
            count = tree_to.pull(br_from, overwrite)
 
165
 
 
166
    return count