Fossil SCM

Eliminate DIFF_INLINE flag (which is 0 anyway, no longer necessary). Strip end-of-line CR's in json_wiki_diff page as well.

jan.nijtmans 2014-03-17 13:12 UTC trunk
Commit e6309e051b623b83462ccc1026c8689dcc03ca46
Parent 597d1101b48ca5d…
3 files changed -1 +2 -6 +1 -1
~ src/diff.c ~ src/info.c ~ src/json_wiki.c
M src/diff.c
-1
--- src/diff.c
+++ src/diff.c
@@ -32,11 +32,10 @@
3232
 #define DIFF_WIDTH_MASK ((u64)0x00ff0000) /* side-by-side column width */
3333
 #define DIFF_IGNORE_EOLWS ((u64)0x01000000) /* Ignore end-of-line whitespace */
3434
 #define DIFF_IGNORE_ALLWS ((u64)0x03000000) /* Ignore all whitespace */
3535
 #define DIFF_SIDEBYSIDE ((u64)0x04000000) /* Generate a side-by-side diff */
3636
 #define DIFF_VERBOSE ((u64)0x08000000) /* Missing shown as empty files */
37
-#define DIFF_INLINE ((u64)0x00000000) /* Inline (not side-by-side) diff */
3837
 #define DIFF_BRIEF ((u64)0x10000000) /* Show filenames only */
3938
 #define DIFF_HTML ((u64)0x20000000) /* Render for HTML */
4039
 #define DIFF_LINENO ((u64)0x40000000) /* Show line numbers */
4140
 #define DIFF_NOOPT (((u64)0x01)<<32) /* Suppress optimizations (debug) */
4241
 #define DIFF_INVERT (((u64)0x02)<<32) /* Invert the diff (debug) */
4342
--- src/diff.c
+++ src/diff.c
@@ -32,11 +32,10 @@
32 #define DIFF_WIDTH_MASK ((u64)0x00ff0000) /* side-by-side column width */
33 #define DIFF_IGNORE_EOLWS ((u64)0x01000000) /* Ignore end-of-line whitespace */
34 #define DIFF_IGNORE_ALLWS ((u64)0x03000000) /* Ignore all whitespace */
35 #define DIFF_SIDEBYSIDE ((u64)0x04000000) /* Generate a side-by-side diff */
36 #define DIFF_VERBOSE ((u64)0x08000000) /* Missing shown as empty files */
37 #define DIFF_INLINE ((u64)0x00000000) /* Inline (not side-by-side) diff */
38 #define DIFF_BRIEF ((u64)0x10000000) /* Show filenames only */
39 #define DIFF_HTML ((u64)0x20000000) /* Render for HTML */
40 #define DIFF_LINENO ((u64)0x40000000) /* Show line numbers */
41 #define DIFF_NOOPT (((u64)0x01)<<32) /* Suppress optimizations (debug) */
42 #define DIFF_INVERT (((u64)0x02)<<32) /* Invert the diff (debug) */
43
--- src/diff.c
+++ src/diff.c
@@ -32,11 +32,10 @@
32 #define DIFF_WIDTH_MASK ((u64)0x00ff0000) /* side-by-side column width */
33 #define DIFF_IGNORE_EOLWS ((u64)0x01000000) /* Ignore end-of-line whitespace */
34 #define DIFF_IGNORE_ALLWS ((u64)0x03000000) /* Ignore all whitespace */
35 #define DIFF_SIDEBYSIDE ((u64)0x04000000) /* Generate a side-by-side diff */
36 #define DIFF_VERBOSE ((u64)0x08000000) /* Missing shown as empty files */
 
37 #define DIFF_BRIEF ((u64)0x10000000) /* Show filenames only */
38 #define DIFF_HTML ((u64)0x20000000) /* Render for HTML */
39 #define DIFF_LINENO ((u64)0x40000000) /* Show line numbers */
40 #define DIFF_NOOPT (((u64)0x01)<<32) /* Suppress optimizations (debug) */
41 #define DIFF_INVERT (((u64)0x02)<<32) /* Invert the diff (debug) */
42
M src/info.c
+2 -6
--- src/info.c
+++ src/info.c
@@ -443,24 +443,20 @@
443443
 /*
444444
 ** Construct an appropriate diffFlag for text_diff() based on query
445445
 ** parameters and the to boolean arguments.
446446
 */
