Fossil SCM

Tweak stash help text for internal consistency

andygoth 2016-10-12 13:31 trunk
Commit de4e4e2a309e72b54eabf2e566e31645943e32db
Parent 0b50909c5fd2fba…
1 file changed +14 -16
~ src/stash.c
M src/stash.c
+14 -16
--- src/stash.c
+++ src/stash.c
@@ -25,11 +25,11 @@
2525
 ** SQL code to implement the tables needed by the stash.
2626
 */
2727
 static const char zStashInit[] =
2828
 @ CREATE TABLE IF NOT EXISTS localdb.stash(
2929
 @ stashid INTEGER PRIMARY KEY, -- Unique stash identifier
30
-@ vid INTEGER, -- The baseline check-out for this stash
30
+@ vid INTEGER, -- The baseline checkout for this stash
3131
 @ comment TEXT, -- Comment for this stash. Or NULL
3232
 @ ctime TIMESTAMP -- When the stash was created
3333
 @ );
3434
 @ CREATE TABLE IF NOT EXISTS localdb.stashfile(
3535
 @ stashid INTEGER REFERENCES stash, -- Stash that contains this file
@@ -196,11 +196,11 @@
196196
 }
197197
 return stashid;
198198
 }
199199
200200
 /*
201
-** Apply a stash to the current check-out.
201
+** Apply a stash to the current checkout.
202202
 */
