/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
93 by Szilveszter Farkas (Phanatic)
Began to implement Merge dialog.
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
import os
18
19
try:
20
    import pygtk
21
    pygtk.require("2.0")
22
except:
23
    pass
24
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
25
from gi.repository import Gtk
93 by Szilveszter Farkas (Phanatic)
Began to implement Merge dialog.
26
98 by Szilveszter Farkas (Phanatic)
Implemented basic Merge functionality.
27
from bzrlib.branch import Branch
93 by Szilveszter Farkas (Phanatic)
Began to implement Merge dialog.
28
import bzrlib.errors as errors
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
29
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
30
from bzrlib.plugins.gtk import icon_path
724 by Jelmer Vernooij
Fix formatting, imports.
31
from bzrlib.plugins.gtk.dialog import (
32
    error_dialog,
33
    info_dialog,
34
    warning_dialog,
35
    )
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
36
from bzrlib.plugins.gtk.errors import show_bzr_error
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
37
from bzrlib.plugins.gtk.i18n import _i18n
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
38
39
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
40
class MergeDialog(Gtk.Dialog):
93 by Szilveszter Farkas (Phanatic)
Began to implement Merge dialog.
41
    """ Display the Merge dialog and perform the needed actions. """
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
42
    
43
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
93 by Szilveszter Farkas (Phanatic)
Began to implement Merge dialog.
44
        """ Initialize the Merge dialog. """
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
45
        GObject.GObject.__init__(self, title="Merge changes",
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
46
                                  parent=parent,
47
                                  flags=0,
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
48
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
576.3.2 by Jasper Groenewegen
Add PointlessMerge error
49
        self.set_icon_from_file(icon_path("bzr-icon-64.png"))
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
50
        # Get arguments
93 by Szilveszter Farkas (Phanatic)
Began to implement Merge dialog.
51
        self.wt = wt
52
        self.wtpath = wtpath
576.3.1 by Jasper Groenewegen
Merge dialog: Add ability to choose between folder and custom location as merge source
53
        self.default_branch_path = default_branch_path
54
        self.parent_window = parent
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
55
        
56
        # Create widgets
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
57
        self._hbox = Gtk.HBox()
58
        self._source = Gtk.HBox()
59
        self._label_merge_from = Gtk.Label(label=_i18n("Merge from"))
60
        self._combo_source = Gtk.ComboBoxText()
576.3.1 by Jasper Groenewegen
Merge dialog: Add ability to choose between folder and custom location as merge source
61
        for entry in [_i18n("Folder"),_i18n("Custom Location")]:
62
            self._combo_source.append_text(entry)
63
        self._combo_source.connect("changed", self._on_combo_changed)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
64
        self._button_merge = Gtk.Button(_i18n("_Merge"))
65
        self._button_merge_icon = Gtk.Image()
66
        self._button_merge_icon.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.BUTTON)
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
67
        self._button_merge.set_image(self._button_merge_icon)
68
        self._button_merge.connect('clicked', self._on_merge_clicked)
69
        
70
        # Add widgets to dialog
576.3.1 by Jasper Groenewegen
Merge dialog: Add ability to choose between folder and custom location as merge source
71
        self.vbox.pack_start(self._hbox, False, False, 0)
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
72
        self._hbox.add(self._label_merge_from)
576.3.1 by Jasper Groenewegen
Merge dialog: Add ability to choose between folder and custom location as merge source
73
        self._hbox.add(self._combo_source)
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
74
        self._hbox.set_spacing(5)
75
        self.action_area.pack_end(self._button_merge)
76
        
576.3.2 by Jasper Groenewegen
Add PointlessMerge error
77
        if self.default_branch_path and os.path.isdir(
78
                            self.default_branch_path.partition('file://')[2]):
576.3.1 by Jasper Groenewegen
Merge dialog: Add ability to choose between folder and custom location as merge source
79
            self.directory = self.default_branch_path.partition('file://')[2]
80
            self._combo_source.set_active(0)
576.3.2 by Jasper Groenewegen
Add PointlessMerge error
81
        elif self.default_branch_path:
82
            self._combo_source.set_active(1)
576.3.1 by Jasper Groenewegen
Merge dialog: Add ability to choose between folder and custom location as merge source
83
        else:
576.3.2 by Jasper Groenewegen
Add PointlessMerge error
84
            # If no default_branch_path give, default to folder source with current folder
85
            self._combo_source.set_active(0)
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
86
        self.vbox.show_all()
576.3.1 by Jasper Groenewegen
Merge dialog: Add ability to choose between folder and custom location as merge source
87
    
