20
20
pygtk.require("2.0")
26
26
from errors import show_bzr_error
28
# FIXME: This needs to be public JRV 20070714
29
from bzrlib.builtins import _create_prefix
30
from bzrlib.config import LocationConfig
31
28
import bzrlib.errors as errors
33
from bzrlib.plugins.gtk import _i18n
34
from dialog import error_dialog, info_dialog, question_dialog
36
from history import UrlHistory
30
from bzrlib.plugins.gtk.dialog import (
35
from bzrlib.plugins.gtk.history import UrlHistory
36
from bzrlib.plugins.gtk.i18n import _i18n
38
39
class PushDialog(gtk.Dialog):
39
""" New implementation of the Push dialog. """
40
"""New implementation of the Push dialog."""
40
42
def __init__(self, repository, revid, branch=None, parent=None):
41
""" Initialize the Push dialog. """
42
gtk.Dialog.__init__(self, title="Push - Olive",
43
"""Initialize the Push dialog. """
44
gtk.Dialog.__init__(self, title="Push",
45
47
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
48
50
self.repository = repository
50
52
self.branch = branch
52
54
# Create the widgets
53
55
self._label_location = gtk.Label(_i18n("Location:"))
54
56
self._combo = gtk.ComboBoxEntry()
55
57
self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
56
58
self._hbox_location = gtk.HBox()
59
61
self._button_push.connect('clicked', self._on_push_clicked)
62
64
self._label_location.set_alignment(0, 0.5)
63
65
self._hbox_location.set_spacing(3)
64
66
self.vbox.set_spacing(3)
67
69
self._hbox_location.pack_start(self._label_location, False, False)
68
70
self._hbox_location.pack_start(self._combo, True, True)
69
71
self.vbox.pack_start(self._hbox_location)
70
72
self.action_area.pack_end(self._button_push)
73
75
self.vbox.show_all()
75
77
# Build location history
76
78
self._history = UrlHistory(self.branch.get_config(), 'push_history')
77
79
self._build_history()
79
81
def _build_history(self):
80
""" Build up the location history. """
82
"""Build up the location history. """
81
83
self._combo_model = gtk.ListStore(str)
82
84
for item in self._history.get_entries():
83
85
self._combo_model.append([ item ])
84
86
self._combo.set_model(self._combo_model)
85
87
self._combo.set_text_column(0)
87
89
if self.branch is not None:
88
90
location = self.branch.get_push_location()
89
91
if location is not None:
90
92
self._combo.get_child().set_text(location)
93
95
def _on_push_clicked(self, widget):
94
""" Push button clicked handler. """
96
"""Push button clicked handler. """
95
97
location = self._combo.get_child().get_text()
97
if self.branch is not None and self.branch.get_push_location() is None:
98
response = question_dialog(_i18n('Set default push location'),
99
_i18n('There is no default push location set.\nSet %r as default now?') % location)
100
if response == gtk.RESPONSE_OK:
101
self.branch.set_push_location(location)
104
101
revs = do_push(self.branch, location=location, overwrite=False)
107
104
_i18n('You cannot push if branches have diverged.\nOverwrite?'))
108
105
if response == gtk.RESPONSE_YES:
109
106
revs = do_push(self.branch, location=location, overwrite=True)
108
if self.branch is not None and self.branch.get_push_location() is None:
109
self.branch.set_push_location(location)
111
111
self._history.add_entry(location)
112
112
info_dialog(_i18n('Push successful'),
113
113
_i18n("%d revision(s) pushed.") % revs)
115
115
self.response(gtk.RESPONSE_OK)
117
118
def do_push(br_from, location, overwrite):
118
""" Update a mirror of a branch.
119
"""Update a mirror of a branch.
120
121
:param br_from: the source branch
122
122
:param location: the location of the branch that you'd like to update
124
123
:param overwrite: overwrite target location if it diverged
126
124
:return: number of revisions pushed
128
126
from bzrlib.bzrdir import BzrDir
129
127
from bzrlib.transport import get_transport
131
129
transport = get_transport(location)
132
130
location_url = transport.base
added
removed
push.py