203203
 static void stash_apply(int stashid, int nConflict){
204204
 int vid;
205205
 Stmt q;
206206
 db_prepare(&q,
@@ -420,60 +420,58 @@
420420
 ** Save the current changes in the working tree as a new stash.
421421
 ** Then revert the changes back to the last check-in. If FILES
422422
 ** are listed, then only stash and revert the named files. The
423423
 ** "save" verb can be omitted if and only if there are no other
424424
 ** arguments. The "snapshot" verb works the same as "save" but
425
-** omits the revert, keeping the check-out unchanged.
425
+** omits the revert, keeping the checkout unchanged.
426426
 **
427
-** fossil stash list ?-v|--verbose?
428
-** fossil stash ls ?-v|--verbose?
427
+** fossil stash list|ls ?-v|--verbose? ?-W|--width <num>?
429428
 **
430429
 ** List all changes sets currently stashed. Show information about
431430
 ** individual files in each changeset if -v or --verbose is used.
432431
 **
433432
 ** fossil stash show|cat ?STASHID? ?DIFF-FLAGS?
434433
 **
435
-** Show the content of a stash
434
+** Show the contents of a stash.
436435
 **
437436
 ** fossil stash pop
438437
 ** fossil stash apply ?STASHID?
439438
 **
440439
 ** Apply STASHID or the most recently create stash to the current
441
-** working check-out. The "pop" command deletes that changeset from
440
+** working checkout. The "pop" command deletes that changeset from
442441
 ** the stash after applying it but the "apply" command retains the
443442
 ** changeset.
444443
 **
445444
 ** fossil stash goto ?STASHID?
446445
 **
447446
 ** Update to the baseline checkout for STASHID then apply the
448447
 ** changes of STASHID. Keep STASHID so that it can be reused
449448
 ** This command is undoable.
450449
 **
451
-** fossil stash drop ?STASHID? ?-a|--all?
452
-** fossil stash rm ?STASHID? ?-a|--all?
450
+** fossil stash drop|rm ?STASHID? ?-a|--all?
453451
 **
454452
 ** Forget everything about STASHID. Forget the whole stash if the
455453
 ** -a|--all flag is used. Individual drops are undoable but -a|--all
456454
 ** is not.
457455
 **
458
-** fossil stash diff ?STASHID?
459
-** fossil stash gdiff ?STASHID?
456
+** fossil stash diff ?STASHID? ?DIFF-OPTIONS?
457
+** fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
460458
 **
461459
 ** Show diffs of the current working directory and what that
462460
 ** directory would be if STASHID were applied.
463461
 **
464462
 ** SUMMARY:
465463
 ** fossil stash
466464
 ** fossil stash save ?-m|--comment COMMENT? ?FILES...?
467465
 ** fossil stash snapshot ?-m|--comment COMMENT? ?FILES...?
468
-** fossil stash list|ls ?-v|--verbose? ?-W|--width <num>?
466
+** fossil stash list|ls ?-v|--verbose? ?-W|--width <num>?
469467
 ** fossil stash show|cat ?STASHID? ?DIFF-OPTIONS?
470468
 ** fossil stash pop
471
-** fossil stash apply ?STASHID?
472
-** fossil stash goto ?STASHID?
473
-** fossil stash rm|drop ?STASHID? ?-a|--all?
474
-** fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS?
469
+** fossil stash apply|goto ?STASHID?
470
+** fossil stash drop|rm ?STASHID? ?-a|--all?
471
+** fossil stash diff ?STASHID? ?DIFF-OPTIONS?
472
+** fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
475473
 */
476474
 void stash_cmd(void){
477475
 const char *zCmd;
478476
 int nCmd;
479477
 int stashid = 0;
480478
--- src/stash.c
+++ src/stash.c
@@ -25,11 +25,11 @@
25 ** SQL code to implement the tables needed by the stash.
26 */
27 static const char zStashInit[] =
28 @ CREATE TABLE IF NOT EXISTS localdb.stash(
29 @ stashid INTEGER PRIMARY KEY, -- Unique stash identifier
30 @ vid INTEGER, -- The baseline check-out for this stash
31 @ comment TEXT, -- Comment for this stash. Or NULL
32 @ ctime TIMESTAMP -- When the stash was created
33 @ );
34 @ CREATE TABLE IF NOT EXISTS localdb.stashfile(
35 @ stashid INTEGER REFERENCES stash, -- Stash that contains this file
@@ -196,11 +196,11 @@
196 }
197 return stashid;
198 }
199
200 /*
201 ** Apply a stash to the current check-out.
202 */
203 static void stash_apply(int stashid, int nConflict){
204 int vid;
205 Stmt q;
206 db_prepare(&q,
@@ -420,60 +420,58 @@
420 ** Save the current changes in the working tree as a new stash.
421 ** Then revert the changes back to the last check-in. If FILES
422 ** are listed, then only stash and revert the named files. The
423 ** "save" verb can be omitted if and only if there are no other
424 ** arguments. The "snapshot" verb works the same as "save" but
425 ** omits the revert, keeping the check-out unchanged.
426 **
427 ** fossil stash list ?-v|--verbose?
428 ** fossil stash ls ?-v|--verbose?
429 **
430 ** List all changes sets currently stashed. Show information about
431 ** individual files in each changeset if -v or --verbose is used.
432 **
433 ** fossil stash show|cat ?STASHID? ?DIFF-FLAGS?
434 **
435 ** Show the content of a stash
436 **
437 ** fossil stash pop
438 ** fossil stash apply ?STASHID?
439 **
440 ** Apply STASHID or the most recently create stash to the current
441 ** working check-out. The "pop" command deletes that changeset from
442 ** the stash after applying it but the "apply" command retains the
443 ** changeset.
444 **
445 ** fossil stash goto ?STASHID?
446 **
447 ** Update to the baseline checkout for STASHID then apply the
448 ** changes of STASHID. Keep STASHID so that it can be reused
449 ** This command is undoable.
450 **
451 ** fossil stash drop ?STASHID? ?-a|--all?
452 ** fossil stash rm ?STASHID? ?-a|--all?
453 **
454 ** Forget everything about STASHID. Forget the whole stash if the
455 ** -a|--all flag is used. Individual drops are undoable but -a|--all
456 ** is not.
457 **
458 ** fossil stash diff ?STASHID?
459 ** fossil stash gdiff ?STASHID?
460 **
461 ** Show diffs of the current working directory and what that
462 ** directory would be if STASHID were applied.
463 **
464 ** SUMMARY:
465 ** fossil stash
466 ** fossil stash save ?-m|--comment COMMENT? ?FILES...?
467 ** fossil stash snapshot ?-m|--comment COMMENT? ?FILES...?
468 ** fossil stash list|ls ?-v|--verbose? ?-W|--width <num>?
469 ** fossil stash show|cat ?STASHID? ?DIFF-OPTIONS?
470 ** fossil stash pop
471 ** fossil stash apply ?STASHID?
472 ** fossil stash goto ?STASHID?
473 ** fossil stash rm|drop ?STASHID? ?-a|--all?
474 ** fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS?
475 */
476 void stash_cmd(void){
477 const char *zCmd;
478 int nCmd;
479 int stashid = 0;
480
--- src/stash.c
+++ src/stash.c
@@ -25,11 +25,11 @@
25 ** SQL code to implement the tables needed by the stash.
26 */
27 static const char zStashInit[] =
28 @ CREATE TABLE IF NOT EXISTS localdb.stash(
29 @ stashid INTEGER PRIMARY KEY, -- Unique stash identifier
30 @ vid INTEGER, -- The baseline checkout for this stash
31 @ comment TEXT, -- Comment for this stash. Or NULL
32 @ ctime TIMESTAMP -- When the stash was created
33 @ );
34 @ CREATE TABLE IF NOT EXISTS localdb.stashfile(
35 @ stashid INTEGER REFERENCES stash, -- Stash that contains this file
@@ -196,11 +196,11 @@
196 }
197 return stashid;
198 }
199
200 /*
201 ** Apply a stash to the current checkout.
202 */
203 static void stash_apply(int stashid, int nConflict){
204 int vid;
205 Stmt q;
206 db_prepare(&q,
@@ -420,60 +420,58 @@
420 ** Save the current changes in the working tree as a new stash.
421 ** Then revert the changes back to the last check-in. If FILES
422 ** are listed, then only stash and revert the named files. The
423 ** "save" verb can be omitted if and only if there are no other
424 ** arguments. The "snapshot" verb works the same as "save" but
425 ** omits the revert, keeping the checkout unchanged.
426 **
427 ** fossil stash list|ls ?-v|--verbose? ?-W|--width <num>?
 
428 **
429 ** List all changes sets currently stashed. Show information about
430 ** individual files in each changeset if -v or --verbose is used.
431 **
432 ** fossil stash show|cat ?STASHID? ?DIFF-FLAGS?
433 **
434 ** Show the contents of a stash.
435 **
436 ** fossil stash pop
437 ** fossil stash apply ?STASHID?
438 **
439 ** Apply STASHID or the most recently create stash to the current
440 ** working checkout. The "pop" command deletes that changeset from
441 ** the stash after applying it but the "apply" command retains the
442 ** changeset.
443 **
444 ** fossil stash goto ?STASHID?
445 **
446 ** Update to the baseline checkout for STASHID then apply the
447 ** changes of STASHID. Keep STASHID so that it can be reused
448 ** This command is undoable.
449 **
450 ** fossil stash drop|rm ?STASHID? ?-a|--all?
 
451 **
452 ** Forget everything about STASHID. Forget the whole stash if the
453 ** -a|--all flag is used. Individual drops are undoable but -a|--all
454 ** is not.
455 **
456 ** fossil stash diff ?STASHID? ?DIFF-OPTIONS?
457 ** fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
458 **
459 ** Show diffs of the current working directory and what that
460 ** directory would be if STASHID were applied.
461 **
462 ** SUMMARY:
463 ** fossil stash
464 ** fossil stash save ?-m|--comment COMMENT? ?FILES...?
465 ** fossil stash snapshot ?-m|--comment COMMENT? ?FILES...?
466 ** fossil stash list|ls ?-v|--verbose? ?-W|--width <num>?
467 ** fossil stash show|cat ?STASHID? ?DIFF-OPTIONS?
468 ** fossil stash pop
469 ** fossil stash apply|goto ?STASHID?
470 ** fossil stash drop|rm ?STASHID? ?-a|--all?
471 ** fossil stash diff ?STASHID? ?DIFF-OPTIONS?
472 ** fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
473 */
474 void stash_cmd(void){
475 const char *zCmd;
476 int nCmd;
477 int stashid = 0;
478

Keyboard Shortcuts

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