Fossil SCM
Fix annotate_file() so that it correctly errors out if the named file does not exist in the repository.
Commit
a7d9598a0d0fda75517a87de0205363317c533f4e8c4bcbf27205e449197769b
Parent
f5bcc25ac08b151…
1 file changed
+3
+3
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2257,10 +2257,13 @@ | ||
| 2257 | 2257 | |
| 2258 | 2258 | /* Get filename ID */ |
| 2259 | 2259 | file_tree_name(zFilename, &treename, 0, 1); |
| 2260 | 2260 | zFilename = blob_str(&treename); |
| 2261 | 2261 | fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename); |
| 2262 | + if( fnid==0 ){ | |
| 2263 | + fossil_fatal("no such file: %Q", zFilename); | |
| 2264 | + } | |
| 2262 | 2265 | |
| 2263 | 2266 | db_prepare(&q, |
| 2264 | 2267 | "SELECT DISTINCT" |
| 2265 | 2268 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 2266 | 2269 | " (SELECT uuid FROM blob WHERE rid=mlink.mid)," |
| 2267 | 2270 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2257,10 +2257,13 @@ | |
| 2257 | |
| 2258 | /* Get filename ID */ |
| 2259 | file_tree_name(zFilename, &treename, 0, 1); |
| 2260 | zFilename = blob_str(&treename); |
| 2261 | fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename); |
| 2262 | |
| 2263 | db_prepare(&q, |
| 2264 | "SELECT DISTINCT" |
| 2265 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 2266 | " (SELECT uuid FROM blob WHERE rid=mlink.mid)," |
| 2267 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2257,10 +2257,13 @@ | |
| 2257 | |
| 2258 | /* Get filename ID */ |
| 2259 | file_tree_name(zFilename, &treename, 0, 1); |
| 2260 | zFilename = blob_str(&treename); |
| 2261 | fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename); |
| 2262 | if( fnid==0 ){ |
| 2263 | fossil_fatal("no such file: %Q", zFilename); |
| 2264 | } |
| 2265 | |
| 2266 | db_prepare(&q, |
| 2267 | "SELECT DISTINCT" |
| 2268 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 2269 | " (SELECT uuid FROM blob WHERE rid=mlink.mid)," |
| 2270 |