/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: 2008-06-29 19:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629191834-ha2ecpv5szt96nge
Make sure signed testament matches repository data.

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
30
31
 
31
32
from dialog import error_dialog, info_dialog, warning_dialog
32
 
from guifiles import GLADEFILENAME
 
33
from errors import show_bzr_error
 
34
from olive.guifiles import GLADEFILENAME
33
35
 
34
36
 
35
37
class MergeDialog:
36
38
    """ Display the Merge dialog and perform the needed actions. """
37
 
    def __init__(self, wt, wtpath):
 
39
    def __init__(self, wt, wtpath,default_branch_path=None):
38
40
        """ Initialize the Merge dialog. """
39
41
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_merge', 'olive-gtk')
40
42
        
53
55
        
54
56
        # Get some widgets
55
57
        self.entry = self.glade.get_widget('entry_merge')
 
58
        if default_branch_path:
 
59
            self.entry.set_text(default_branch_path)
56
60
 
57
61
    def display(self):
58
62
        """ Display the Add file(s) dialog. """
59
63
        self.window.show_all()
60
64
 
 
65
    @show_bzr_error
61
66
    def merge(self, widget):
62
67
        branch = self.entry.get_text()
63
68
        if branch == "":
64
 
            error_dialog(_('Branch not given'),
65
 
                         _('Please specify a branch to merge from.'))
66
 
            return
67
 
 
68
 
        try:
69
 
            other_branch = Branch.open_containing(branch)[0]
70
 
        except errors.NotBranchError:
71
 
            error_dialog(_('Specified location not a branch'),
72
 
                         _('Please specify a branch you want to merge from.'))
73
 
            return
74
 
        
 
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
75
        try:
76
76
            conflicts = self.wt.merge_from_branch(other_branch)
77
77
        except errors.BzrCommandError, errmsg:
78
 
            error_dialog(_('Bazaar command error'), str(errmsg))
 
78
            error_dialog(_i18n('Bazaar command error'), str(errmsg))
79
79
            return
80
80
        
81
81
        self.close()
82
82
        if conflicts == 0:
83
83
            # No conflicts found.
84
 
            info_dialog(_('Merge successful'),
85
 
                        _('All changes applied successfully.'))
 
84
            info_dialog(_i18n('Merge successful'),
 
85
                        _i18n('All changes applied successfully.'))
86
86
        else:
87
87
            # There are conflicts to be resolved.
88
 
            warning_dialog(_('Conflicts encountered'),
89
 
                           _('Please resolve the conflicts manually before committing.'))
 
88
            warning_dialog(_i18n('Conflicts encountered'),
 
89
                           _i18n('Please resolve the conflicts manually before committing.'))
90
90
    
91
91
    def open(self, widget):
92
92
        fcd = gtk.FileChooserDialog(title="Please select a folder",