Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merging aku's changes into the head. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
b0ad3f90bc4f389747c4740629e2488b |
| User & Date: | drh 2007-08-25 19:00:33.000 |
Context
|
2007-08-25
| ||
| 19:31 | Generate the "manifest.uuid" file containing the SHA1 hash of the "manifest" file whenever the manifest is generated. Makefiles can used the "manifest.uuid" to insert the version number into the executable. ... (check-in: 95e17f4e3f user: drh tags: trunk) | |
| 19:00 | Merging aku's changes into the head. ... (check-in: b0ad3f90bc user: drh tags: trunk) | |
| 18:58 | Attempting the same merge that aku tried and got empty files with. ... (check-in: 424d47e453 user: drh tags: trunk) | |
| 18:51 | Changes to the CLI version of the timeline command to show places where forks occur in the tree and where content is merged. Lots more work is needed to show the structure of a tree well. This is definitely a work in progress. ... (check-in: b846db063c user: drh tags: trunk) | |
Changes
Changes to src/descendents.c.
| ︙ | ︙ | |||
80 81 82 83 84 85 86 |
base = db_lget_int("checkout", 0);
}else{
base = name_to_rid(g.argv[2]);
}
if( base==0 ) return;
compute_leaves(base);
db_prepare(&q,
| | > | > > | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 |
base = db_lget_int("checkout", 0);
}else{
base = name_to_rid(g.argv[2]);
}
if( base==0 ) return;
compute_leaves(base);
db_prepare(&q,
"SELECT blob.rid, uuid, datetime(event.mtime,'localtime'), comment, 0,"
" (SELECT count(*) FROM plink WHERE cid=blob.rid)"
" FROM leaves, blob, event"
" WHERE blob.rid=leaves.rid"
" AND event.objid=leaves.rid"
" ORDER BY event.mtime DESC"
);
print_timeline(&q, 20);
db_finalize(&q);
}
/*
** COMMAND: branches
**
** Usage: %fossil branches
** Find leaves of all branches.
*/
void branches_cmd(void){
Stmt q;
db_must_be_within_tree();
db_prepare(&q,
"SELECT blob.rid, blob.uuid, datetime(event.mtime,'localtime'),"
" event.comment, 0,"
" (SELECT count(*) FROM plink WHERE cid=blob.rid)"
" FROM blob, event"
" WHERE blob.rid IN"
" (SELECT cid FROM plink EXCEPT SELECT pid FROM plink)"
" AND event.objid=blob.rid"
" ORDER BY event.mtime DESC"
);
print_timeline(&q, 20);
|
| ︙ | ︙ |
Changes to src/timeline.c.
| ︙ | ︙ | |||
161 162 163 164 165 166 167 |
*/
void print_timeline(Stmt *q, int mxLine){
int nLine = 0;
char zPrevDate[20];
zPrevDate[0] = 0;
while( db_step(q)==SQLITE_ROW && nLine<=mxLine ){
| | | | > > > > > > > > > > > > > > > > > | | | > > | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 |
*/
void print_timeline(Stmt *q, int mxLine){
int nLine = 0;
char zPrevDate[20];
zPrevDate[0] = 0;
while( db_step(q)==SQLITE_ROW && nLine<=mxLine ){
const char *zId = db_column_text(q, 1);
const char *zDate = db_column_text(q, 2);
const char *zCom = db_column_text(q, 3);
int nChild = db_column_int(q, 4);
int nParent = db_column_int(q, 5);
char *zFree = 0;
char zUuid[UUID_SIZE+1];
sprintf(zUuid, "%.10s", zId);
if( memcmp(zDate, zPrevDate, 10) ){
printf("=== %.10s ===\n", zDate);
memcpy(zPrevDate, zDate, 10);
nLine++;
}
if( zCom==0 ) zCom = "";
printf("%.5s [%.10s] ", &zDate[11], zUuid);
if( nChild>1 || nParent>1 ){
int n = 0;
char zPrefix[50];
if( nParent>1 ){
sqlite3_snprintf(sizeof(zPrefix), zPrefix, "*MERGE* ");
n = strlen(zPrefix);
}
if( nChild>1 ){
sqlite3_snprintf(sizeof(zPrefix)-n, &zPrefix[n], "*FORK* ");
n = strlen(zPrefix);
}
zCom = zFree = sqlite3_mprintf("%s%s", zPrefix, zCom);
}
nLine += comment_print(zCom, 19, 79);
sqlite3_free(zFree);
}
}
/*
** COMMAND: timeline
**
** Usage: %fossil timeline ?DATETIME? ?-n|--count N?
**
** Print a summary of activity going backwards in date and time
** specified or from the current date and time if no arguments
** are given. Show as many as N (default 20) check-ins.
**
** The date and time should be in the ISO8601 format. For
** examples: "2007-08-18 07:21:21". The time may be omitted.
** Times are according to the local timezone.
*/
void timeline_cmd(void){
Stmt q;
int n;
const char *zCount;
char *zDate;
db_find_and_open_repository();
zCount = find_option("n","count",1);
if( zCount ){
n = atoi(zCount);
}else{
n = 20;
}
if( g.argc!=2 && g.argc!=3 ){
usage("YYYY-MM-DDtHH:MM:SS");
}
if( g.argc==3 ){
zDate = g.argv[2];
}else{
zDate = "now";
}
db_prepare(&q,
"SELECT blob.rid, uuid, datetime(event.mtime,'localtime'),"
" comment || ' (by ' || user || ')',"
" (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim),"
" (SELECT count(*) FROM plink WHERE cid=blob.rid)"
" FROM event, blob"
" WHERE event.type='ci' AND blob.rid=event.objid"
" AND event.mtime<=(SELECT julianday(%Q,'utc'))"
" ORDER BY event.mtime DESC", zDate
);
print_timeline(&q, n);
db_finalize(&q);
}
|
Changes to src/xfer.c.
| ︙ | ︙ | |||
88 89 90 91 92 93 94 | int rid; Blob content, hash; if( pXfer->nToken<3 || pXfer->nToken>4 || !blob_is_uuid(&pXfer->aToken[1]) || !blob_is_int(&pXfer->aToken[pXfer->nToken-1], &n) | | | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 |
int rid;
Blob content, hash;
if( pXfer->nToken<3
|| pXfer->nToken>4
|| !blob_is_uuid(&pXfer->aToken[1])
|| !blob_is_int(&pXfer->aToken[pXfer->nToken-1], &n)
|| n<0
|| (pXfer->nToken==4 && !blob_is_uuid(&pXfer->aToken[2]))
){
blob_appendf(&pXfer->err, "malformed file line");
return;
}
blob_zero(&content);
blob_zero(&hash);
|
| ︙ | ︙ |