Fossil SCM

Merging what I had at [61523cbe67] over trunk related to href targets.

viriketo 2012-02-17 21:36 annotate_links merge
Commit d5129ae101354e72402188017b8488223c7589fa
Parent 6b7ddfefbfb871f…
6 files changed +1 +1 +9 -4 +9 -4 +6 -3 +6 -3
~ src/db.c ~ src/db.c ~ src/diff.c ~ src/diff.c ~ src/timeline.c ~ src/timeline.c
M src/db.c
+1
--- src/db.c
+++ src/db.c
@@ -1855,10 +1855,11 @@
18551855
 { "gdiff-command", 0, 16, 0, "gdiff" },
18561856
 { "gmerge-command",0, 40, 0, "" },
18571857
 { "https-login", 0, 0, 0, "off" },
18581858
 { "ignore-glob", 0, 40, 1, "" },
18591859
 { "empty-dirs", 0, 40, 1, "" },
1860
+ { "href-targets", 0, 0, 0, "on" },
18601861
 { "http-port", 0, 16, 0, "8080" },
18611862
 { "localauth", 0, 0, 0, "off" },
18621863
 { "main-branch", 0, 40, 0, "trunk" },
18631864
 { "manifest", 0, 0, 1, "off" },
18641865
 { "max-upload", 0, 25, 0, "250000" },
18651866
--- src/db.c
+++ src/db.c
@@ -1855,10 +1855,11 @@
1855 { "gdiff-command", 0, 16, 0, "gdiff" },
1856 { "gmerge-command",0, 40, 0, "" },
1857 { "https-login", 0, 0, 0, "off" },
1858 { "ignore-glob", 0, 40, 1, "" },
1859 { "empty-dirs", 0, 40, 1, "" },
 
1860 { "http-port", 0, 16, 0, "8080" },
1861 { "localauth", 0, 0, 0, "off" },
1862 { "main-branch", 0, 40, 0, "trunk" },
1863 { "manifest", 0, 0, 1, "off" },
1864 { "max-upload", 0, 25, 0, "250000" },
1865
--- src/db.c
+++ src/db.c
@@ -1855,10 +1855,11 @@
1855 { "gdiff-command", 0, 16, 0, "gdiff" },
1856 { "gmerge-command",0, 40, 0, "" },
1857 { "https-login", 0, 0, 0, "off" },
1858 { "ignore-glob", 0, 40, 1, "" },
1859 { "empty-dirs", 0, 40, 1, "" },
1860 { "href-targets", 0, 0, 0, "on" },
1861 { "http-port", 0, 16, 0, "8080" },
1862 { "localauth", 0, 0, 0, "off" },
1863 { "main-branch", 0, 40, 0, "trunk" },
1864 { "manifest", 0, 0, 1, "off" },
1865 { "max-upload", 0, 25, 0, "250000" },
1866
M src/db.c
+1
--- src/db.c
+++ src/db.c
@@ -1855,10 +1855,11 @@
18551855
 { "gdiff-command", 0, 16, 0, "gdiff" },
18561856
 { "gmerge-command",0, 40, 0, "" },
18571857
 { "https-login", 0, 0, 0, "off" },
18581858
 { "ignore-glob", 0, 40, 1, "" },
18591859
 { "empty-dirs", 0, 40, 1, "" },
1860
+ { "href-targets", 0, 0, 0, "on" },
18601861
 { "http-port", 0, 16, 0, "8080" },
18611862
 { "localauth", 0, 0, 0, "off" },
18621863
 { "main-branch", 0, 40, 0, "trunk" },
18631864
 { "manifest", 0, 0, 1, "off" },
18641865
 { "max-upload", 0, 25, 0, "250000" },
18651866
--- src/db.c
+++ src/db.c
@@ -1855,10 +1855,11 @@
1855 { "gdiff-command", 0, 16, 0, "gdiff" },
1856 { "gmerge-command",0, 40, 0, "" },
1857 { "https-login", 0, 0, 0, "off" },
1858 { "ignore-glob", 0, 40, 1, "" },
1859 { "empty-dirs", 0, 40, 1, "" },
 
