/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

Add options to viz treeview to not show the line graph, and to only show the main line.
Set the revision browser to use these options.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
27
27
 
28
28
from bzrlib.branch import Branch
29
29
import bzrlib.errors as errors
30
 
from bzrlib.plugins.gtk import _i18n
31
30
 
32
31
from dialog import error_dialog, info_dialog, warning_dialog
33
32
from errors import show_bzr_error
66
65
    def merge(self, widget):
67
66
        branch = self.entry.get_text()
68
67
        if branch == "":
69
 
            error_dialog(_i18n('Branch not given'),
70
 
                         _i18n('Please specify a branch to merge from.'))
 
68
            error_dialog(_('Branch not given'),
 
69
                         _('Please specify a branch to merge from.'))
71
70
            return
72
71
 
73
72
        other_branch = Branch.open_containing(branch)[0]
75
74
        try:
76
75
            conflicts = self.wt.merge_from_branch(other_branch)
77
76
        except errors.BzrCommandError, errmsg:
78
 
            error_dialog(_i18n('Bazaar command error'), str(errmsg))
 
77
            error_dialog(_('Bazaar command error'), str(errmsg))
79
78
            return
80
79
        
81
80
        self.close()
82
81
        if conflicts == 0:
83
82
            # No conflicts found.
84
 
            info_dialog(_i18n('Merge successful'),
85
 
                        _i18n('All changes applied successfully.'))
 
83
            info_dialog(_('Merge successful'),
 
84
                        _('All changes applied successfully.'))
86
85
        else:
87
86
            # There are conflicts to be resolved.
88
 
            warning_dialog(_i18n('Conflicts encountered'),
89
 
                           _i18n('Please resolve the conflicts manually before committing.'))
 
87
            warning_dialog(_('Conflicts encountered'),
 
88
                           _('Please resolve the conflicts manually before committing.'))
90
89
    
91
90
    def open(self, widget):
92
91
        fcd = gtk.FileChooserDialog(title="Please select a folder",