Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Eliminate DIFF_INLINE flag (which is 0 anyway, no longer necessary). Strip end-of-line CR's in json_wiki_diff page as well. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
e6309e051b623b83462ccc1026c8689d |
| User & Date: | jan.nijtmans 2014-03-17 13:12:42.694 |
Context
|
2014-03-17
| ||
| 14:15 | skip some tests when running inside of an open checkout. ... (check-in: 36a8d91d0c user: jan.nijtmans tags: trunk) | |
| 13:12 | Eliminate DIFF_INLINE flag (which is 0 anyway, no longer necessary). Strip end-of-line CR's in json_wiki_diff page as well. ... (check-in: e6309e051b user: jan.nijtmans tags: trunk) | |
| 12:47 | Make stripping of end-of-line CR work correctly now (REALLY!) ... (check-in: 597d1101b4 user: jan.nijtmans tags: trunk) | |
Changes
Changes to src/diff.c.
| ︙ | ︙ | |||
30 31 32 33 34 35 36 | */ #define DIFF_CONTEXT_MASK ((u64)0x0000ffff) /* Lines of context. Default if 0 */ #define DIFF_WIDTH_MASK ((u64)0x00ff0000) /* side-by-side column width */ #define DIFF_IGNORE_EOLWS ((u64)0x01000000) /* Ignore end-of-line whitespace */ #define DIFF_IGNORE_ALLWS ((u64)0x03000000) /* Ignore all whitespace */ #define DIFF_SIDEBYSIDE ((u64)0x04000000) /* Generate a side-by-side diff */ #define DIFF_VERBOSE ((u64)0x08000000) /* Missing shown as empty files */ | < | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | */ #define DIFF_CONTEXT_MASK ((u64)0x0000ffff) /* Lines of context. Default if 0 */ #define DIFF_WIDTH_MASK ((u64)0x00ff0000) /* side-by-side column width */ #define DIFF_IGNORE_EOLWS ((u64)0x01000000) /* Ignore end-of-line whitespace */ #define DIFF_IGNORE_ALLWS ((u64)0x03000000) /* Ignore all whitespace */ #define DIFF_SIDEBYSIDE ((u64)0x04000000) /* Generate a side-by-side diff */ #define DIFF_VERBOSE ((u64)0x08000000) /* Missing shown as empty files */ #define DIFF_BRIEF ((u64)0x10000000) /* Show filenames only */ #define DIFF_HTML ((u64)0x20000000) /* Render for HTML */ #define DIFF_LINENO ((u64)0x40000000) /* Show line numbers */ #define DIFF_NOOPT (((u64)0x01)<<32) /* Suppress optimizations (debug) */ #define DIFF_INVERT (((u64)0x02)<<32) /* Invert the diff (debug) */ #define DIFF_CONTEXT_EX (((u64)0x04)<<32) /* Use context even if zero */ #define DIFF_NOTTOOBIG (((u64)0x08)<<32) /* Only display if not too big */ |
| ︙ | ︙ |
Changes to src/info.c.
| ︙ | ︙ | |||
441 442 443 444 445 446 447 |
}
/*
** Construct an appropriate diffFlag for text_diff() based on query
** parameters and the to boolean arguments.
*/
u64 construct_diff_flags(int verboseFlag, int sideBySide){
| | | < < < < | 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 |
}
/*
** Construct an appropriate diffFlag for text_diff() based on query
** parameters and the to boolean arguments.
*/
u64 construct_diff_flags(int verboseFlag, int sideBySide){
u64 diffFlags = 0; /* Zero means do not show any diff */
if( verboseFlag!=0 ){
int x;
if( sideBySide ){
diffFlags = DIFF_SIDEBYSIDE;
/* "dw" query parameter determines width of each column */
x = atoi(PD("dw","80"))*(DIFF_CONTEXT_MASK+1);
if( x<0 || x>DIFF_WIDTH_MASK ) x = DIFF_WIDTH_MASK;
diffFlags += x;
}
if( P("w") ){
diffFlags |= DIFF_IGNORE_ALLWS;
}
/* "dc" query parameter determines lines of context */
x = atoi(PD("dc","7"));
|
| ︙ | ︙ |
Changes to src/json_wiki.c.
| ︙ | ︙ | |||
540 541 542 543 544 545 546 |
goto manifest;
}
blob_init(&w1, pW1->zWiki, -1);
blob_zero(&w2);
blob_init(&w2, pW2->zWiki, -1);
blob_zero(&d);
| | | 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 |
goto manifest;
}
blob_init(&w1, pW1->zWiki, -1);
blob_zero(&w2);
blob_init(&w2, pW2->zWiki, -1);
blob_zero(&d);
diffFlags = DIFF_IGNORE_EOLWS | DIFF_STRIP_EOLCR;
text_diff(&w2, &w1, &d, 0, diffFlags);
blob_reset(&w1);
blob_reset(&w2);
pay = cson_new_object();
zUuid = json_wiki_get_uuid_for_rid( pW1->rid );
|
| ︙ | ︙ |