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 GObject
19
from gi.repository import Gtk
26
21
from errors import show_bzr_error
28
from bzrlib.config import LocationConfig
29
23
import bzrlib.errors as errors
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. """
25
from bzrlib.plugins.gtk.dialog import (
30
from bzrlib.plugins.gtk.history import UrlHistory
31
from bzrlib.plugins.gtk.i18n import _i18n
34
class PushDialog(Gtk.Dialog):
35
"""New implementation of the Push dialog."""
38
37
def __init__(self, repository, revid, branch=None, parent=None):
39
""" Initialize the Push dialog. """
40
gtk.Dialog.__init__(self, title="Push - Olive",
38
"""Initialize the Push dialog. """
39
Gtk.Dialog.__init__(self, title="Push",
43
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
42
buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
46
46
self.repository = repository
48
48
self.branch = branch
50
50
# Create the widgets
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()
51
self._label_location = Gtk.Label(label=_i18n("Location:"))
52
self._combo = Gtk.ComboBox.new_with_entry()
53
self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
54
self._hbox_location = Gtk.HBox()
57
57
self._button_push.connect('clicked', self._on_push_clicked)
60
60
self._label_location.set_alignment(0, 0.5)
61
61
self._hbox_location.set_spacing(3)
62
self.vbox.set_spacing(3)
62
self.get_content_area().set_spacing(3)
65
self._hbox_location.pack_start(self._label_location, False, False)
66
self._hbox_location.pack_start(self._combo, True, True)
67
self.vbox.pack_start(self._hbox_location)
68
self.action_area.pack_end(self._button_push)
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
70
self.get_action_area().pack_end(self._button_push, True, True, 0)
73
self.get_content_area().show_all()
73
75
# Build location history
74
76
self._history = UrlHistory(self.branch.get_config(), 'push_history')
75
77
self._build_history()
77
79
def _build_history(self):
78
""" Build up the location history. """
79
self._combo_model = gtk.ListStore(str)
80
"""Build up the location history. """
81
self._combo_model = Gtk.ListStore(str)
80
82
for item in self._history.get_entries():
81
83
self._combo_model.append([ item ])
82
84
self._combo.set_model(self._combo_model)
83
self._combo.set_text_column(0)
85
self._combo.set_entry_text_column(0)
85
87
if self.branch is not None:
86
88
location = self.branch.get_push_location()
87
89
if location is not None:
88
90
self._combo.get_child().set_text(location)
91
93
def _on_push_clicked(self, widget):
92
""" Push button clicked handler. """
94
"""Push button clicked handler. """
93
95
location = self._combo.get_child().get_text()
97
99
revs = do_push(self.branch, location=location, overwrite=False)
98
100
except errors.DivergedBranches:
99
101
response = question_dialog(_i18n('Branches have been diverged'),
100
102
_i18n('You cannot push if branches have diverged.\nOverwrite?'))
101
if response == gtk.RESPONSE_YES:
103
if response == Gtk.ResponseType.YES:
102
104
revs = do_push(self.branch, location=location, overwrite=True)
104
106
if self.branch is not None and self.branch.get_push_location() is None:
105
107
self.branch.set_push_location(location)
107
109
self._history.add_entry(location)
108
110
info_dialog(_i18n('Push successful'),
109
111
_i18n("%d revision(s) pushed.") % revs)
111
self.response(gtk.RESPONSE_OK)
113
self.response(Gtk.ResponseType.OK)
113
116
def do_push(br_from, location, overwrite):
114
""" Update a mirror of a branch.
117
"""Update a mirror of a branch.
116
119
:param br_from: the source branch
118
120
:param location: the location of the branch that you'd like to update
120
121
:param overwrite: overwrite target location if it diverged
122
122
:return: number of revisions pushed
124
124
from bzrlib.bzrdir import BzrDir
125
125
from bzrlib.transport import get_transport
127
127
transport = get_transport(location)
128
128
location_url = transport.base
added
removed
push.py
