/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

  • Committer: Aaron Bentley
  • Date: 2007-01-17 06:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: aaron.bentley@utoronto.ca-20070117064255-x4gznz5e0lyjq3gk
Remove usused span selector

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/merge.py
28
28
from bzrlib.branch import Branch
29
29
import bzrlib.errors as errors
30
30
 
31
 
from olive.dialog import error_dialog, info_dialog, warning_dialog
32
 
from errors import show_bzr_error
33
 
from olive.guifiles import GLADEFILENAME
 
31
from dialog import error_dialog, info_dialog, warning_dialog
 
32
from guifiles import GLADEFILENAME
34
33
 
35
34
 
36
35
class MergeDialog:
59
58
        """ Display the Add file(s) dialog. """
60
59
        self.window.show_all()
61
60
 
62
 
    @show_bzr_error
63
61
    def merge(self, widget):
64
62
        branch = self.entry.get_text()
65
63
        if branch == "":
67
65
                         _('Please specify a branch to merge from.'))
68
66
            return
69
67
 
70
 
        other_branch = Branch.open_containing(branch)[0]
71
 
 
 
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
        
72
75
        try:
73
76
            conflicts = self.wt.merge_from_branch(other_branch)
74
77
        except errors.BzrCommandError, errmsg: