Fossil SCM
Make form field widths consistent for settings. Fix comment for the 'binary-glob' setting.
Commit
c24b6890199575bb9acae75edd41b8cb7afb2215
Parent
d25f6ddf35ae0e4…
1 file changed
+8
-8
M
src/db.c
+8
-8
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2027,20 +2027,20 @@ | ||
| 2027 | 2027 | { "allow-symlinks",0, 0, 1, "off" }, |
| 2028 | 2028 | { "auto-captcha", "autocaptcha", 0, 0, "on" }, |
| 2029 | 2029 | { "auto-hyperlink",0, 0, 0, "on", }, |
| 2030 | 2030 | { "auto-shun", 0, 0, 0, "on" }, |
| 2031 | 2031 | { "autosync", 0, 0, 0, "on" }, |
| 2032 | - { "binary-glob", 0, 32, 1, "" }, | |
| 2032 | + { "binary-glob", 0, 40, 1, "" }, | |
| 2033 | 2033 | { "clearsign", 0, 0, 0, "off" }, |
| 2034 | 2034 | { "case-sensitive",0, 0, 0, "on" }, |
| 2035 | - { "crnl-glob", 0, 16, 1, "" }, | |
| 2035 | + { "crnl-glob", 0, 40, 1, "" }, | |
| 2036 | 2036 | { "default-perms", 0, 16, 0, "u" }, |
| 2037 | 2037 | { "diff-binary", 0, 0, 0, "on" }, |
| 2038 | - { "diff-command", 0, 16, 0, "" }, | |
| 2038 | + { "diff-command", 0, 40, 0, "" }, | |
| 2039 | 2039 | { "dont-push", 0, 0, 0, "off" }, |
| 2040 | - { "editor", 0, 16, 0, "" }, | |
| 2041 | - { "gdiff-command", 0, 16, 0, "gdiff" }, | |
| 2040 | + { "editor", 0, 32, 0, "" }, | |
| 2041 | + { "gdiff-command", 0, 40, 0, "gdiff" }, | |
| 2042 | 2042 | { "gmerge-command",0, 40, 0, "" }, |
| 2043 | 2043 | { "https-login", 0, 0, 0, "off" }, |
| 2044 | 2044 | { "ignore-glob", 0, 40, 1, "" }, |
| 2045 | 2045 | { "empty-dirs", 0, 40, 1, "" }, |
| 2046 | 2046 | { "http-port", 0, 16, 0, "8080" }, |
| @@ -2047,18 +2047,18 @@ | ||
| 2047 | 2047 | { "localauth", 0, 0, 0, "off" }, |
| 2048 | 2048 | { "main-branch", 0, 40, 0, "trunk" }, |
| 2049 | 2049 | { "manifest", 0, 0, 1, "off" }, |
| 2050 | 2050 | { "max-upload", 0, 25, 0, "250000" }, |
| 2051 | 2051 | { "mtime-changes", 0, 0, 0, "on" }, |
| 2052 | - { "pgp-command", 0, 32, 0, "gpg --clearsign -o " }, | |
| 2052 | + { "pgp-command", 0, 40, 0, "gpg --clearsign -o " }, | |
| 2053 | 2053 | { "proxy", 0, 32, 0, "off" }, |
| 2054 | 2054 | { "relative-paths",0, 0, 0, "on" }, |
| 2055 | 2055 | { "repo-cksum", 0, 0, 0, "on" }, |
| 2056 | 2056 | { "self-register", 0, 0, 0, "off" }, |
| 2057 | 2057 | { "ssl-ca-location",0, 40, 0, "" }, |
| 2058 | 2058 | { "ssl-identity", 0, 40, 0, "" }, |
| 2059 | - { "ssh-command", 0, 32, 0, "" }, | |
| 2059 | + { "ssh-command", 0, 40, 0, "" }, | |
| 2060 | 2060 | #ifdef FOSSIL_ENABLE_TCL |
| 2061 | 2061 | { "tcl", 0, 0, 0, "off" }, |
| 2062 | 2062 | { "tcl-setup", 0, 40, 0, "" }, |
| 2063 | 2063 | #endif |
| 2064 | 2064 | { "web-browser", 0, 32, 0, "" }, |
| @@ -2108,11 +2108,11 @@ | ||
| 2108 | 2108 | ** then only pull operations occur automatically. |
| 2109 | 2109 | ** Default: on |
| 2110 | 2110 | ** |
| 2111 | 2111 | ** binary-glob The VALUE is a comma or newline-separated list of |
| 2112 | 2112 | ** (versionable) GLOB patterns that should be treated as binary files |
| 2113 | -** for merging purposes. Example: *.xml | |
| 2113 | +** for committing and merging purposes. Example: *.jpg | |
| 2114 | 2114 | ** |
| 2115 | 2115 | ** case-sensitive If TRUE, the files whose names differ only in case |
| 2116 | 2116 | ** care considered distinct. If FALSE files whose names |
| 2117 | 2117 | ** differ only in case are the same file. Defaults to |
| 2118 | 2118 | ** TRUE for unix and FALSE for windows and mac. |
| 2119 | 2119 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2027,20 +2027,20 @@ | |
| 2027 | { "allow-symlinks",0, 0, 1, "off" }, |
| 2028 | { "auto-captcha", "autocaptcha", 0, 0, "on" }, |
| 2029 | { "auto-hyperlink",0, 0, 0, "on", }, |
| 2030 | { "auto-shun", 0, 0, 0, "on" }, |
| 2031 | { "autosync", 0, 0, 0, "on" }, |
| 2032 | { "binary-glob", 0, 32, 1, "" }, |
| 2033 | { "clearsign", 0, 0, 0, "off" }, |
| 2034 | { "case-sensitive",0, 0, 0, "on" }, |
| 2035 | { "crnl-glob", 0, 16, 1, "" }, |
| 2036 | { "default-perms", 0, 16, 0, "u" }, |
| 2037 | { "diff-binary", 0, 0, 0, "on" }, |
| 2038 | { "diff-command", 0, 16, 0, "" }, |
| 2039 | { "dont-push", 0, 0, 0, "off" }, |
| 2040 | { "editor", 0, 16, 0, "" }, |
| 2041 | { "gdiff-command", 0, 16, 0, "gdiff" }, |
| 2042 | { "gmerge-command",0, 40, 0, "" }, |
| 2043 | { "https-login", 0, 0, 0, "off" }, |
| 2044 | { "ignore-glob", 0, 40, 1, "" }, |
| 2045 | { "empty-dirs", 0, 40, 1, "" }, |
| 2046 | { "http-port", 0, 16, 0, "8080" }, |
| @@ -2047,18 +2047,18 @@ | |
| 2047 | { "localauth", 0, 0, 0, "off" }, |
| 2048 | { "main-branch", 0, 40, 0, "trunk" }, |
| 2049 | { "manifest", 0, 0, 1, "off" }, |
| 2050 | { "max-upload", 0, 25, 0, "250000" }, |
| 2051 | { "mtime-changes", 0, 0, 0, "on" }, |
| 2052 | { "pgp-command", 0, 32, 0, "gpg --clearsign -o " }, |
| 2053 | { "proxy", 0, 32, 0, "off" }, |
| 2054 | { "relative-paths",0, 0, 0, "on" }, |
| 2055 | { "repo-cksum", 0, 0, 0, "on" }, |
| 2056 | { "self-register", 0, 0, 0, "off" }, |
| 2057 | { "ssl-ca-location",0, 40, 0, "" }, |
| 2058 | { "ssl-identity", 0, 40, 0, "" }, |
| 2059 | { "ssh-command", 0, 32, 0, "" }, |
| 2060 | #ifdef FOSSIL_ENABLE_TCL |
| 2061 | { "tcl", 0, 0, 0, "off" }, |
| 2062 | { "tcl-setup", 0, 40, 0, "" }, |
| 2063 | #endif |
| 2064 | { "web-browser", 0, 32, 0, "" }, |
| @@ -2108,11 +2108,11 @@ | |
| 2108 | ** then only pull operations occur automatically. |
| 2109 | ** Default: on |
| 2110 | ** |
| 2111 | ** binary-glob The VALUE is a comma or newline-separated list of |
| 2112 | ** (versionable) GLOB patterns that should be treated as binary files |
| 2113 | ** for merging purposes. Example: *.xml |
| 2114 | ** |
| 2115 | ** case-sensitive If TRUE, the files whose names differ only in case |
| 2116 | ** care considered distinct. If FALSE files whose names |
| 2117 | ** differ only in case are the same file. Defaults to |
| 2118 | ** TRUE for unix and FALSE for windows and mac. |
| 2119 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2027,20 +2027,20 @@ | |
| 2027 | { "allow-symlinks",0, 0, 1, "off" }, |
| 2028 | { "auto-captcha", "autocaptcha", 0, 0, "on" }, |
| 2029 | { "auto-hyperlink",0, 0, 0, "on", }, |
| 2030 | { "auto-shun", 0, 0, 0, "on" }, |
| 2031 | { "autosync", 0, 0, 0, "on" }, |
| 2032 | { "binary-glob", 0, 40, 1, "" }, |
| 2033 | { "clearsign", 0, 0, 0, "off" }, |
| 2034 | { "case-sensitive",0, 0, 0, "on" }, |
| 2035 | { "crnl-glob", 0, 40, 1, "" }, |
| 2036 | { "default-perms", 0, 16, 0, "u" }, |
| 2037 | { "diff-binary", 0, 0, 0, "on" }, |
| 2038 | { "diff-command", 0, 40, 0, "" }, |
| 2039 | { "dont-push", 0, 0, 0, "off" }, |
| 2040 | { "editor", 0, 32, 0, "" }, |
| 2041 | { "gdiff-command", 0, 40, 0, "gdiff" }, |
| 2042 | { "gmerge-command",0, 40, 0, "" }, |
| 2043 | { "https-login", 0, 0, 0, "off" }, |
| 2044 | { "ignore-glob", 0, 40, 1, "" }, |
| 2045 | { "empty-dirs", 0, 40, 1, "" }, |
| 2046 | { "http-port", 0, 16, 0, "8080" }, |
| @@ -2047,18 +2047,18 @@ | |
| 2047 | { "localauth", 0, 0, 0, "off" }, |
| 2048 | { "main-branch", 0, 40, 0, "trunk" }, |
| 2049 | { "manifest", 0, 0, 1, "off" }, |
| 2050 | { "max-upload", 0, 25, 0, "250000" }, |
| 2051 | { "mtime-changes", 0, 0, 0, "on" }, |
| 2052 | { "pgp-command", 0, 40, 0, "gpg --clearsign -o " }, |
| 2053 | { "proxy", 0, 32, 0, "off" }, |
| 2054 | { "relative-paths",0, 0, 0, "on" }, |
| 2055 | { "repo-cksum", 0, 0, 0, "on" }, |
| 2056 | { "self-register", 0, 0, 0, "off" }, |
| 2057 | { "ssl-ca-location",0, 40, 0, "" }, |
| 2058 | { "ssl-identity", 0, 40, 0, "" }, |
| 2059 | { "ssh-command", 0, 40, 0, "" }, |
| 2060 | #ifdef FOSSIL_ENABLE_TCL |
| 2061 | { "tcl", 0, 0, 0, "off" }, |
| 2062 | { "tcl-setup", 0, 40, 0, "" }, |
| 2063 | #endif |
| 2064 | { "web-browser", 0, 32, 0, "" }, |
| @@ -2108,11 +2108,11 @@ | |
| 2108 | ** then only pull operations occur automatically. |
| 2109 | ** Default: on |
| 2110 | ** |
| 2111 | ** binary-glob The VALUE is a comma or newline-separated list of |
| 2112 | ** (versionable) GLOB patterns that should be treated as binary files |
| 2113 | ** for committing and merging purposes. Example: *.jpg |
| 2114 | ** |
| 2115 | ** case-sensitive If TRUE, the files whose names differ only in case |
| 2116 | ** care considered distinct. If FALSE files whose names |
| 2117 | ** differ only in case are the same file. Defaults to |
| 2118 | ** TRUE for unix and FALSE for windows and mac. |
| 2119 |