/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to errors.py

• browse files at revision 793.1.1
• compare with another revision
• download diff
• download tarball
• view history from revision 793.1.1

• reverse the comparison (793.1.1 to 511.5.6)
• stop comparing with revision 511.5.6

Show diffs side-by-side

added

removed

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

18

 

from bzrlib.plugins.gtk import _i18n

19

 

from dialog import error_dialog

 

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

20

23

 

21

24

 

22

25

def show_bzr_error(unbound):

33

36

        except errors.PointlessCommit:

34

37

            error_dialog(_i18n('No changes to commit'),

35

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.'))

36

42

        except errors.ConflictsInTree:

37

43

            error_dialog(_i18n('Conflicts in tree'),

38

44

                         _i18n('You need to resolve the conflicts before committing.'))

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0