15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from gi.repository import Gtk
20
26
from errors import show_bzr_error
28
from bzrlib.config import LocationConfig
22
29
import bzrlib.errors as errors
24
from bzrlib.plugins.gtk.dialog import (
29
from bzrlib.plugins.gtk.history import UrlHistory
30
from bzrlib.plugins.gtk.i18n import _i18n
33
class PushDialog(Gtk.Dialog):
34
"""New implementation of the Push dialog."""
31
from bzrlib.plugins.gtk import _i18n
32
from dialog import error_dialog, info_dialog, question_dialog
34
from history import UrlHistory
36
class PushDialog(gtk.Dialog):
37
""" New implementation of the Push dialog. """
36
38
def __init__(self, repository, revid, branch=None, parent=None):
37
"""Initialize the Push dialog. """
38
GObject.GObject.__init__(self, title="Push",
39
""" Initialize the Push dialog. """
40
gtk.Dialog.__init__(self, title="Push - Olive",
41
buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
43
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
44
46
self.repository = repository
46
48
self.branch = branch
48
50
# Create the widgets
49
self._label_location = Gtk.Label(label=_i18n("Location:"))
50
self._combo = Gtk.ComboBoxEntry()
51
self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
52
self._hbox_location = Gtk.HBox()
51
self._label_location = gtk.Label(_i18n("Location:"))
52
self._combo = gtk.ComboBoxEntry()
53
self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
54
self._hbox_location = gtk.HBox()
55
57
self._button_push.connect('clicked', self._on_push_clicked)
58
60
self._label_location.set_alignment(0, 0.5)
59
61
self._hbox_location.set_spacing(3)
60
62
self.vbox.set_spacing(3)
63
65
self._hbox_location.pack_start(self._label_location, False, False)
64
66
self._hbox_location.pack_start(self._combo, True, True)
65
self.vbox.pack_start(self._hbox_location, True, True, 0)
67
self.vbox.pack_start(self._hbox_location)
66
68
self.action_area.pack_end(self._button_push)
69
71
self.vbox.show_all()
71
73
# Build location history
72
74
self._history = UrlHistory(self.branch.get_config(), 'push_history')
73
75
self._build_history()
75
77
def _build_history(self):
76
"""Build up the location history. """
77
self._combo_model = Gtk.ListStore(str)
78
""" Build up the location history. """
79
self._combo_model = gtk.ListStore(str)
78
80
for item in self._history.get_entries():
79
81
self._combo_model.append([ item ])
80
82
self._combo.set_model(self._combo_model)
81
83
self._combo.set_text_column(0)
83
85
if self.branch is not None:
84
86
location = self.branch.get_push_location()
85
87
if location is not None:
86
88
self._combo.get_child().set_text(location)
89
91
def _on_push_clicked(self, widget):
90
"""Push button clicked handler. """
92
""" Push button clicked handler. """
91
93
location = self._combo.get_child().get_text()
95
97
revs = do_push(self.branch, location=location, overwrite=False)
96
98
except errors.DivergedBranches:
97
99
response = question_dialog(_i18n('Branches have been diverged'),
98
100
_i18n('You cannot push if branches have diverged.\nOverwrite?'))
99
if response == Gtk.ResponseType.YES:
101
if response == gtk.RESPONSE_YES:
100
102
revs = do_push(self.branch, location=location, overwrite=True)
102
104
if self.branch is not None and self.branch.get_push_location() is None:
103
105
self.branch.set_push_location(location)
105
107
self._history.add_entry(location)
106
108
info_dialog(_i18n('Push successful'),
107
109
_i18n("%d revision(s) pushed.") % revs)
109
self.response(Gtk.ResponseType.OK)
111
self.response(gtk.RESPONSE_OK)
112
113
def do_push(br_from, location, overwrite):
113
"""Update a mirror of a branch.
114
""" Update a mirror of a branch.
115
116
:param br_from: the source branch
116
118
:param location: the location of the branch that you'd like to update
117
120
:param overwrite: overwrite target location if it diverged
118
122
:return: number of revisions pushed
120
124
from bzrlib.bzrdir import BzrDir
121
125
from bzrlib.transport import get_transport
123
127
transport = get_transport(location)
124
128
location_url = transport.base
added
removed
push.py
