/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-20 12:39:08 UTC
  • mfrom: (776.3.23 gpush-do-push)
  • Revision ID: sinzui.is@verizon.net-20120320123908-lclvaiasu0e50odg
Merged faster push.

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