/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-17 11:51:03 UTC
  • Revision ID: jelmer@samba.org-20080717115103-djh5sb0pvpse2zkb
Add note about glade.

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
 
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
 
17
import bzrlib.errors as errors
 
18
from bzrlib.plugins.gtk import _i18n
 
19
from dialog import error_dialog
23
20
 
24
21
 
25
22
def show_bzr_error(unbound):
36
33
        except errors.PointlessCommit:
37
34
            error_dialog(_i18n('No changes to commit'),
38
35
                         _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.'))
42
36
        except errors.ConflictsInTree:
43
37
            error_dialog(_i18n('Conflicts in tree'),
44
38
                         _i18n('You need to resolve the conflicts before committing.'))