447447
 u64 construct_diff_flags(int verboseFlag, int sideBySide){
448
- u64 diffFlags;
449
- if( verboseFlag==0 ){
450
- diffFlags = 0; /* Zero means do not show any diff */
451
- }else{
448
+ u64 diffFlags = 0; /* Zero means do not show any diff */
449
+ if( verboseFlag!=0 ){
452450
 int x;
453451
 if( sideBySide ){
454452
 diffFlags = DIFF_SIDEBYSIDE;
455453
456454
 /* "dw" query parameter determines width of each column */
457455
 x = atoi(PD("dw","80"))*(DIFF_CONTEXT_MASK+1);
458456
 if( x<0 || x>DIFF_WIDTH_MASK ) x = DIFF_WIDTH_MASK;
459457
 diffFlags += x;
460
- }else{
461
- diffFlags = DIFF_INLINE;
462458
 }
463459
464460
 if( P("w") ){
465461
 diffFlags |= DIFF_IGNORE_ALLWS;
466462
 }
467463
--- src/info.c
+++ src/info.c
@@ -443,24 +443,20 @@
443 /*
444 ** Construct an appropriate diffFlag for text_diff() based on query
445 ** parameters and the to boolean arguments.
446 */
447 u64 construct_diff_flags(int verboseFlag, int sideBySide){
448 u64 diffFlags;
449 if( verboseFlag==0 ){
450 diffFlags = 0; /* Zero means do not show any diff */
451 }else{
452 int x;
453 if( sideBySide ){
454 diffFlags = DIFF_SIDEBYSIDE;
455
456 /* "dw" query parameter determines width of each column */
457 x = atoi(PD("dw","80"))*(DIFF_CONTEXT_MASK+1);
458 if( x<0 || x>DIFF_WIDTH_MASK ) x = DIFF_WIDTH_MASK;
459 diffFlags += x;
460 }else{
461 diffFlags = DIFF_INLINE;
462 }
463
464 if( P("w") ){
465 diffFlags |= DIFF_IGNORE_ALLWS;
466 }
467
--- src/info.c
+++ src/info.c
@@ -443,24 +443,20 @@
443 /*
444 ** Construct an appropriate diffFlag for text_diff() based on query
445 ** parameters and the to boolean arguments.
446 */
447 u64 construct_diff_flags(int verboseFlag, int sideBySide){
448 u64 diffFlags = 0; /* Zero means do not show any diff */
449 if( verboseFlag!=0 ){
 
 
450 int x;
451 if( sideBySide ){
452 diffFlags = DIFF_SIDEBYSIDE;
453
454 /* "dw" query parameter determines width of each column */
455 x = atoi(PD("dw","80"))*(DIFF_CONTEXT_MASK+1);
456 if( x<0 || x>DIFF_WIDTH_MASK ) x = DIFF_WIDTH_MASK;
457 diffFlags += x;
 
 
458 }
459
460 if( P("w") ){
461 diffFlags |= DIFF_IGNORE_ALLWS;
462 }
463
M src/json_wiki.c
+1 -1
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -542,11 +542,11 @@
542542
543543
 blob_init(&w1, pW1->zWiki, -1);
544544
 blob_zero(&w2);
545545
 blob_init(&w2, pW2->zWiki, -1);
546546
 blob_zero(&d);
547
- diffFlags = DIFF_IGNORE_EOLWS | DIFF_INLINE;
547
+ diffFlags = DIFF_IGNORE_EOLWS | DIFF_STRIP_EOLCR;
548548
 text_diff(&w2, &w1, &d, 0, diffFlags);
549549
 blob_reset(&w1);
550550
 blob_reset(&w2);
551551
552552
 pay = cson_new_object();
553553
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -542,11 +542,11 @@
542
543 blob_init(&w1, pW1->zWiki, -1);
544 blob_zero(&w2);
545 blob_init(&w2, pW2->zWiki, -1);
546 blob_zero(&d);
547 diffFlags = DIFF_IGNORE_EOLWS | DIFF_INLINE;
548 text_diff(&w2, &w1, &d, 0, diffFlags);
549 blob_reset(&w1);
550 blob_reset(&w2);
551
552 pay = cson_new_object();
553
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -542,11 +542,11 @@
542
543 blob_init(&w1, pW1->zWiki, -1);
544 blob_zero(&w2);
545 blob_init(&w2, pW2->zWiki, -1);
546 blob_zero(&d);
547 diffFlags = DIFF_IGNORE_EOLWS | DIFF_STRIP_EOLCR;
548 text_diff(&w2, &w1, &d, 0, diffFlags);
549 blob_reset(&w1);
550 blob_reset(&w2);
551
552 pay = cson_new_object();
553

Keyboard Shortcuts

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