/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

List pull and merge in nautilus-bzr.

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