Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch viric_flavour Excluding Merge-Ins
This is equivalent to a diff from a0dae8555a to a1b0955973
2016-04-08
| ||
13:09 | Update the built-in SQLite to the latest trunk version, which includes fixes added since the 3.12.0 release. check-in: 987861d9ed user: drh tags: trunk | |
13:03 | Updating from trunk. Leaf check-in: a1b0955973 user: viriketo tags: viric_flavour | |
11:24 | Each call to socket_open() automatically closes any previously opened socket. check-in: a0dae8555a user: drh tags: trunk | |
2016-04-07
| ||
18:41 | Make usage of 'Usage:' and 'or:' consistent in all help text. check-in: 8bfd9951ca user: rberteig tags: trunk | |
2015-02-09
| ||
11:00 | viric's flavour of fossil, which includes the cherry-picked changes out of trunk: [d0b1b1114] [39e165afb] [dad37196f] [f309130a8]. This outdates the branch annotate_links ([f14798e0e3]), which has some extra changes, some hard to port. This lets the browser pick the right program to open them straight. check-in: b31afcc2ca user: viriketo tags: viric_flavour | |
Changes to src/info.c.
︙ | ︙ | |||
673 674 675 676 677 678 679 | @ | %z(href("%R/zip/%t-%S.zip?uuid=%!S",zPJ,zUuid,zUuid)) @ ZIP archive</a> fossil_free(zUrl); } @ </td></tr> @ <tr><th>Other Links:</th> @ <td> | | | | | > > | | 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 | @ | %z(href("%R/zip/%t-%S.zip?uuid=%!S",zPJ,zUuid,zUuid)) @ ZIP archive</a> fossil_free(zUrl); } @ </td></tr> @ <tr><th>Other Links:</th> @ <td> @ %z(href("%R/tree?ci=%S",zUuid))files</a> @ | %z(href("%R/fileage?name=%S",zUuid))file ages</a> @ | %z(href("%R/tree?nofiles&type=tree&ci=%S",zUuid))folders</a> @ | %z(href("%R/artifact/%S",zUuid))manifest</a> @ | <a href="%s(g.zTop)/vdiff?from=pbranch:%S(zUuid)&to=%S(zUuid)"> @ changes over parent branch</a> if( g.anon.Write ){ @ | %z(href("%R/ci_edit?r=%S",zUuid))edit</a> } @ </td> @ </tr> blob_reset(&projName); } @ </table> }else{ |
︙ | ︙ | |||
917 918 919 920 921 922 923 924 925 926 927 928 929 | ** Output a description of a check-in */ static void checkin_description(int rid){ Stmt q; db_prepare(&q, "SELECT datetime(mtime), coalesce(euser,user)," " coalesce(ecomment,comment), uuid," " (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref" " WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid" " AND tagxref.rid=blob.rid AND tagxref.tagtype>0)" " FROM event, blob" " WHERE event.objid=%d AND type='ci'" " AND blob.rid=%d", | > > | > > > | 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 | ** Output a description of a check-in */ static void checkin_description(int rid){ Stmt q; db_prepare(&q, "SELECT datetime(mtime), coalesce(euser,user)," " coalesce(ecomment,comment), uuid," " coalesce((SELECT value FROM tagxref" " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid),'trunk')," " (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref" " WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid" " AND tagxref.rid=blob.rid AND tagxref.tagtype>0)" " FROM event, blob" " WHERE event.objid=%d AND type='ci'" " AND blob.rid=%d", TAG_BRANCH, rid, rid ); while( db_step(&q)==SQLITE_ROW ){ const char *zDate = db_column_text(&q, 0); const char *zUser = db_column_text(&q, 1); const char *zUuid = db_column_text(&q, 3); const char *zBranch = db_column_text(&q, 4); const char *zTagList = db_column_text(&q, 4); Blob comment; int wikiFlags = WIKI_INLINE|WIKI_NOBADLINKS; if( db_get_boolean("timeline-block-markup", 0)==0 ){ wikiFlags |= WIKI_NOBLOCK; } hyperlink_to_uuid(zUuid); @ on branch <a href="%R/timeline?r=%s(zBranch)&nd&c=%T(zDate)"> @ %s(zBranch)</a> - blob_zero(&comment); db_column_blob(&q, 2, &comment); wiki_convert(&comment, 0, wikiFlags); blob_reset(&comment); @ (user: hyperlink_to_user(zUser,zDate,","); if( zTagList && zTagList[0] && g.perm.Hyperlink ){ |
︙ | ︙ |
Changes to src/name.c.
︙ | ︙ | |||
184 185 186 187 188 189 190 191 192 193 194 195 196 197 | rid = db_int(0, "SELECT objid FROM event" " WHERE mtime<=julianday('%qz') AND type GLOB '%q'" " ORDER BY mtime DESC LIMIT 1", &zTag[4], zType); return rid; } /* "tag:" + symbolic-name */ if( memcmp(zTag, "tag:", 4)==0 ){ rid = db_int(0, "SELECT event.objid, max(event.mtime)" " FROM tag, tagxref, event" " WHERE tag.tagname='sym-%q' " | > > > > > > > > > | 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 | rid = db_int(0, "SELECT objid FROM event" " WHERE mtime<=julianday('%qz') AND type GLOB '%q'" " ORDER BY mtime DESC LIMIT 1", &zTag[4], zType); return rid; } /* "parent:", as for parent branch. It returns the checkin of the last checkin of the parent branch that has been merged in. */ if( memcmp(zTag, "pbranch:", 8)==0 ){ int branchRid = symbolic_name_to_rid(&zTag[8], zType); if (branchRid == 0) return 0; rid = get_parent_branch_rid(branchRid); return rid; } /* "tag:" + symbolic-name */ if( memcmp(zTag, "tag:", 4)==0 ){ rid = db_int(0, "SELECT event.objid, max(event.mtime)" " FROM tag, tagxref, event" " WHERE tag.tagname='sym-%q' " |
︙ | ︙ | |||
1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 | ** Show all phantom artifacts */ void test_phatoms_cmd(void){ db_find_and_open_repository(0,0); describe_artifacts_to_stdout("IN (SELECT rid FROM blob WHERE size<0)", 0); } /* Maximum number of collision examples to remember */ #define MAX_COLLIDE 25 /* ** Generate a report on the number of collisions in SHA1 hashes ** generated by the SQL given in the argument. */ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 | ** Show all phantom artifacts */ void test_phatoms_cmd(void){ db_find_and_open_repository(0,0); describe_artifacts_to_stdout("IN (SELECT rid FROM blob WHERE size<0)", 0); } /* ** It returns the checkin of the last checkin of the parent branch that has ** been merged in. */ int get_parent_branch_rid(int ridRequested){ Stmt s; const char *branchName; /* Name of the branch requested at rid */ const char *parentBranchName; /* Name of the parent branch */ int rid; /* Get the name of the current branch */ branchName = db_text(0, "SELECT value FROM tagxref" " WHERE tagid=%d" " AND tagxref.tagtype>0" " AND rid=%d", TAG_BRANCH, ridRequested); if ( !branchName ) return 0; /* Find the name of the branch this was forked from */ db_prepare(&s, "SELECT pid, tagxref.value FROM plink JOIN tagxref" " WHERE cid=:rid" " AND isprim=1" " AND tagxref.tagid=%d" " AND tagxref.tagtype>0" " AND tagxref.rid=pid", TAG_BRANCH); rid = ridRequested; while( rid > 0 ) { db_bind_int(&s, ":rid", rid); if ( db_step(&s) == SQLITE_ROW ) { rid = db_column_int(&s, 0); parentBranchName = db_column_text(&s, 1); if ( !parentBranchName ) { rid = 0; break; } if ( fossil_strcmp(parentBranchName, branchName) ) { parentBranchName = fossil_strdup(parentBranchName); break; } }else{ rid = 0; break; } db_reset(&s); } db_finalize(&s); if (rid == 0) return 0; /* Find the last checkin coming from the parent branch */ db_prepare(&s, "SELECT pid, tagxref.value FROM plink JOIN tagxref" " WHERE cid=:rid" " AND tagxref.tagid=%d" " AND tagxref.tagtype>0" " AND tagxref.rid=pid ORDER BY isprim ASC", TAG_BRANCH); rid = ridRequested; while( rid > 0 ) { db_bind_int(&s, ":rid", rid); int found = 0; while ( db_step(&s) == SQLITE_ROW ) { const char *branchNamePid; /* Branch name of the pid */ ++found; rid = db_column_int(&s, 0); branchNamePid = db_column_text(&s, 1); if ( !branchNamePid ) { break; } if ( fossil_strcmp(parentBranchName, branchNamePid)==0 ) { /* Found the last merge from the parent branch */ db_finalize(&s); return rid; } } if (found == 0) { break; } db_reset(&s); } db_finalize(&s); return 0; } /* Maximum number of collision examples to remember */ #define MAX_COLLIDE 25 /* ** Generate a report on the number of collisions in SHA1 hashes ** generated by the SQL given in the argument. */ |
︙ | ︙ |
Changes to src/timeline.c.
︙ | ︙ | |||
101 102 103 104 105 106 107 | /* ** Hash a string and use the hash to determine a background color. */ char *hash_color(const char *z){ int i; /* Loop counter */ unsigned int h = 0; /* Hash on the branch name */ int r, g, b; /* Values for red, green, and blue */ | < < | > > > > | | < < < < < | < > | | > | | | | < > | > | | | < < < | 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | /* ** Hash a string and use the hash to determine a background color. */ char *hash_color(const char *z){ int i; /* Loop counter */ unsigned int h = 0; /* Hash on the branch name */ int r, g, b; /* Values for red, green, and blue */ static char zColor[10]; /* The resulting color */ static int whitefg = -1; int cpc = 4; /* colours per component */ int cfactor = 128/cpc; /* Factor so n*cpc < 128 */ int cmin = cfactor - 1; /* Factor so the max component is 127 and the min is different than the bg */ if(whitefg = -1) whitefg = skin_detail_boolean("white-foreground"); /* Calculate the hash based on the branch name */ for(i=0; z[i]; i++){ h = (h<<11) ^ (h<<1) ^ (h>>3) ^ z[i]; } /* 'cpc' different random values per component, between 'cmin' and 127 */ r = cmin + (h % cpc) * cfactor; h /= cpc; g = cmin + (h % cpc) * cfactor; h /= cpc; b = cmin + (h % cpc) * cfactor; h /= cpc; /* In case of blackfg, get the inverse effect */ if(!whitefg) { r = 255 - r; g = 255 - g; b = 255 - b; } sqlite3_snprintf(8, zColor, "#%02x%02x%02x", r,g,b); return zColor; } /* ** COMMAND: test-hash-color |
︙ | ︙ |