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
19
from StringIO import StringIO
21
from gi.repository import (
26
25
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
38
class PushDialog(gtk.Dialog):
39
""" New implementation of the Push dialog. """
29
from bzrlib.push import _show_push_branch
30
from bzrlib.plugins.gtk.history import UrlHistory
31
from bzrlib.plugins.gtk.i18n import _i18n
32
from bzrlib.plugins.gtk.ui import (
37
class PushDialog(Gtk.Dialog):
38
"""New implementation of the Push dialog."""
40
40
def __init__(self, repository, revid, branch=None, parent=None):
41
""" Initialize the Push dialog. """
42
gtk.Dialog.__init__(self, title="Push - Olive",
45
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
41
"""Initialize the Push dialog. """
42
super(PushDialog, self).__init__(
43
title="Push", parent=parent, flags=0,
44
buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE))
48
47
self.repository = repository
50
49
self.branch = branch
52
51
# Create the widgets
53
self._label_location = gtk.Label(_i18n("Location:"))
54
self._combo = gtk.ComboBoxEntry()
55
self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
56
self._hbox_location = gtk.HBox()
52
self._label_location = Gtk.Label(label=_i18n("Location:"))
53
self._combo = Gtk.ComboBox.new_with_entry()
54
self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
55
self._hbox_location = Gtk.HBox()
58
self.connect('close', self._on_close_clicked)
59
59
self._button_push.connect('clicked', self._on_push_clicked)
62
62
self._label_location.set_alignment(0, 0.5)
63
63
self._hbox_location.set_spacing(3)
64
self.vbox.set_spacing(3)
64
self.get_content_area().set_spacing(3)
67
self._hbox_location.pack_start(self._label_location, False, False)
68
self._hbox_location.pack_start(self._combo, True, True)
69
self.vbox.pack_start(self._hbox_location)
70
self.action_area.pack_end(self._button_push)
67
self._hbox_location.pack_start(
68
self._label_location, False, False, 0)
69
self._hbox_location.pack_start(self._combo, False, False, 0)
70
self.get_content_area().pack_start(
71
self._hbox_location, False, False, 0)
72
self.get_action_area().pack_end(self._button_push, True, True, 0)
75
self.progress_widget = ProgressPanel()
76
ui.ui_factory.set_progress_bar_widget(self.progress_widget)
77
self.get_content_area().pack_start(
78
self.progress_widget, False, False, 0)
79
self.push_message = Gtk.Label()
80
alignment = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
81
alignment.add(self.push_message)
82
self.get_content_area().pack_start(alignment, False, False, 0)
85
self.get_content_area().show_all()
86
self.progress_widget.hide()
75
88
# Build location history
76
89
self._history = UrlHistory(self.branch.get_config(), 'push_history')
77
90
self._build_history()
79
92
def _build_history(self):
80
""" Build up the location history. """
81
self._combo_model = gtk.ListStore(str)
93
"""Build up the location history. """
94
self._combo_model = Gtk.ListStore(str)
82
95
for item in self._history.get_entries():
83
self._combo_model.append([ item ])
96
self._combo_model.append([item])
84
97
self._combo.set_model(self._combo_model)
85
self._combo.set_text_column(0)
98
self._combo.set_entry_text_column(0)
87
100
if self.branch is not None:
88
101
location = self.branch.get_push_location()
89
102
if location is not None:
90
103
self._combo.get_child().set_text(location)
105
def _on_close_clicked(self, widget):
106
"""Close dialog handler."""
107
ui.ui_factory.set_progress_bar_widget(None)
93
109
def _on_push_clicked(self, widget):
94
""" Push button clicked handler. """
110
"""Push button clicked handler. """
111
self.push_message.hide()
112
self.progress_widget.tick()
95
113
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)
114
do_push(self.branch, location, False, self.on_push_complete)
104
revs = do_push(self.branch, location=location, overwrite=False)
105
except errors.DivergedBranches:
106
response = question_dialog(_i18n('Branches have been diverged'),
107
_i18n('You cannot push if branches have diverged.\nOverwrite?'))
108
if response == gtk.RESPONSE_YES:
109
revs = do_push(self.branch, location=location, overwrite=True)
116
def on_push_complete(self, location, message):
111
117
self._history.add_entry(location)
112
info_dialog(_i18n('Push successful'),
113
_i18n("%d revision(s) pushed.") % revs)
115
self.response(gtk.RESPONSE_OK)
117
def do_push(br_from, location, overwrite):
118
""" Update a mirror of a branch.
118
if (self.branch is not None
119
and self.branch.get_push_location() is None):
120
self.branch.set_push_location(location)
122
self.progress_widget.finished()
123
self.push_message.props.label = message
124
self.push_message.show()
128
class PushHandler(logging.Handler):
129
"""A logging handler to collect messages."""
132
logging.Handler.__init__(self, logging.INFO)
135
def handleError(self, record):
138
def emit(self, record):
139
self.messages.append(record.getMessage())
143
def do_push(br_from, location, overwrite, callback):
144
"""Update a mirror of a branch.
120
147
:param br_from: the source branch
122
148
:param location: the location of the branch that you'd like to update
124
149
:param overwrite: overwrite target location if it diverged
126
150
:return: number of revisions pushed
128
from bzrlib.bzrdir import BzrDir
129
from bzrlib.transport import get_transport
131
transport = get_transport(location)
132
location_url = transport.base
152
log = logging.getLogger('bzr')
153
old_propagate = log.propagate
154
message = 'Branch pushed'
155
handler = PushHandler()
137
dir_to = BzrDir.open(location_url)
138
br_to = dir_to.open_branch()
139
except errors.NotBranchError:
141
transport = transport.clone('..')
143
relurl = transport.relpath(location_url)
144
transport.mkdir(relurl)
145
except errors.NoSuchFile:
146
response = question_dialog(_i18n('Non existing parent directory'),
147
_i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
148
if response == gtk.RESPONSE_OK:
149
_create_prefix(transport)
152
dir_to = br_from.bzrdir.clone(location_url,
153
revision_id=br_from.last_revision())
154
br_to = dir_to.open_branch()
155
count = len(br_to.revision_history())
157
old_rh = br_to.revision_history()
159
tree_to = dir_to.open_workingtree()
160
except errors.NotLocalUrl:
161
# FIXME - what to do here? how should we warn the user?
162
count = br_to.pull(br_from, overwrite)
163
except errors.NoWorkingTree:
164
count = br_to.pull(br_from, overwrite)
166
count = tree_to.pull(br_from, overwrite)
158
log.addHandler(handler)
159
log.propagate = False
160
# Revid is None to imply tip.
161
# The call assumes text ui (file) to write to.
163
br_from, None, location, StringIO(), overwrite=overwrite)
164
message = '\n'.join(handler.messages)
165
except errors.BzrCommandError, error:
166
message = _i18n('Error: ') + str(error)
168
log.removeHandler(handler)
169
log.propagate = old_propagate
170
callback(location, message)
added
removed
push.py
