Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Enhance the "vdiff" web method so that it shows the differences between to arbitrary check-ins identified by the "from" and "to" query parameters. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
1d713f3f4d2292573363cf3b731ee351 |
User & Date: | drh 2010-08-07 18:09:01.000 |
Context
2010-08-11
| ||
07:00 | Allow a checkin to be checked out again even if one of the files in that checkin has been shunned. ... (check-in: 7e23178ba3 user: drh tags: trunk) | |
2010-08-07
| ||
18:09 | Enhance the "vdiff" web method so that it shows the differences between to arbitrary check-ins identified by the "from" and "to" query parameters. ... (check-in: 1d713f3f4d user: drh tags: trunk) | |
16:10 | The "fossil diff" command now accepts options --from and --to in order to do a diff between two arbitrary check-ins. ... (check-in: 296b90a25b user: drh tags: trunk) | |
Changes
Changes to src/info.c.
︙ | ︙ | |||
236 237 238 239 240 241 242 243 244 245 246 247 248 249 | text_diff(&from, &to, &out, 5); @ %h(blob_str(&out)) blob_reset(&from); blob_reset(&to); blob_reset(&out); } /* ** WEBPAGE: vinfo ** WEBPAGE: ci ** URL: /ci?name=RID|ARTIFACTID ** ** Display information about a particular check-in. | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 | text_diff(&from, &to, &out, 5); @ %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 */ int showDiff /* Show edit diffs if true */ ){ if( !g.okHistory ){ if( zNew==0 ){ @ <p>Deleted %h(zName)</p> }else if( zOld==0 ){ @ <p>Added %h(zName)</p> }else{ @ <p>Changes to %h(zName)</p> } }else if( zOld && zNew ){ @ <p>Modified <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> @ from <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a> @ to <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)].</a> if( !showDiff ){ @ @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)">[diff]</a> }else{ int rid1 = uuid_to_rid(zOld, 0); int rid2 = uuid_to_rid(zNew, 0); @ <blockquote><pre> append_diff(rid1, rid2); @ </pre></blockquote> } }else if( zOld ){ @ <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></p> }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></p> } } /* ** WEBPAGE: vinfo ** WEBPAGE: ci ** URL: /ci?name=RID|ARTIFACTID ** ** Display information about a particular check-in. |
︙ | ︙ | |||
389 390 391 392 393 394 395 | if( showDiff ){ @ <a href="%s(g.zBaseURL)/ci/%T(zName)">[hide diffs]</a><br/> }else{ @ <a href="%s(g.zBaseURL)/vinfo/%T(zName)">[show diffs]</a><br/> } } db_prepare(&q, | | < < | | | < < < < < < < < < < < | < < < < < < < < < < < < < < < < | 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 | if( showDiff ){ @ <a href="%s(g.zBaseURL)/ci/%T(zName)">[hide diffs]</a><br/> }else{ @ <a href="%s(g.zBaseURL)/vinfo/%T(zName)">[show diffs]</a><br/> } } db_prepare(&q, "SELECT name," " (SELECT uuid FROM blob WHERE rid=mlink.pid)," " (SELECT uuid FROM blob WHERE rid=mlink.fid)" " FROM mlink JOIN filename ON filename.fnid=mlink.fnid" " WHERE mlink.mid=%d" " ORDER BY name", rid ); while( db_step(&q)==SQLITE_ROW ){ const char *zName = db_column_text(&q,0); const char *zOld = db_column_text(&q,1); const char *zNew = db_column_text(&q,2); append_file_change_line(zName, zOld, zNew, showDiff); } db_finalize(&q); style_footer(); } /* ** WEBPAGE: winfo |
︙ | ︙ | |||
518 519 520 521 522 523 524 525 526 527 | wiki_convert(&wiki, 0, 0); blob_reset(&wiki); } manifest_clear(&m); } style_footer(); } /* ** WEBPAGE: vdiff | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | > | < > | | | < < | < < < < < > | > | < < < < < | < < < < < | > > | > > > > > > | < < > > | > > | < | < | < < < < > | < < > > | > > > > < < < > > | | 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 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 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 | wiki_convert(&wiki, 0, 0); blob_reset(&wiki); } manifest_clear(&m); } style_footer(); } /* ** Show a webpage error message */ void webpage_error(const char *zFormat, ...){ va_list ap; const char *z; va_start(ap, zFormat); z = vmprintf(zFormat, ap); va_end(ap); style_header("URL Error"); @ <h1>Error</h1> @ <p>%h(z)</p> style_footer(); } /* ** Find an checkin based on query parameter zParam and parse its ** manifest. Return the number of errors. */ static int vdiff_parse_manifest(const char *zParam, int *pRid, Manifest *pM){ int rid; Blob content; *pRid = rid = name_to_rid_www(zParam); if( rid==0 ){ webpage_error("Missing \"%s\" query parameter.", zParam); return 1; } if( !is_a_version(rid) ){ webpage_error("Artifact %s is not a checkin.", P(zParam)); return 1; } content_get(rid, &content); manifest_parse(pM, &content); return 0; } /* ** Output a description of a check-in */ void checkin_description(int rid){ Stmt q; db_prepare(&q, "SELECT datetime(mtime), coalesce(euser,user)," " coalesce(ecomment,comment), uuid" " FROM event, blob" " WHERE event.objid=%d AND type='ci'" " AND blob.rid=%d", rid, rid ); while( db_step(&q)==SQLITE_ROW ){ const char *zDate = db_column_text(&q, 0); const char *zUser = db_column_text(&q, 1); const char *zCom = db_column_text(&q, 2); const char *zUuid = db_column_text(&q, 3); @ Check-in hyperlink_to_uuid(zUuid); @ - %w(zCom) by hyperlink_to_user(zUser,zDate," on"); hyperlink_to_date(zDate, "."); } 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; int iFrom, iTo; Manifest mFrom, mTo; login_check_credentials(); if( !g.okRead ){ login_needed(); return; } login_anonymous_available(); if( vdiff_parse_manifest("from", &ridFrom, &mFrom) ) return; if( vdiff_parse_manifest("to", &ridTo, &mTo) ) 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> iFrom = iTo = 0; while( iFrom<mFrom.nFile && iTo<mTo.nFile ){ int cmp; if( iFrom>=mFrom.nFile ){ cmp = +1; }else if( iTo>=mTo.nFile ){ cmp = -1; }else{ cmp = strcmp(mFrom.aFile[iFrom].zName, mTo.aFile[iTo].zName); } if( cmp<0 ){ append_file_change_line(mFrom.aFile[iFrom].zName, mFrom.aFile[iFrom].zUuid, 0, 0); iFrom++; }else if( cmp>0 ){ append_file_change_line(mTo.aFile[iTo].zName, 0, mTo.aFile[iTo].zUuid, 0); iTo++; }else if( strcmp(mFrom.aFile[iFrom].zUuid, mTo.aFile[iTo].zUuid)==0 ){ /* No changes */ iFrom++; iTo++; }else{ append_file_change_line(mFrom.aFile[iFrom].zName, mFrom.aFile[iFrom].zUuid, mTo.aFile[iTo].zUuid, showDetail); iFrom++; iTo++; } } manifest_clear(&mFrom); manifest_clear(&mTo); style_footer(); } /* ** Write a description of an object to the www reply. ** ** If the object is a file then mention: |
︙ | ︙ | |||
781 782 783 784 785 786 787 | /* ** WEBPAGE: fdiff ** ** Two arguments, v1 and v2, are integers. Show the difference between ** the two records. */ void diff_page(void){ | | < > > | 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 | /* ** WEBPAGE: fdiff ** ** Two arguments, v1 and v2, are integers. Show the difference between ** the two records. */ void diff_page(void){ int v1, v2; Blob c1, c2, diff; login_check_credentials(); if( !g.okRead ){ login_needed(); return; } v1 = name_to_rid_www("v1"); v2 = name_to_rid_www("v2"); if( v1==0 || v2==0 ) fossil_redirect_home(); style_header("Diff"); @ <h2>Differences From:</h2> @ <blockquote> object_description(v1, 1, 0); @ </blockquote> @ <h2>To:</h2> |
︙ | ︙ |