Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch jan-sbsdiff Excluding Merge-Ins
This is equivalent to a diff from fd486df492 to a92908a6b5
2011-10-17
| ||
01:19 | Merge the side-by-side diff code into trunk. check-in: 0bde74ea1e user: drh tags: trunk | |
01:18 | Remove unused variables and surplus blank lines from the side-by-side diff code. Closed-Leaf check-in: a92908a6b5 user: drh tags: jan-sbsdiff | |
01:12 | Add new warnings for when Fossil overwrites an unmanged file on "update" or "merge". Undo has been and continues to be available to recover the overwritten files. check-in: 39f979b08c user: drh tags: trunk | |
00:26 | Rephrasing and fixed a typo. check-in: 8e358aa8c6 user: jan tags: jan-sbsdiff | |
2011-10-16
| ||
23:24 | Merge the latest trunk changes into the side-by-side diff branch. check-in: 23c3affad4 user: drh tags: jan-sbsdiff | |
23:10 | Fix a typo in the timeline EVENT table entries generated by "fossil rebuild" in the previous check-in. check-in: fd486df492 user: drh tags: trunk | |
23:00 | Show tag changes on the timeline. A "fossil rebuild" is required to take advantage of this new feature. Also put a • character in front of non-checkin timeline entries to make them stand out more. check-in: 87540ed6e6 user: drh tags: trunk | |
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 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 |
** array of COPY/DELETE/INSERT triples. */ free(c.aFrom); free(c.aTo); return c.aEdit; } } /* ** Copy a line with a limit. Used for side-by-side diffs to enforce a maximum ** line length limit. */ static char *copylimline(char *out, DLine *dl, int lim){ int len; len = dl->h & LENGTH_MASK; if( lim && len > lim ){ memcpy(out, dl->z, lim-3); strcpy(&out[lim-3], "..."); }else{ memcpy(out, dl->z, len); out[len] = '\0'; } return out; } /* ** Output table body of a side-by-side diff. Prior to the call, the caller ** should have output: ** <table class="sbsdiff"> ** <tr><th colspan="2" class="diffhdr">Old title</th><th/> ** <th colspan="2" class="diffhdr">New title</th></tr> ** ** And after the call, it should output: ** </table> ** ** Some good reference diffs in the fossil repository for testing: ** /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; int collim=0; /* Currently not settable; allows a column limit for diffs */ int allowExp=0; /* Currently not settable; (dis)allow expansion of rows */ /* 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); /* Note: This would be generated within a table. */ @ <p class="generalError" style="white-space: nowrap">cannot compute @ difference between binary files</p> return 0; } collim = collim < 4 ? 0 : collim; /* Compute the difference */ diff_all(&c); linebuf = fossil_malloc(LENGTH_MASK+1); if( !linebuf ){ free(c.aFrom); free(c.aTo); free(c.aEdit); return 0; } iFrom=iTo=0; i=0; while( i<c.nEdit ){ int j; /* Copied lines */ for( j=0; j<c.aEdit[i]; j++){ /* Hide lines which are copied and are further away from block boundaries ** than 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 lines</td> @ </tr> if( !allowExp ) continue; @ <tr style="display:none;"> }else{ if( !allowExp ) continue; @ <tr style="display:none;"> } copylimline(linebuf, &c.aFrom[iFrom+j], collim); @ <td class="lineno">%d(iFrom+j+1)</td> @ <td class="srcline">%h(linebuf)</td> @ <td> </td> copylimline(linebuf, &c.aTo[iTo+j], collim); @ <td class="lineno">%d(iTo+j+1)</td> @ <td class="srcline">%h(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++ ){ @ <tr> if( j<c.aEdit[i+1] ){ copylimline(linebuf, &c.aFrom[iFrom+j], collim); @ <td class="changed lineno">%d(iFrom+j+1)</td> @ <td class="changed srcline">%h(linebuf)</td> }else{ @ <td colspan="2" class="changedvoid"/> } @ <td class="changed">|</td> if( j<c.aEdit[i+2] ){ copylimline(linebuf, &c.aTo[iTo+j], collim); @ <td class="changed lineno">%d(iTo+j+1)</td> @ <td class="changed srcline">%h(linebuf)</td> }else{ @ <td colspan="2" class="changedvoid"/> } @ </tr> } iFrom+=c.aEdit[i+1]; iTo+=c.aEdit[i+2]; }else{ /* Process deleted lines */ for( j=0; j<c.aEdit[i+1]; j++ ){ @ <tr> copylimline(linebuf, &c.aFrom[iFrom+j], collim); @ <td class="removed lineno">%d(iFrom+j+1)</td> @ <td class="removed srcline">%h(linebuf)</td> @ <td><</td> @ <td colspan="2" class="removedvoid"/> @ </tr> } iFrom+=c.aEdit[i+1]; /* Process inserted lines */ for( j=0; j<c.aEdit[i+2]; j++ ){ @ <tr> @ <td colspan="2" class="addedvoid"/> @ <td>></td> copylimline(linebuf, &c.aTo[iTo+j], collim); @ <td class="added lineno">%d(iTo+j+1)</td> @ <td class="added srcline">%h(linebuf)</td> @ </tr> } iTo+=c.aEdit[i+2]; } i+=3; } free(linebuf); free(c.aFrom); free(c.aTo); free(c.aEdit); return 1; } /* ** 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 ... 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 ... 359 360 361 362 363 364 365 366 367 368 369 370 371 372 ... 388 389 390 391 392 393 394 395 396 397 398 399 400 401 ... 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 ... 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 ... 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 ... 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 ... 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 |
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> ................................................................................ @ <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 ){ @ <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> } } ................................................................................ ** "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"); ................................................................................ "SELECT uuid, datetime(mtime, 'localtime'), user, comment," " datetime(omtime, 'localtime')" " FROM blob, event" " WHERE blob.rid=%d" " AND event.objid=%d", rid, rid ); if( db_step(&q)==SQLITE_ROW ){ const char *zUuid = db_column_text(&q, 0); char *zTitle = mprintf("Check-in [%.10s]", zUuid); char *zEUser, *zEComment; const char *zUser; const char *zComment; const char *zDate; ................................................................................ if( zParent ){ @ <div class="section">Changes</div> showDiff = g.zPath[0]!='c'; if( db_get_boolean("show-version-diffs", 0)==0 ){ showDiff = !showDiff; if( showDiff ){ @ <a href="%s(g.zTop)/vinfo/%T(zName)">[hide diffs]</a> }else{ @ <a href="%s(g.zTop)/ci/%T(zName)">[show diffs]</a> } }else{ if( showDiff ){ @ <a href="%s(g.zTop)/ci/%T(zName)">[hide diffs]</a> }else{ @ <a href="%s(g.zTop)/vinfo/%T(zName)">[show diffs]</a> } } @ @ <a href="%s(g.zTop)/vpatch?from=%S(zParent)&to=%S(zUuid)">[patch]</a><br/> db_prepare(&q, "SELECT name," " mperm," ................................................................................ ); 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, mperm); } db_finalize(&q); } style_footer(); } /* ................................................................................ } db_finalize(&q); } /* ** WEBPAGE: vdiff ** URL: /vdiff?from=UUID&to=UUID&detail=BOOLEAN ** ** Show all differences between two checkins. */ void vdiff_page(void){ int ridFrom, ridTo; int showDetail = 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")); style_header("Check-in Differences"); @ <h2>Difference From:</h2><blockquote> checkin_description(ridFrom); @ </blockquote><h2>To:</h2><blockquote> checkin_description(ridTo); @ </blockquote><hr /><p> ................................................................................ }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); pFileFrom = manifest_file_next(pFrom, 0); }else if( cmp>0 ){ append_file_change_line(pFileTo->zName, 0, pFileTo->zUuid, 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, manifest_file_mperm(pFileTo)); pFileFrom = manifest_file_next(pFrom, 0); pFileTo = manifest_file_next(pTo, 0); } } manifest_destroy(pFrom); manifest_destroy(pTo); ................................................................................ @ <a href="%s(g.zTop)/artifact/%S(zUuid)">[view]</a> } } /* ** WEBPAGE: fdiff ** URL: fdiff?v1=UUID&v2=UUID&patch ** ** Two arguments, v1 and v2, identify the files to be diffed. Show the ** difference between the two artifacts. Generate plaintext if "patch" ** is present. */ void diff_page(void){ int v1, v2; int isPatch; Blob c1, c2, diff, *pOut; char *zV1; char *zV2; login_check_credentials(); if( !g.perm.Read ){ login_needed(); return; } v1 = name_to_rid_www("v1"); v2 = name_to_rid_www("v2"); if( v1==0 || v2==0 ) fossil_redirect_home(); zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1); zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2); isPatch = P("patch")!=0; if( isPatch ){ pOut = cgi_output_blob(); cgi_set_content_type("text/plain"); }else{ blob_zero(&diff); pOut = &diff; } content_get(v1, &c1); content_get(v2, &c2); text_diff(&c1, &c2, pOut, 4, 1); blob_reset(&c1); blob_reset(&c2); if( !isPatch ){ style_header("Diff"); style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", g.zTop, P("v1"), P("v2")); @ <h2>Differences From @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> object_description(v1, 0, 0); @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2> object_description(v2, 0, 0); @ <hr /> @ <blockquote><pre> @ %h(blob_str(&diff)) @ </pre></blockquote> blob_reset(&diff); style_footer(); } } /* ** WEBPAGE: raw |
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | > > > > > > > | | > > > > > > > > > > > > | > > > > | > > > > | > | > > > > > > > > > > > | | | | | | | > > > | | | | | > > > > > > > > > > > > > > | | | > |
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 326 327 328 329 ... 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 ... 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 ... 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 ... 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 ... 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 ... 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 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 ... 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 .... 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 |
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); } @ <table class="sbsdiff"> @ <tr><th colspan="2" class="diffhdr">Old (%S(zFrom))</th><th/> @ <th colspan="2" class="diffhdr">New (%S(zTo))</th></tr> html_sbsdiff(&from, &to, 5, 1); @ </table> 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> ................................................................................ @ <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 ){ generate_sbsdiff(zOld, zNew); }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> } } ................................................................................ ** "show-version-diffs" setting is turned on. */ void ci_page(void){ Stmt q; int rid; int isLeaf; int showDiff; int sideBySide; 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"); ................................................................................ "SELECT uuid, datetime(mtime, 'localtime'), user, comment," " datetime(omtime, 'localtime')" " FROM blob, event" " WHERE blob.rid=%d" " AND event.objid=%d", rid, rid ); sideBySide = atoi(PD("sbs","1")); if( db_step(&q)==SQLITE_ROW ){ const char *zUuid = db_column_text(&q, 0); char *zTitle = mprintf("Check-in [%.10s]", zUuid); char *zEUser, *zEComment; const char *zUser; const char *zComment; const char *zDate; ................................................................................ if( zParent ){ @ <div class="section">Changes</div> showDiff = g.zPath[0]!='c'; if( db_get_boolean("show-version-diffs", 0)==0 ){ showDiff = !showDiff; if( showDiff ){ @ <a href="%s(g.zTop)/vinfo/%T(zName)">[hide diffs]</a> @ if( sideBySide ){ @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> @ [unified diffs]</a> }else{ @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> @ [side-by-side diffs]</a> } }else{ @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> @ [show unified diffs]</a> @ @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> @ [show side-by-side diffs]</a> } }else{ if( showDiff ){ @ <a href="%s(g.zTop)/ci/%T(zName)">[hide diffs]</a> @ if( sideBySide ){ @ <a href="%s(g.zTop)/info/%T(zName)?sbs=0"> @ [unified diffs]</a> }else{ @ <a href="%s(g.zTop)/info/%T(zName)?sbs=1"> @ [side-by-side diffs]</a> } }else{ @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=0"> @ [show unified diffs]</a> @ @ <a href="%s(g.zTop)/vinfo/%T(zName)?sbs=1"> @ [show side-by-side diffs]</a> } } @ @ <a href="%s(g.zTop)/vpatch?from=%S(zParent)&to=%S(zUuid)">[patch]</a><br/> db_prepare(&q, "SELECT name," " mperm," ................................................................................ ); 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(); } /* ................................................................................ } 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")); if( !sideBySide ){ style_submenu_element("Side-by-side Diff", "sbsdiff", "%s/vdiff?from=%T&to=%T&detail=%d&sbs=1", g.zTop, P("from"), P("to"), showDetail); }else{ style_submenu_element("Unified Diff", "udiff", "%s/vdiff?from=%T&to=%T&detail=%d&sbs=0", g.zTop, P("from"), P("to"), showDetail); } style_header("Check-in Differences"); @ <h2>Difference From:</h2><blockquote> checkin_description(ridFrom); @ </blockquote><h2>To:</h2><blockquote> checkin_description(ridTo); @ </blockquote><hr /><p> ................................................................................ }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); ................................................................................ @ <a href="%s(g.zTop)/artifact/%S(zUuid)">[view]</a> } } /* ** WEBPAGE: fdiff ** URL: fdiff?v1=UUID&v2=UUID&patch&sbs=BOOLEAN ** ** Two arguments, v1 and v2, identify the files to be diffed. Show the ** difference between the two artifacts. Show diff side by side unless sbs ** is 0. Generate plaintext if "patch" is present. */ void diff_page(void){ int v1, v2; int isPatch; int sideBySide; Blob c1, c2, diff, *pOut; char *zV1; char *zV2; login_check_credentials(); if( !g.perm.Read ){ login_needed(); return; } v1 = name_to_rid_www("v1"); v2 = name_to_rid_www("v2"); if( v1==0 || v2==0 ) fossil_redirect_home(); sideBySide = atoi(PD("sbs","1")); zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1); zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2); isPatch = P("patch")!=0; if( isPatch ){ pOut = cgi_output_blob(); cgi_set_content_type("text/plain"); }else{ blob_zero(&diff); pOut = &diff; } if( !sideBySide || isPatch ){ content_get(v1, &c1); content_get(v2, &c2); text_diff(&c1, &c2, pOut, 4, 1); blob_reset(&c1); blob_reset(&c2); } if( !isPatch ){ style_header("Diff"); style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", g.zTop, P("v1"), P("v2")); if( !sideBySide ){ style_submenu_element("Side-by-side Diff", "sbsdiff", "%s/fdiff?v1=%T&v2=%T&sbs=1", g.zTop, P("v1"), P("v2")); }else{ style_submenu_element("Unified Diff", "udiff", "%s/fdiff?v1=%T&v2=%T&sbs=0", g.zTop, P("v1"), P("v2")); } @ <h2>Differences From @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> object_description(v1, 0, 0); @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2> object_description(v2, 0, 0); @ <hr /> if( sideBySide ){ generate_sbsdiff(zV1, zV2); }else{ @ <blockquote><pre> @ %h(blob_str(&diff)) @ </pre></blockquote> } blob_reset(&diff); style_footer(); } } /* ** WEBPAGE: raw |
Changes to src/skins.c.
150 151 152 153 154 155 156 157 158 159 160 161 162 163 ... 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 ... 588 589 590 591 592 593 594 595 596 597 598 599 600 601 ... 883 884 885 886 887 888 889 890 891 892 893 894 895 896 |
@ } @ @ /* The label/value pairs on (for example) the vinfo page */ @ table.label-value th { @ vertical-align: top; @ text-align: right; @ padding: 0.2ex 2ex; @ }'); @ 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?blackwhite" type="text/css" ................................................................................ @ @ /* The label/value pairs on (for example) the ci page */ @ table.label-value th { @ vertical-align: top; @ text-align: right; @ padding: 0.2ex 2ex; @ } @ '); @ 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?tan" type="text/css" @ media="screen"> ................................................................................ @ } @ @ /* The label/value pairs on (for example) the ci page */ @ table.label-value th { @ vertical-align: top; @ text-align: right; @ padding: 0.2ex 2ex; @ }'); @ 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" ................................................................................ @ @ 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" |
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 ... 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 ... 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 .... 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 |
@ } @ @ /* The label/value pairs on (for example) the vinfo page */ @ table.label-value th { @ vertical-align: top; @ text-align: right; @ padding: 0.2ex 2ex; @ } @ @ /* Side-by-side diff */ @ table.sbsdiff { @ background-color: white; @ font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace; @ font-size: 10pt; @ border-collapse:collapse; @ white-space: pre; @ width: 98%; @ 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 { @ color: white; @ background-color: rgb(20, 20, 20); @ text-align: center; @ } @ @ table.sbsdiff tr td.added { @ background-color: rgb(230, 230, 230); @ } @ @ table.sbsdiff tr td.removed { @ background-color: rgb(200, 200, 200); @ } @ @ table.sbsdiff tr td.changed { @ background-color: rgb(220, 220, 220); @ }'); @ 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?blackwhite" type="text/css" ................................................................................ @ @ /* The label/value pairs on (for example) the ci page */ @ table.label-value th { @ vertical-align: top; @ text-align: right; @ padding: 0.2ex 2ex; @ } @ @ /* Side-by-side diff */ @ table.sbsdiff { @ background-color: #ffffc5; @ font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace; @ font-size: 10pt; @ border-collapse:collapse; @ white-space: pre; @ width: 98%; @ 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: #a09048; @ text-align: center; @ } @ @ table.sbsdiff tr td.added { @ background-color: rgb(210, 210, 100); @ } @ @ table.sbsdiff tr td.removed { @ background-color: rgb(190, 200, 110); @ } @ @ table.sbsdiff tr td.changed { @ background-color: rgb(200, 210, 120); @ }'); @ 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?tan" type="text/css" @ media="screen"> ................................................................................ @ } @ @ /* The label/value pairs on (for example) the ci page */ @ table.label-value th { @ vertical-align: top; @ text-align: right; @ padding: 0.2ex 2ex; @ } @ @ /* Side-by-side diff */ @ table.sbsdiff { @ background-color: white; @ font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace; @ font-size: 10pt; @ border-collapse:collapse; @ white-space: pre; @ width: 98%; @ 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 { @ color: white; @ background-color: black; @ text-align: center; @ } @ @ table.sbsdiff tr td.added { @ background-color: white; @ } @ @ table.sbsdiff tr td.removed { @ background-color: white; @ text-decoration: line-through; @ } @ @ table.sbsdiff tr td.changed { @ background-color: white; @ }'); @ 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" ................................................................................ @ @ table.report tr td { @ padding: 3px 5px; @ } @ @ textarea { @ font-size: 1em; @ } @ @ /* Side-by-side diff */ @ table.sbsdiff { @ background-color: white; @ font-family: Dejavu Sans Mono, Monaco, Lucida Console, monospace; @ font-size: 8pt; @ border-collapse:collapse; @ width: 98%; @ border: 1px #000 dashed; @ margin-left: auto; @ margin-right: auto; @ } @ @ table.sbsdiff th.diffhdr { @ border-bottom: dotted; @ border-width: 1px; @ } @ @ table.sbsdiff tr td { @ padding-left: 3px; @ padding-right: 3px; @ margin: 0px; @ vertical-align: top; @ white-space: pre-wrap; @ } @ @ table.sbsdiff tr td.lineno { @ text-align: right; @ /* border-bottom: 1px solid rgb(220, 220, 220); */ @ } @ @ table.sbsdiff tr td.srcline { @ max-width: 400px; @ /* Note: May partially hide long lines without whitespaces */ @ overflow: hidden; @ /* border-bottom: 1px solid rgb(220, 220, 220); */ @ } @ @ table.sbsdiff tr td.meta { @ background-color: rgb(170, 160, 255); @ padding-top: 0.25em; @ padding-bottom: 0.25em; @ text-align: center; @ -moz-border-radius: 5px; @ -moz-border-radius: 5px; @ -webkit-border-radius: 5px; @ -webkit-border-radius: 5px; @ -border-radius: 5px; @ -border-radius: 5px; @ border-radius: 5px; @ border-radius: 5px; @ } @ @ table.sbsdiff tr td.added { @ background-color: rgb(180, 250, 180); @ /* border-bottom: 1px solid rgb(160, 230, 160); */ @ } @ @ table.sbsdiff tr td.removed { @ background-color: rgb(250, 130, 130); @ /* border-bottom: 1px solid rgb(230, 110, 110); */ @ } @ @ table.sbsdiff tr td.changed { @ background-color: rgb(210, 210, 200); @ /* border-bottom: 1px solid rgb(190, 190, 180); */ @ }'); @ 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" |
Changes to src/style.c.
394 395 396 397 398 399 400 401 402 403 404 405 406 407 |
@ @ /* The label/value pairs on (for example) the ci page */ @ table.label-value th { @ vertical-align: top; @ text-align: right; @ padding: 0.2ex 2ex; @ } @ ; /* The following table contains bits of default CSS that must ** be included if they are not found in the application-defined ** CSS. |
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 |
@ @ /* The label/value pairs on (for example) the ci page */ @ table.label-value th { @ vertical-align: top; @ text-align: right; @ padding: 0.2ex 2ex; @ } @ @ /* Side-by-side diff */ @ table.sbsdiff { @ background-color: white; @ font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace; @ font-size: 10pt; @ border-collapse:collapse; @ white-space: pre; @ width: 98%; @ border: 1px #000 dashed; @ margin-left: auto; @ margin-right: auto; @ } @ @ 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; @ vertical-align: top; @ } @ @ table.sbsdiff tr td.lineno { @ text-align: right; @ } @ @ table.sbsdiff tr td.srcline { @ } @ @ 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.addedvoid { @ background-color: rgb(190, 190, 180); @ } @ @ table.sbsdiff tr td.removed { @ background-color: rgb(250, 130, 130); @ } @ table.sbsdiff tr td.removedvoid { @ background-color: rgb(190, 190, 180); @ } @ @ table.sbsdiff tr td.changed { @ background-color: rgb(210, 210, 200); @ } @ table.sbsdiff tr td.changedvoid { @ background-color: rgb(190, 190, 180); @ } @ ; /* The following table contains bits of default CSS that must ** be included if they are not found in the application-defined ** CSS. |