def _create(self):
table = gtk.Table(rows=3, columns=2)
self.vbox.add(table)
label = gtk.Label()
label.set_markup("<b>Branch to Submit:</b>")
table.attach(label, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
label = gtk.Label(str(self.branch))
table.attach(label, 1, 2, 0, 1, gtk.FILL, gtk.FILL)
label = gtk.Label()
label.set_markup("<b>Target Branch:</b>")
table.attach(label, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
self.submit_branch = BranchSelectionBox(self.branch.get_submit_branch())
table.attach(self.submit_branch, 1, 2, 1, 2, gtk.FILL, gtk.FILL)
# TODO: Display number of revisions to be send whenever
# submit branch changes
label = gtk.Label()
label.set_markup("<b>Email To:</b>")
table.attach(label, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
self.mail_to = gtk.ComboBoxEntry()
mail_to = self.branch.get_config().get_user_option('submit_to')
if mail_to is None:
submit_branch = self.submit_branch.get_branch()
if submit_branch is not None:
mail_to = submit_branch.get_config().get_user_option(
'child_submit_to')
if mail_to is not None:
self.mail_to.get_child().set_text(mail_to)
table.attach(self.mail_to, 1, 2, 2, 3, gtk.FILL, gtk.FILL)
self.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
gtk.STOCK_OK, gtk.RESPONSE_OK)
self.show_all()
def _create(self):
table = Gtk.Table(rows=3, columns=2)
self.get_content_area().add(table)
label = Gtk.Label()
label.set_markup("<b>Branch to Submit:</b>")
table.attach(label, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
label = Gtk.Label(label=str(self.branch))
table.attach(label, 1, 2, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
label = Gtk.Label()
label.set_markup("<b>Target Branch:</b>")
table.attach(label, 0, 1, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
self.submit_branch = BranchSelectionBox(self.branch.get_submit_branch())
table.attach(self.submit_branch, 1, 2, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
# TODO: Display number of revisions to be sent whenever
# submit branch changes
label = Gtk.Label()
label.set_markup("<b>Email To:</b>")
table.attach(label, 0, 1, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
self.mail_to = Gtk.ComboBox.new_with_entry()
mail_to = self.branch.get_config().get_user_option("submit_to")
if mail_to is None:
submit_branch = self.submit_branch.get_branch()
if submit_branch is not None:
mail_to = submit_branch.get_config().get_user_option("child_submit_to")
if mail_to is not None:
self.mail_to.get_child().set_text(mail_to)
table.attach(self.mail_to, 1, 2, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
self.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OK, Gtk.ResponseType.OK)
self.show_all()
class SendMergeDirectiveDialog(Gtk.Dialog):
def __init__(self, branch, parent=None):
super(SendMergeDirectiveDialog, self).__init__(parent)
self.branch = branch
self.set_title("Send Merge Directive")
self._create()
def _create(self):
table = Gtk.Table(rows=3, columns=2)
self.get_content_area().add(table)
label = Gtk.Label()
label.set_markup("<b>Branch to Submit:</b>")
table.attach(label, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
label = Gtk.Label(label=str(self.branch))
table.attach(label, 1, 2, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
label = Gtk.Label()
label.set_markup("<b>Target Branch:</b>")
table.attach(label, 0, 1, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
self.submit_branch = BranchSelectionBox(self.branch.get_submit_branch())
table.attach(self.submit_branch, 1, 2, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
# TODO: Display number of revisions to be sent whenever
# submit branch changes
label = Gtk.Label()
label.set_markup("<b>Email To:</b>")
table.attach(label, 0, 1, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
self.mail_to = Gtk.ComboBox.new_with_entry()
mail_to = self.branch.get_config().get_user_option("submit_to")
if mail_to is None:
submit_branch = self.submit_branch.get_branch()
if submit_branch is not None:
mail_to = submit_branch.get_config().get_user_option("child_submit_to")
if mail_to is not None:
self.mail_to.get_child().set_text(mail_to)
table.attach(self.mail_to, 1, 2, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
self.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OK, Gtk.ResponseType.OK)
self.show_all()
def get_mail_to(self):
return self.mail_to.get_child().get_text()
def get_merge_directive(self):
from bzrlib.merge_directive import MergeDirective2
from bzrlib import osutils
import time
return MergeDirective2.from_objects(
self.branch.repository,
self.branch.last_revision(),
time.time(),
osutils.local_time_offset(),
self.submit_branch.get_url(),
public_branch=None,
include_patch=True,
include_bundle=True,
message=None,
base_revision_id=None,
)
def __init__(self, path=None, parent=None, remote_path=None):
""" Initialize the Branch dialog. """
super(BranchDialog, self).__init__(
title="Branch - Olive", parent=parent, flags=0,
buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
# Get arguments
self.path = path
# Create the widgets
self._button_branch = Gtk.Button(_i18n("_Branch"), use_underline=True)
self._remote_branch = BranchSelectionBox()
self._button_revision = Gtk.Button('')
self._label_location = Gtk.Label(label=_i18n("Branch location:"))
self._label_location.set_alignment(0, 0.5)
self._label_destination = Gtk.Label(label=_i18n("Destination:"))
self._label_nick = Gtk.Label(label=_i18n("Branck nick:"))
self._label_revision = Gtk.Label(label=_i18n("Revision:"))
self._filechooser = Gtk.FileChooserButton(_i18n("Please select a folder"))
self._filechooser.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
self._hbox_revision = Gtk.HBox()
self._entry_revision = Gtk.Entry()
self._entry_nick = Gtk.Entry()
# Set callbacks
self._button_branch.connect('clicked', self._on_branch_clicked)
self._button_revision.connect('clicked', self._on_revision_clicked)
self._remote_branch.connect('branch-changed', self._on_branch_changed)
# Create the table and pack the widgets into it
self._table = Gtk.Table(rows=3, columns=2)
self._table.attach(self._label_location, 0, 1, 0, 1)
self._table.attach(self._remote_branch, 1, 2, 0, 1)
self._table.attach(self._label_destination, 0, 1, 1, 2)
self._table.attach(self._label_nick, 0, 1, 2, 3)
self._table.attach(self._label_revision, 0, 1, 3, 4)
self._table.attach(self._filechooser, 1, 2, 1, 2)
self._table.attach(self._entry_nick, 1, 2, 2, 3)
self._table.attach(self._hbox_revision, 1, 2, 3, 4)
# Set properties
self._image_browse = Gtk.Image()
self._image_browse.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
self._button_revision.set_image(self._image_browse)
self._button_revision.set_sensitive(False)
self._label_destination.set_alignment(0, 0.5)
self._label_nick.set_alignment(0, 0.5)
self._label_revision.set_alignment(0, 0.5)
self._table.set_row_spacings(3)
self._table.set_col_spacings(3)
self.get_content_area().set_spacing(3)
if remote_path is not None:
self._remote_branch.set_url(remote_path)
if self.path is not None:
self._filechooser.set_filename(self.path)
# Pack some widgets
self._hbox_revision.pack_start(self._entry_revision, True, True, 0)
self._hbox_revision.pack_start(self._button_revision, False, False, 0)
self.get_content_area().add(self._table)
self.action_area.pack_end(self._button_branch, False, False, 0)
# Show the dialog
self.get_content_area().show_all()
class BranchDialog(Gtk.Dialog):
""" New implementation of the Branch dialog. """
def __init__(self, path=None, parent=None, remote_path=None):
""" Initialize the Branch dialog. """
super(BranchDialog, self).__init__(
title="Branch - Olive", parent=parent, flags=0,
buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
# Get arguments
self.path = path
# Create the widgets
self._button_branch = Gtk.Button(_i18n("_Branch"), use_underline=True)
self._remote_branch = BranchSelectionBox()
self._button_revision = Gtk.Button('')
self._label_location = Gtk.Label(label=_i18n("Branch location:"))
self._label_location.set_alignment(0, 0.5)
self._label_destination = Gtk.Label(label=_i18n("Destination:"))
self._label_nick = Gtk.Label(label=_i18n("Branck nick:"))
self._label_revision = Gtk.Label(label=_i18n("Revision:"))
self._filechooser = Gtk.FileChooserButton(_i18n("Please select a folder"))
self._filechooser.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
self._hbox_revision = Gtk.HBox()
self._entry_revision = Gtk.Entry()
self._entry_nick = Gtk.Entry()
# Set callbacks
self._button_branch.connect('clicked', self._on_branch_clicked)
self._button_revision.connect('clicked', self._on_revision_clicked)
self._remote_branch.connect('branch-changed', self._on_branch_changed)
# Create the table and pack the widgets into it
self._table = Gtk.Table(rows=3, columns=2)
self._table.attach(self._label_location, 0, 1, 0, 1)
self._table.attach(self._remote_branch, 1, 2, 0, 1)
self._table.attach(self._label_destination, 0, 1, 1, 2)
self._table.attach(self._label_nick, 0, 1, 2, 3)
self._table.attach(self._label_revision, 0, 1, 3, 4)
self._table.attach(self._filechooser, 1, 2, 1, 2)
self._table.attach(self._entry_nick, 1, 2, 2, 3)
self._table.attach(self._hbox_revision, 1, 2, 3, 4)
# Set properties
self._image_browse = Gtk.Image()
self._image_browse.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
self._button_revision.set_image(self._image_browse)
self._button_revision.set_sensitive(False)
self._label_destination.set_alignment(0, 0.5)
self._label_nick.set_alignment(0, 0.5)
self._label_revision.set_alignment(0, 0.5)
self._table.set_row_spacings(3)
self._table.set_col_spacings(3)
self.get_content_area().set_spacing(3)
if remote_path is not None:
self._remote_branch.set_url(remote_path)
if self.path is not None:
self._filechooser.set_filename(self.path)
# Pack some widgets
self._hbox_revision.pack_start(self._entry_revision, True, True, 0)
self._hbox_revision.pack_start(self._button_revision, False, False, 0)
self.get_content_area().add(self._table)
self.action_area.pack_end(self._button_branch, False, False, 0)
# Show the dialog
self.get_content_area().show_all()
def _get_last_revno(self):
""" Get the revno of the last revision (if any). """
try:
br = self._remote_branch.get_branch()
return br.revno()
except:
pass
def _on_revision_clicked(self, button):
""" Browse for revision button clicked handler. """
from revbrowser import RevisionBrowser
try:
br = self._remote_branch.get_branch()
except:
return
revb = RevisionBrowser(br, self)
response = revb.run()
if response != Gtk.ResponseType.NONE:
revb.hide()
if response == Gtk.ResponseType.OK:
if revb.selected_revno is not None:
self._entry_revision.set_text(revb.selected_revno)
revb.destroy()
@show_bzr_error
def _on_branch_clicked(self, button):
""" Branch button clicked handler. """
location = self._remote_branch.get_url()
if location is '':
error_dialog(_i18n('Missing branch location'),
_i18n('You must specify a branch location.'))
return
destination = self._filechooser.get_filename()
try:
revno = int(self._entry_revision.get_text())
except:
revno = None
nick = self._entry_nick.get_text()
if nick is '':
nick = os.path.basename(location.rstrip("/\\"))
br_from = Branch.open(location)
br_from.lock_read()
try:
revision_id = br_from.get_rev_id(revno)
basis_dir = None
to_location = destination + os.sep + nick
to_transport = get_transport(to_location)
to_transport.mkdir('.')
try:
# preserve whatever source format we have.
dir = br_from.bzrdir.sprout(to_transport.base,
revision_id,
basis_dir)
branch = dir.open_branch()
revs = branch.revno()
except errors.NoSuchRevision:
to_transport.delete_tree('.')
raise
finally:
br_from.unlock()
info_dialog(_i18n('Branching successful'),
_i18n('%d revision(s) branched.') % revs)
self.response(Gtk.ResponseType.OK)
def _on_branch_changed(self, widget, event):
""" We try to get the last revision if focus lost. """
rev = self._get_last_revno()
if rev is None:
self._entry_revision.set_text(_i18n('N/A'))
self._button_revision.set_sensitive(False)
else:
self._entry_revision.set_text(str(rev))
self._button_revision.set_sensitive(True)
if self._entry_nick.get_text() == '':
self._entry_nick.set_text(os.path.basename(self._remote_branch.get_url().rstrip("/\\")))