/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: Javier Derderian
  • Date: 2008-04-11 20:34:06 UTC
  • mto: (465.1.1 gtk.patch)
  • mto: This revision was merged to the branch mainline in revision 466.
  • Revision ID: javierder@gmail.com-20080411203406-ftlwyodw9vr87olv
Updated "Compare with..." (#78765) to use revbrowser.RevisionBrowser.
Also needed to fix #215872 to make it work.

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
import gtk.glade
 
27
 
 
28
from bzrlib.branch import Branch
 
29
import bzrlib.errors as errors
 
30
 
 
31
from dialog import error_dialog, info_dialog, warning_dialog
 
32
from errors import show_bzr_error
 
33
from olive.guifiles import GLADEFILENAME
 
34
 
 
35
 
 
36
class MergeDialog:
 
37
    """ Display the Merge dialog and perform the needed actions. """
 
38
    def __init__(self, wt, wtpath,default_branch_path=None):
 
39
        """ Initialize the Merge dialog. """
 
40
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_merge', 'olive-gtk')
 
41
        
 
42
        self.window = self.glade.get_widget('window_merge')
 
43
        
 
44
        # Dictionary for signal_autoconnect
 
45
        dic = { "on_button_merge_merge_clicked": self.merge,
 
46
                "on_button_merge_cancel_clicked": self.close,
 
47
                "on_button_merge_open_clicked": self.open }
 
48
        
 
49
        # Connect the signals to the handlers
 
50
        self.glade.signal_autoconnect(dic)
 
51
 
 
52
        self.wt = wt
 
53
        self.wtpath = wtpath
 
54
        
 
55
        # Get some widgets
 
56
        self.entry = self.glade.get_widget('entry_merge')
 
57
        if default_branch_path:
 
58
            self.entry.set_text(default_branch_path)
 
59
 
 
60
    def display(self):
 
61
        """ Display the Add file(s) dialog. """
 
62
        self.window.show_all()
 
63
 
 
64
    @show_bzr_error
 
65
    def merge(self, widget):
 
66
        branch = self.entry.get_text()
 
67
        if branch == "":
 
68
            error_dialog(_('Branch not given'),
 
69
                         _('Please specify a branch to merge from.'))
 
70
            return
 
71
 
 
72
        other_branch = Branch.open_containing(branch)[0]
 
73
 
 
74
        try:
 
75
            conflicts = self.wt.merge_from_branch(other_branch)
 
76
        except errors.BzrCommandError, errmsg:
 
77
            error_dialog(_('Bazaar command error'), str(errmsg))
 
78
            return
 
79
        
 
80
        self.close()
 
81
        if conflicts == 0:
 
82
            # No conflicts found.
 
83
            info_dialog(_('Merge successful'),
 
84
                        _('All changes applied successfully.'))
 
85
        else:
 
86
            # There are conflicts to be resolved.
 
87
            warning_dialog(_('Conflicts encountered'),
 
88
                           _('Please resolve the conflicts manually before committing.'))
 
89
    
 
90
    def open(self, widget):
 
91
        fcd = gtk.FileChooserDialog(title="Please select a folder",
 
92
                                    parent=self.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
        fcd.set_default_response(gtk.RESPONSE_OK)
 
97
        
 
98
        if fcd.run() == gtk.RESPONSE_OK:
 
99
            self.entry.set_text(fcd.get_filename())
 
100
        
 
101
        fcd.destroy()
 
102
        
 
103
    def close(self, widget=None):
 
104
        self.window.destroy()