Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch targets_setting Excluding Merge-Ins
This is equivalent to a diff from c80ee413ab to 61523cbe67
|
2012-02-17
| ||
| 21:36 | Merging what I had at [61523cbe67] over trunk related to href targets. check-in: d5129ae101 user: viriketo tags: annotate_links | |
|
2011-10-18
| ||
| 23:37 | When editing the properties of a check-in and comparing the old and new comment text, ignore leading and trailing whitespace and the differences between \r\n and \n. Hopefully this will reduce the number of unwanted comment edits. check-in: 48928829e2 user: drh tags: trunk | |
| 21:20 | Adding a space I forgot in in the html output. Closed-Leaf check-in: 61523cbe67 user: viriketo tags: targets_setting | |
| 20:55 | Adding a boolean setting to choose the use of 'targets' in the anchors href. Default enabled. Related to the thread starting at http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06588.html check-in: d29df2f0a2 user: viriketo tags: targets_setting | |
| 19:49 | Bringing the changes I had in [4bae75a08e] to a trunk-derived branch. check-in: ef5d2176f9 user: viriketo tags: annotate_links | |
| 19:45 | Should fix ticket [f0f9aff371f2]. Until now, the annotate_cmd was taking the last (or any?) checkin that had the artifact to be annotated, totally unrelated to what version is checked out. I made annotate_cmd respect the checkout, and annotate only from the past until the checked out version. This makes the command slower, but at least does... Closed-Leaf check-in: c7c4279f13 user: viriketo tags: annotatecmd_fix | |
|
2011-10-17
| ||
| 23:12 | Fix typo in warning message. check-in: c80ee413ab user: drh tags: trunk | |
| 16:01 | Fixed an incorrect const qualifier (caught by clang). check-in: fda7c2c63d user: stephan tags: trunk | |
Changes to src/db.c.
1776 1776 { "dont-push", 0, 0, 0, "off" }, 1777 1777 { "editor", 0, 16, 0, "" }, 1778 1778 { "gdiff-command", 0, 16, 0, "gdiff" }, 1779 1779 { "gmerge-command",0, 40, 0, "" }, 1780 1780 { "https-login", 0, 0, 0, "off" }, 1781 1781 { "ignore-glob", 0, 40, 1, "" }, 1782 1782 { "empty-dirs", 0, 40, 1, "" }, 1783 + { "href-targets", 0, 0, 0, "on" }, 1783 1784 { "http-port", 0, 16, 0, "8080" }, 1784 1785 { "localauth", 0, 0, 0, "off" }, 1785 1786 { "main-branch", 0, 40, 0, "trunk" }, 1786 1787 { "manifest", 0, 0, 1, "off" }, 1787 1788 { "max-upload", 0, 25, 0, "250000" }, 1788 1789 { "mtime-changes", 0, 0, 0, "on" }, 1789 1790 { "pgp-command", 0, 32, 0, "gpg --clearsign -o " },
Changes to src/diff.c.
949 949 int annFlags /* Flags to alter the annotation */ 950 950 ){ 951 951 Blob toAnnotate; /* Text of the final (mid) version of the file */ 952 952 Blob step; /* Text of previous revision */ 953 953 int rid; /* Artifact ID of the file being annotated */ 954 954 char *zLabel; /* Label to apply to a line */ 955 955 Stmt q; /* Query returning all ancestor versions */ 956 + const char *zInfoTarget; /* String for target info window */ 957 + 958 + zInfoTarget = db_get_boolean("href-targets", 1) ? "target='infowindow'" : ""; 956 959 957 960 /* Initialize the annotation */ 958 961 rid = db_int(0, "SELECT fid FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid); 959 962 if( rid==0 ){ 960 963 fossil_panic("file #%d is unchanged in manifest #%d", fnid, mid); 961 964 } 962 965 if( !content_get(rid, &toAnnotate) ){ ................................................................................ 985 988 while( db_step(&q)==SQLITE_ROW ){ 986 989 int pid = db_column_int(&q, 0); 987 990 const char *zUuid = db_column_text(&q, 1); 988 991 const char *zDate = db_column_text(&q, 2); 989 992 const char *zUser = db_column_text(&q, 3); 990 993 if( webLabel ){ 991 994 zLabel = mprintf( 992 - "<a href='%s/info/%s' target='infowindow'>%.10s</a> %s %9.9s", 993 - g.zTop, zUuid, zUuid, zDate, zUser 995 + "<a href='%s/info/%s' %s>%.10s</a> %s %9.9s", 996 + g.zTop, zUuid, 997 + zInfoTarget, 998 + zUuid, zDate, zUser 994 999 ); 995 1000 }else{ 996 1001 zLabel = mprintf("%.10s %s %9.9s", zUuid, zDate, zUser); 997 1002 } 998 1003 p->nVers++; 999 1004 p->azVers = fossil_realloc(p->azVers, p->nVers*sizeof(p->azVers[0]) ); 1000 1005 p->azVers[p->nVers-1] = zLabel;
Changes to src/timeline.c.
200 200 int suppressCnt = 0; 201 201 char zPrevDate[20]; 202 202 GraphContext *pGraph = 0; 203 203 int prevWasDivider = 0; /* True if previous output row was <hr> */ 204 204 int fchngQueryInit = 0; /* True if fchngQuery is initialized */ 205 205 Stmt fchngQuery; /* Query for file changes on check-ins */ 206 206 static Stmt qbranch; 207 + const char *zDiffTarget; /* String for the target diff window */ 207 208 208 209 zPrevDate[0] = 0; 209 210 mxWikiLen = db_get_int("timeline-max-comment", 0); 210 211 if( db_get_boolean("timeline-block-markup", 0) ){ 211 212 wikiFlags = WIKI_INLINE; 212 213 }else{ 213 214 wikiFlags = WIKI_INLINE | WIKI_NOBLOCK; 214 215 } 216 + zDiffTarget = db_get_boolean("href-targets", 1) ? 217 + "target=\"diffwindow\"": ""; 215 218 if( tmFlags & TIMELINE_GRAPH ){ 216 219 pGraph = graph_init(); 217 220 /* style is not moved to css, because this is 218 221 ** a technical div for the timeline graph 219 222 */ 220 223 @ <div id="canvas" style="position:relative;width:1px;height:1px;"></div> 221 224 } ................................................................................ 426 429 if( !inUl ){ 427 430 @ <ul class="filelist"> 428 431 inUl = 1; 429 432 } 430 433 if( isNew ){ 431 434 @ <li> %h(zFilename) (new file) 432 435 @ <a href="%s(g.zTop)/artifact/%S(zNew)" 433 - @ target="diffwindow">[view]</a></li> 436 + @ %s(zDiffTarget)>[view]</a></li> 434 437 }else if( isDel ){ 435 438 @ <li> %h(zFilename) (deleted)</li> 436 439 }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){ 437 440 @ <li> %h(zOldName) → %h(zFilename) 438 441 @ <a href="%s(g.zTop)/artifact/%S(zNew)" 439 - @ target="diffwindow">[view]</a></li> 442 + @ %s(zDiffTarget)>[view]</a></li> 440 443 }else{ 441 444 if( zOldName!=0 ){ 442 445 @ <li> %h(zOldName) → %h(zFilename) 443 446 }else{ 444 447 @ <li> %h(zFilename) 445 448 } 446 449 @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)" 447 - @ target="diffwindow">[diff]</a></li> 450 + @ %s(zDiffTarget)>[diff]</a></li> 448 451 } 449 452 } 450 453 db_reset(&fchngQuery); 451 454 if( inUl ){ 452 455 @ </ul> 453 456 } 454 457 }