Fossil SCM
Change file_size() to file_wd_size() in file_is_the_same().
Commit
a369dc77210bf42ccf4ab50fd1d7a15ec371f061
Parent
3e141b792c689c0…
1 file changed
+8
-1
+8
-1
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -57,14 +57,21 @@ | ||
| 57 | 57 | */ |
| 58 | 58 | static const char *azManifest[] = { |
| 59 | 59 | "manifest", |
| 60 | 60 | "manifest.uuid", |
| 61 | 61 | }; |
| 62 | + | |
| 63 | + /* Cached setting "manifest" */ | |
| 64 | + static int cachedManifest = -1; | |
| 65 | + | |
| 66 | + if( cachedManifest == -1 ){ | |
| 67 | + cachedManifest = db_get_boolean("manifest",0); | |
| 68 | + } | |
| 62 | 69 | |
| 63 | 70 | if( N>=0 && N<count(azName) ) return azName[N]; |
| 64 | 71 | if( N>=count(azName) && N<count(azName)+count(azManifest) |
| 65 | - && db_get_boolean("manifest",0) ){ | |
| 72 | + && cachedManifest ){ | |
| 66 | 73 | return azManifest[N-count(azName)]; |
| 67 | 74 | } |
| 68 | 75 | return 0; |
| 69 | 76 | } |
| 70 | 77 | |
| 71 | 78 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -57,14 +57,21 @@ | |
| 57 | */ |
| 58 | static const char *azManifest[] = { |
| 59 | "manifest", |
| 60 | "manifest.uuid", |
| 61 | }; |
| 62 | |
| 63 | if( N>=0 && N<count(azName) ) return azName[N]; |
| 64 | if( N>=count(azName) && N<count(azName)+count(azManifest) |
| 65 | && db_get_boolean("manifest",0) ){ |
| 66 | return azManifest[N-count(azName)]; |
| 67 | } |
| 68 | return 0; |
| 69 | } |
| 70 | |
| 71 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -57,14 +57,21 @@ | |
| 57 | */ |
| 58 | static const char *azManifest[] = { |
| 59 | "manifest", |
| 60 | "manifest.uuid", |
| 61 | }; |
| 62 | |
| 63 | /* Cached setting "manifest" */ |
| 64 | static int cachedManifest = -1; |
| 65 | |
| 66 | if( cachedManifest == -1 ){ |
| 67 | cachedManifest = db_get_boolean("manifest",0); |
| 68 | } |
| 69 | |
| 70 | if( N>=0 && N<count(azName) ) return azName[N]; |
| 71 | if( N>=count(azName) && N<count(azName)+count(azManifest) |
| 72 | && cachedManifest ){ |
| 73 | return azManifest[N-count(azName)]; |
| 74 | } |
| 75 | return 0; |
| 76 | } |
| 77 | |
| 78 |