Fossil SCM
Add sbsdiff link to the /info page.
Commit
286f09508ca49982691f4642e599b3f9e2f1a856
Parent
d1f63cd8233e234…
1 file changed
+15
-2
+15
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -396,11 +396,11 @@ | ||
| 396 | 396 | void ci_page(void){ |
| 397 | 397 | Stmt q; |
| 398 | 398 | int rid; |
| 399 | 399 | int isLeaf; |
| 400 | 400 | int showDiff; |
| 401 | - int sideBySide=0; /* Temporary default */ | |
| 401 | + int sideBySide; | |
| 402 | 402 | const char *zName; /* Name of the checkin to be displayed */ |
| 403 | 403 | const char *zUuid; /* UUID of zName */ |
| 404 | 404 | const char *zParent; /* UUID of the parent checkin (if any) */ |
| 405 | 405 | |
| 406 | 406 | login_check_credentials(); |
| @@ -426,10 +426,11 @@ | ||
| 426 | 426 | " FROM blob, event" |
| 427 | 427 | " WHERE blob.rid=%d" |
| 428 | 428 | " AND event.objid=%d", |
| 429 | 429 | rid, rid |
| 430 | 430 | ); |
| 431 | + sideBySide = atoi(PD("sbs","1")); | |
| 431 | 432 | if( db_step(&q)==SQLITE_ROW ){ |
| 432 | 433 | const char *zUuid = db_column_text(&q, 0); |
| 433 | 434 | char *zTitle = mprintf("Check-in [%.10s]", zUuid); |
| 434 | 435 | char *zEUser, *zEComment; |
| 435 | 436 | const char *zUser; |
| @@ -547,12 +548,24 @@ | ||
| 547 | 548 | showDiff = g.zPath[0]!='c'; |
| 548 | 549 | if( db_get_boolean("show-version-diffs", 0)==0 ){ |
| 549 | 550 | showDiff = !showDiff; |
| 550 | 551 | if( showDiff ){ |
| 551 | 552 | @ <a href="%s(g.zTop)/vinfo/%T(zName)">[hide diffs]</a> |
| 553 | + @ | |
| 554 | + if( sideBySide ){ | |
| 555 | + @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> | |
| 556 | + @ [show 1-pane diffs]</a> | |
| 557 | + }else{ | |
| 558 | + @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> | |
| 559 | + @ [show 2-pane diffs]</a> | |
| 560 | + } | |
| 552 | 561 | }else{ |
| 553 | - @ <a href="%s(g.zTop)/ci/%T(zName)">[show diffs]</a> | |
| 562 | + @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> | |
| 563 | + @ [show 1-pane diffs]</a> | |
| 564 | + @ | |
| 565 | + @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> | |
| 566 | + @ [show 2-pane diffs]</a> | |
| 554 | 567 | } |
| 555 | 568 | }else{ |
| 556 | 569 | if( showDiff ){ |
| 557 | 570 | @ <a href="%s(g.zTop)/ci/%T(zName)">[hide diffs]</a> |
| 558 | 571 | }else{ |
| 559 | 572 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -396,11 +396,11 @@ | |
| 396 | void ci_page(void){ |
| 397 | Stmt q; |
| 398 | int rid; |
| 399 | int isLeaf; |
| 400 | int showDiff; |
| 401 | int sideBySide=0; /* Temporary default */ |
| 402 | const char *zName; /* Name of the checkin to be displayed */ |
| 403 | const char *zUuid; /* UUID of zName */ |
| 404 | const char *zParent; /* UUID of the parent checkin (if any) */ |
| 405 | |
| 406 | login_check_credentials(); |
| @@ -426,10 +426,11 @@ | |
| 426 | " FROM blob, event" |
| 427 | " WHERE blob.rid=%d" |
| 428 | " AND event.objid=%d", |
| 429 | rid, rid |
| 430 | ); |
| 431 | if( db_step(&q)==SQLITE_ROW ){ |
| 432 | const char *zUuid = db_column_text(&q, 0); |
| 433 | char *zTitle = mprintf("Check-in [%.10s]", zUuid); |
| 434 | char *zEUser, *zEComment; |
| 435 | const char *zUser; |
| @@ -547,12 +548,24 @@ | |
| 547 | showDiff = g.zPath[0]!='c'; |
| 548 | if( db_get_boolean("show-version-diffs", 0)==0 ){ |
| 549 | showDiff = !showDiff; |
| 550 | if( showDiff ){ |
| 551 | @ <a href="%s(g.zTop)/vinfo/%T(zName)">[hide diffs]</a> |
| 552 | }else{ |
| 553 | @ <a href="%s(g.zTop)/ci/%T(zName)">[show diffs]</a> |
| 554 | } |
| 555 | }else{ |
| 556 | if( showDiff ){ |
| 557 | @ <a href="%s(g.zTop)/ci/%T(zName)">[hide diffs]</a> |
| 558 | }else{ |
| 559 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -396,11 +396,11 @@ | |
| 396 | void ci_page(void){ |
| 397 | Stmt q; |
| 398 | int rid; |
| 399 | int isLeaf; |
| 400 | int showDiff; |
| 401 | int sideBySide; |
| 402 | const char *zName; /* Name of the checkin to be displayed */ |
| 403 | const char *zUuid; /* UUID of zName */ |
| 404 | const char *zParent; /* UUID of the parent checkin (if any) */ |
| 405 | |
| 406 | login_check_credentials(); |
| @@ -426,10 +426,11 @@ | |
| 426 | " FROM blob, event" |
| 427 | " WHERE blob.rid=%d" |
| 428 | " AND event.objid=%d", |
| 429 | rid, rid |
| 430 | ); |
| 431 | sideBySide = atoi(PD("sbs","1")); |
| 432 | if( db_step(&q)==SQLITE_ROW ){ |
| 433 | const char *zUuid = db_column_text(&q, 0); |
| 434 | char *zTitle = mprintf("Check-in [%.10s]", zUuid); |
| 435 | char *zEUser, *zEComment; |
| 436 | const char *zUser; |
| @@ -547,12 +548,24 @@ | |
| 548 | showDiff = g.zPath[0]!='c'; |
| 549 | if( db_get_boolean("show-version-diffs", 0)==0 ){ |
| 550 | showDiff = !showDiff; |
| 551 | if( showDiff ){ |
| 552 | @ <a href="%s(g.zTop)/vinfo/%T(zName)">[hide diffs]</a> |
| 553 | @ |
| 554 | if( sideBySide ){ |
| 555 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> |
| 556 | @ [show 1-pane diffs]</a> |
| 557 | }else{ |
| 558 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> |
| 559 | @ [show 2-pane diffs]</a> |
| 560 | } |
| 561 | }else{ |
| 562 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=0"> |
| 563 | @ [show 1-pane diffs]</a> |
| 564 | @ |
| 565 | @ <a href="%s(g.zTop)/ci/%T(zName)?sbs=1"> |
| 566 | @ [show 2-pane diffs]</a> |
| 567 | } |
| 568 | }else{ |
| 569 | if( showDiff ){ |
| 570 | @ <a href="%s(g.zTop)/ci/%T(zName)">[hide diffs]</a> |
| 571 | }else{ |
| 572 |