Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch stash_rm Excluding Merge-Ins
This is equivalent to a diff from a87717ad86 to d2c4a24275
|
2011-08-26
| ||
| 14:10 | Merge the "stash rm" command into trunk. check-in: 0b4f83067a user: drh tags: trunk | |
| 14:09 | Merge the autosetup updates into trunk. check-in: 64a2b0d51f user: drh tags: trunk | |
|
2011-08-24
| ||
| 22:13 | Update to the latest autosetup, mainly for better temp file handling on mingw/msys, and fixes for the sun studio compiler. Leaf check-in: 4e5dd3536e user: steveb tags: autosetup | |
| 21:45 | Fix code stylistic issues with the "stash rm" patch. Also document the new stash verb. Leaf check-in: d2c4a24275 user: drh tags: stash_rm | |
| 20:05 | "rm" subcmd to stash, "drop"-alike functionality check-in: 1f4e6cf1ae user: bch tags: stash_rm | |
|
2011-08-23
| ||
| 18:00 | go back to the old numbering on the pre-checkin checklist (ok'd drh). check-in: a87717ad86 user: martin.weber tags: trunk | |
| 17:57 | Change numbering back so that the preliminary step is 0, the most important one is #1. check-in: 90e310ebbd user: martin.weber tags: msw-hack | |
| 16:55 | Merge the msw-hack branch into trunk. check-in: d41074f862 user: drh tags: trunk | |
Changes to src/stash.c.
273 273 } 274 274 blob_reset(&delta); 275 275 } 276 276 db_finalize(&q); 277 277 } 278 278 279 279 /* 280 -** Drop the indicates stash 280 +** Drop the indicated stash 281 281 */ 282 282 static void stash_drop(int stashid){ 283 283 db_multi_exec( 284 284 "DELETE FROM stash WHERE stashid=%d;" 285 285 "DELETE FROM stashfile WHERE stashid=%d;", 286 286 stashid, stashid 287 287 ); ................................................................................ 343 343 ** fossil stash goto ?STASHID? 344 344 ** 345 345 ** Update to the baseline checkout for STASHID then apply the 346 346 ** changes of STASHID. Keep STASHID so that it can be reused 347 347 ** This command is undoable. 348 348 ** 349 349 ** fossil stash drop ?STASHID? ?--all? 350 +** fossil stash rm ?STASHID? ?--all? 350 351 ** 351 352 ** Forget everything about STASHID. Forget the whole stash if the 352 353 ** --all flag is used. Individual drops are undoable but --all is not. 353 354 ** 354 355 ** fossil stash snapshot ?-m COMMENT? ?FILES...? 355 356 ** 356 357 ** Save the current changes in the working tress as a new stash ................................................................................ 426 427 fossil_print(" "); 427 428 comment_print(zCom, 7, 79); 428 429 } 429 430 } 430 431 db_finalize(&q); 431 432 if( n==0 ) fossil_print("empty stash\n"); 432 433 }else 433 - if( memcmp(zCmd, "drop", nCmd)==0 ){ 434 + if( memcmp(zCmd, "drop", nCmd)==0 || memcmp(zCmd, "rm", nCmd)==0 ){ 434 435 int allFlag = find_option("all", 0, 0)!=0; 435 436 if( g.argc>4 ) usage("stash apply STASHID"); 436 437 if( allFlag ){ 437 438 db_multi_exec("DELETE FROM stash; DELETE FROM stashfile;"); 438 439 }else{ 439 440 stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0); 440 441 undo_begin();