Fossil SCM

The various diff-rendering pages now have toggles to show/hide individual diffs, as discussed in [forum:0f751ad9c8].

stephan 2021-03-03 17:28 trunk merge
Commit 877246cf3d15f8d5774c8c868130d220560a917ca831475315cd67694d1e78d3
Parent d21e3c5a3ad3052…
10 files changed +1 +3 +2 +1 +1 +1 +1 +2 +2 +2
~ src/builtin.c ~ src/default.css ~ src/fossil.info-diff.js ~ src/info.c ~ src/info.c ~ src/main.mk ~ win/Makefile.mingw ~ win/Makefile.msc ~ www/changes.wiki ~ www/changes.wiki
M src/builtin.c
+1
--- src/builtin.c
+++ src/builtin.c
@@ -704,10 +704,11 @@
704704
 /* This list ordering isn't strictly important. */
705705
 {"confirmer", 0, 0},
706706
 {"copybutton", 0, "dom\0"},
707707
 {"dom", 0, 0},
708708
 {"fetch", 0, 0},
709
+ {"info-diff", 0, "dom\0"},
709710
 {"numbered-lines", 0, "popupwidget\0copybutton\0"},
710711
 {"pikchr", 0, "dom\0"},
711712
 {"popupwidget", 0, "dom\0"},
712713
 {"storage", 0, 0},
713714
 {"tabs", 0, "dom\0"}
714715
--- src/builtin.c
+++ src/builtin.c
@@ -704,10 +704,11 @@
704 /* This list ordering isn't strictly important. */
705 {"confirmer", 0, 0},
706 {"copybutton", 0, "dom\0"},
707 {"dom", 0, 0},
708 {"fetch", 0, 0},
 
709 {"numbered-lines", 0, "popupwidget\0copybutton\0"},
710 {"pikchr", 0, "dom\0"},
711 {"popupwidget", 0, "dom\0"},
712 {"storage", 0, 0},
713 {"tabs", 0, "dom\0"}
714
--- src/builtin.c
+++ src/builtin.c
@@ -704,10 +704,11 @@
704 /* This list ordering isn't strictly important. */
705 {"confirmer", 0, 0},
706 {"copybutton", 0, "dom\0"},
707 {"dom", 0, 0},
708 {"fetch", 0, 0},
709 {"info-diff", 0, "dom\0"},
710 {"numbered-lines", 0, "popupwidget\0copybutton\0"},
711 {"pikchr", 0, "dom\0"},
712 {"popupwidget", 0, "dom\0"},
713 {"storage", 0, 0},
714 {"tabs", 0, "dom\0"}
715
M src/default.css
+3
--- src/default.css
+++ src/default.css
@@ -1763,10 +1763,13 @@
17631763
 body.chat #chat-drop-details img {
17641764
 max-width: 45%;
17651765
 max-height: 45%;
17661766
 }
17671767
1768
+input[type="checkbox"].diff-toggle {
1769
+ float: right;
1770
+}
17681771
 /* Objects in the "desktoponly" class are invisible on mobile */
17691772
 @media screen and (max-width: 600px) {
17701773
 .desktoponly {
17711774
 display: none;
17721775
 }
17731776
17741777
ADDED src/fossil.info-diff.js
--- src/default.css
+++ src/default.css
@@ -1763,10 +1763,13 @@
1763 body.chat #chat-drop-details img {
1764 max-width: 45%;
1765 max-height: 45%;
1766 }
1767
 
 
 
