Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Simplify branch changes. The historical_version_of_file() function appears to return >0 upon success. Also, remove superfluous slash from '.fossil-settings' path construction in print_setting(). |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | andygoth-versioned-open |
| Files: | files | file ages | folders |
| SHA1: |
20972e8042763226ad6b6a0a02656566 |
| User & Date: | mistachkin 2015-04-08 06:08:28.083 |
| Original Comment: | Simplify branch changes. The historical_version_of_file() function appears to return ^>0 upon success. Also, remove superfluous slash from '.fossil-settings' path construction in print_setting(). |
Context
|
2015-04-08
| ||
| 06:37 | During open, only refresh the 'allow-symlinks' setting if there is an open revision. check-in: 65c23c63db user: mistachkin tags: andygoth-versioned-open | |
| 06:08 | Simplify branch changes. The historical_version_of_file() function appears to return >0 upon success. Also, remove superfluous slash from '.fossil-settings' path construction in print_setting(). check-in: 20972e8042 user: mistachkin tags: andygoth-versioned-open | |
| 05:06 | Check versioned settings (namely, allow-symlinks) during open. check-in: 6a4c3c5ee2 user: andygoth tags: andygoth-versioned-open | |
Changes
Changes to src/db.c.
| ︙ | ︙ | |||
1911 1912 1913 1914 1915 1916 1917 1918 |
zVersionedSetting = fossil_strdup(cacheEntry->zValue);
break;
}
cacheEntry = cacheEntry->next;
}
/* Attempt to read value from file in checkout if there wasn't a cache hit. */
if( cacheEntry==0 ){
Blob setting;
| > | < | < < > | > | > > > > > > | > > | | > | < | 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 |
zVersionedSetting = fossil_strdup(cacheEntry->zValue);
break;
}
cacheEntry = cacheEntry->next;
}
/* Attempt to read value from file in checkout if there wasn't a cache hit. */
if( cacheEntry==0 ){
Blob versionedPathname;
Blob setting;
blob_zero(&versionedPathname);
blob_zero(&setting);
blob_appendf(&versionedPathname, "%s.fossil-settings/%s",
g.zLocalRoot, zName);
if( !g.localOpen ){
Blob noWarnFile;
if( historical_version_of_file(g.zOpenRevision,
blob_str(&versionedPathname),
&setting, 0, 0, 0, -1)>0 ){
found = 1;
}
/* See if there's a no-warn flag */
blob_append(&versionedPathname, ".no-warn", -1);
blob_zero(&noWarnFile);
if( historical_version_of_file(g.zOpenRevision,
blob_str(&versionedPathname),
&noWarnFile, 0, 0, 0, -1)>0 ){
noWarn = 1;
}
blob_reset(&noWarnFile);
}else if( file_size(blob_str(&versionedPathname))>=0 ){
/* File exists, and contains the value for this setting. Load from
** the file. */
if( blob_read_from_file(&setting, blob_str(&versionedPathname))>=0 ){
found = 1;
}
/* See if there's a no-warn flag */
blob_append(&versionedPathname, ".no-warn", -1);
if( file_size(blob_str(&versionedPathname))>=0 ){
noWarn = 1;
}
}
blob_reset(&versionedPathname);
if( found ){
blob_trim(&setting); /* Avoid non-obvious problems with line endings
** on boolean properties */
zVersionedSetting = strdup(blob_str(&setting));
}
blob_reset(&setting);
/* Store result in cache, which can be the value or 0 if not found */
cacheEntry = (struct _cacheEntry*)fossil_malloc(sizeof(struct _cacheEntry));
cacheEntry->next = cache;
cacheEntry->zName = zName;
cacheEntry->zValue = fossil_strdup(zVersionedSetting);
cache = cacheEntry;
}
/* Display a warning? */
if( zVersionedSetting!=0 && zNonVersionedSetting!=0
&& zNonVersionedSetting[0]!='\0' && !noWarn
){
/* There's a versioned setting, and a non-versioned setting. Tell
** the user about the conflict */
|
| ︙ | ︙ | |||
2305 2306 2307 2308 2309 2310 2311 |
}else{
fossil_print("%-20s\n", pSetting->name);
}
if( pSetting->versionable && g.localOpen ){
/* Check to see if this is overridden by a versionable settings file */
Blob versionedPathname;
blob_zero(&versionedPathname);
| | | 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 |
}else{
fossil_print("%-20s\n", pSetting->name);
}
if( pSetting->versionable && g.localOpen ){
/* Check to see if this is overridden by a versionable settings file */
Blob versionedPathname;
blob_zero(&versionedPathname);
blob_appendf(&versionedPathname, "%s.fossil-settings/%s",
g.zLocalRoot, pSetting->name);
if( file_size(blob_str(&versionedPathname))>=0 ){
fossil_print(" (overridden by contents of file .fossil-settings/%s)\n",
pSetting->name);
}
}
db_finalize(&q);
|
| ︙ | ︙ |