Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Modify "/fdiff?patch" to generate unified patches with the default number of context lines, analogous to "/vdiff?patch". It looks like "/fdiff?patch" was switched to side-by-side during the recent diff refactoring, when "diffFlags = 4" in its code path no longer meant "4 lines of diff context" (packed into the now obsoleted DIFF_CONTEXT_MASK range), but DIFF_SIDEBYSIDE. (Please roll back this commit or move it to a siding branch if incorrect.) |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
5aa1ec37890fe6d505d410df5f1b0864 |
| User & Date: | florian 2021-12-28 06:47:00.000 |
Context
|
2021-12-28
| ||
| 13:55 | Remove reference to miniz in "The Fossil Build Process". ... (check-in: 280c3584e4 user: danield tags: trunk) | |
| 06:47 | Modify "/fdiff?patch" to generate unified patches with the default number of context lines, analogous to "/vdiff?patch". It looks like "/fdiff?patch" was switched to side-by-side during the recent diff refactoring, when "diffFlags = 4" in its code path no longer meant "4 lines of diff context" (packed into the now obsoleted DIFF_CONTEXT_MASK range), but DIFF_SIDEBYSIDE. (Please roll back this commit or move it to a siding branch if incorrect.) ... (check-in: 5aa1ec3789 user: florian tags: trunk) | |
|
2021-12-26
| ||
| 13:11 | Some of the comments in cgi.c had become stale after years of evolution. Try to bring them up-to-date. ... (check-in: 37ccaafddb user: drh tags: trunk) | |
Changes
Changes to src/info.c.
| ︙ | ︙ | |||
1765 1766 1767 1768 1769 1770 1771 |
if( zRe ) re_compile(&pRe, zRe, 0);
if( verbose ) objdescFlags |= OBJDESC_DETAIL;
if( isPatch ){
Blob c1, c2, *pOut;
DiffConfig DCfg;
pOut = cgi_output_blob();
cgi_set_content_type("text/plain");
| | | 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 |
if( zRe ) re_compile(&pRe, zRe, 0);
if( verbose ) objdescFlags |= OBJDESC_DETAIL;
if( isPatch ){
Blob c1, c2, *pOut;
DiffConfig DCfg;
pOut = cgi_output_blob();
cgi_set_content_type("text/plain");
diffFlags = DIFF_VERBOSE;
content_get(v1, &c1);
content_get(v2, &c2);
diff_config_init(&DCfg, diffFlags);
DCfg.pRe = pRe;
text_diff(&c1, &c2, pOut, &DCfg);
blob_reset(&c1);
blob_reset(&c2);
|
| ︙ | ︙ |