/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: 2011-08-27 18:03:04 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110827180304-9405wmp3lyzq5jx2
Updated most of BranchView to gtk3.

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.controldir import ControlDir
28
 
from bzrlib.push import PushResult
29
 
from bzrlib.transport import get_transport
 
23
import bzrlib.errors as errors
30
24
 
31
25
from bzrlib.plugins.gtk.dialog import (
 
26
    info_dialog,
32
27
    question_dialog,
33
28
    )
 
29
 
34
30
from bzrlib.plugins.gtk.history import UrlHistory
35
31
from bzrlib.plugins.gtk.i18n import _i18n
36
 
from bzrlib.plugins.gtk.ui import ProgressPanel
37
32
 
38
33
 
39
34
class PushDialog(Gtk.Dialog):
40
35
    """New implementation of the Push dialog."""
41
36
 
42
 
    def __init__(self, repository=None, revid=None, branch=None, parent=None):
 
37
    def __init__(self, repository, revid, branch=None, parent=None):
43
38
        """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
50
 
 
51
 
        # Unused arguments
 
39
        Gtk.Dialog.__init__(self, title="Push",
 
40
                                  parent=parent,
 
41
                                  flags=0,
 
42
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
43
 
 
44
 
 
45
        # Get arguments
52
46
        self.repository = repository
53
 
        if revid is None:
54
 
            revid = branch.last_revision()
55
47
        self.revid = revid
 
48
        self.branch = branch
56
49
 
57
50
        # Create the widgets
58
51
        self._label_location = Gtk.Label(label=_i18n("Location:"))
59
52
        self._combo = Gtk.ComboBox.new_with_entry()
60
53
        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()
 
54
        self._hbox_location = Gtk.HBox()
64
55
 
65
56
        # Set callbacks
66
 
        ui.ui_factory.set_progress_bar_widget(self._progress_widget)
67
 
        self.connect('close', self._on_close_clicked)
68
57
        self._button_push.connect('clicked', self._on_push_clicked)
69
58
 
70
59
        # Set properties
71
 
        content_area = self.get_content_area()
72
 
        content_area.set_spacing(6)
 
60
        self._label_location.set_alignment(0, 0.5)
 
61
        self._hbox_location.set_spacing(3)
 
62
        self.get_content_area().set_spacing(3)
73
63
 
74
64
        # 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)
 
65
        self._hbox_location.pack_start(
 
66
            self._label_location, False, False, 0)
 
67
        self._hbox_location.pack_start(self._combo, True, True, 0)
 
68
        self.get_content_area().pack_start(self._hbox_location, True, True, 0)
 
69
        # XXX sinzui 2011-08-12: maybe False, False, 0
80
70
        self.get_action_area().pack_end(self._button_push, True, True, 0)
81
71
 
82
72
        # Show the dialog
83
 
        content_area.show_all()
84
 
        self._progress_widget.hide()
85
 
        self._push_message.hide()
 
73
        self.get_content_area().show_all()
86
74
 
87
75
        # Build location history
88
76
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
92
80
        """Build up the location history. """
93
81
        self._combo_model = Gtk.ListStore(str)
94
82
        for item in self._history.get_entries():
95
 
            self._combo_model.append([item])
 
83
            self._combo_model.append([ item ])
96
84
        self._combo.set_model(self._combo_model)
97
85
        self._combo.set_entry_text_column(0)
98
86
 
101
89
            if location is not None:
102
90
                self._combo.get_child().set_text(location)
103
91
 
104
 
    def _on_close_clicked(self, widget):
105
 
        """Close dialog handler."""
106
 
        ui.ui_factory.set_progress_bar_widget(None)
107
 
 
108
92
    @show_bzr_error
109
93
    def _on_push_clicked(self, widget):
110
94
        """Push button clicked handler. """
111
 
        self._push_message.hide()
112
 
        self._progress_widget.tick()
113
95
        location = self._combo.get_child().get_text()
 
96
        revs = 0
114
97
 
115
98
        try:
116
 
            message = do_push(self.branch, location, overwrite=False)
 
99
            revs = do_push(self.branch, location=location, overwrite=False)
117
100
        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?'))
 
101
            response = question_dialog(_i18n('Branches have been diverged'),
 
102
                                       _i18n('You cannot push if branches have diverged.\nOverwrite?'))
122
103
            if response == Gtk.ResponseType.YES:
123
 
                message = do_push(self.branch, location, overwrite=True)
124
 
            else:
125
 
                return
 
104
                revs = do_push(self.branch, location=location, overwrite=True)
 
105
 
 
106
        if self.branch is not None and self.branch.get_push_location() is None:
 
107
            self.branch.set_push_location(location)
 
108
 
126
109
        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()
 
110
        info_dialog(_i18n('Push successful'),
 
111
                    _i18n("%d revision(s) pushed.") % revs)
 
112
 
 
113
        self.response(Gtk.ResponseType.OK)
134
114
 
135
115
 
136
116
def do_push(br_from, location, overwrite):
141
121
    :param overwrite: overwrite target location if it diverged
142
122
    :return: number of revisions pushed
143
123
    """
144
 
    revision_id = None
145
 
    to_transport = get_transport(location)
 
124
    from bzrlib.bzrdir import BzrDir
 
125
    from bzrlib.transport import get_transport
 
126
 
 
127
    transport = get_transport(location)
 
128
    location_url = transport.base
 
129
 
 
130
    old_rh = []
 
131
 
146
132
    try:
147
 
        dir_to = ControlDir.open_from_transport(to_transport)
 
133
        dir_to = BzrDir.open(location_url)
 
134
        br_to = dir_to.open_branch()
148
135
    except errors.NotBranchError:
149
 
        dir_to = None
150
 
 
151
 
    if dir_to is None:
 
136
        # create a branch.
 
137
        transport = transport.clone('..')
152
138
        try:
153
 
            br_to = br_from.create_clone_on_transport(
154
 
                to_transport, revision_id=revision_id)
 
139
            relurl = transport.relpath(location_url)
 
140
            transport.mkdir(relurl)
155
141
        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)
 
142
            response = question_dialog(_i18n('Non existing parent directory'),
 
143
                         _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
160
144
            if response == Gtk.ResponseType.OK:
161
 
                br_to = br_from.create_clone_on_transport(
162
 
                    to_transport, revision_id=revision_id, create_prefix=True)
 
145
                transport.create_prefix()
163
146
            else:
164
 
                return _i18n("Push aborted.")
165
 
        push_result = create_push_result(br_from, br_to)
 
147
                return
 
148
        dir_to = br_from.bzrdir.clone(location_url,
 
149
            revision_id=br_from.last_revision())
 
150
        br_to = dir_to.open_branch()
 
151
        count = len(br_to.revision_history())
166
152
    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
 
153
        old_rh = br_to.revision_history()
 
154
        try:
 
155
            tree_to = dir_to.open_workingtree()
 
156
        except errors.NotLocalUrl:
 
157
            # FIXME - what to do here? how should we warn the user?
 
158
            count = br_to.pull(br_from, overwrite)
 
159
        except errors.NoWorkingTree:
 
160
            count = br_to.pull(br_from, overwrite)
 
161
        else:
 
162
            count = tree_to.pull(br_from, overwrite)
 
163
 
 
164
    return count