Fossil SCM

reserve the use of brackets in stdout for artifacts

rwilson 2009-12-10 02:19 trunk
Commit 6ae51190cc04637983646d890f7ab976e41ef3f4
Parent 68bfc1d5ccf953b…
3 files changed +3 -3 +1 -1 +1 -1
~ src/checkin.c ~ src/rebuild.c ~ src/update.c
M src/checkin.c
+3 -3
--- src/checkin.c
+++ src/checkin.c
@@ -237,11 +237,11 @@
237237
 while( db_step(&q)==SQLITE_ROW ){
238238
 if( allFlag ){
239239
 unlink(db_column_text(&q, 0));
240240
 }else{
241241
 Blob ans;
242
- char *prompt = mprintf("remove unmanaged file \"%s\" [y/N]? ",
242
+ char *prompt = mprintf("remove unmanaged file \"%s\" (y/N)? ",
243243
 db_column_text(&q, 0));
244244
 blob_zero(&ans);
245245
 prompt_user(prompt, &ans);
246246
 if( blob_str(&ans)[0]=='y' ){
247247
 unlink(db_column_text(&q, 0));
@@ -545,11 +545,11 @@
545545
 prepare_commit_comment(&comment, zInit);
546546
 free(zInit);
547547
 if( blob_size(&comment)==0 ){
548548
 Blob ans;
549549
 blob_zero(&ans);
550
- prompt_user("empty check-in comment. continue [y/N]? ", &ans);
550
+ prompt_user("empty check-in comment. continue (y/N)? ", &ans);
551551
 if( blob_str(&ans)[0]!='y' ){
552552
 db_end_transaction(1);
553553
 exit(1);
554554
 }
555555
 }else{
@@ -674,11 +674,11 @@
674674
 blob_appendf(&manifest, "Z %b\n", &mcksum);
675675
 zManifestFile = mprintf("%smanifest", g.zLocalRoot);
676676
 if( !noSign && !g.markPrivate && clearsign(&manifest, &manifest) ){
677677
 Blob ans;
678678
 blob_zero(&ans);
679
- prompt_user("unable to sign manifest. continue [y/N]? ", &ans);
679
+ prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
680680
 if( blob_str(&ans)[0]!='y' ){
681681
 db_end_transaction(1);
682682
 exit(1);
683683
 }
684684
 }
685685
--- src/checkin.c
+++ src/checkin.c
@@ -237,11 +237,11 @@
237 while( db_step(&q)==SQLITE_ROW ){
238 if( allFlag ){
239 unlink(db_column_text(&q, 0));
240 }else{
241 Blob ans;
242 char *prompt = mprintf("remove unmanaged file \"%s\" [y/N]? ",
243 db_column_text(&q, 0));
244 blob_zero(&ans);
245 prompt_user(prompt, &ans);
246 if( blob_str(&ans)[0]=='y' ){
247 unlink(db_column_text(&q, 0));
@@ -545,11 +545,11 @@
545 prepare_commit_comment(&comment, zInit);
546 free(zInit);
547 if( blob_size(&comment)==0 ){
548 Blob ans;
549 blob_zero(&ans);
550 prompt_user("empty check-in comment. continue [y/N]? ", &ans);
551 if( blob_str(&ans)[0]!='y' ){
552 db_end_transaction(1);
553 exit(1);
554 }
555 }else{
@@ -674,11 +674,11 @@
674 blob_appendf(&manifest, "Z %b\n", &mcksum);
675 zManifestFile = mprintf("%smanifest", g.zLocalRoot);
676 if( !noSign && !g.markPrivate && clearsign(&manifest, &manifest) ){
677 Blob ans;
678 blob_zero(&ans);
679 prompt_user("unable to sign manifest. continue [y/N]? ", &ans);
680 if( blob_str(&ans)[0]!='y' ){
681 db_end_transaction(1);
682 exit(1);
683 }
684 }
685
--- src/checkin.c
+++ src/checkin.c
@@ -237,11 +237,11 @@
237 while( db_step(&q)==SQLITE_ROW ){
238 if( allFlag ){
239 unlink(db_column_text(&q, 0));
240 }else{
241 Blob ans;
242 char *prompt = mprintf("remove unmanaged file \"%s\" (y/N)? ",
243 db_column_text(&q, 0));
244 blob_zero(&ans);
245 prompt_user(prompt, &ans);
246 if( blob_str(&ans)[0]=='y' ){
247 unlink(db_column_text(&q, 0));
@@ -545,11 +545,11 @@
545 prepare_commit_comment(&comment, zInit);
546 free(zInit);
547 if( blob_size(&comment)==0 ){
548 Blob ans;
549 blob_zero(&ans);
550 prompt_user("empty check-in comment. continue (y/N)? ", &ans);
551 if( blob_str(&ans)[0]!='y' ){
552 db_end_transaction(1);
553 exit(1);
554 }
555 }else{
@@ -674,11 +674,11 @@
674 blob_appendf(&manifest, "Z %b\n", &mcksum);
675 zManifestFile = mprintf("%smanifest", g.zLocalRoot);
676 if( !noSign && !g.markPrivate && clearsign(&manifest, &manifest) ){
677 Blob ans;
678 blob_zero(&ans);
679 prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
680 if( blob_str(&ans)[0]!='y' ){
681 db_end_transaction(1);
682 exit(1);
683 }
684 }
685
M src/rebuild.c
+1 -1
--- src/rebuild.c
+++ src/rebuild.c
@@ -371,11 +371,11 @@
371371
 if( !bForce ){
372372
 Blob ans;
373373
 blob_zero(&ans);
374374
 prompt_user("Scrubbing the repository will permanently remove user\n"
375375
 "passwords and other information. Changes cannot be undone.\n"
376
- "Continue [y/N]? ", &ans);
376
+ "Continue (y/N)? ", &ans);
377377
 if( blob_str(&ans)[0]!='y' ){
378378
 exit(1);
379379
 }
380380
 }
381381
 db_begin_transaction();
382382
--- src/rebuild.c
+++ src/rebuild.c
@@ -371,11 +371,11 @@
371 if( !bForce ){
372 Blob ans;
373 blob_zero(&ans);
374 prompt_user("Scrubbing the repository will permanently remove user\n"
375 "passwords and other information. Changes cannot be undone.\n"
376 "Continue [y/N]? ", &ans);
377 if( blob_str(&ans)[0]!='y' ){
378 exit(1);
379 }
380 }
381 db_begin_transaction();
382
--- src/rebuild.c
+++ src/rebuild.c
@@ -371,11 +371,11 @@
371 if( !bForce ){
372 Blob ans;
373 blob_zero(&ans);
374 prompt_user("Scrubbing the repository will permanently remove user\n"
375 "passwords and other information. Changes cannot be undone.\n"
376 "Continue (y/N)? ", &ans);
377 if( blob_str(&ans)[0]!='y' ){
378 exit(1);
379 }
380 }
381 db_begin_transaction();
382
M src/update.c
+1 -1
--- src/update.c
+++ src/update.c
@@ -304,11 +304,11 @@
304304
 file_tree_name(zFile, &fname, 1);
305305
306306
 if( access(zFile, 0) ) yesRevert = 1;
307307
 if( yesRevert==0 ){
308308
 char *prompt = mprintf("revert file %B? this will"
309
- " destroy local changes [y/N]? ",
309
+ " destroy local changes (y/N)? ",
310310
 &fname);
311311
 blob_zero(&ans);
312312
 prompt_user(prompt, &ans);
313313
 free( prompt );
314314
 if( blob_str(&ans)[0]=='y' ){
315315
--- src/update.c
+++ src/update.c
@@ -304,11 +304,11 @@
304 file_tree_name(zFile, &fname, 1);
305
306 if( access(zFile, 0) ) yesRevert = 1;
307 if( yesRevert==0 ){
308 char *prompt = mprintf("revert file %B? this will"
309 " destroy local changes [y/N]? ",
310 &fname);
311 blob_zero(&ans);
312 prompt_user(prompt, &ans);
313 free( prompt );
314 if( blob_str(&ans)[0]=='y' ){
315
--- src/update.c
+++ src/update.c
@@ -304,11 +304,11 @@
304 file_tree_name(zFile, &fname, 1);
305
306 if( access(zFile, 0) ) yesRevert = 1;
307 if( yesRevert==0 ){
308 char *prompt = mprintf("revert file %B? this will"
309 " destroy local changes (y/N)? ",
310 &fname);
311 blob_zero(&ans);
312 prompt_user(prompt, &ans);
313 free( prompt );
314 if( blob_str(&ans)[0]=='y' ){
315

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button