Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch diff-js-refactoring Excluding Merge-Ins
This is equivalent to a diff from 2921ec2588 to 916094f820
|
2021-09-11
| ||
| 17:09 | Enhance the various diff views (excluding diff -b output) to be able to dynamically load more context lines per mouse click. check-in: 51c1efd403 user: stephan tags: trunk | |
| 15:53 | Merge the diff alignment scoring tweak from trunk. Closed-Leaf check-in: 916094f820 user: drh tags: diff-js-refactoring | |
| 15:52 | Tweak the diff-alignment scoring algorithm to give extra affinity to lines that share a common prefix. check-in: 2921ec2588 user: drh tags: trunk | |
| 08:17 | Diff-related CSS cleanups. check-in: 1ca68f3ab4 user: stephan tags: diff-js-refactoring | |
|
2021-09-10
| ||
| 23:50 | When computing a diff display, if the number of rows to skip between two diff regions is less than the context size, then go ahead and show the skip area as common text. check-in: 674da6424a user: drh tags: trunk | |
Changes to skins/bootstrap/css.txt.
| ︙ | |||
4398 4399 4400 4401 4402 4403 4404 | 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 | + + + + + + + + + + + + + + + + + + + + + + + + |
height: 4px;
background: #000;
}
body.branch .submenu > a.timeline-link {
color: black;
}
tr.diffskip > td.chunkctrl .jcbutton {
min-width: 3.5ex;
max-width: revert;
}
/* Bootstrap installs a 'table' class on tables which causes its
styles to be more specific matches than our diff tables, so we have
to fight that fire with more fire... */
table.diff.table>thead>tr>th, table.diff.table>tbody>tr>th,
table.diff.table>tfoot>tr>th, table.diff.table>thead>tr>td,
table.diff.table>tbody>tr>td, table.diff.table>tfoot>tr>td {
padding: 0;
line-height: revert;
vertical-align: top;
border-top: none;
}
table.diff tr.diffskip.jchunk > td {
padding: 0.25em 0.5em;
}
table.diff pre {
border: none;
word-wrap: initial;
}
|
Changes to skins/darkmode/css.txt.
| ︙ | |||
477 478 479 480 481 482 483 | 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 | + + - + + + + |
text-decoration: none;
}
td.difftxt ins > ins {
background-color: #559855;
color: #000;
text-decoration: none;
}
tr.diffskip.jchunk {
background-color: black;
|
| ︙ |
Changes to skins/eagle/css.txt.
| ︙ | |||
261 262 263 264 265 266 267 | 261 262 263 264 265 266 267 268 269 270 271 272 273 274 | - |
/* Side-by-side diff */
table.splitdiff {
background-color: #485D7B;
font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace;
font-size: 8pt;
border-collapse:collapse;
white-space: pre;
|
| ︙ | |||
345 346 347 348 349 350 351 | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 | + + - + + + + + + - + |
/* deleted in a diff */
td.difftxt del > del, td.diffln del {
background-color: rgb(230, 110, 110);
}
td.difftxt del {
background-color: inherit;
}
tr.diffskip.jchunk {
background-color: #7EA2D9;
|
| ︙ |
Changes to skins/khaki/css.txt.
| ︙ | |||
168 169 170 171 172 173 174 | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 | + + + + + + + + + |
div.forumPostBody blockquote {
border-width: 1pt;
border-radius: 0.25em;
border-style: solid;
padding: 0 0.5em;
}
tr.diffskip > td.chunkctrl .jcbutton {
color: white;
background-color: #a09048;
}
tr.diffskip.jchunk {
background-color: #c0af58;
}
|
Changes to skins/xekri/css.txt.
| ︙ | |||
261 262 263 264 265 266 267 268 269 270 271 272 273 274 | 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | + + + + + + + |
padding: 0.1rem 1rem;
}
/**************************************
* Diffs
*/
tr.diffskip.jchunk {
background-color: black;
}
tr.diffskip > td.chunkctrl .jcbutton {
background-color: #303536;
}
/* Code Added */
td.diffln ins,
td.difftxt ins > ins {
background-color: #7f7;
color: #000;
}
|
| ︙ | |||
291 292 293 294 295 296 297 | 298 299 300 301 302 303 304 305 306 307 308 309 310 311 | - |
* Diffs : Side-By-Side
*/
/* display (column-based) */
table.splitdiff {
border-spacing: 0;
font-size: 0.85rem;
|
| ︙ |
Changes to src/builtin.c.
| ︙ | |||
621 622 623 624 625 626 627 628 629 630 631 632 633 634 | 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 | + + |
fossil_free(zName);
zName = db_get("project-code", "");
CX("projectCode: %!j,\n", zName);
fossil_free(zName);
CX("/* Length of UUID hashes for display purposes. */");
CX("hashDigits: %d, hashDigitsUrl: %d,\n",
hash_digits(0), hash_digits(1));
CX("diffContextLines: %d,\n",
diff_context_lines(0));
CX("editStateMarkers: {"
"/*Symbolic markers to denote certain edit states.*/"
"isNew:'[+]', isModified:'[*]', isDeleted:'[-]'},\n");
CX("confirmerButtonTicks: 3 "
"/*default fossil.confirmer tick count.*/,\n");
/* Inject certain info about the current skin... */
CX("skin:{");
|
| ︙ | |||
700 701 702 703 704 705 706 707 708 709 710 711 712 713 | 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 | + |
** entries: all known deps of this one. Each
** REQUIRES an EXPLICIT trailing \0, including
** the final one! */
} fjs[] = {
/* This list ordering isn't strictly important. */
{"confirmer", 0, 0},
{"copybutton", 0, "dom\0"},
{"diff", 0, "dom\0fetch\0popupwidget\0"},
{"dom", 0, 0},
{"fetch", 0, 0},
{"info-diff", 0, "dom\0"},
{"numbered-lines", 0, "popupwidget\0copybutton\0"},
{"pikchr", 0, "dom\0"},
{"popupwidget", 0, "dom\0"},
{"storage", 0, 0},
|
| ︙ |
Changes to src/default.css.
| ︙ | |||
530 531 532 533 534 535 536 | 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 | - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + |
}
ul.filelist li {
padding-top: 1px;
}
/* Rules governing diff layout and colors */
table.diff {
|
| ︙ |
Changes to src/diff.c.
| ︙ | |||
2594 2595 2596 2597 2598 2599 2600 | 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 | - + + + + + - - - + + + + + + |
lnFrom += del;
lnTo += ins;
}
}
/*
** Extract the number of lines of context from diffFlags. Supply an
|
| ︙ |
Changes to src/diff.js.
1 2 3 4 5 6 7 8 9 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | - + + - + + | /* Refinements to the display of unified and side-by-side diffs. ** ** In all cases, the table columns tagged with "difftxt" are expanded, ** where possible, to fill the width of the screen. ** ** For a side-by-side diff, if either column is two wide to fit on the ** display, scrollbars are added. The scrollbars are linked, so that ** both sides scroll together. Left and right arrows also scroll. */ |
| ︙ | |||
32 33 34 35 36 37 38 | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | - - - + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + |
return false;
};
}
var i, diffs = document.querySelectorAll('table.splitdiff')
for(i=0; i<diffs.length; i++){
initDiff(diffs[i]);
}
|
Changes to src/diffcmd.c.
| ︙ | |||
196 197 198 199 200 201 202 | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | - + |
@ <meta charset="UTF-8">
@ <style>
@ h1 {
@ font-size: 150%;
@ }
@
@ table.diff {
|
| ︙ |
Changes to src/fileedit.c.
| ︙ | |||
1997 1998 1999 2000 2001 2002 2003 | 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 | - + | ** used for dynamically toggling certain UI components on and off. ** Must come after window.fossil has been intialized and before ** fossil.page.fileedit.js. Potential TODO: move this into the ** window.fossil bootstrapping so that we don't have to "fulfill" ** the JS multiple times. */ ajax_emit_js_preview_modes(1); |
| ︙ |
Added src/fossil.diff.js.