/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: 2008-07-27 12:05:06 UTC
  • mfrom: (577.1.1 trunk)
  • Revision ID: jelmer@samba.org-20080727120506-jeeik6ywvz8ny0im
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
errors.py
16
16
 
17
17
import bzrlib.errors as errors
18
18
from bzrlib.plugins.gtk import _i18n
19
 
from dialog import error_dialog
 
19
from dialog import error_dialog, info_dialog, warning_dialog
20
20
 
21
21
 
22
22
def show_bzr_error(unbound):
33
33
        except errors.PointlessCommit:
34
34
            error_dialog(_i18n('No changes to commit'),
35
35
                         _i18n('Try force commit if you want to commit anyway.'))
 
36
        except errors.PointlessMerge:
 
37
            info_dialog(_i18n('No changes to merge'),
 
38
                         _i18n('Merge location is already fully merged in working tree.'))
36
39
        except errors.ConflictsInTree:
37
40
            error_dialog(_i18n('Conflicts in tree'),
38
41
                         _i18n('You need to resolve the conflicts before committing.'))