1768 /* Objects in the "desktoponly" class are invisible on mobile */
1769 @media screen and (max-width: 600px) {
1770 .desktoponly {
1771 display: none;
1772 }
1773
1774 DDED src/fossil.info-diff.js
--- src/default.css
+++ src/default.css
@@ -1763,10 +1763,13 @@
1763 body.chat #chat-drop-details img {
1764 max-width: 45%;
1765 max-height: 45%;
1766 }
1767
1768 input[type="checkbox"].diff-toggle {
1769 float: right;
1770 }
1771 /* Objects in the "desktoponly" class are invisible on mobile */
1772 @media screen and (max-width: 600px) {
1773 .desktoponly {
1774 display: none;
1775 }
1776
1777 DDED src/fossil.info-diff.js
M src/fossil.info-diff.js
+2
--- a/src/fossil.info-diff.js
+++ b/src/fossil.info-diff.js
@@ -0,0 +1,2 @@
1
+s unsightly horiz. scrol(D.tr(),'fe!=f.lastWidth ){
2
+ pre.udiff, table.sbsdiffcols
--- a/src/fossil.info-diff.js
+++ b/src/fossil.info-diff.js
@@ -0,0 +1,2 @@
 
 
--- a/src/fossil.info-diff.js
+++ b/src/fossil.info-diff.js
@@ -0,0 +1,2 @@
1 s unsightly horiz. scrol(D.tr(),'fe!=f.lastWidth ){
2 pre.udiff, table.sbsdiffcols
M src/info.c
+1
--- src/info.c
+++ src/info.c
@@ -939,10 +939,11 @@
939939
 append_file_change_line(zUuid, zName, zOld, zNew, zOldName,
940940
 diffFlags,pRe,mperm);
941941
 }
942942
 db_finalize(&q3);
943943
 append_diff_javascript(diffType==2);
944
+ builtin_fossil_js_bundle_or("info-diff",NULL);
944945
 style_finish_page();
945946
 }
946947
947948
 /*
948949
 ** WEBPAGE: winfo
949950
--- src/info.c
+++ src/info.c
@@ -939,10 +939,11 @@
939 append_file_change_line(zUuid, zName, zOld, zNew, zOldName,
940 diffFlags,pRe,mperm);
941 }
942 db_finalize(&q3);
943 append_diff_javascript(diffType==2);
 
944 style_finish_page();
945 }
946
947 /*
948 ** WEBPAGE: winfo
949
--- src/info.c
+++ src/info.c
@@ -939,10 +939,11 @@
939 append_file_change_line(zUuid, zName, zOld, zNew, zOldName,
940 diffFlags,pRe,mperm);
941 }
942 db_finalize(&q3);
943 append_diff_javascript(diffType==2);
944 builtin_fossil_js_bundle_or("info-diff",NULL);
945 style_finish_page();
946 }
947
948 /*
949 ** WEBPAGE: winfo
950
M src/info.c
+1
--- src/info.c
+++ src/info.c
@@ -939,10 +939,11 @@
939939
 append_file_change_line(zUuid, zName, zOld, zNew, zOldName,
940940
 diffFlags,pRe,mperm);
941941
 }
942942
 db_finalize(&q3);
943943
 append_diff_javascript(diffType==2);
944
+ builtin_fossil_js_bundle_or("info-diff",NULL);
944945
 style_finish_page();
945946
 }
946947
947948
 /*
948949
 ** WEBPAGE: winfo
949950
--- src/info.c
+++ src/info.c
@@ -939,10 +939,11 @@
939 append_file_change_line(zUuid, zName, zOld, zNew, zOldName,
940 diffFlags,pRe,mperm);
941 }
942 db_finalize(&q3);
943 append_diff_javascript(diffType==2);
 
944 style_finish_page();
945 }
946
947 /*
948 ** WEBPAGE: winfo
949
--- src/info.c
+++ src/info.c
@@ -939,10 +939,11 @@
939 append_file_change_line(zUuid, zName, zOld, zNew, zOldName,
940 diffFlags,pRe,mperm);
941 }
942 db_finalize(&q3);
943 append_diff_javascript(diffType==2);
944 builtin_fossil_js_bundle_or("info-diff",NULL);
945 style_finish_page();
946 }
947
948 /*
949 ** WEBPAGE: winfo
950
M src/main.mk
+1
--- src/main.mk
+++ src/main.mk
@@ -225,10 +225,11 @@
225225
 $(SRCDIR)/fossil.bootstrap.js \
226226
 $(SRCDIR)/fossil.confirmer.js \
227227
 $(SRCDIR)/fossil.copybutton.js \
228228
 $(SRCDIR)/fossil.dom.js \
229229
 $(SRCDIR)/fossil.fetch.js \
230
+ $(SRCDIR)/fossil.info-diff.js \
230231
 $(SRCDIR)/fossil.numbered-lines.js \
231232
 $(SRCDIR)/fossil.page.fileedit.js \
232233
 $(SRCDIR)/fossil.page.forumpost.js \
233234
 $(SRCDIR)/fossil.page.pikchrshow.js \
234235
 $(SRCDIR)/fossil.page.wikiedit.js \
235236
--- src/main.mk
+++ src/main.mk
@@ -225,10 +225,11 @@
225 $(SRCDIR)/fossil.bootstrap.js \
226 $(SRCDIR)/fossil.confirmer.js \
227 $(SRCDIR)/fossil.copybutton.js \
228 $(SRCDIR)/fossil.dom.js \
229 $(SRCDIR)/fossil.fetch.js \
 
230 $(SRCDIR)/fossil.numbered-lines.js \
231 $(SRCDIR)/fossil.page.fileedit.js \
232 $(SRCDIR)/fossil.page.forumpost.js \
233 $(SRCDIR)/fossil.page.pikchrshow.js \
234 $(SRCDIR)/fossil.page.wikiedit.js \
235
--- src/main.mk
+++ src/main.mk
@@ -225,10 +225,11 @@
225 $(SRCDIR)/fossil.bootstrap.js \
226 $(SRCDIR)/fossil.confirmer.js \
227 $(SRCDIR)/fossil.copybutton.js \
228 $(SRCDIR)/fossil.dom.js \
229 $(SRCDIR)/fossil.fetch.js \
230 $(SRCDIR)/fossil.info-diff.js \
231 $(SRCDIR)/fossil.numbered-lines.js \
232 $(SRCDIR)/fossil.page.fileedit.js \
233 $(SRCDIR)/fossil.page.forumpost.js \
234 $(SRCDIR)/fossil.page.pikchrshow.js \
235 $(SRCDIR)/fossil.page.wikiedit.js \
236
M win/Makefile.mingw
+1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -634,10 +634,11 @@
634634
 $(SRCDIR)/fossil.bootstrap.js \
635635
 $(SRCDIR)/fossil.confirmer.js \
636636
 $(SRCDIR)/fossil.copybutton.js \
637637
 $(SRCDIR)/fossil.dom.js \
638638
 $(SRCDIR)/fossil.fetch.js \
639
+ $(SRCDIR)/fossil.info-diff.js \
639640
 $(SRCDIR)/fossil.numbered-lines.js \
640641
 $(SRCDIR)/fossil.page.fileedit.js \
641642
 $(SRCDIR)/fossil.page.forumpost.js \
642643
 $(SRCDIR)/fossil.page.pikchrshow.js \
643644
 $(SRCDIR)/fossil.page.wikiedit.js \
644645
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -634,10 +634,11 @@
634 $(SRCDIR)/fossil.bootstrap.js \
635 $(SRCDIR)/fossil.confirmer.js \
636 $(SRCDIR)/fossil.copybutton.js \
637 $(SRCDIR)/fossil.dom.js \
638 $(SRCDIR)/fossil.fetch.js \
 
639 $(SRCDIR)/fossil.numbered-lines.js \
640 $(SRCDIR)/fossil.page.fileedit.js \
641 $(SRCDIR)/fossil.page.forumpost.js \
642 $(SRCDIR)/fossil.page.pikchrshow.js \
643 $(SRCDIR)/fossil.page.wikiedit.js \
644
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -634,10 +634,11 @@
634 $(SRCDIR)/fossil.bootstrap.js \
635 $(SRCDIR)/fossil.confirmer.js \
636 $(SRCDIR)/fossil.copybutton.js \
637 $(SRCDIR)/fossil.dom.js \
638 $(SRCDIR)/fossil.fetch.js \
639 $(SRCDIR)/fossil.info-diff.js \
640 $(SRCDIR)/fossil.numbered-lines.js \
641 $(SRCDIR)/fossil.page.fileedit.js \
642 $(SRCDIR)/fossil.page.forumpost.js \
643 $(SRCDIR)/fossil.page.pikchrshow.js \
644 $(SRCDIR)/fossil.page.wikiedit.js \
645
M win/Makefile.msc
+2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -559,10 +559,11 @@
559559
 "$(SRCDIR)\fossil.bootstrap.js" \
560560
 "$(SRCDIR)\fossil.confirmer.js" \
561561
 "$(SRCDIR)\fossil.copybutton.js" \
562562
 "$(SRCDIR)\fossil.dom.js" \
563563
 "$(SRCDIR)\fossil.fetch.js" \
564
+ "$(SRCDIR)\fossil.info-diff.js" \
564565
 "$(SRCDIR)\fossil.numbered-lines.js" \
565566
 "$(SRCDIR)\fossil.page.fileedit.js" \
566567
 "$(SRCDIR)\fossil.page.forumpost.js" \
567568
 "$(SRCDIR)\fossil.page.pikchrshow.js" \
568569
 "$(SRCDIR)\fossil.page.wikiedit.js" \
@@ -1164,10 +1165,11 @@
11641165
 echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
11651166
 echo "$(SRCDIR)\fossil.confirmer.js" >> $@
11661167
 echo "$(SRCDIR)\fossil.copybutton.js" >> $@
11671168
 echo "$(SRCDIR)\fossil.dom.js" >> $@
11681169
 echo "$(SRCDIR)\fossil.fetch.js" >> $@
1170
+ echo "$(SRCDIR)\fossil.info-diff.js" >> $@
11691171
 echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
11701172
 echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
11711173
 echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
11721174
 echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
11731175
 echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
11741176
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -559,10 +559,11 @@
559 "$(SRCDIR)\fossil.bootstrap.js" \
560 "$(SRCDIR)\fossil.confirmer.js" \
561 "$(SRCDIR)\fossil.copybutton.js" \
562 "$(SRCDIR)\fossil.dom.js" \
563 "$(SRCDIR)\fossil.fetch.js" \
 
564 "$(SRCDIR)\fossil.numbered-lines.js" \
565 "$(SRCDIR)\fossil.page.fileedit.js" \
566 "$(SRCDIR)\fossil.page.forumpost.js" \
567 "$(SRCDIR)\fossil.page.pikchrshow.js" \
568 "$(SRCDIR)\fossil.page.wikiedit.js" \
@@ -1164,10 +1165,11 @@
1164 echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1165 echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1166 echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1167 echo "$(SRCDIR)\fossil.dom.js" >> $@
1168 echo "$(SRCDIR)\fossil.fetch.js" >> $@
 
1169 echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1170 echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1171 echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1172 echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1173 echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1174
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -559,10 +559,11 @@
559 "$(SRCDIR)\fossil.bootstrap.js" \
560 "$(SRCDIR)\fossil.confirmer.js" \
561 "$(SRCDIR)\fossil.copybutton.js" \
562 "$(SRCDIR)\fossil.dom.js" \
563 "$(SRCDIR)\fossil.fetch.js" \
564 "$(SRCDIR)\fossil.info-diff.js" \
565 "$(SRCDIR)\fossil.numbered-lines.js" \
566 "$(SRCDIR)\fossil.page.fileedit.js" \
567 "$(SRCDIR)\fossil.page.forumpost.js" \
568 "$(SRCDIR)\fossil.page.pikchrshow.js" \
569 "$(SRCDIR)\fossil.page.wikiedit.js" \
@@ -1164,10 +1165,11 @@
1165 echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1166 echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1167 echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1168 echo "$(SRCDIR)\fossil.dom.js" >> $@
1169 echo "$(SRCDIR)\fossil.fetch.js" >> $@
1170 echo "$(SRCDIR)\fossil.info-diff.js" >> $@
1171 echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1172 echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1173 echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1174 echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1175 echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1176
M www/changes.wiki
+2
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,12 @@
3434
 is not specified by a query parameter, and if the
3535
 "[/help?cmd=preferred-diff-type|preferred-diff-type]"
3636
 setting is omitted or less than 1, then select the diff type based
3737
 on a guess of whether or not the request is coming from a mobile
3838
 device. Mobile gets unified and desktop gets side-by-side.
39
+ * The various pages which show diffs now have toggles to show/hide
40
+ individual diffs.
3941
 * Add the "[/help?cmd=preferred-diff-type|preferred-diff-type]"
4042
 setting to allow an admin to force a default diff type.
4143
 * The "pikchr-background" settings is now available in
4244
 "detail.txt" skin files, for better control of Pikchr
4345
 colors in inverted color schemes.
4446
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,12 @@
34 is not specified by a query parameter, and if the
35 "[/help?cmd=preferred-diff-type|preferred-diff-type]"
36 setting is omitted or less than 1, then select the diff type based
37 on a guess of whether or not the request is coming from a mobile
38 device. Mobile gets unified and desktop gets side-by-side.
 
 
39 * Add the "[/help?cmd=preferred-diff-type|preferred-diff-type]"
40 setting to allow an admin to force a default diff type.
41 * The "pikchr-background" settings is now available in
42 "detail.txt" skin files, for better control of Pikchr
43 colors in inverted color schemes.
44
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,12 @@
34 is not specified by a query parameter, and if the
35 "[/help?cmd=preferred-diff-type|preferred-diff-type]"
36 setting is omitted or less than 1, then select the diff type based
37 on a guess of whether or not the request is coming from a mobile
38 device. Mobile gets unified and desktop gets side-by-side.
39 * The various pages which show diffs now have toggles to show/hide
40 individual diffs.
41 * Add the "[/help?cmd=preferred-diff-type|preferred-diff-type]"
42 setting to allow an admin to force a default diff type.
43 * The "pikchr-background" settings is now available in
44 "detail.txt" skin files, for better control of Pikchr
45 colors in inverted color schemes.
46
M www/changes.wiki
+2
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,12 @@
3434
 is not specified by a query parameter, and if the
3535
 "[/help?cmd=preferred-diff-type|preferred-diff-type]"
3636
 setting is omitted or less than 1, then select the diff type based
3737
 on a guess of whether or not the request is coming from a mobile
3838
 device. Mobile gets unified and desktop gets side-by-side.
39
+ * The various pages which show diffs now have toggles to show/hide
40
+ individual diffs.
3941
 * Add the "[/help?cmd=preferred-diff-type|preferred-diff-type]"
4042
 setting to allow an admin to force a default diff type.
4143
 * The "pikchr-background" settings is now available in
4244
 "detail.txt" skin files, for better control of Pikchr
4345
 colors in inverted color schemes.
4446
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,12 @@
34 is not specified by a query parameter, and if the
35 "[/help?cmd=preferred-diff-type|preferred-diff-type]"
36 setting is omitted or less than 1, then select the diff type based
37 on a guess of whether or not the request is coming from a mobile
38 device. Mobile gets unified and desktop gets side-by-side.
 
 
39 * Add the "[/help?cmd=preferred-diff-type|preferred-diff-type]"
40 setting to allow an admin to force a default diff type.
41 * The "pikchr-background" settings is now available in
42 "detail.txt" skin files, for better control of Pikchr
43 colors in inverted color schemes.
44
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,12 @@
34 is not specified by a query parameter, and if the
35 "[/help?cmd=preferred-diff-type|preferred-diff-type]"
36 setting is omitted or less than 1, then select the diff type based
37 on a guess of whether or not the request is coming from a mobile
38 device. Mobile gets unified and desktop gets side-by-side.
39 * The various pages which show diffs now have toggles to show/hide
40 individual diffs.
41 * Add the "[/help?cmd=preferred-diff-type|preferred-diff-type]"
42 setting to allow an admin to force a default diff type.
43 * The "pikchr-background" settings is now available in
44 "detail.txt" skin files, for better control of Pikchr
45 colors in inverted color schemes.
46

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button