diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-01-20 20:36:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-20 20:36:16 -0800 |
| commit | 36a189c86e4a4ad75a75f598eedfe2defab3cbf3 (patch) | |
| tree | 50fb45f3a88aa9ad61e7ba2e0b194681aecfde3e /git-gui/lib/error.tcl | |
| parent | ce33288ea6b81a2f4f5aecd72177bcc8174562ae (diff) | |
| parent | 6caaf2daf0ea50ff99009b94f24252b8fa747e64 (diff) | |
| download | git-36a189c86e4a4ad75a75f598eedfe2defab3cbf3.tar.gz git-36a189c86e4a4ad75a75f598eedfe2defab3cbf3.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Correct encoding of glossary/fr.po to UTF-8
git-gui: Consolidate hook execution code into a single function
git-gui: Correct window title for hook failure dialogs
git-gui: Honor the standard commit-msg hook
Diffstat (limited to 'git-gui/lib/error.tcl')
| -rw-r--r-- | git-gui/lib/error.tcl | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/git-gui/lib/error.tcl b/git-gui/lib/error.tcl index 13565b7ab..0fdd7531d 100644 --- a/git-gui/lib/error.tcl +++ b/git-gui/lib/error.tcl @@ -62,7 +62,7 @@ proc ask_popup {msg} { eval $cmd } -proc hook_failed_popup {hook msg} { +proc hook_failed_popup {hook msg {is_fatal 1}} { set w .hookfail toplevel $w @@ -77,14 +77,16 @@ proc hook_failed_popup {hook msg} { -width 80 -height 10 \ -font font_diff \ -yscrollcommand [list $w.m.sby set] - label $w.m.l2 \ - -text [mc "You must correct the above errors before committing."] \ - -anchor w \ - -justify left \ - -font font_uibold scrollbar $w.m.sby -command [list $w.m.t yview] pack $w.m.l1 -side top -fill x - pack $w.m.l2 -side bottom -fill x + if {$is_fatal} { + label $w.m.l2 \ + -text [mc "You must correct the above errors before committing."] \ + -anchor w \ + -justify left \ + -font font_uibold + pack $w.m.l2 -side bottom -fill x + } pack $w.m.sby -side right -fill y pack $w.m.t -side left -fill both -expand 1 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10 @@ -99,6 +101,6 @@ proc hook_failed_popup {hook msg} { bind $w <Visibility> "grab $w; focus $w" bind $w <Key-Return> "destroy $w" - wm title $w [append "[appname] ([reponame]): " [mc "error"]] + wm title $w [strcat "[appname] ([reponame]): " [mc "error"]] tkwait window $w } |