/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 errors.py

  • Committer: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
errors.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import bzrlib.errors as errors
 
17
from bzrlib import errors
 
18
from bzrlib.plugins.gtk.dialog import (
 
19
    error_dialog,
 
20
    info_dialog,
 
21
    )
 
22
from bzrlib.plugins.gtk.i18n import _i18n
18
23
 
19
 
from olive.dialog import error_dialog
20
24
 
21
25
def show_bzr_error(unbound):
22
26
    """Decorator that shows bazaar exceptions. """
24
28
        try:
25
29
            unbound(*args, **kwargs)
26
30
        except errors.NotBranchError:
27
 
            error_dialog(_('Directory is not a branch'),
28
 
                         _('You can perform this action only in a branch.'))
 
31
            error_dialog(_i18n('Directory is not a branch'),
 
32
                         _i18n('You can perform this action only in a branch.'))
29
33
        except errors.LocalRequiresBoundBranch:
30
 
            error_dialog(_('Directory is not a checkout'),
31
 
                         _('You can perform local commit only on checkouts.'))
 
34
            error_dialog(_i18n('Directory is not a checkout'),
 
35
                         _i18n('You can perform local commit only on checkouts.'))
32
36
        except errors.PointlessCommit:
33
 
            error_dialog(_('No changes to commit'),
34
 
                         _('Try force commit if you want to commit anyway.'))
 
37
            error_dialog(_i18n('No changes to commit'),
 
38
                         _i18n('Try force commit if you want to commit anyway.'))
 
39
        except errors.PointlessMerge:
 
40
            info_dialog(_i18n('No changes to merge'),
 
41
                         _i18n('Merge location is already fully merged in working tree.'))
35
42
        except errors.ConflictsInTree:
36
 
            error_dialog(_('Conflicts in tree'),
37
 
                         _('You need to resolve the conflicts before committing.'))
 
43
            error_dialog(_i18n('Conflicts in tree'),
 
44
                         _i18n('You need to resolve the conflicts before committing.'))
38
45
        except errors.StrictCommitFailed:
39
 
            error_dialog(_('Strict commit failed'),
40
 
                         _('There are unknown files in the working tree.\nPlease add or delete them.'))
 
46
            error_dialog(_i18n('Strict commit failed'),
 
47
                         _i18n('There are unknown files in the working tree.\nPlease add or delete them.'))
41
48
        except errors.BoundBranchOutOfDate, errmsg:
42
 
            error_dialog(_('Bound branch is out of date'),
43
 
                         _('%s') % errmsg)
 
49
            error_dialog(_i18n('Bound branch is out of date'),
 
50
                         # FIXME: Really ? Internationalizing %s ?? --vila080505
 
51
                         _i18n('%s') % errmsg)
44
52
        except errors.NotVersionedError:
45
 
            error_dialog(_('File not versioned'),
46
 
                         _('The selected file is not versioned.'))
 
53
            error_dialog(_i18n('File not versioned'),
 
54
                         _i18n('The selected file is not versioned.'))
47
55
        except errors.DivergedBranches:
48
 
            error_dialog(_('Branches have been diverged'),
49
 
                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
 
56
            error_dialog(_i18n('Branches have been diverged'),
 
57
                         _i18n('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
50
58
        except errors.NoSuchFile:
51
 
            error_dialog(_("No diff output"),
52
 
                         _("The selected file hasn't changed."))
 
59
            error_dialog(_i18n("No diff output"),
 
60
                         _i18n("The selected file hasn't changed."))
53
61
        except errors.NoSuchRevision:
54
 
                error_dialog(_('No such revision'),
55
 
                             _("The revision you specified doesn't exist."))
 
62
                error_dialog(_i18n('No such revision'),
 
63
                             _i18n("The revision you specified doesn't exist."))
56
64
        except errors.FileExists:
57
 
                error_dialog(_('Target already exists'),
58
 
                             _("Target directory already exists. Please select another target."))
 
65
                error_dialog(_i18n('Target already exists'),
 
66
                             _i18n("Target directory already exists. Please select another target."))
59
67
        except errors.AlreadyBranchError, errmsg:
60
 
            error_dialog(_('Directory is already a branch'),
61
 
                         _('The current directory (%s) is already a branch.\nYou can start using it, or initialize another directory.') % errmsg)
 
68
            error_dialog(_i18n('Directory is already a branch'),
 
69
                         _i18n('The current directory (%s) is already a branch.\nYou can start using it, or initialize another directory.') % errmsg)
62
70
        except errors.BranchExistsWithoutWorkingTree, errmsg:
63
 
            error_dialog(_('Branch without a working tree'),
64
 
                         _('The current directory (%s)\nis a branch without a working tree.') % errmsg)
 
71
            error_dialog(_i18n('Branch without a working tree'),
 
72
                         _i18n('The current directory (%s)\nis a branch without a working tree.') % errmsg)
65
73
        except errors.BzrError, msg:
66
 
            error_dialog(_('Unknown bzr error'), str(msg))
 
74
            error_dialog(_i18n('Unknown bzr error'), str(msg))
67
75
        except errors.PermissionDenied:
68
 
            error_dialog(_("Permission denied"), _("permission denied."))
 
76
            error_dialog(_i18n("Permission denied"), _i18n("permission denied."))
69
77
        except Exception, msg:
70
 
            error_dialog(_('Unknown error'), str(msg))
 
78
            error_dialog(_i18n('Unknown error'), str(msg))
71
79
 
72
80
    convert.__doc__ = unbound.__doc__
73
81
    convert.__name__ = unbound.__name__