/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 olive/merge.py

merge with main branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/merge.py
25
25
import gtk
26
26
import gtk.glade
27
27
 
 
28
from bzrlib.branch import Branch
28
29
import bzrlib.errors as errors
29
30
 
30
31
from __init__ import gladefile
31
 
from dialog import error_dialog
 
32
from dialog import error_dialog, info_dialog, warning_dialog
32
33
 
33
34
class MergeDialog:
34
35
    """ Display the Merge dialog and perform the needed actions. """
48
49
 
49
50
        self.wt = wt
50
51
        self.wtpath = wtpath
 
52
        
 
53
        # Get some widgets
 
54
        self.entry = self.glade.get_widget('entry_merge')
51
55
 
52
56
    def display(self):
53
57
        """ Display the Add file(s) dialog. """
54
58
        self.window.show_all()
55
59
 
56
60
    def merge(self, widget):
57
 
        print "DEBUG: Merge button pressed."
 
61
        branch = self.entry.get_text()
 
62
        if branch == "":
 
63
            error_dialog(_('Branch not given'),
 
64
                         _('Please specify a branch to merge from.'))
 
65
            return
 
66
 
 
67
        try:
 
68
            other_branch = Branch.open_containing(branch)[0]
 
69
        except errors.NotBranchError:
 
70
            error_dialog(_('Specified location not a branch'),
 
71
                         _('Please specify a branch you want to merge from.'))
 
72
            return
 
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.'))
58
89
    
59
90
    def open(self, widget):
60
 
        print "DEBUG: Open branch button pressed."
61
 
    
 
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
        
62
103
    def close(self, widget=None):
63
104
        self.window.destroy()