88
    def _on_folder_source(self):
89
        """ Merge from folder, create a filechooser dialog and button """
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
90
        self._source = Gtk.HBox()
91
        self._filechooser_dialog = Gtk.FileChooserDialog(title="Please select a folder",
576.3.1 by Jasper Groenewegen
Merge dialog: Add ability to choose between folder and custom location as merge source
92
                                    parent=self.parent_window,
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
93
                                    action=Gtk.FileChooserAction.SELECT_FOLDER,
94
                                    buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
95
                                             Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
96
        self._filechooser_dialog.set_default_response(Gtk.ResponseType.OK)
97
        self._filechooser = Gtk.FileChooserButton(self._filechooser_dialog)
576.3.1 by Jasper Groenewegen
Merge dialog: Add ability to choose between folder and custom location as merge source
98
        self._filechooser.show()
99
        directory = getattr(self, 'directory', None)
100
        if not directory:
101
            directory = os.path.dirname(self.wt.abspath(self.wtpath))
102
        self._filechooser_dialog.set_current_folder(directory)
103
        self._source.pack_start(self._filechooser, True, True, 0)
104
        self.vbox.pack_start(self._source, True, True, 5)
105
        self._source.show()
106
    
107
    def _on_custom_source(self):
108
        """ Merge from a custom source (can be folder, remote, etc), create entry """
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
109
        self._source = Gtk.HBox()
110
        self._custom_entry = Gtk.Entry()
576.3.2 by Jasper Groenewegen
Add PointlessMerge error
111
        if self.default_branch_path:
112
            self._custom_entry.set_text(self.default_branch_path)
113
        self._custom_entry.connect("activate", self._on_merge_clicked)
576.3.1 by Jasper Groenewegen
Merge dialog: Add ability to choose between folder and custom location as merge source
114
        self._custom_entry.show()
115
        self._source.pack_start(self._custom_entry, True, True, 0)
116
        self.vbox.pack_start(self._source, True, True, 5)
117
        self._source.show()
118
    
119
    def _on_combo_changed(self, widget):
120
        merge_source = self._combo_source.get_active()
121
        self._source.destroy()
122
        if merge_source == 0:
123
            # Merge from folder
124
            self._on_folder_source()
125
        elif merge_source == 1:
126
            # Merge from custom
127
            self._on_custom_source()
128
    
132 by Jelmer Vernooij
Use decorator for catching and showing bzr-gtk errors graphically. Eventually, this should go away and should be handled by the ui factory.
129
    @show_bzr_error
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
130
    def _on_merge_clicked(self, widget):
576.3.1 by Jasper Groenewegen
Merge dialog: Add ability to choose between folder and custom location as merge source
131
        merge_source = self._combo_source.get_active()
132
        if merge_source == 0:
133
            branch = self._filechooser.get_filename()
134
        elif merge_source == 1:
135
            branch = self._custom_entry.get_text()
98 by Szilveszter Farkas (Phanatic)
Implemented basic Merge functionality.
136
        if branch == "":
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
137
            error_dialog(_i18n('Branch not given'),
138
                         _i18n('Please specify a branch to merge from.'))
98 by Szilveszter Farkas (Phanatic)
Implemented basic Merge functionality.
139
            return
140
132 by Jelmer Vernooij
Use decorator for catching and showing bzr-gtk errors graphically. Eventually, this should go away and should be handled by the ui factory.
141
        other_branch = Branch.open_containing(branch)[0]
142
98 by Szilveszter Farkas (Phanatic)
Implemented basic Merge functionality.
143
        try:
144
            conflicts = self.wt.merge_from_branch(other_branch)
145
        except errors.BzrCommandError, errmsg:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
146
            error_dialog(_i18n('Bazaar command error'), str(errmsg))
98 by Szilveszter Farkas (Phanatic)
Implemented basic Merge functionality.
147
            return
148
        
149
        if conflicts == 0:
150
            # No conflicts found.
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
151
            info_dialog(_i18n('Merge successful'),
152
                        _i18n('All changes applied successfully.'))
98 by Szilveszter Farkas (Phanatic)
Implemented basic Merge functionality.
153
        else:
154
            # There are conflicts to be resolved.
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
155
            warning_dialog(_i18n('Conflicts encountered'),
156
                           _i18n('Please resolve the conflicts manually before committing.'))
533.1.1 by Jasper Groenewegen
Replace MergeDialog with glade-less version.
157
        
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
158
        self.response(Gtk.ResponseType.OK)