Changes On Branch bch
Not logged in

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

Changes In Branch bch Excluding Merge-Ins

This is equivalent to a diff from f73ed21d3b to 0eaf7528b1

2011-02-17
00:05
Merge in Brad Harder's "stash ls" command. check-in: ae73c07be0 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: c616cef3f7 user: drh tags: trunk
22:55
merge trunk Closed-Leaf check-in: 0eaf7528b1 user: bharder tags: bch
19:19
Always close opendir() objects if and only if successfully opened. Ticket [d7169e51ebb3400f6] check-in: f73ed21d3b user: drh tags: trunk
19:13
For the ssh: transport method, use the -T option to disable pseudottys. Increase the size of the buffer for holding the MOTD. check-in: 7c8519003d user: drh tags: trunk
2011-02-15
05:19
"stash ls", in addition to "stash list" check-in: 9abf05437b user: bharder tags: bch

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"