19
from gi.repository import Gtk
28
21
from bzrlib.branch import Branch
29
22
import bzrlib.errors as errors
31
from dialog import error_dialog, info_dialog, warning_dialog
32
from guifiles import GLADEFILENAME
24
from bzrlib.plugins.gtk import icon_path
25
from bzrlib.plugins.gtk.dialog import (
30
from bzrlib.plugins.gtk.errors import show_bzr_error
31
from bzrlib.plugins.gtk.i18n import _i18n
34
class MergeDialog(Gtk.Dialog):
36
35
""" Display the Merge dialog and perform the needed actions. """
37
def __init__(self, wt, wtpath):
37
def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
38
38
""" Initialize the Merge dialog. """
39
self.glade = gtk.glade.XML(GLADEFILENAME, 'window_merge', 'olive-gtk')
41
self.window = self.glade.get_widget('window_merge')
43
# Dictionary for signal_autoconnect
44
dic = { "on_button_merge_merge_clicked": self.merge,
45
"on_button_merge_cancel_clicked": self.close,
46
"on_button_merge_open_clicked": self.open }
48
# Connect the signals to the handlers
49
self.glade.signal_autoconnect(dic)
39
super(MergeDialog, self).__init__(
40
title="Merge changes", parent=parent, flags=0,
41
buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
42
self.set_icon_from_file(icon_path("bzr-icon-64.png"))
52
45
self.wtpath = wtpath
55
self.entry = self.glade.get_widget('entry_merge')
58
""" Display the Add file(s) dialog. """
59
self.window.show_all()
61
def merge(self, widget):
62
branch = self.entry.get_text()
46
self.default_branch_path = default_branch_path
47
self.parent_window = parent
50
self._hbox = Gtk.HBox()
51
self._source = Gtk.HBox()
52
self._label_merge_from = Gtk.Label(label=_i18n("Merge from"))
53
self._combo_source = Gtk.ComboBoxText()
54
for entry in [_i18n("Folder"),_i18n("Custom Location")]:
55
self._combo_source.append_text(entry)
56
self._combo_source.connect("changed", self._on_combo_changed)
57
self._button_merge = Gtk.Button(_i18n("_Merge"), use_underline=True)
58
self._button_merge_icon = Gtk.Image()
59
self._button_merge_icon.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.BUTTON)
60
self._button_merge.set_image(self._button_merge_icon)
61
self._button_merge.connect('clicked', self._on_merge_clicked)
63
# Add widgets to dialog
64
self.get_content_area().pack_start(self._hbox, False, False, 0)
65
self._hbox.add(self._label_merge_from)
66
self._hbox.add(self._combo_source)
67
self._hbox.set_spacing(5)
68
self.action_area.pack_end(self._button_merge, False, False, 0)
70
if self.default_branch_path and os.path.isdir(
71
self.default_branch_path.partition('file://')[2]):
72
self.directory = self.default_branch_path.partition('file://')[2]
73
self._combo_source.set_active(0)
74
elif self.default_branch_path:
75
self._combo_source.set_active(1)
77
# If no default_branch_path give, default to folder source with current folder
78
self._combo_source.set_active(0)
79
self.get_content_area().show_all()
81
def _on_folder_source(self):
82
""" Merge from folder, create a filechooser dialog and button """
83
self._source = Gtk.HBox()
84
self._filechooser_dialog = Gtk.FileChooserDialog(title="Please select a folder",
85
parent=self.parent_window,
86
action=Gtk.FileChooserAction.SELECT_FOLDER,
87
buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
88
Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
89
self._filechooser_dialog.set_default_response(Gtk.ResponseType.OK)
90
self._filechooser = Gtk.FileChooserButton(self._filechooser_dialog)
91
self._filechooser.show()
92
directory = getattr(self, 'directory', None)
94
directory = os.path.dirname(self.wt.abspath(self.wtpath))
95
self._filechooser_dialog.set_current_folder(directory)
96
self._source.pack_start(self._filechooser, True, True, 0)
97
self.get_content_area().pack_start(self._source, True, True, 5)
100
def _on_custom_source(self):
101
""" Merge from a custom source (can be folder, remote, etc), create entry """
102
self._source = Gtk.HBox()
103
self._custom_entry = Gtk.Entry()
104
if self.default_branch_path:
105
self._custom_entry.set_text(self.default_branch_path)
106
self._custom_entry.connect("activate", self._on_merge_clicked)
107
self._custom_entry.show()
108
self._source.pack_start(self._custom_entry, True, True, 0)
109
self.get_content_area().pack_start(self._source, True, True, 5)
112
def _on_combo_changed(self, widget):
113
merge_source = self._combo_source.get_active()
114
self._source.destroy()
115
if merge_source == 0:
117
self._on_folder_source()
118
elif merge_source == 1:
120
self._on_custom_source()
123
def _on_merge_clicked(self, widget):
124
merge_source = self._combo_source.get_active()
125
if merge_source == 0:
126
branch = self._filechooser.get_filename()
127
elif merge_source == 1:
128
branch = self._custom_entry.get_text()
64
error_dialog(_('Branch not given'),
65
_('Please specify a branch to merge from.'))
69
other_branch = Branch.open_containing(branch)[0]
70
except errors.NotBranchError:
71
error_dialog(_('Specified location not a branch'),
72
_('Please specify a branch you want to merge from.'))
130
error_dialog(_i18n('Branch not given'),
131
_i18n('Please specify a branch to merge from.'))
134
other_branch = Branch.open_containing(branch)[0]
76
137
conflicts = self.wt.merge_from_branch(other_branch)
77
138
except errors.BzrCommandError, errmsg:
78
error_dialog(_('Bazaar command error'), str(errmsg))
139
error_dialog(_i18n('Bazaar command error'), str(errmsg))
82
142
if conflicts == 0:
83
143
# No conflicts found.
84
info_dialog(_('Merge successful'),
85
_('All changes applied successfully.'))
144
info_dialog(_i18n('Merge successful'),
145
_i18n('All changes applied successfully.'))
87
147
# There are conflicts to be resolved.
88
warning_dialog(_('Conflicts encountered'),
89
_('Please resolve the conflicts manually before committing.'))
91
def open(self, widget):
92
fcd = gtk.FileChooserDialog(title="Please select a folder",
94
action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
95
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
96
gtk.STOCK_OPEN, gtk.RESPONSE_OK))
97
fcd.set_default_response(gtk.RESPONSE_OK)
99
if fcd.run() == gtk.RESPONSE_OK:
100
self.entry.set_text(fcd.get_filename())
104
def close(self, widget=None):
105
self.window.destroy()
148
warning_dialog(_i18n('Conflicts encountered'),
149
_i18n('Please resolve the conflicts manually before committing.'))
151
self.response(Gtk.ResponseType.OK)
added
removed
merge.py
