/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to merge.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-10 18:44:39 UTC
  • mto: This revision was merged to the branch mainline in revision 730.
  • Revision ID: jelmer@samba.org-20110410184439-g7hqaacexqtviq13
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
 
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
 
 
25
import gtk
 
26
 
 
27
from bzrlib.branch import Branch
 
28
import bzrlib.errors as errors
 
29
 
 
30
from bzrlib.plugins.gtk import icon_path
 
31
from bzrlib.plugins.gtk.dialog import (
 
32
    error_dialog,
 
33
    info_dialog,
 
34
    warning_dialog,
 
35
    )
 
36
from bzrlib.plugins.gtk.errors import show_bzr_error
 
37
from bzrlib.plugins.gtk.i18n import _i18n
 
38
 
 
39
 
 
40
class MergeDialog(gtk.Dialog):
 
41
    """ Display the Merge dialog and perform the needed actions. """
 
42
    
 
43
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
 
44
        """ Initialize the Merge dialog. """
 
45
        gtk.Dialog.__init__(self, title="Merge changes",
 
46
                                  parent=parent,
 
47
                                  flags=0,
 
48
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
49
        self.set_icon_from_file(icon_path("bzr-icon-64.png"))
 
50
        # Get arguments
 
51
        self.wt = wt
 
52
        self.wtpath = wtpath
 
53
        self.default_branch_path = default_branch_path
 
54
        self.parent_window = parent
 
55
        
 
56
        # Create widgets
 
57
        self._hbox = gtk.HBox()
 
58
        self._source = gtk.HBox()
 
59
        self._label_merge_from = gtk.Label(_i18n("Merge from"))
 
60
        self._combo_source = gtk.combo_box_new_text()
 
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)
 
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.ICON_SIZE_BUTTON)
 
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
 
71
        self.vbox.pack_start(self._hbox, False, False, 0)
 
72
        self._hbox.add(self._label_merge_from)
 
73
        self._hbox.add(self._combo_source)
 
74
        self._hbox.set_spacing(5)
 
75
        self.action_area.pack_end(self._button_merge)
 
76
        
 
77
        if self.default_branch_path and os.path.isdir(
 
78
                            self.default_branch_path.partition('file://')[2]):
 
79
            self.directory = self.default_branch_path.partition('file://')[2]
 
80
            self._combo_source.set_active(0)
 
81
        elif self.default_branch_path:
 
82
            self._combo_source.set_active(1)
 
83
        else:
 
84
            # If no default_branch_path give, default to folder source with current folder
 
85
            self._combo_source.set_active(0)
 
86
        self.vbox.show_all()
 
87
    
 
88
    def _on_folder_source(self):
 
89
        """ Merge from folder, create a filechooser dialog and button """
 
90
        self._source = gtk.HBox()
 
91
        self._filechooser_dialog = gtk.FileChooserDialog(title="Please select a folder",
 
92
                                    parent=self.parent_window,
 
93
                                    action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
 
94
                                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
 
95
                                             gtk.STOCK_OPEN, gtk.RESPONSE_OK))
 
96
        self._filechooser_dialog.set_default_response(gtk.RESPONSE_OK)
 
97
        self._filechooser = gtk.FileChooserButton(self._filechooser_dialog)
 
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 """
 
109
        self._source = gtk.HBox()
 
110
        self._custom_entry = gtk.Entry()
 
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)
 
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
    
 
129
    @show_bzr_error
 
130
    def _on_merge_clicked(self, widget):
 
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()
 
136
        if branch == "":
 
137
            error_dialog(_i18n('Branch not given'),
 
138
                         _i18n('Please specify a branch to merge from.'))
 
139
            return
 
140
 
 
141
        other_branch = Branch.open_containing(branch)[0]
 
142
 
 
143
        try:
 
144
            conflicts = self.wt.merge_from_branch(other_branch)
 
145
        except errors.BzrCommandError, errmsg:
 
146
            error_dialog(_i18n('Bazaar command error'), str(errmsg))
 
147
            return
 
148
        
 
149
        if conflicts == 0:
 
150
            # No conflicts found.
 
151
            info_dialog(_i18n('Merge successful'),
 
152
                        _i18n('All changes applied successfully.'))
 
153
        else:
 
154
            # There are conflicts to be resolved.
 
155
            warning_dialog(_i18n('Conflicts encountered'),
 
156
                           _i18n('Please resolve the conflicts manually before committing.'))
 
157
        
 
158
        self.response(gtk.RESPONSE_OK)