Fossil

Check-in [ae73c07b]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge in Brad Harder's "stash ls" command.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:ae73c07be0f53003a939a3a74cb536d24e3e9128
User & Date: drh 2011-02-17 00:05:13
Context
2011-02-17
13:43
Print the SSH command that is issued for ssh: access, scrubbed of any password content. Remove redundant -e and -T options from the ssh command. check-in: f63ff9fc user: drh tags: trunk
08:15
Enable a “stash make” subcommand as an alias for “stash snapshot” Leaf check-in: 4e0274bb user: BM tags: stash_mk
00:05
Merge in Brad Harder's "stash ls" command. check-in: ae73c07b user: drh tags: trunk
2011-02-16
23:47
Update to the latest pre-release SQLite version (as part of the SQLite testing process). Update the makefiles to use SQLITE_ENABLE_STAT2. check-in: c616cef3 user: drh tags: trunk
22:55
merge trunk Closed-Leaf check-in: 0eaf7528 user: bharder tags: bch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/stash.c.

315
316
317
318
319
320
321

322
323
324
325
326
327
328
...
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
**     Save the current changes in the working tree as a new stash.
**     Then revert the changes back to the last check-in.  If FILES
**     are listed, then only stash and revert the named files.  The
**     "save" verb can be omitted if and only if there are no other
**     arguments.
**
**  fossil stash list

**
**     List all changes sets currently stashed.
**
**  fossil stash pop
**
**     Apply the most recently create stash to the current working
**     check-out.  Then delete that stash.  This is equivalent to
................................................................................
    }
    g.argv[1] = "revert";
    revert_cmd();
  }else
  if( memcmp(zCmd, "snapshot", nCmd)==0 ){
    stash_create();
  }else
  if( memcmp(zCmd, "list", nCmd)==0 ){
    Stmt q;
    int n = 0;
    verify_all_options();
    db_prepare(&q,
       "SELECT stashid, (SELECT uuid FROM blob WHERE rid=vid),"
       "       comment, datetime(ctime) FROM stash"
       " ORDER BY ctime DESC"







>







 







|







315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
...
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
**     Save the current changes in the working tree as a new stash.
**     Then revert the changes back to the last check-in.  If FILES
**     are listed, then only stash and revert the named files.  The
**     "save" verb can be omitted if and only if there are no other
**     arguments.
**
**  fossil stash list
**  fossil stash ls
**
**     List all changes sets currently stashed.
**
**  fossil stash pop
**
**     Apply the most recently create stash to the current working
**     check-out.  Then delete that stash.  This is equivalent to
................................................................................
    }
    g.argv[1] = "revert";
    revert_cmd();
  }else
  if( memcmp(zCmd, "snapshot", nCmd)==0 ){
    stash_create();
  }else
  if( memcmp(zCmd, "list", nCmd)==0 || memcmp(zCmd, "ls", nCmd)==0 ){
    Stmt q;
    int n = 0;
    verify_all_options();
    db_prepare(&q,
       "SELECT stashid, (SELECT uuid FROM blob WHERE rid=vid),"
       "       comment, datetime(ctime) FROM stash"
       " ORDER BY ctime DESC"