1860 { "http-port", 0, 16, 0, "8080" },
1861 { "localauth", 0, 0, 0, "off" },
1862 { "main-branch", 0, 40, 0, "trunk" },
1863 { "manifest", 0, 0, 1, "off" },
1864 { "max-upload", 0, 25, 0, "250000" },
1865
--- src/db.c
+++ src/db.c
@@ -1855,10 +1855,11 @@
1855 { "gdiff-command", 0, 16, 0, "gdiff" },
1856 { "gmerge-command",0, 40, 0, "" },
1857 { "https-login", 0, 0, 0, "off" },
1858 { "ignore-glob", 0, 40, 1, "" },
1859 { "empty-dirs", 0, 40, 1, "" },
1860 { "href-targets", 0, 0, 0, "on" },
1861 { "http-port", 0, 16, 0, "8080" },
1862 { "localauth", 0, 0, 0, "off" },
1863 { "main-branch", 0, 40, 0, "trunk" },
1864 { "manifest", 0, 0, 1, "off" },
1865 { "max-upload", 0, 25, 0, "250000" },
1866
M src/diff.c
+9 -4
--- src/diff.c
+++ src/diff.c
@@ -1740,10 +1740,15 @@
17401740
 Blob toAnnotate; /* Text of the final (mid) version of the file */
17411741
 Blob step; /* Text of previous revision */
17421742
 int rid; /* Artifact ID of the file being annotated */
17431743
 char *zLabel; /* Label to apply to a line */
17441744
 Stmt q; /* Query returning all ancestor versions */
1745
+ const char *zInfoTarget; /* String for target info window */
1746
+ const char *zDiffTarget; /* String for target diff window */
1747
+
1748
+ zInfoTarget = db_get_boolean("href-targets", 1) ? "target='infowindow'" : "";
1749
+ zDiffTarget = db_get_boolean("href-targets", 1) ? "target='diffwindow'" : "";
17451750
17461751
 /* Initialize the annotation */
