Fossil SCM

Fixing the usage() calls in stash.c, as it duplicated the word stash; it was giving messags like "Usage: fossil stash stash pop".

viriketo 2011-10-13 12:56 trunk
Commit 399c0ddae480e57726affd978818eb33a190fb2e
Parent 0a7ab3ccb09e2fd…
1 file changed +6 -6
~ src/stash.c
M src/stash.c
+6 -6
--- src/stash.c
+++ src/stash.c
@@ -482,11 +482,11 @@
482482
 db_finalize(&q);
483483
 if( n==0 ) fossil_print("empty stash\n");
484484
 }else
485485
 if( memcmp(zCmd, "drop", nCmd)==0 || memcmp(zCmd, "rm", nCmd)==0 ){
486486
 int allFlag = find_option("all", 0, 0)!=0;
487
- if( g.argc>4 ) usage("stash apply STASHID");
487
+ if( g.argc>4 ) usage("apply STASHID");
488488
 if( allFlag ){
489489
 db_multi_exec("DELETE FROM stash; DELETE FROM stashfile;");
490490
 }else{
491491
 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
492492
 undo_begin();
@@ -494,30 +494,30 @@
494494
 stash_drop(stashid);
495495
 undo_finish();
496496
 }
497497
 }else
498498
 if( memcmp(zCmd, "pop", nCmd)==0 ){
499
- if( g.argc>3 ) usage("stash pop");
499
+ if( g.argc>3 ) usage("pop");
500500
 stashid = stash_get_id(0);
501501
 undo_begin();
502502
 stash_apply(stashid, 0);
503503
 undo_save_stash(stashid);
504504
 undo_finish();
505505
 stash_drop(stashid);
506506
 }else
507507
 if( memcmp(zCmd, "apply", nCmd)==0 ){
508
- if( g.argc>4 ) usage("stash apply STASHID");
508
+ if( g.argc>4 ) usage("apply STASHID");
509509
 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
510510
 undo_begin();
511511
 stash_apply(stashid, 0);
512512
 undo_finish();
513513
 }else
514514
 if( memcmp(zCmd, "goto", nCmd)==0 ){
515515
 int nConflict;
516516
 int vid;
517517
518
- if( g.argc>4 ) usage("stash apply STASHID");
518
+ if( g.argc>4 ) usage("apply STASHID");
519519
 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
520520
 undo_begin();
521521
 vid = db_int(0, "SELECT vid FROM stash WHERE stashid=%d", stashid);
522522
 nConflict = update_to(vid);
523523
 stash_apply(stashid, nConflict);
@@ -526,20 +526,20 @@
526526
 stashid);
527527
 undo_finish();
528528
 }else
529529
 if( memcmp(zCmd, "diff", nCmd)==0 ){
530530
 const char *zDiffCmd = db_get("diff-command", 0);
531
- if( g.argc>4 ) usage("stash diff STASHID");
531
+ if( g.argc>4 ) usage("diff STASHID");
532532
 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
533533
 stash_diff(stashid, zDiffCmd);
534534
 }else
535535
 if( memcmp(zCmd, "gdiff", nCmd)==0 ){
536536
 const char *zDiffCmd = db_get("gdiff-command", 0);
537
- if( g.argc>4 ) usage("stash diff STASHID");
537
+ if( g.argc>4 ) usage("diff STASHID");
538538
 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
539539
 stash_diff(stashid, zDiffCmd);
540540
 }else
541541
 {
542542
 usage("SUBCOMMAND ARGS...");
543543
 }
544544
 db_end_transaction(0);
545545
 }
