1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os
try:
import pygtk
pygtk.require("2.0")
except:
pass
import gtk
from bzrlib.branch import Branch
import bzrlib.errors as errors
from bzrlib.plugins.gtk import _i18n
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
from bzrlib.plugins.gtk.errors import show_bzr_error
class MergeDialog(gtk.Dialog):
""" Display the Merge dialog and perform the needed actions. """
def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
""" Initialize the Merge dialog. """
gtk.Dialog.__init__(self, title="Olive - Merge",
parent=parent,
flags=0,
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
# Get arguments
self.wt = wt
self.wtpath = wtpath
if default_branch_path and os.path.isdir(default_branch_path.partition('file://')[2]):
directory = default_branch_path.partition('file://')[2]
else:
directory = os.path.dirname(self.wt.abspath(self.wtpath))
# Create widgets
self._hbox = gtk.HBox()
self._label_merge_from = gtk.Label(_i18n("Merge from"))
self._filechooser_dialog = gtk.FileChooserDialog(title="Please select a folder",
parent=self.window,
action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
gtk.STOCK_OPEN, gtk.RESPONSE_OK))
self._filechooser_dialog.set_default_response(gtk.RESPONSE_OK)
self._filechooser = gtk.FileChooserButton(self._filechooser_dialog)
self._button_merge = gtk.Button(_i18n("_Merge"))
self._button_merge_icon = gtk.Image()
self._button_merge_icon.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
self._button_merge.set_image(self._button_merge_icon)
self._button_merge.connect('clicked', self._on_merge_clicked)
# Set location
self._filechooser_dialog.set_current_folder(directory)
# Add widgets to dialog
self.vbox.add(self._hbox)
self._hbox.add(self._label_merge_from)
self._hbox.add(self._filechooser)
self._hbox.set_spacing(5)
self.action_area.pack_end(self._button_merge)
self.vbox.show_all()
@show_bzr_error
def _on_merge_clicked(self, widget):
branch = self._filechooser.get_filename()
if branch == "":
error_dialog(_i18n('Branch not given'),
_i18n('Please specify a branch to merge from.'))
return
other_branch = Branch.open_containing(branch)[0]
try:
conflicts = self.wt.merge_from_branch(other_branch)
except errors.BzrCommandError, errmsg:
error_dialog(_i18n('Bazaar command error'), str(errmsg))
return
if conflicts == 0:
# No conflicts found.
info_dialog(_i18n('Merge successful'),
_i18n('All changes applied successfully.'))
else:
# There are conflicts to be resolved.
warning_dialog(_i18n('Conflicts encountered'),
_i18n('Please resolve the conflicts manually before committing.'))
self.response(gtk.RESPONSE_OK)
|