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