Fossil SCM

merge trunk

jan.nijtmans 2012-09-26 09:32 use-utf8-in-win-external-editor merge
Commit 71ef64bb7529858094761684ada41e134074b998
Parent 433cb7147991288…
3 files changed +5 -2 +5 -2 +10 -2
~ src/checkin.c ~ src/checkin.c ~ src/diff.c
M src/checkin.c
+5 -2
--- src/checkin.c
+++ src/checkin.c
@@ -515,14 +515,17 @@
515515
 blob_read_from_file(&text, zFile);
516516
 }else{
517517
 char zIn[300];
518518
 blob_reset(&text);
519519
 while( fgets(zIn, sizeof(zIn), stdin)!=0 ){
520
- if( zIn[0]=='.' && (zIn[1]==0 || zIn[1]=='\r' || zIn[1]=='\n') ){
520
+ char *zUtf8 = fossil_mbcs_to_utf8(zIn);
521
+ if( zUtf8[0]=='.' && (zUtf8[1]==0 || zUtf8[1]=='\r' || zUtf8[1]=='\n') ){
522
+ fossil_mbcs_free(zUtf8);
521523
 break;
522524
 }
523
- blob_append(&text, zIn, -1);
525
+ blob_append(&text, zUtf8, -1);
526
+ fossil_mbcs_free(zUtf8);
524527
 }
525528
 }
526529
 blob_remove_cr(&text);
527530
 if( zEditor ) {
528531
 file_delete(zFile);
529532
--- src/checkin.c
+++ src/checkin.c
@@ -515,14 +515,17 @@
515 blob_read_from_file(&text, zFile);
516 }else{
517 char zIn[300];
518 blob_reset(&text);
519 while( fgets(zIn, sizeof(zIn), stdin)!=0 ){
520 if( zIn[0]=='.' && (zIn[1]==0 || zIn[1]=='\r' || zIn[1]=='\n') ){
 
 
521 break;
522 }
523 blob_append(&text, zIn, -1);
 
524 }
525 }
526 blob_remove_cr(&text);
527 if( zEditor ) {
528 file_delete(zFile);
529
--- src/checkin.c
+++ src/checkin.c
@@ -515,14 +515,17 @@
515 blob_read_from_file(&text, zFile);
516 }else{
517 char zIn[300];
518 blob_reset(&text);
519 while( fgets(zIn, sizeof(zIn), stdin)!=0 ){
520 char *zUtf8 = fossil_mbcs_to_utf8(zIn);
521 if( zUtf8[0]=='.' && (zUtf8[1]==0 || zUtf8[1]=='\r' || zUtf8[1]=='\n') ){
522 fossil_mbcs_free(zUtf8);
523 break;
524 }
525 blob_append(&text, zUtf8, -1);
526 fossil_mbcs_free(zUtf8);
527 }
528 }
529 blob_remove_cr(&text);
530 if( zEditor ) {
531 file_delete(zFile);
532
M src/checkin.c
+5 -2
--- src/checkin.c
+++ src/checkin.c
@@ -515,14 +515,17 @@
515515
 blob_read_from_file(&text, zFile);
516516
 }else{
517517
 char zIn[300];
518518
 blob_reset(&text);
519519
 while( fgets(zIn, sizeof(zIn), stdin)!=0 ){
520
- if( zIn[0]=='.' && (zIn[1]==0 || zIn[1]=='\r' || zIn[1]=='\n') ){
520
+ char *zUtf8 = fossil_mbcs_to_utf8(zIn);
521
+ if( zUtf8[0]=='.' && (zUtf8[1]==0 || zUtf8[1]=='\r' || zUtf8[1]=='\n') ){
522
+ fossil_mbcs_free(zUtf8);
521523
 break;
522524
 }
523
- blob_append(&text, zIn, -1);
525
+ blob_append(&text, zUtf8, -1);
526
+ fossil_mbcs_free(zUtf8);
524527
 }
525528
 }
526529
 blob_remove_cr(&text);
527530
 if( zEditor ) {
528531
 file_delete(zFile);
529532
--- src/checkin.c
+++ src/checkin.c
@@ -515,14 +515,17 @@
515 blob_read_from_file(&text, zFile);
516 }else{
517 char zIn[300];
518 blob_reset(&text);
519 while( fgets(zIn, sizeof(zIn), stdin)!=0 ){
520 if( zIn[0]=='.' && (zIn[1]==0 || zIn[1]=='\r' || zIn[1]=='\n') ){
 
 
521 break;
522 }
523 blob_append(&text, zIn, -1);
 
524 }
525 }
526 blob_remove_cr(&text);
527 if( zEditor ) {
528 file_delete(zFile);
529
--- src/checkin.c
+++ src/checkin.c
@@ -515,14 +515,17 @@
515 blob_read_from_file(&text, zFile);
516 }else{
517 char zIn[300];
518 blob_reset(&text);
519 while( fgets(zIn, sizeof(zIn), stdin)!=0 ){
520 char *zUtf8 = fossil_mbcs_to_utf8(zIn);
521 if( zUtf8[0]=='.' && (zUtf8[1]==0 || zUtf8[1]=='\r' || zUtf8[1]=='\n') ){
522 fossil_mbcs_free(zUtf8);
523 break;
524 }
525 blob_append(&text, zUtf8, -1);
526 fossil_mbcs_free(zUtf8);
527 }
528 }
529 blob_remove_cr(&text);
530 if( zEditor ) {
531 file_delete(zFile);
532
M src/diff.c
+10 -2
--- src/diff.c
+++ src/diff.c
@@ -975,11 +975,15 @@
975975
 sbsWriteLineno(&s, a);
976976
 s.iStart = 0;
977977
 s.zStart = "<span class=\"diffrm\">";
978978
 s.iEnd = s.width;
979979
 sbsWriteText(&s, &A[a], SBS_PAD);
980
- sbsWrite(&s, " <\n", 3);
980
+ if( escHtml ){
981
+ sbsWrite(&s, " &lt;\n", 6);
982
+ }else{
983
+ sbsWrite(&s, " <\n", 3);
984
+ }
981985
 blob_append(pOut, s.zLine, s.n);
982986
 assert( ma>0 );
983987
 ma--;
984988
 a++;
985989
 }else if( alignment[j]==2 ){
@@ -992,11 +996,15 @@
992996
 a++;
993997
 b++;
994998
 }else{
995999
 s.n = 0;
9961000
 sbsWriteSpace(&s, width + 7);
997
- sbsWrite(&s, " > ", 3);
1001
+ if( escHtml ){
1002
+ sbsWrite(&s, " &gt; ", 6);
1003
+ }else{
1004
+ sbsWrite(&s, " > ", 3);
1005
+ }
9981006
 sbsWriteLineno(&s, b);
9991007
 s.iStart = 0;
10001008
 s.zStart = "<span class=\"diffadd\">";
10011009
 s.iEnd = s.width;
10021010
 sbsWriteText(&s, &B[b], SBS_NEWLINE);
10031011
--- src/diff.c
+++ src/diff.c
@@ -975,11 +975,15 @@
975 sbsWriteLineno(&s, a);
976 s.iStart = 0;
977 s.zStart = "<span class=\"diffrm\">";
978 s.iEnd = s.width;
979 sbsWriteText(&s, &A[a], SBS_PAD);
980 sbsWrite(&s, " <\n", 3);
 
 
 
 
981 blob_append(pOut, s.zLine, s.n);
982 assert( ma>0 );
983 ma--;
984 a++;
985 }else if( alignment[j]==2 ){
@@ -992,11 +996,15 @@
992 a++;
993 b++;
994 }else{
995 s.n = 0;
996 sbsWriteSpace(&s, width + 7);
997 sbsWrite(&s, " > ", 3);
 
 
 
 
998 sbsWriteLineno(&s, b);
999 s.iStart = 0;
1000 s.zStart = "<span class=\"diffadd\">";
1001 s.iEnd = s.width;
1002 sbsWriteText(&s, &B[b], SBS_NEWLINE);
1003
--- src/diff.c
+++ src/diff.c
@@ -975,11 +975,15 @@
975 sbsWriteLineno(&s, a);
976 s.iStart = 0;
977 s.zStart = "<span class=\"diffrm\">";
978 s.iEnd = s.width;
979 sbsWriteText(&s, &A[a], SBS_PAD);
980 if( escHtml ){
981 sbsWrite(&s, " &lt;\n", 6);
982 }else{
983 sbsWrite(&s, " <\n", 3);
984 }
985 blob_append(pOut, s.zLine, s.n);
986 assert( ma>0 );
987 ma--;
988 a++;
989 }else if( alignment[j]==2 ){
@@ -992,11 +996,15 @@
996 a++;
997 b++;
998 }else{
999 s.n = 0;
1000 sbsWriteSpace(&s, width + 7);
1001 if( escHtml ){
1002 sbsWrite(&s, " &gt; ", 6);
1003 }else{
1004 sbsWrite(&s, " > ", 3);
1005 }
1006 sbsWriteLineno(&s, b);
1007 s.iStart = 0;
1008 s.zStart = "<span class=\"diffadd\">";
1009 s.iEnd = s.width;
1010 sbsWriteText(&s, &B[b], SBS_NEWLINE);
1011

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button