Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | reserve the use of brackets in stdout for artifacts |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
6ae51190cc04637983646d890f7ab976 |
| User & Date: | rwilson 2009-12-10 02:19:16 |
Context
|
2009-12-10
| ||
| 02:25 | reserve the use of brackets in stdout for artifacts check-in: 5bccc5a5 user: rwilson tags: trunk | |
| 02:19 | reserve the use of brackets in stdout for artifacts check-in: 6ae51190 user: rwilson tags: trunk | |
|
2009-12-09
| ||
| 23:35 | When a commit aborts, the check-in comment is saved and used to reinitialize the check-in comment template on the next commit attempt. check-in: 68bfc1d5 user: drh tags: trunk | |
Changes
Changes to src/checkin.c.
235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 ... 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 ... 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 |
db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
}
while( db_step(&q)==SQLITE_ROW ){
if( allFlag ){
unlink(db_column_text(&q, 0));
}else{
Blob ans;
char *prompt = mprintf("remove unmanaged file \"%s\" [y/N]? ",
db_column_text(&q, 0));
blob_zero(&ans);
prompt_user(prompt, &ans);
if( blob_str(&ans)[0]=='y' ){
unlink(db_column_text(&q, 0));
}
}
................................................................................
}else{
char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
prepare_commit_comment(&comment, zInit);
free(zInit);
if( blob_size(&comment)==0 ){
Blob ans;
blob_zero(&ans);
prompt_user("empty check-in comment. continue [y/N]? ", &ans);
if( blob_str(&ans)[0]!='y' ){
db_end_transaction(1);
exit(1);
}
}else{
db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment);
db_end_transaction(0);
................................................................................
blob_appendf(&manifest, "U %F\n", zUserOvrd ? zUserOvrd : g.zLogin);
md5sum_blob(&manifest, &mcksum);
blob_appendf(&manifest, "Z %b\n", &mcksum);
zManifestFile = mprintf("%smanifest", g.zLocalRoot);
if( !noSign && !g.markPrivate && clearsign(&manifest, &manifest) ){
Blob ans;
blob_zero(&ans);
prompt_user("unable to sign manifest. continue [y/N]? ", &ans);
if( blob_str(&ans)[0]!='y' ){
db_end_transaction(1);
exit(1);
}
}
blob_write_to_file(&manifest, zManifestFile);
blob_reset(&manifest);
|
| | | |
235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 ... 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 ... 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 |
db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
}
while( db_step(&q)==SQLITE_ROW ){
if( allFlag ){
unlink(db_column_text(&q, 0));
}else{
Blob ans;
char *prompt = mprintf("remove unmanaged file \"%s\" (y/N)? ",
db_column_text(&q, 0));
blob_zero(&ans);
prompt_user(prompt, &ans);
if( blob_str(&ans)[0]=='y' ){
unlink(db_column_text(&q, 0));
}
}
................................................................................
}else{
char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
prepare_commit_comment(&comment, zInit);
free(zInit);
if( blob_size(&comment)==0 ){
Blob ans;
blob_zero(&ans);
prompt_user("empty check-in comment. continue (y/N)? ", &ans);
if( blob_str(&ans)[0]!='y' ){
db_end_transaction(1);
exit(1);
}
}else{
db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment);
db_end_transaction(0);
................................................................................
blob_appendf(&manifest, "U %F\n", zUserOvrd ? zUserOvrd : g.zLogin);
md5sum_blob(&manifest, &mcksum);
blob_appendf(&manifest, "Z %b\n", &mcksum);
zManifestFile = mprintf("%smanifest", g.zLocalRoot);
if( !noSign && !g.markPrivate && clearsign(&manifest, &manifest) ){
Blob ans;
blob_zero(&ans);
prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
if( blob_str(&ans)[0]!='y' ){
db_end_transaction(1);
exit(1);
}
}
blob_write_to_file(&manifest, zManifestFile);
blob_reset(&manifest);
|
Changes to src/rebuild.c.
369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 |
db_open_repository(g.argv[2]);
}
if( !bForce ){
Blob ans;
blob_zero(&ans);
prompt_user("Scrubbing the repository will permanently remove user\n"
"passwords and other information. Changes cannot be undone.\n"
"Continue [y/N]? ", &ans);
if( blob_str(&ans)[0]!='y' ){
exit(1);
}
}
db_begin_transaction();
db_multi_exec(
"UPDATE user SET pw='';"
|
| |
369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 |
db_open_repository(g.argv[2]);
}
if( !bForce ){
Blob ans;
blob_zero(&ans);
prompt_user("Scrubbing the repository will permanently remove user\n"
"passwords and other information. Changes cannot be undone.\n"
"Continue (y/N)? ", &ans);
if( blob_str(&ans)[0]!='y' ){
exit(1);
}
}
db_begin_transaction();
db_multi_exec(
"UPDATE user SET pw='';"
|
Changes to src/update.c.
302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 |
zFile = mprintf("%/", g.argv[g.argc-1]);
file_tree_name(zFile, &fname, 1);
if( access(zFile, 0) ) yesRevert = 1;
if( yesRevert==0 ){
char *prompt = mprintf("revert file %B? this will"
" destroy local changes [y/N]? ",
&fname);
blob_zero(&ans);
prompt_user(prompt, &ans);
free( prompt );
if( blob_str(&ans)[0]=='y' ){
yesRevert = 1;
}
|
| |
302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 |
zFile = mprintf("%/", g.argv[g.argc-1]);
file_tree_name(zFile, &fname, 1);
if( access(zFile, 0) ) yesRevert = 1;
if( yesRevert==0 ){
char *prompt = mprintf("revert file %B? this will"
" destroy local changes (y/N)? ",
&fname);
blob_zero(&ans);
prompt_user(prompt, &ans);
free( prompt );
if( blob_str(&ans)[0]=='y' ){
yesRevert = 1;
}
|