Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Show an error message when trying to rename one file on top of another, rather than throwing a uniqueness constraint. Ticket [1e43138b8b8e90f] |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
14fdae7e4018df438771a1b14cd607bc |
| User & Date: | drh 2012-11-07 11:28:00.000 |
| Original User & Date: | drh 2012-11-07 11:28:57.803 |
Context
|
2012-11-08
| ||
| 09:20 | a few more minor html5 violations ... (check-in: 1858d202ef user: jan.nijtmans tags: trunk) | |
|
2012-11-07
| ||
| 12:10 | merge trunk <p>Fix continuation-byte check for UTF-8 chars > 2 bytes. ... (check-in: 3920fa67bd user: jan.nijtmans tags: improve_commit_warning) | |
| 11:28 | Show an error message when trying to rename one file on top of another, rather than throwing a uniqueness constraint. Ticket [1e43138b8b8e90f] ... (check-in: 14fdae7e40 user: drh tags: trunk) | |
|
2012-11-06
| ||
| 19:42 | Make sure that pending deletes from "fossil rm" operations are preserved across a "fossil update". ... (check-in: 28272fa125 user: drh tags: trunk) | |
Changes
Changes to src/add.c.
| ︙ | ︙ | |||
498 499 500 501 502 503 504 505 506 507 508 509 510 511 |
/*
** Rename a single file.
**
** The original name of the file is zOrig. The new filename is zNew.
*/
static void mv_one_file(int vid, const char *zOrig, const char *zNew){
fossil_print("RENAME %s %s\n", zOrig, zNew);
db_multi_exec(
"UPDATE vfile SET pathname='%q' WHERE pathname='%q' AND vid=%d",
zNew, zOrig, vid
);
}
| > > > > > > > > > > | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 |
/*
** Rename a single file.
**
** The original name of the file is zOrig. The new filename is zNew.
*/
static void mv_one_file(int vid, const char *zOrig, const char *zNew){
int x = db_int(-1, "SELECT deleted FROM vfile WHERE pathname=%Q", zNew);
if( x>=0 ){
if( x==0 ){
fossil_fatal("cannot rename '%s' to '%s' since another file named '%s'"
" is currently under management", zOrig, zNew, zNew);
}else{
fossil_fatal("cannot rename '%s' to '%s' since the delete of '%s' has "
"not yet been committed", zOrig, zNew, zNew);
}
}
fossil_print("RENAME %s %s\n", zOrig, zNew);
db_multi_exec(
"UPDATE vfile SET pathname='%q' WHERE pathname='%q' AND vid=%d",
zNew, zOrig, vid
);
}
|
| ︙ | ︙ |