Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Correct SELECT to not exclude added files, i.e. files not present in the blob table |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | andygoth-changes |
| Files: | files | file ages | folders |
| SHA1: |
45e2e3e968c72f1edd4895fafa198c10 |
| User & Date: | andygoth 2016-11-07 00:20:29 |
Context
|
2016-11-07
| ||
| 00:33 | Integrate andygoth-changes, try two (check-in: e7764947 user: andygoth tags: trunk) | |
| 00:20 | Correct SELECT to not exclude added files, i.e. files not present in the blob table (Closed-Leaf check-in: 45e2e3e9 user: andygoth tags: andygoth-changes) | |
|
2016-11-06
| ||
| 23:40 | Correct SQL syntax error on "fossil changes -merge" which is not supposed to display any files yet still tries to run the file query even though it says only "ORDER BY pathname" with no SELECT (check-in: 61da7752 user: andygoth tags: andygoth-changes) | |
Changes
Changes to src/checkin.c.
149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 |
/* Obtain the list of managed files if appropriate. */
blob_zero(&sql);
if( flags & C_ALL ){
/* Start with a list of all managed files. */
blob_append_sql(&sql,
"SELECT pathname, %s as mtime, %s as size, deleted, chnged, rid,"
" coalesce(origname!=pathname,0) AS renamed, islink, 1 AS managed"
" FROM vfile, blob USING (rid)"
" WHERE is_selected(id)%s",
flags & C_MTIME ? "datetime(checkin_mtime(:vid, rid), "
"'unixepoch', toLocal())" : "''" /*safe-for-%s*/,
flags & C_SIZE ? "blob.size" : "0" /*safe-for-%s*/,
blob_sql_text(&where));
/* Exclude unchanged files unless requested. */
if( !(flags & C_UNCHANGED) ){
blob_append_sql(&sql,
" AND (chnged OR deleted OR rid=0 OR pathname!=origname)");
}
|
| | |
149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 |
/* Obtain the list of managed files if appropriate. */
blob_zero(&sql);
if( flags & C_ALL ){
/* Start with a list of all managed files. */
blob_append_sql(&sql,
"SELECT pathname, %s as mtime, %s as size, deleted, chnged, rid,"
" coalesce(origname!=pathname,0) AS renamed, islink, 1 AS managed"
" FROM vfile LEFT JOIN blob USING (rid)"
" WHERE is_selected(id)%s",
flags & C_MTIME ? "datetime(checkin_mtime(:vid, rid), "
"'unixepoch', toLocal())" : "''" /*safe-for-%s*/,
flags & C_SIZE ? "coalesce(blob.size, 0)" : "0" /*safe-for-%s*/,
blob_sql_text(&where));
/* Exclude unchanged files unless requested. */
if( !(flags & C_UNCHANGED) ){
blob_append_sql(&sql,
" AND (chnged OR deleted OR rid=0 OR pathname!=origname)");
}
|