Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Started adding support for showing side-by-side diffs in the web ui. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | jan-sbsdiff |
| Files: | files | file ages | folders |
| SHA1: |
a6a8e8941356779fd5f85492a8e14e6f |
| User & Date: | jan 2011-10-13 23:48:35.167 |
Context
|
2011-10-14
| ||
| 15:41 | Updated the built-in skins for sbsdiff. check-in: bb76b57aa2 user: jan tags: jan-sbsdiff | |
|
2011-10-13
| ||
| 23:48 | Started adding support for showing side-by-side diffs in the web ui. check-in: a6a8e89413 user: jan tags: jan-sbsdiff | |
|
2011-10-12
| ||
| 16:20 | Fixing the merge_renames test, so it accepts being called out of a repository. The message given by fossil when trying 'info' out of a repository had changed. check-in: 0a7ab3ccb0 user: viriketo tags: trunk | |
Changes
Changes to src/diff.c.
| ︙ | ︙ | |||
576 577 578 579 580 581 582 583 584 585 586 587 588 589 |
** array of COPY/DELETE/INSERT triples.
*/
free(c.aFrom);
free(c.aTo);
return c.aEdit;
}
}
/*
** COMMAND: test-rawdiff
*/
void test_rawdiff_cmd(void){
Blob a, b;
int r;
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 |
** array of COPY/DELETE/INSERT triples.
*/
free(c.aFrom);
free(c.aTo);
return c.aEdit;
}
}
/*
* References in the fossil repository:
* /vdiff?from=080d27a&to=4b0f813&detail=1
* /vdiff?from=636804745b&to=c1d78e0556&detail=1
* /vdiff?from=c0b6c28d29&to=25169506b7&detail=1
* /vdiff?from=e3d022dffa&to=48bcfbd47b&detail=1
*/
int *html_sbsdiff(
Blob *pA_Blob, /* FROM file */
Blob *pB_Blob, /* TO file */
int nContext, /* Amount of context to unified diff */
int ignoreEolWs /* Ignore whitespace at the end of lines */
){
DContext c;
int i;
int iFrom, iTo;
char *linebuf;
/* Prepare the input files */
memset(&c, 0, sizeof(c));
c.aFrom = break_into_lines(blob_str(pA_Blob), blob_size(pA_Blob),
&c.nFrom, ignoreEolWs);
c.aTo = break_into_lines(blob_str(pB_Blob), blob_size(pB_Blob),
&c.nTo, ignoreEolWs);
if( c.aFrom==0 || c.aTo==0 ){
free(c.aFrom);
free(c.aTo);
/* TODO Error handling */
return 0;
}
/* Compute the difference */
diff_all(&c);
linebuf = fossil_malloc(LENGTH_MASK+1);
if( !linebuf ){
/* TODO Handle error */
}
iFrom=iTo=0;
i=0;
while( i<c.nEdit ){
int j;
/* Copied lines */
for( j=0; j<c.aEdit[i]; j++){
int len;
int dist;
/* Hide lines which are copied and are further away from block boundaries
** then nConext lines. For each block with hidden lines, show a row
** notifying the user about the hidden rows.
*/
if( j<nContext || j>c.aEdit[i]-nContext-1 ){
@ <tr>
}else if( j==nContext && j<c.aEdit[i]-nContext-1 ){
@ <tr>
@ <td class="meta" colspan="5" style="white-space: nowrap;">
@ %d(c.aEdit[i]-2*nContext) hidden line(s).</td>
@ </tr>
continue;
}else{
@ <tr style="display:none;">
}
len = c.aFrom[iFrom+j].h & LENGTH_MASK;
memcpy(linebuf, c.aFrom[iFrom+j].z, len);
linebuf[len] = '\0';
@ <td class="lineno">%d(iFrom+j+1)</td><td>%s(linebuf)</td>
@ <td> </td>
len = c.aTo[iTo+j].h & LENGTH_MASK;
memcpy(linebuf, c.aTo[iTo+j].z, len);
linebuf[len] = '\0';
@ <td class="lineno">%d(iTo+j+1)</td><td>%s(linebuf)</td>
@ </tr>
}
iFrom+=c.aEdit[i];
iTo+=c.aEdit[i];
if( c.aEdit[i+1]!=0 && c.aEdit[i+2]!=0 ){
int lim;
lim = c.aEdit[i+1] > c.aEdit[i+2] ? c.aEdit[i+1] : c.aEdit[i+2];
/* Assume changed lines */
for( j=0; j<lim; j++ ){
int len;
@ <tr>
if( j<c.aEdit[i+1] ){
len = c.aFrom[iFrom+j].h & LENGTH_MASK;
memcpy(linebuf, c.aFrom[iFrom+j].z, len);
linebuf[len] = '\0';
@ <td class="changed lineno">%d(iFrom+j+1)</td>
@ <td class="changed">%s(linebuf)</td>
}else{
@ <td colspan="2"/>
}
@ <td class="changed">|</td>
if( j<c.aEdit[i+2] ){
len = c.aTo[iTo+j].h & LENGTH_MASK;
memcpy(linebuf, c.aTo[iTo+j].z, len);
linebuf[len] = '\0';
@ <td class="changed lineno">%d(iTo+j+1)</td>
@ <td class="changed">%s(linebuf)</td>
}else{
@ <td colspan="2"/>
}
@ </tr>
}
iFrom+=c.aEdit[i+1];
iTo+=c.aEdit[i+2];
}else{
/* Process deleted lines */
for( j=0; j<c.aEdit[i+1]; j++ ){
int len;
@ <tr>
len = c.aFrom[iFrom+j].h & LENGTH_MASK;
memcpy(linebuf, c.aFrom[iFrom+j].z, len);
linebuf[len] = '\0';
@ <td class="removed lineno">%d(iFrom+j+1)</td>
@ <td class="removed">%s(linebuf)</td>
@ <td><</td>
@ <td colspan="2"/>
@ </tr>
}
iFrom+=c.aEdit[i+1];
/* Process inserted lines */
for( j=0; j<c.aEdit[i+2]; j++ ){
int len;
@ <tr>
@ <td colspan="2"/>
@ <td>></td>
len = c.aTo[iTo+j].h & LENGTH_MASK;
memcpy(linebuf, c.aTo[iTo+j].z, len);
linebuf[len] = '\0';
@ <td class="added lineno">%d(iTo+j+1)</td>
@ <td class="added">%s(linebuf)</td>
@ </tr>
}
iTo+=c.aEdit[i+2];
}
i+=3;
}
free(linebuf);
free(c.aFrom);
free(c.aTo);
free(c.aEdit);
return 0;
}
/*
** COMMAND: test-rawdiff
*/
void test_rawdiff_cmd(void){
Blob a, b;
int r;
|
| ︙ | ︙ |
Changes to src/info.c.
| ︙ | ︙ | |||
274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 |
blob_zero(&out);
text_diff(&from, &to, &out, 5, 1);
@ %h(blob_str(&out))
blob_reset(&from);
blob_reset(&to);
blob_reset(&out);
}
/*
** Write a line of web-page output that shows changes that have occurred
** to a file between two check-ins.
*/
static void append_file_change_line(
const char *zName, /* Name of the file that has changed */
const char *zOld, /* blob.uuid before change. NULL for added files */
const char *zNew, /* blob.uuid after change. NULL for deletes */
const char *zOldName, /* Prior name. NULL if no name change. */
int showDiff, /* Show edit diffs if true */
int mperm /* executable or symlink permission for zNew */
){
if( !g.perm.History ){
if( zNew==0 ){
@ <p>Deleted %h(zName)</p>
}else if( zOld==0 ){
@ <p>Added %h(zName)</p>
| > > > > > > > > > > > > > > > > > > > > > > > > > > > | 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 |
blob_zero(&out);
text_diff(&from, &to, &out, 5, 1);
@ %h(blob_str(&out))
blob_reset(&from);
blob_reset(&to);
blob_reset(&out);
}
/*
** Write the difference between two RIDs to the output
*/
static void generate_sbsdiff(const char *zFrom, const char *zTo){
int fromid;
int toid;
Blob from, to;
if( zFrom ){
fromid = uuid_to_rid(zFrom, 0);
content_get(fromid, &from);
}else{
blob_zero(&from);
}
if( zTo ){
toid = uuid_to_rid(zTo, 0);
content_get(toid, &to);
}else{
blob_zero(&to);
}
html_sbsdiff(&from, &to, 5, 1);
blob_reset(&from);
blob_reset(&to);
}
/*
** Write a line of web-page output that shows changes that have occurred
** to a file between two check-ins.
*/
static void append_file_change_line(
const char *zName, /* Name of the file that has changed */
const char *zOld, /* blob.uuid before change. NULL for added files */
const char *zNew, /* blob.uuid after change. NULL for deletes */
const char *zOldName, /* Prior name. NULL if no name change. */
int showDiff, /* Show edit diffs if true */
int sideBySide, /* Show diffs side-by-side */
int mperm /* executable or symlink permission for zNew */
){
if( !g.perm.History ){
if( zNew==0 ){
@ <p>Deleted %h(zName)</p>
}else if( zOld==0 ){
@ <p>Added %h(zName)</p>
|
| ︙ | ︙ | |||
327 328 329 330 331 332 333 |
@ <p>Deleted <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
@ version <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a>
}else{
@ <p>Added <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
@ version <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)]</a>
}
if( showDiff ){
| > > > > > > > | | | > | 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 |
@ <p>Deleted <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
@ version <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a>
}else{
@ <p>Added <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
@ version <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)]</a>
}
if( showDiff ){
if( sideBySide ){
@ <table class="sbsdiff">
@ <tr><th colspan="2" class="diffhdr"">Old (%s(zOld))</th><th/>
@ <th colspan="2" class="diffhdr">New (%s(zNew))</th></tr>
generate_sbsdiff(zOld, zNew);
@ </table>
}else{
@ <blockquote><pre>
append_diff(zOld, zNew);
@ </pre></blockquote>
}
}else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
@
@ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)">[diff]</a>
}
@ </p>
}
}
|
| ︙ | ︙ | |||
359 360 361 362 363 364 365 366 367 368 369 370 371 372 |
** "show-version-diffs" setting is turned on.
*/
void ci_page(void){
Stmt q;
int rid;
int isLeaf;
int showDiff;
const char *zName; /* Name of the checkin to be displayed */
const char *zUuid; /* UUID of zName */
const char *zParent; /* UUID of the parent checkin (if any) */
login_check_credentials();
if( !g.perm.Read ){ login_needed(); return; }
zName = P("name");
| > | 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 |
** "show-version-diffs" setting is turned on.
*/
void ci_page(void){
Stmt q;
int rid;
int isLeaf;
int showDiff;
int sideBySide=0; /* Temporary default */
const char *zName; /* Name of the checkin to be displayed */
const char *zUuid; /* UUID of zName */
const char *zParent; /* UUID of the parent checkin (if any) */
login_check_credentials();
if( !g.perm.Read ){ login_needed(); return; }
zName = P("name");
|
| ︙ | ︙ | |||
538 539 540 541 542 543 544 |
);
while( db_step(&q)==SQLITE_ROW ){
const char *zName = db_column_text(&q,0);
int mperm = db_column_int(&q, 1);
const char *zOld = db_column_text(&q,2);
const char *zNew = db_column_text(&q,3);
const char *zOldName = db_column_text(&q, 4);
| | > | 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 |
);
while( db_step(&q)==SQLITE_ROW ){
const char *zName = db_column_text(&q,0);
int mperm = db_column_int(&q, 1);
const char *zOld = db_column_text(&q,2);
const char *zNew = db_column_text(&q,3);
const char *zOldName = db_column_text(&q, 4);
append_file_change_line(zName, zOld, zNew, zOldName, showDiff,
sideBySide, mperm);
}
db_finalize(&q);
}
style_footer();
}
/*
|
| ︙ | ︙ | |||
688 689 690 691 692 693 694 | } db_finalize(&q); } /* ** WEBPAGE: vdiff | | > > | 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 |
}
db_finalize(&q);
}
/*
** WEBPAGE: vdiff
** URL: /vdiff?from=UUID&to=UUID&detail=BOOLEAN;sbs=BOOLEAN
**
** Show all differences between two checkins.
*/
void vdiff_page(void){
int ridFrom, ridTo;
int showDetail = 0;
int sideBySide = 0;
Manifest *pFrom, *pTo;
ManifestFile *pFileFrom, *pFileTo;
login_check_credentials();
if( !g.perm.Read ){ login_needed(); return; }
login_anonymous_available();
pFrom = vdiff_parse_manifest("from", &ridFrom);
if( pFrom==0 ) return;
pTo = vdiff_parse_manifest("to", &ridTo);
if( pTo==0 ) return;
showDetail = atoi(PD("detail","0"));
sideBySide = atoi(PD("sbs","1"));
style_header("Check-in Differences");
@ <h2>Difference From:</h2><blockquote>
checkin_description(ridFrom);
@ </blockquote><h2>To:</h2><blockquote>
checkin_description(ridTo);
@ </blockquote><hr /><p>
|
| ︙ | ︙ | |||
729 730 731 732 733 734 735 |
}else if( pFileTo==0 ){
cmp = -1;
}else{
cmp = fossil_strcmp(pFileFrom->zName, pFileTo->zName);
}
if( cmp<0 ){
append_file_change_line(pFileFrom->zName,
| | | | | 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 |
}else if( pFileTo==0 ){
cmp = -1;
}else{
cmp = fossil_strcmp(pFileFrom->zName, pFileTo->zName);
}
if( cmp<0 ){
append_file_change_line(pFileFrom->zName,
pFileFrom->zUuid, 0, 0, 0, 0, 0);
pFileFrom = manifest_file_next(pFrom, 0);
}else if( cmp>0 ){
append_file_change_line(pFileTo->zName,
0, pFileTo->zUuid, 0, 0, 0,
manifest_file_mperm(pFileTo));
pFileTo = manifest_file_next(pTo, 0);
}else if( fossil_strcmp(pFileFrom->zUuid, pFileTo->zUuid)==0 ){
/* No changes */
pFileFrom = manifest_file_next(pFrom, 0);
pFileTo = manifest_file_next(pTo, 0);
}else{
append_file_change_line(pFileFrom->zName,
pFileFrom->zUuid,
pFileTo->zUuid, 0, showDetail, sideBySide,
manifest_file_mperm(pFileTo));
pFileFrom = manifest_file_next(pFrom, 0);
pFileTo = manifest_file_next(pTo, 0);
}
}
manifest_destroy(pFrom);
manifest_destroy(pTo);
|
| ︙ | ︙ |
Changes to src/skins.c.
| ︙ | ︙ | |||
883 884 885 886 887 888 889 890 891 892 893 894 895 896 |
@
@ table.report tr td {
@ padding: 3px 5px;
@ }
@
@ textarea {
@ font-size: 1em;
@ }');
@ REPLACE INTO config(name,mtime,value) VALUES('header',now(),'<html>
@ <head>
@ <title>$<project_name>: $<title></title>
@ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
@ href="$home/timeline.rss">
@ <link rel="stylesheet" href="$home/style.css?black2" type="text/css"
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 |
@
@ table.report tr td {
@ padding: 3px 5px;
@ }
@
@ textarea {
@ font-size: 1em;
@ }
@
@ /* Side-by-side diff */
@ table.sbsdiff {
@ font-family: Dejavu Sans Mono, Monaco, Lucida Console, monospace;
@ font-size: 7pt;
@ border-collapse:collapse;
@ white-space: pre;
@ width: 100%;
@ border: 1px #000 dashed;
@ }
@
@ table.sbsdiff th.diffhdr {
@ border-bottom: dotted;
@ border-width: 1px;
@ }
@
@ table.sbsdiff tr td {
@ white-space: pre;
@ padding-left: 3px;
@ padding-right: 3px;
@ margin: 0px;
@ }
@
@ table.sbsdiff tr td.lineno {
@ text-align: right;
@ }
@
@ table.sbsdiff tr td.meta {
@ background-color: rgb(170, 160, 255);
@ text-align: center;
@ }
@
@ table.sbsdiff tr td.added {
@ background-color: rgb(180, 250, 180);
@ }
@
@ table.sbsdiff tr td.removed {
@ background-color: rgb(250, 130, 130);
@ }
@
@ table.sbsdiff tr td.changed {
@ background-color: rgb(210, 210, 200);
@ }');
@ REPLACE INTO config(name,mtime,value) VALUES('header',now(),'<html>
@ <head>
@ <title>$<project_name>: $<title></title>
@ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
@ href="$home/timeline.rss">
@ <link rel="stylesheet" href="$home/style.css?black2" type="text/css"
|
| ︙ | ︙ |