Fossil SCM
Change the relative-paths default to 'on', after feedback from the community.
Commit
42a830e76da3551fbbf411f2c098a5bf65c074e6
Parent
64ae65791a54a16…
3 files changed
+1
-1
+2
-2
+7
-3
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -115,11 +115,11 @@ | ||
| 115 | 115 | ** status report should be shown relative to the current |
| 116 | 116 | ** working directory. |
| 117 | 117 | */ |
| 118 | 118 | static int determine_cwd_relative_option() |
| 119 | 119 | { |
| 120 | - int relativePaths = db_get_boolean("relative-paths", 0); | |
| 120 | + int relativePaths = db_get_boolean("relative-paths", 1); | |
| 121 | 121 | int absPathOption = find_option("abs-paths", 0, 0)!=0; |
| 122 | 122 | int relPathOption = find_option("rel-paths", 0, 0)!=0; |
| 123 | 123 | if( absPathOption ){ relativePaths = 0; } |
| 124 | 124 | if( relPathOption ){ relativePaths = 1; } |
| 125 | 125 | return relativePaths; |
| 126 | 126 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -115,11 +115,11 @@ | |
| 115 | ** status report should be shown relative to the current |
| 116 | ** working directory. |
| 117 | */ |
| 118 | static int determine_cwd_relative_option() |
| 119 | { |
| 120 | int relativePaths = db_get_boolean("relative-paths", 0); |
| 121 | int absPathOption = find_option("abs-paths", 0, 0)!=0; |
| 122 | int relPathOption = find_option("rel-paths", 0, 0)!=0; |
| 123 | if( absPathOption ){ relativePaths = 0; } |
| 124 | if( relPathOption ){ relativePaths = 1; } |
| 125 | return relativePaths; |
| 126 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -115,11 +115,11 @@ | |
| 115 | ** status report should be shown relative to the current |
| 116 | ** working directory. |
| 117 | */ |
| 118 | static int determine_cwd_relative_option() |
| 119 | { |
| 120 | int relativePaths = db_get_boolean("relative-paths", 1); |
| 121 | int absPathOption = find_option("abs-paths", 0, 0)!=0; |
| 122 | int relPathOption = find_option("rel-paths", 0, 0)!=0; |
| 123 | if( absPathOption ){ relativePaths = 0; } |
| 124 | if( relPathOption ){ relativePaths = 1; } |
| 125 | return relativePaths; |
| 126 |
M
src/db.c
+2
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1741,11 +1741,11 @@ | ||
| 1741 | 1741 | { "manifest", 0, 0, 1, "off" }, |
| 1742 | 1742 | { "max-upload", 0, 25, 0, "250000" }, |
| 1743 | 1743 | { "mtime-changes", 0, 0, 0, "on" }, |
| 1744 | 1744 | { "pgp-command", 0, 32, 0, "gpg --clearsign -o " }, |
| 1745 | 1745 | { "proxy", 0, 32, 0, "off" }, |
| 1746 | - { "relative-paths",0, 0, 0, "off" }, | |
| 1746 | + { "relative-paths",0, 0, 0, "on" }, | |
| 1747 | 1747 | { "repo-cksum", 0, 0, 0, "on" }, |
| 1748 | 1748 | { "self-register", 0, 0, 0, "off" }, |
| 1749 | 1749 | { "ssl-ca-location",0, 40, 0, "" }, |
| 1750 | 1750 | { "ssl-identity", 0, 40, 0, "" }, |
| 1751 | 1751 | { "ssh-command", 0, 32, 0, "" }, |
| @@ -1857,11 +1857,11 @@ | ||
| 1857 | 1857 | ** the "http_proxy" environment variable is consulted. |
| 1858 | 1858 | ** If the http_proxy environment variable is undefined |
| 1859 | 1859 | ** then a direct HTTP connection is used. |
| 1860 | 1860 | ** |
| 1861 | 1861 | ** relative-paths When showing changes and extras, report paths relative |
| 1862 | -** to the current working directory. Default: "off" | |
| 1862 | +** to the current working directory. Default: "on" | |
| 1863 | 1863 | ** |
| 1864 | 1864 | ** repo-cksum Compute checksums over all files in each checkout |
| 1865 | 1865 | ** as a double-check of correctness. Defaults to "on". |
| 1866 | 1866 | ** Disable on large repositories for a performance |
| 1867 | 1867 | ** improvement. |
| 1868 | 1868 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1741,11 +1741,11 @@ | |
| 1741 | { "manifest", 0, 0, 1, "off" }, |
| 1742 | { "max-upload", 0, 25, 0, "250000" }, |
| 1743 | { "mtime-changes", 0, 0, 0, "on" }, |
| 1744 | { "pgp-command", 0, 32, 0, "gpg --clearsign -o " }, |
| 1745 | { "proxy", 0, 32, 0, "off" }, |
| 1746 | { "relative-paths",0, 0, 0, "off" }, |
| 1747 | { "repo-cksum", 0, 0, 0, "on" }, |
| 1748 | { "self-register", 0, 0, 0, "off" }, |
| 1749 | { "ssl-ca-location",0, 40, 0, "" }, |
| 1750 | { "ssl-identity", 0, 40, 0, "" }, |
| 1751 | { "ssh-command", 0, 32, 0, "" }, |
| @@ -1857,11 +1857,11 @@ | |
| 1857 | ** the "http_proxy" environment variable is consulted. |
| 1858 | ** If the http_proxy environment variable is undefined |
| 1859 | ** then a direct HTTP connection is used. |
| 1860 | ** |
| 1861 | ** relative-paths When showing changes and extras, report paths relative |
| 1862 | ** to the current working directory. Default: "off" |
| 1863 | ** |
| 1864 | ** repo-cksum Compute checksums over all files in each checkout |
| 1865 | ** as a double-check of correctness. Defaults to "on". |
| 1866 | ** Disable on large repositories for a performance |
| 1867 | ** improvement. |
| 1868 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1741,11 +1741,11 @@ | |
| 1741 | { "manifest", 0, 0, 1, "off" }, |
| 1742 | { "max-upload", 0, 25, 0, "250000" }, |
| 1743 | { "mtime-changes", 0, 0, 0, "on" }, |
| 1744 | { "pgp-command", 0, 32, 0, "gpg --clearsign -o " }, |
| 1745 | { "proxy", 0, 32, 0, "off" }, |
| 1746 | { "relative-paths",0, 0, 0, "on" }, |
| 1747 | { "repo-cksum", 0, 0, 0, "on" }, |
| 1748 | { "self-register", 0, 0, 0, "off" }, |
| 1749 | { "ssl-ca-location",0, 40, 0, "" }, |
| 1750 | { "ssl-identity", 0, 40, 0, "" }, |
| 1751 | { "ssh-command", 0, 32, 0, "" }, |
| @@ -1857,11 +1857,11 @@ | |
| 1857 | ** the "http_proxy" environment variable is consulted. |
| 1858 | ** If the http_proxy environment variable is undefined |
| 1859 | ** then a direct HTTP connection is used. |
| 1860 | ** |
| 1861 | ** relative-paths When showing changes and extras, report paths relative |
| 1862 | ** to the current working directory. Default: "on" |
| 1863 | ** |
| 1864 | ** repo-cksum Compute checksums over all files in each checkout |
| 1865 | ** as a double-check of correctness. Defaults to "on". |
| 1866 | ** Disable on large repositories for a performance |
| 1867 | ** improvement. |
| 1868 |
+7
-3
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -6,13 +6,17 @@ | ||
| 6 | 6 | * Added the "[/help/winsrv | fossil winsrv]" command |
| 7 | 7 | for creating a Fossil service on windows systems. |
| 8 | 8 | * Added "versionable settings" where settings that affect |
| 9 | 9 | the local tree can be stored in versioned files in the |
| 10 | 10 | .fossil-settings directory. |
| 11 | - * Added "relative-paths" setting and options for status, | |
| 12 | - changes and extras commands to optionally show pathnames | |
| 13 | - relative to the current working directory. | |
| 11 | + * The status, changes and extras commands now show | |
| 12 | + pathnames relative to the current working directory, | |
| 13 | + unless overridden by command line options or the | |
| 14 | + "relative-paths" setting.<br><b>WARNING:</b> This | |
| 15 | + change will break scripts which rely on the current | |
| 16 | + output when the current working directory is not the | |
| 17 | + repository root. | |
| 14 | 18 | * Added "empty-dirs" versionable setting. |
| 15 | 19 | * Added support for client-side SSL certificates with "ssl-identity" |
| 16 | 20 | setting and --ssl-identity option. |
| 17 | 21 | * Added "ssl-ca-location" setting to specify trusted root |
| 18 | 22 | SSL certificates. |
| 19 | 23 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -6,13 +6,17 @@ | |
| 6 | * Added the "[/help/winsrv | fossil winsrv]" command |
| 7 | for creating a Fossil service on windows systems. |
| 8 | * Added "versionable settings" where settings that affect |
| 9 | the local tree can be stored in versioned files in the |
| 10 | .fossil-settings directory. |
| 11 | * Added "relative-paths" setting and options for status, |
| 12 | changes and extras commands to optionally show pathnames |
| 13 | relative to the current working directory. |
| 14 | * Added "empty-dirs" versionable setting. |
| 15 | * Added support for client-side SSL certificates with "ssl-identity" |
| 16 | setting and --ssl-identity option. |
| 17 | * Added "ssl-ca-location" setting to specify trusted root |
| 18 | SSL certificates. |
| 19 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -6,13 +6,17 @@ | |
| 6 | * Added the "[/help/winsrv | fossil winsrv]" command |
| 7 | for creating a Fossil service on windows systems. |
| 8 | * Added "versionable settings" where settings that affect |
| 9 | the local tree can be stored in versioned files in the |
| 10 | .fossil-settings directory. |
| 11 | * The status, changes and extras commands now show |
| 12 | pathnames relative to the current working directory, |
| 13 | unless overridden by command line options or the |
| 14 | "relative-paths" setting.<br><b>WARNING:</b> This |
| 15 | change will break scripts which rely on the current |
| 16 | output when the current working directory is not the |
| 17 | repository root. |
| 18 | * Added "empty-dirs" versionable setting. |
| 19 | * Added support for client-side SSL certificates with "ssl-identity" |
| 20 | setting and --ssl-identity option. |
| 21 | * Added "ssl-ca-location" setting to specify trusted root |
| 22 | SSL certificates. |
| 23 |