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