Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Tolerate "[...]" delimiters enclosing hash identifiers. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
537b498e6cd4f10df71a50befe7d0e69 |
| User & Date: | drh 2017-12-05 15:48:54.452 |
| Original Comment: | Tolerate "[...]" delimiters enclosing hash identifiers. |
Context
|
2017-12-05
| ||
| 16:04 | Remove the [...] surrounding hashes in the detail information of the timeline. check-in: cc846d4bcd user: drh tags: trunk | |
| 15:48 | Tolerate "[...]" delimiters enclosing hash identifiers. check-in: 537b498e6c user: drh tags: trunk | |
| 15:21 | Add the "/test-builtin-files" webpage. check-in: cee662d96e user: drh tags: trunk | |
Changes
Changes to src/name.c.
| ︙ | ︙ | |||
74 75 76 77 78 79 80 | db_finalize(&q); return rid; } /* ** Convert a symbolic name into a RID. Acceptable forms: ** | | | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | db_finalize(&q); return rid; } /* ** Convert a symbolic name into a RID. Acceptable forms: ** ** * artifact hash (optionally enclosed in [...]) ** * 4-character or larger prefix of a artifact ** * Symbolic Name ** * "tag:" + symbolic name ** * Date or date-time ** * "date:" + Date or date-time ** * symbolic-name ":" date-time ** * "tip" |
| ︙ | ︙ | |||
110 111 112 113 114 115 116 117 118 119 120 121 122 123 |
*/
int symbolic_name_to_rid(const char *zTag, const char *zType){
int vid;
int rid = 0;
int nTag;
int i;
int startOfBranch = 0;
if( zType==0 || zType[0]==0 ){
zType = "*";
}else if( zType[0]=='b' ){
zType = "ci";
startOfBranch = 1;
}
| > > | 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 |
*/
int symbolic_name_to_rid(const char *zTag, const char *zType){
int vid;
int rid = 0;
int nTag;
int i;
int startOfBranch = 0;
const char *zXTag; /* zTag with optional [...] removed */
int nXTag; /* Size of zXTag */
if( zType==0 || zType[0]==0 ){
zType = "*";
}else if( zType[0]=='b' ){
zType = "ci";
startOfBranch = 1;
}
|
| ︙ | ︙ | |||
225 226 227 228 229 230 231 232 233 |
" AND event.objid=tagxref.rid "
" AND event.mtime<=julianday(%Q)"
" AND event.type GLOB '%q'",
zTagBase, zDate, zType
);
return rid;
}
/* artifact hash or prefix */
| > > > > > > > > > > > | | > | | 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 |
" AND event.objid=tagxref.rid "
" AND event.mtime<=julianday(%Q)"
" AND event.type GLOB '%q'",
zTagBase, zDate, zType
);
return rid;
}
/* Remove optional [...] */
zXTag = zTag;
nXTag = nTag;
if( zXTag[0]=='[' ){
zXTag++;
nXTag--;
}
if( nXTag>0 && zXTag[nXTag-1]==']' ){
nXTag--;
}
/* artifact hash or prefix */
if( nXTag>=4 && nXTag<=HNAME_MAX && validate16(zXTag, nXTag) ){
Stmt q;
char zUuid[HNAME_MAX+1];
memcpy(zUuid, zXTag, nXTag);
zUuid[nXTag] = 0;
canonical16(zUuid, nXTag);
rid = 0;
if( zType[0]=='*' ){
db_prepare(&q, "SELECT rid FROM blob WHERE uuid GLOB '%q*'", zUuid);
}else{
db_prepare(&q,
"SELECT blob.rid"
" FROM blob, event"
|
| ︙ | ︙ |