17471752
 rid = db_int(0, "SELECT fid FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid);
17481753
 if( rid==0 ){
17491754
 fossil_panic("file #%d is unchanged in manifest #%d", fnid, mid);
@@ -1780,15 +1785,15 @@
17801785
 const char *zUuidParentFile = db_column_text(&q, 3);
17811786
 const char *zDate = db_column_text(&q, 4);
17821787
 const char *zUser = db_column_text(&q, 5);
17831788
 if( webLabel ){
17841789
 zLabel = mprintf(
1785
- "<a href='%s/info/%s' target='infowindow'>%.10s</a> "
1786
- "<a href='%s/fdiff?v1=%s&v2=%s' target='diffwindow'>d</a> "
1790
+ "<a href='%s/info/%s' %s>%.10s</a> "
1791
+ "<a href='%s/fdiff?v1=%s&v2=%s' %s>d</a> "
17871792
 "%s %9.9s",
1788
- g.zTop, zUuid, zUuid,
1789
- g.zTop, zUuidParentFile, zUuidFile,
1793
+ g.zTop, zUuid, zInfoTarget, zUuid,
1794
+ g.zTop, zUuidParentFile, zUuidFile, zDiffTarget,
17901795
 zDate, zUser);
17911796
 }else{
17921797
 zLabel = mprintf("%.10s %s %9.9s", zUuid, zDate, zUser);
17931798
 }
17941799
 p->nVers++;
17951800
--- src/diff.c
+++ src/diff.c
@@ -1740,10 +1740,15 @@
1740 Blob toAnnotate; /* Text of the final (mid) version of the file */
1741 Blob step; /* Text of previous revision */
1742 int rid; /* Artifact ID of the file being annotated */
1743 char *zLabel; /* Label to apply to a line */
1744 Stmt q; /* Query returning all ancestor versions */
 
 
 
 
 
1745
1746 /* Initialize the annotation */
1747 rid = db_int(0, "SELECT fid FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid);
1748 if( rid==0 ){
1749 fossil_panic("file #%d is unchanged in manifest #%d", fnid, mid);
@@ -1780,15 +1785,15 @@
1780 const char *zUuidParentFile = db_column_text(&q, 3);
1781 const char *zDate = db_column_text(&q, 4);
1782 const char *zUser = db_column_text(&q, 5);
1783 if( webLabel ){
1784 zLabel = mprintf(
1785 "<a href='%s/info/%s' target='infowindow'>%.10s</a> "
1786 "<a href='%s/fdiff?v1=%s&v2=%s' target='diffwindow'>d</a> "
1787 "%s %9.9s",
1788 g.zTop, zUuid, zUuid,
1789 g.zTop, zUuidParentFile, zUuidFile,
1790 zDate, zUser);
1791 }else{
1792 zLabel = mprintf("%.10s %s %9.9s", zUuid, zDate, zUser);
1793 }
1794 p->nVers++;
1795
--- src/diff.c
+++ src/diff.c
@@ -1740,10 +1740,15 @@
1740 Blob toAnnotate; /* Text of the final (mid) version of the file */
1741 Blob step; /* Text of previous revision */
1742 int rid; /* Artifact ID of the file being annotated */
1743 char *zLabel; /* Label to apply to a line */
1744 Stmt q; /* Query returning all ancestor versions */
1745 const char *zInfoTarget; /* String for target info window */
1746 const char *zDiffTarget; /* String for target diff window */
1747
1748 zInfoTarget = db_get_boolean("href-targets", 1) ? "target='infowindow'" : "";
1749 zDiffTarget = db_get_boolean("href-targets", 1) ? "target='diffwindow'" : "";
1750
1751 /* Initialize the annotation */
1752 rid = db_int(0, "SELECT fid FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid);
1753 if( rid==0 ){
1754 fossil_panic("file #%d is unchanged in manifest #%d", fnid, mid);
@@ -1780,15 +1785,15 @@
1785 const char *zUuidParentFile = db_column_text(&q, 3);
1786 const char *zDate = db_column_text(&q, 4);
1787 const char *zUser = db_column_text(&q, 5);
1788 if( webLabel ){
1789 zLabel = mprintf(
1790 "<a href='%s/info/%s' %s>%.10s</a> "
1791 "<a href='%s/fdiff?v1=%s&v2=%s' %s>d</a> "
1792 "%s %9.9s",
1793 g.zTop, zUuid, zInfoTarget, zUuid,
1794 g.zTop, zUuidParentFile, zUuidFile, zDiffTarget,
1795 zDate, zUser);
1796 }else{
1797 zLabel = mprintf("%.10s %s %9.9s", zUuid, zDate, zUser);
1798 }
1799 p->nVers++;
1800
M src/diff.c
+9 -4
--- src/diff.c
+++ src/diff.c
@@ -1740,10 +1740,15 @@
17401740
 Blob toAnnotate; /* Text of the final (mid) version of the file */
17411741
 Blob step; /* Text of previous revision */
17421742
 int rid; /* Artifact ID of the file being annotated */
17431743
 char *zLabel; /* Label to apply to a line */
17441744
 Stmt q; /* Query returning all ancestor versions */
1745
+ const char *zInfoTarget; /* String for target info window */
1746
+ const char *zDiffTarget; /* String for target diff window */
1747
+
1748
+ zInfoTarget = db_get_boolean("href-targets", 1) ? "target='infowindow'" : "";
1749
+ zDiffTarget = db_get_boolean("href-targets", 1) ? "target='diffwindow'" : "";
17451750
17461751
 /* Initialize the annotation */
17471752
 rid = db_int(0, "SELECT fid FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid);
17481753
 if( rid==0 ){
17491754
 fossil_panic("file #%d is unchanged in manifest #%d", fnid, mid);
@@ -1780,15 +1785,15 @@
17801785
 const char *zUuidParentFile = db_column_text(&q, 3);
17811786
 const char *zDate = db_column_text(&q, 4);
17821787
 const char *zUser = db_column_text(&q, 5);
17831788
 if( webLabel ){
17841789
 zLabel = mprintf(
1785
- "<a href='%s/info/%s' target='infowindow'>%.10s</a> "
1786
- "<a href='%s/fdiff?v1=%s&v2=%s' target='diffwindow'>d</a> "
1790
+ "<a href='%s/info/%s' %s>%.10s</a> "
1791
+ "<a href='%s/fdiff?v1=%s&v2=%s' %s>d</a> "
17871792
 "%s %9.9s",
1788
- g.zTop, zUuid, zUuid,
1789
- g.zTop, zUuidParentFile, zUuidFile,
1793
+ g.zTop, zUuid, zInfoTarget, zUuid,
1794
+ g.zTop, zUuidParentFile, zUuidFile, zDiffTarget,
17901795
 zDate, zUser);
17911796
 }else{
17921797
 zLabel = mprintf("%.10s %s %9.9s", zUuid, zDate, zUser);
17931798
 }
17941799
 p->nVers++;
17951800
--- src/diff.c
+++ src/diff.c
@@ -1740,10 +1740,15 @@
1740 Blob toAnnotate; /* Text of the final (mid) version of the file */
1741 Blob step; /* Text of previous revision */
1742 int rid; /* Artifact ID of the file being annotated */
1743 char *zLabel; /* Label to apply to a line */
1744 Stmt q; /* Query returning all ancestor versions */
 
 
 
 
 
1745
1746 /* Initialize the annotation */
1747 rid = db_int(0, "SELECT fid FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid);
1748 if( rid==0 ){
1749 fossil_panic("file #%d is unchanged in manifest #%d", fnid, mid);
@@ -1780,15 +1785,15 @@
1780 const char *zUuidParentFile = db_column_text(&q, 3);
1781 const char *zDate = db_column_text(&q, 4);
1782 const char *zUser = db_column_text(&q, 5);
1783 if( webLabel ){
1784 zLabel = mprintf(
1785 "<a href='%s/info/%s' target='infowindow'>%.10s</a> "
1786 "<a href='%s/fdiff?v1=%s&v2=%s' target='diffwindow'>d</a> "
1787 "%s %9.9s",
1788 g.zTop, zUuid, zUuid,
1789 g.zTop, zUuidParentFile, zUuidFile,
1790 zDate, zUser);
1791 }else{
1792 zLabel = mprintf("%.10s %s %9.9s", zUuid, zDate, zUser);
1793 }
1794 p->nVers++;
1795
--- src/diff.c
+++ src/diff.c
@@ -1740,10 +1740,15 @@
1740 Blob toAnnotate; /* Text of the final (mid) version of the file */
1741 Blob step; /* Text of previous revision */
1742 int rid; /* Artifact ID of the file being annotated */
1743 char *zLabel; /* Label to apply to a line */
1744 Stmt q; /* Query returning all ancestor versions */
1745 const char *zInfoTarget; /* String for target info window */
1746 const char *zDiffTarget; /* String for target diff window */
1747
1748 zInfoTarget = db_get_boolean("href-targets", 1) ? "target='infowindow'" : "";
1749 zDiffTarget = db_get_boolean("href-targets", 1) ? "target='diffwindow'" : "";
1750
1751 /* Initialize the annotation */
1752 rid = db_int(0, "SELECT fid FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid);
1753 if( rid==0 ){
1754 fossil_panic("file #%d is unchanged in manifest #%d", fnid, mid);
@@ -1780,15 +1785,15 @@
1785 const char *zUuidParentFile = db_column_text(&q, 3);
1786 const char *zDate = db_column_text(&q, 4);
1787 const char *zUser = db_column_text(&q, 5);
1788 if( webLabel ){
1789 zLabel = mprintf(
1790 "<a href='%s/info/%s' %s>%.10s</a> "
1791 "<a href='%s/fdiff?v1=%s&v2=%s' %s>d</a> "
1792 "%s %9.9s",
1793 g.zTop, zUuid, zInfoTarget, zUuid,
1794 g.zTop, zUuidParentFile, zUuidFile, zDiffTarget,
1795 zDate, zUser);
1796 }else{
1797 zLabel = mprintf("%.10s %s %9.9s", zUuid, zDate, zUser);
1798 }
1799 p->nVers++;
1800
M src/timeline.c
+6 -3
--- src/timeline.c
+++ src/timeline.c
@@ -205,18 +205,21 @@
205205
 GraphContext *pGraph = 0;
206206
 int prevWasDivider = 0; /* True if previous output row was <hr> */
207207
 int fchngQueryInit = 0; /* True if fchngQuery is initialized */
208208
 Stmt fchngQuery; /* Query for file changes on check-ins */
209209
 static Stmt qbranch;
210
+ const char *zDiffTarget; /* String for the target diff window */
210211
211212
 zPrevDate[0] = 0;
212213
 mxWikiLen = db_get_int("timeline-max-comment", 0);
213214
 if( db_get_boolean("timeline-block-markup", 0) ){
214215
 wikiFlags = WIKI_INLINE;
215216
 }else{
216217
 wikiFlags = WIKI_INLINE | WIKI_NOBLOCK;
217218
 }
219
+ zDiffTarget = db_get_boolean("href-targets", 1) ?
220
+ "target=\"diffwindow\"": "";
218221
 if( tmFlags & TIMELINE_GRAPH ){
219222
 pGraph = graph_init();
220223
 /* style is not moved to css, because this is
221224
 ** a technical div for the timeline graph
222225
 */
@@ -437,25 +440,25 @@
437440
 inUl = 1;
438441
 }
439442
 if( isNew ){
440443
 @ <li> %h(zFilename) (new file) &nbsp;
441444
 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
442
- @ target="diffwindow">[view]</a></li>
445
+ @ %s(zDiffTarget)>[view]</a></li>
443446
 }else if( isDel ){
444447
 @ <li> %h(zFilename) (deleted)</li>
445448
 }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){
446449
 @ <li> %h(zOldName) &rarr; %h(zFilename)
447450
 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
448
- @ target="diffwindow">[view]</a></li>
451
+ @ %s(zDiffTarget)>[view]</a></li>
449452
 }else{
450453
 if( zOldName!=0 ){
451454
 @ <li> %h(zOldName) &rarr; %h(zFilename)
452455
 }else{
453456
 @ <li> %h(zFilename) &nbsp;
454457
 }
455458
 @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)"
456
- @ target="diffwindow">[diff]</a></li>
459
+ @ %s(zDiffTarget)>[diff]</a></li>
457460
 }
458461
 }
459462
 db_reset(&fchngQuery);
460463
 if( inUl ){
461464
 @ </ul>
462465
--- src/timeline.c
+++ src/timeline.c
@@ -205,18 +205,21 @@
205 GraphContext *pGraph = 0;
206 int prevWasDivider = 0; /* True if previous output row was <hr> */
207 int fchngQueryInit = 0; /* True if fchngQuery is initialized */
208 Stmt fchngQuery; /* Query for file changes on check-ins */
209 static Stmt qbranch;
 
210
211 zPrevDate[0] = 0;
212 mxWikiLen = db_get_int("timeline-max-comment", 0);
213 if( db_get_boolean("timeline-block-markup", 0) ){
214 wikiFlags = WIKI_INLINE;
215 }else{
216 wikiFlags = WIKI_INLINE | WIKI_NOBLOCK;
217 }
 
 
218 if( tmFlags & TIMELINE_GRAPH ){
219 pGraph = graph_init();
220 /* style is not moved to css, because this is
221 ** a technical div for the timeline graph
222 */
@@ -437,25 +440,25 @@
437 inUl = 1;
438 }
439 if( isNew ){
440 @ <li> %h(zFilename) (new file) &nbsp;
441 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
442 @ target="diffwindow">[view]</a></li>
443 }else if( isDel ){
444 @ <li> %h(zFilename) (deleted)</li>
445 }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){
446 @ <li> %h(zOldName) &rarr; %h(zFilename)
447 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
448 @ target="diffwindow">[view]</a></li>
449 }else{
450 if( zOldName!=0 ){
451 @ <li> %h(zOldName) &rarr; %h(zFilename)
452 }else{
453 @ <li> %h(zFilename) &nbsp;
454 }
455 @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)"
456 @ target="diffwindow">[diff]</a></li>
457 }
458 }
459 db_reset(&fchngQuery);
460 if( inUl ){
461 @ </ul>
462
--- src/timeline.c
+++ src/timeline.c
@@ -205,18 +205,21 @@
205 GraphContext *pGraph = 0;
206 int prevWasDivider = 0; /* True if previous output row was <hr> */
207 int fchngQueryInit = 0; /* True if fchngQuery is initialized */
208 Stmt fchngQuery; /* Query for file changes on check-ins */
209 static Stmt qbranch;
210 const char *zDiffTarget; /* String for the target diff window */
211
212 zPrevDate[0] = 0;
213 mxWikiLen = db_get_int("timeline-max-comment", 0);
214 if( db_get_boolean("timeline-block-markup", 0) ){
215 wikiFlags = WIKI_INLINE;
216 }else{
217 wikiFlags = WIKI_INLINE | WIKI_NOBLOCK;
218 }
219 zDiffTarget = db_get_boolean("href-targets", 1) ?
220 "target=\"diffwindow\"": "";
221 if( tmFlags & TIMELINE_GRAPH ){
222 pGraph = graph_init();
223 /* style is not moved to css, because this is
224 ** a technical div for the timeline graph
225 */
@@ -437,25 +440,25 @@
440 inUl = 1;
441 }
442 if( isNew ){
443 @ <li> %h(zFilename) (new file) &nbsp;
444 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
445 @ %s(zDiffTarget)>[view]</a></li>
446 }else if( isDel ){
447 @ <li> %h(zFilename) (deleted)</li>
448 }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){
449 @ <li> %h(zOldName) &rarr; %h(zFilename)
450 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
451 @ %s(zDiffTarget)>[view]</a></li>
452 }else{
453 if( zOldName!=0 ){
454 @ <li> %h(zOldName) &rarr; %h(zFilename)
455 }else{
456 @ <li> %h(zFilename) &nbsp;
457 }
458 @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)"
459 @ %s(zDiffTarget)>[diff]</a></li>
460 }
461 }
462 db_reset(&fchngQuery);
463 if( inUl ){
464 @ </ul>
465
M src/timeline.c
+6 -3
--- src/timeline.c
+++ src/timeline.c
@@ -205,18 +205,21 @@
205205
 GraphContext *pGraph = 0;
206206
 int prevWasDivider = 0; /* True if previous output row was <hr> */
207207
 int fchngQueryInit = 0; /* True if fchngQuery is initialized */
208208
 Stmt fchngQuery; /* Query for file changes on check-ins */
209209
 static Stmt qbranch;
210
+ const char *zDiffTarget; /* String for the target diff window */
210211
211212
 zPrevDate[0] = 0;
212213
 mxWikiLen = db_get_int("timeline-max-comment", 0);
213214
 if( db_get_boolean("timeline-block-markup", 0) ){
214215
 wikiFlags = WIKI_INLINE;
215216
 }else{
216217
 wikiFlags = WIKI_INLINE | WIKI_NOBLOCK;
217218
 }
219
+ zDiffTarget = db_get_boolean("href-targets", 1) ?
220
+ "target=\"diffwindow\"": "";
218221
 if( tmFlags & TIMELINE_GRAPH ){
219222
 pGraph = graph_init();
220223
 /* style is not moved to css, because this is
221224
 ** a technical div for the timeline graph
222225
 */
@@ -437,25 +440,25 @@
437440
 inUl = 1;
438441
 }
439442
 if( isNew ){
440443
 @ <li> %h(zFilename) (new file) &nbsp;
441444
 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
442
- @ target="diffwindow">[view]</a></li>
445
+ @ %s(zDiffTarget)>[view]</a></li>
443446
 }else if( isDel ){
444447
 @ <li> %h(zFilename) (deleted)</li>
445448
 }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){
446449
 @ <li> %h(zOldName) &rarr; %h(zFilename)
447450
 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
448
- @ target="diffwindow">[view]</a></li>
451
+ @ %s(zDiffTarget)>[view]</a></li>
449452
 }else{
450453
 if( zOldName!=0 ){
451454
 @ <li> %h(zOldName) &rarr; %h(zFilename)
452455
 }else{
453456
 @ <li> %h(zFilename) &nbsp;
454457
 }
455458
 @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)"
456
- @ target="diffwindow">[diff]</a></li>
459
+ @ %s(zDiffTarget)>[diff]</a></li>
457460
 }
458461
 }
459462
 db_reset(&fchngQuery);
460463
 if( inUl ){
461464
 @ </ul>
462465
--- src/timeline.c
+++ src/timeline.c
@@ -205,18 +205,21 @@
205 GraphContext *pGraph = 0;
206 int prevWasDivider = 0; /* True if previous output row was <hr> */
207 int fchngQueryInit = 0; /* True if fchngQuery is initialized */
208 Stmt fchngQuery; /* Query for file changes on check-ins */
209 static Stmt qbranch;
 
210
211 zPrevDate[0] = 0;
212 mxWikiLen = db_get_int("timeline-max-comment", 0);
213 if( db_get_boolean("timeline-block-markup", 0) ){
214 wikiFlags = WIKI_INLINE;
215 }else{
216 wikiFlags = WIKI_INLINE | WIKI_NOBLOCK;
217 }
 
 
218 if( tmFlags & TIMELINE_GRAPH ){
219 pGraph = graph_init();
220 /* style is not moved to css, because this is
221 ** a technical div for the timeline graph
222 */
@@ -437,25 +440,25 @@
437 inUl = 1;
438 }
439 if( isNew ){
440 @ <li> %h(zFilename) (new file) &nbsp;
441 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
442 @ target="diffwindow">[view]</a></li>
443 }else if( isDel ){
444 @ <li> %h(zFilename) (deleted)</li>
445 }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){
446 @ <li> %h(zOldName) &rarr; %h(zFilename)
447 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
448 @ target="diffwindow">[view]</a></li>
449 }else{
450 if( zOldName!=0 ){
451 @ <li> %h(zOldName) &rarr; %h(zFilename)
452 }else{
453 @ <li> %h(zFilename) &nbsp;
454 }
455 @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)"
456 @ target="diffwindow">[diff]</a></li>
457 }
458 }
459 db_reset(&fchngQuery);
460 if( inUl ){
461 @ </ul>
462
--- src/timeline.c
+++ src/timeline.c
@@ -205,18 +205,21 @@
205 GraphContext *pGraph = 0;
206 int prevWasDivider = 0; /* True if previous output row was <hr> */
207 int fchngQueryInit = 0; /* True if fchngQuery is initialized */
208 Stmt fchngQuery; /* Query for file changes on check-ins */
209 static Stmt qbranch;
210 const char *zDiffTarget; /* String for the target diff window */
211
212 zPrevDate[0] = 0;
213 mxWikiLen = db_get_int("timeline-max-comment", 0);
214 if( db_get_boolean("timeline-block-markup", 0) ){
215 wikiFlags = WIKI_INLINE;
216 }else{
217 wikiFlags = WIKI_INLINE | WIKI_NOBLOCK;
218 }
219 zDiffTarget = db_get_boolean("href-targets", 1) ?
220 "target=\"diffwindow\"": "";
221 if( tmFlags & TIMELINE_GRAPH ){
222 pGraph = graph_init();
223 /* style is not moved to css, because this is
224 ** a technical div for the timeline graph
225 */
@@ -437,25 +440,25 @@
440 inUl = 1;
441 }
442 if( isNew ){
443 @ <li> %h(zFilename) (new file) &nbsp;
444 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
445 @ %s(zDiffTarget)>[view]</a></li>
446 }else if( isDel ){
447 @ <li> %h(zFilename) (deleted)</li>
448 }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){
449 @ <li> %h(zOldName) &rarr; %h(zFilename)
450 @ <a href="%s(g.zTop)/artifact/%S(zNew)"
451 @ %s(zDiffTarget)>[view]</a></li>
452 }else{
453 if( zOldName!=0 ){
454 @ <li> %h(zOldName) &rarr; %h(zFilename)
455 }else{
456 @ <li> %h(zFilename) &nbsp;
457 }
458 @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)"
459 @ %s(zDiffTarget)>[diff]</a></li>
460 }
461 }
462 db_reset(&fchngQuery);
463 if( inUl ){
464 @ </ul>
465

Keyboard Shortcuts

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