Fossil SCM
Improved error message when --tk fails.
Commit
8dcb0b8a5985c3e130d5c73af021e1fc8e8b1e95c049f30f8aafd9e29558c596
Parent
8c4c93b215df5c9…
2 files changed
+9
-4
+1
-1
+9
-4
| --- src/diff.tcl | ||
| +++ src/diff.tcl | ||
| @@ -97,14 +97,19 @@ | ||
| 97 | 97 | if {![info exists difftxt]} { |
| 98 | 98 | if {$debug} { |
| 99 | 99 | puts "# [list open $fossilcmd r]" |
| 100 | 100 | flush stdout |
| 101 | 101 | } |
| 102 | - set in [open $fossilcmd r] | |
| 103 | - fconfigure $in -encoding utf-8 | |
| 104 | - set difftxt [split [read $in] \n] | |
| 105 | - close $in | |
| 102 | + if {[catch { | |
| 103 | + set in [open $fossilcmd r] | |
| 104 | + fconfigure $in -encoding utf-8 | |
| 105 | + set difftxt [split [read $in] \n] | |
| 106 | + close $in | |
| 107 | + } msg]} { | |
| 108 | + puts $msg | |
| 109 | + exit 1 | |
| 110 | + } | |
| 106 | 111 | } |
| 107 | 112 | set N [llength $difftxt] |
| 108 | 113 | set ii 0 |
| 109 | 114 | set nDiffs 0 |
| 110 | 115 | set n1 0 |
| 111 | 116 |
| --- src/diff.tcl | |
| +++ src/diff.tcl | |
| @@ -97,14 +97,19 @@ | |
| 97 | if {![info exists difftxt]} { |
| 98 | if {$debug} { |
| 99 | puts "# [list open $fossilcmd r]" |
| 100 | flush stdout |
| 101 | } |
| 102 | set in [open $fossilcmd r] |
| 103 | fconfigure $in -encoding utf-8 |
| 104 | set difftxt [split [read $in] \n] |
| 105 | close $in |
| 106 | } |
| 107 | set N [llength $difftxt] |
| 108 | set ii 0 |
| 109 | set nDiffs 0 |
| 110 | set n1 0 |
| 111 |
| --- src/diff.tcl | |
| +++ src/diff.tcl | |
| @@ -97,14 +97,19 @@ | |
| 97 | if {![info exists difftxt]} { |
| 98 | if {$debug} { |
| 99 | puts "# [list open $fossilcmd r]" |
| 100 | flush stdout |
| 101 | } |
| 102 | if {[catch { |
| 103 | set in [open $fossilcmd r] |
| 104 | fconfigure $in -encoding utf-8 |
| 105 | set difftxt [split [read $in] \n] |
| 106 | close $in |
| 107 | } msg]} { |
| 108 | puts $msg |
| 109 | exit 1 |
| 110 | } |
| 111 | } |
| 112 | set N [llength $difftxt] |
| 113 | set ii 0 |
| 114 | set nDiffs 0 |
| 115 | set n1 0 |
| 116 |
+1
-1
| --- src/patch.c | ||
| +++ src/patch.c | ||
| @@ -1129,11 +1129,11 @@ | ||
| 1129 | 1129 | return; |
| 1130 | 1130 | } |
| 1131 | 1131 | if( find_option("force","f",0) ) flags |= PATCH_FORCE; |
| 1132 | 1132 | diff_options(&DCfg, zCmd[0]=='g', 0); |
| 1133 | 1133 | verify_all_options(); |
| 1134 | - zIn = patch_find_patch_filename("apply"); | |
| 1134 | + zIn = patch_find_patch_filename("diff"); | |
| 1135 | 1135 | patch_attach(zIn, stdin, 0); |
| 1136 | 1136 | patch_diff(flags, &DCfg); |
| 1137 | 1137 | fossil_free(zIn); |
| 1138 | 1138 | }else |
| 1139 | 1139 | if( strncmp(zCmd, "pull", n)==0 ){ |
| 1140 | 1140 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -1129,11 +1129,11 @@ | |
| 1129 | return; |
| 1130 | } |
| 1131 | if( find_option("force","f",0) ) flags |= PATCH_FORCE; |
| 1132 | diff_options(&DCfg, zCmd[0]=='g', 0); |
| 1133 | verify_all_options(); |
| 1134 | zIn = patch_find_patch_filename("apply"); |
| 1135 | patch_attach(zIn, stdin, 0); |
| 1136 | patch_diff(flags, &DCfg); |
| 1137 | fossil_free(zIn); |
| 1138 | }else |
| 1139 | if( strncmp(zCmd, "pull", n)==0 ){ |
| 1140 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -1129,11 +1129,11 @@ | |
| 1129 | return; |
| 1130 | } |
| 1131 | if( find_option("force","f",0) ) flags |= PATCH_FORCE; |
| 1132 | diff_options(&DCfg, zCmd[0]=='g', 0); |
| 1133 | verify_all_options(); |
| 1134 | zIn = patch_find_patch_filename("diff"); |
| 1135 | patch_attach(zIn, stdin, 0); |
| 1136 | patch_diff(flags, &DCfg); |
| 1137 | fossil_free(zIn); |
| 1138 | }else |
| 1139 | if( strncmp(zCmd, "pull", n)==0 ){ |
| 1140 |