Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch stash-fixes Excluding Merge-Ins
This is equivalent to a diff from 4946b5b186 to 5634375d0b
|
2016-10-16
| ||
| 01:21 | Merge fixes in this branch to trunk prior to release. check-in: b2d51b1b22 user: andybradford tags: trunk | |
| 00:22 | Merge updates from trunk. Closed-Leaf check-in: 5634375d0b user: mistachkin tags: stash-fixes | |
| 00:21 | Remove a 'knownbug' marker because the underlying issue appears to be fixed on this branch. check-in: 43e122c763 user: mistachkin tags: stash-fixes | |
|
2016-10-15
| ||
| 05:02 | Coding style, removing superfluous 'then' clauses from tester.tcl. check-in: 4946b5b186 user: mistachkin tags: trunk | |
| 04:56 | Further revise the 'test_start_server' and 'test_stop_server' test suite helper procedures to make it possible to actually delete the temporary output-capture file on Windows. check-in: b0081d9786 user: mistachkin tags: trunk | |
Changes to src/stash.c.
| ︙ | ︙ | |||
37 38 39 40 41 42 43 | @ isAdded BOOLEAN, -- True if this is an added file @ isRemoved BOOLEAN, -- True if this file is deleted @ isExec BOOLEAN, -- True if file is executable @ isLink BOOLEAN, -- True if file is a symlink @ origname TEXT, -- Original filename @ newname TEXT, -- New name for file at next check-in @ delta BLOB, -- Delta from baseline. Content if rid=0 | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 |
@ isAdded BOOLEAN, -- True if this is an added file
@ isRemoved BOOLEAN, -- True if this file is deleted
@ isExec BOOLEAN, -- True if file is executable
@ isLink BOOLEAN, -- True if file is a symlink
@ origname TEXT, -- Original filename
@ newname TEXT, -- New name for file at next check-in
@ delta BLOB, -- Delta from baseline. Content if rid=0
@ PRIMARY KEY(newname, stashid)
@ );
@ INSERT OR IGNORE INTO vvar(name, value) VALUES('stash-next', 1);
;
/*
** Add zFName to the stash given by stashid. zFName might be the name of a
** file or a directory. If a directory, add all changed files contained
|
| ︙ | ︙ | |||
276 277 278 279 280 281 282 283 284 285 286 287 288 289 |
blob_reset(&b);
blob_reset(&disk);
}
blob_reset(&delta);
if( fossil_strcmp(zOrig,zNew)!=0 ){
undo_save(zOrig);
file_delete(zOPath);
}
}
stash_add_files_in_sfile(vid);
db_finalize(&q);
if( nConflict ){
fossil_print(
"WARNING: %d merge conflicts - see messages above for details.\n",
| > > > > > | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 |
blob_reset(&b);
blob_reset(&disk);
}
blob_reset(&delta);
if( fossil_strcmp(zOrig,zNew)!=0 ){
undo_save(zOrig);
file_delete(zOPath);
db_multi_exec(
"UPDATE vfile SET pathname='%q', origname='%q'"
" WHERE pathname='%q' %s AND vid=%d",
zNew, zOrig, zOrig, filename_collation(), vid
);
}
}
stash_add_files_in_sfile(vid);
db_finalize(&q);
if( nConflict ){
fossil_print(
"WARNING: %d merge conflicts - see messages above for details.\n",
|
| ︙ | ︙ | |||
471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 |
** fossil stash diff ?STASHID? ?DIFF-OPTIONS?
** fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
*/
void stash_cmd(void){
const char *zCmd;
int nCmd;
int stashid = 0;
undo_capture_command_line();
db_must_be_within_tree();
db_open_config(0, 0);
db_begin_transaction();
db_multi_exec(zStashInit /*works-like:""*/);
if( g.argc<=2 ){
zCmd = "save";
}else{
zCmd = g.argv[2];
}
nCmd = strlen(zCmd);
if( memcmp(zCmd, "save", nCmd)==0 ){
| > > > > > > > > > > > > > > > | 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 |
** fossil stash diff ?STASHID? ?DIFF-OPTIONS?
** fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
*/
void stash_cmd(void){
const char *zCmd;
int nCmd;
int stashid = 0;
int rc;
undo_capture_command_line();
db_must_be_within_tree();
db_open_config(0, 0);
db_begin_transaction();
db_multi_exec(zStashInit /*works-like:""*/);
rc = db_exists("SELECT 1 FROM sqlite_master"
" WHERE name='stashfile'"
" AND sql GLOB '* PRIMARY KEY(origname, stashid)*'");
if( rc!=0 ){
db_multi_exec(
"CREATE TABLE localdb.stashfile_tmp AS SELECT * FROM stashfile;"
"DROP TABLE stashfile;"
);
db_multi_exec(zStashInit /*works-like:""*/);
db_multi_exec(
"INSERT INTO stashfile SELECT * FROM stashfile_tmp;"
"DROP TABLE stashfile_tmp;"
);
}
if( g.argc<=2 ){
zCmd = "save";
}else{
zCmd = g.argv[2];
}
nCmd = strlen(zCmd);
if( memcmp(zCmd, "save", nCmd)==0 ){
|
| ︙ | ︙ |
Changes to test/stash.test.
| ︙ | ︙ | |||
183 184 185 186 187 188 189 |
UPDATE f2
UPDATE f3n
ADDED f0
} -changes {
ADDED f0
MISSING f1
EDITED f2
| | < < | 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 |
UPDATE f2
UPDATE f3n
ADDED f0
} -changes {
ADDED f0
MISSING f1
EDITED f2
RENAMED f3n
} -addremove {
DELETED f1
} -exists {f0 f2 f3n} -notexists {f1 f3}
# Confirm there is no longer a stash saved
fossil stash list
test stash-2-list {[first_data_line] eq "empty stash"}
|
| ︙ | ︙ | |||
309 310 311 312 313 314 315 |
test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]}
stash-test 3-2-pop {pop} {
UPDATE f1
UPDATE f2n
} -changes {
RENAMED f2n
} -addremove {
| < < | | 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 |
test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]}
stash-test 3-2-pop {pop} {
UPDATE f1
UPDATE f2n
} -changes {
RENAMED f2n
} -addremove {
} -exists {f1 f2n} -notexists {f2}
########
# fossil stash snapshot ?-m|--comment COMMENT? ?FILES...?
test_setup
|
| ︙ | ︙ |