546546
--- src/stash.c
+++ src/stash.c
@@ -482,11 +482,11 @@
482 db_finalize(&q);
483 if( n==0 ) fossil_print("empty stash\n");
484 }else
485 if( memcmp(zCmd, "drop", nCmd)==0 || memcmp(zCmd, "rm", nCmd)==0 ){
486 int allFlag = find_option("all", 0, 0)!=0;
487 if( g.argc>4 ) usage("stash apply STASHID");
488 if( allFlag ){
489 db_multi_exec("DELETE FROM stash; DELETE FROM stashfile;");
490 }else{
491 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
492 undo_begin();
@@ -494,30 +494,30 @@
494 stash_drop(stashid);
495 undo_finish();
496 }
497 }else
498 if( memcmp(zCmd, "pop", nCmd)==0 ){
499 if( g.argc>3 ) usage("stash pop");
500 stashid = stash_get_id(0);
501 undo_begin();
502 stash_apply(stashid, 0);
503 undo_save_stash(stashid);
504 undo_finish();
505 stash_drop(stashid);
506 }else
507 if( memcmp(zCmd, "apply", nCmd)==0 ){
508 if( g.argc>4 ) usage("stash apply STASHID");
509 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
510 undo_begin();
511 stash_apply(stashid, 0);
512 undo_finish();
513 }else
514 if( memcmp(zCmd, "goto", nCmd)==0 ){
515 int nConflict;
516 int vid;
517
518 if( g.argc>4 ) usage("stash apply STASHID");
519 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
520 undo_begin();
521 vid = db_int(0, "SELECT vid FROM stash WHERE stashid=%d", stashid);
522 nConflict = update_to(vid);
523 stash_apply(stashid, nConflict);
@@ -526,20 +526,20 @@
526 stashid);
527 undo_finish();
528 }else
529 if( memcmp(zCmd, "diff", nCmd)==0 ){
530 const char *zDiffCmd = db_get("diff-command", 0);
531 if( g.argc>4 ) usage("stash diff STASHID");
532 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
533 stash_diff(stashid, zDiffCmd);
534 }else
535 if( memcmp(zCmd, "gdiff", nCmd)==0 ){
536 const char *zDiffCmd = db_get("gdiff-command", 0);
537 if( g.argc>4 ) usage("stash diff STASHID");
538 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
539 stash_diff(stashid, zDiffCmd);
540 }else
541 {
542 usage("SUBCOMMAND ARGS...");
543 }
544 db_end_transaction(0);
545 }
546
--- src/stash.c
+++ src/stash.c
@@ -482,11 +482,11 @@
482 db_finalize(&q);
483 if( n==0 ) fossil_print("empty stash\n");
484 }else
485 if( memcmp(zCmd, "drop", nCmd)==0 || memcmp(zCmd, "rm", nCmd)==0 ){
486 int allFlag = find_option("all", 0, 0)!=0;
487 if( g.argc>4 ) usage("apply STASHID");
488 if( allFlag ){
489 db_multi_exec("DELETE FROM stash; DELETE FROM stashfile;");
490 }else{
491 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
492 undo_begin();
@@ -494,30 +494,30 @@
494 stash_drop(stashid);
495 undo_finish();
496 }
497 }else
498 if( memcmp(zCmd, "pop", nCmd)==0 ){
499 if( g.argc>3 ) usage("pop");
500 stashid = stash_get_id(0);
501 undo_begin();
502 stash_apply(stashid, 0);
503 undo_save_stash(stashid);
504 undo_finish();
505 stash_drop(stashid);
506 }else
507 if( memcmp(zCmd, "apply", nCmd)==0 ){
508 if( g.argc>4 ) usage("apply STASHID");
509 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
510 undo_begin();
511 stash_apply(stashid, 0);
512 undo_finish();
513 }else
514 if( memcmp(zCmd, "goto", nCmd)==0 ){
515 int nConflict;
516 int vid;
517
518 if( g.argc>4 ) usage("apply STASHID");
519 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
520 undo_begin();
521 vid = db_int(0, "SELECT vid FROM stash WHERE stashid=%d", stashid);
522 nConflict = update_to(vid);
523 stash_apply(stashid, nConflict);
@@ -526,20 +526,20 @@
526 stashid);
527 undo_finish();
528 }else
529 if( memcmp(zCmd, "diff", nCmd)==0 ){
530 const char *zDiffCmd = db_get("diff-command", 0);
531 if( g.argc>4 ) usage("diff STASHID");
532 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
533 stash_diff(stashid, zDiffCmd);
534 }else
535 if( memcmp(zCmd, "gdiff", nCmd)==0 ){
536 const char *zDiffCmd = db_get("gdiff-command", 0);
537 if( g.argc>4 ) usage("diff STASHID");
538 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
539 stash_diff(stashid, zDiffCmd);
540 }else
541 {
542 usage("SUBCOMMAND ARGS...");
543 }
544 db_end_transaction(0);
545 }
546

Keyboard Shortcuts

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