Fossil SCM
Fix the "add" command so that it prints "SKIP" instead of "ADDED" for files that are already under management. Code to do this was already in place, but it did not work correctly due to a logic error.
Commit
d252cfd66d3c8f713c7f180def23931c67195539
Parent
9828493c998b965…
1 file changed
+2
-1
+2
-1
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -168,11 +168,12 @@ | ||
| 168 | 168 | return 0; |
| 169 | 169 | } |
| 170 | 170 | if( db_exists("SELECT 1 FROM vfile" |
| 171 | 171 | " WHERE pathname=%Q %s", zPath, filename_collation()) ){ |
| 172 | 172 | db_multi_exec("UPDATE vfile SET deleted=0" |
| 173 | - " WHERE pathname=%Q %s", zPath, filename_collation()); | |
| 173 | + " WHERE pathname=%Q %s AND deleted", | |
| 174 | + zPath, filename_collation()); | |
| 174 | 175 | }else{ |
| 175 | 176 | char *zFullname = mprintf("%s%s", g.zLocalRoot, zPath); |
| 176 | 177 | int isExe = file_wd_isexe(zFullname); |
| 177 | 178 | db_multi_exec( |
| 178 | 179 | "INSERT INTO vfile(vid,deleted,rid,mrid,pathname,isexe,islink)" |
| 179 | 180 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -168,11 +168,12 @@ | |
| 168 | return 0; |
| 169 | } |
| 170 | if( db_exists("SELECT 1 FROM vfile" |
| 171 | " WHERE pathname=%Q %s", zPath, filename_collation()) ){ |
| 172 | db_multi_exec("UPDATE vfile SET deleted=0" |
| 173 | " WHERE pathname=%Q %s", zPath, filename_collation()); |
| 174 | }else{ |
| 175 | char *zFullname = mprintf("%s%s", g.zLocalRoot, zPath); |
| 176 | int isExe = file_wd_isexe(zFullname); |
| 177 | db_multi_exec( |
| 178 | "INSERT INTO vfile(vid,deleted,rid,mrid,pathname,isexe,islink)" |
| 179 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -168,11 +168,12 @@ | |
| 168 | return 0; |
| 169 | } |
| 170 | if( db_exists("SELECT 1 FROM vfile" |
| 171 | " WHERE pathname=%Q %s", zPath, filename_collation()) ){ |
| 172 | db_multi_exec("UPDATE vfile SET deleted=0" |
| 173 | " WHERE pathname=%Q %s AND deleted", |
| 174 | zPath, filename_collation()); |
| 175 | }else{ |
| 176 | char *zFullname = mprintf("%s%s", g.zLocalRoot, zPath); |
| 177 | int isExe = file_wd_isexe(zFullname); |
| 178 | db_multi_exec( |
| 179 | "INSERT INTO vfile(vid,deleted,rid,mrid,pathname,isexe,islink)" |
| 180 |