Fossil SCM
Documentation updates to better reflect recent changes.
Commit
7f1958acf8347439fd1668b77aab4dce13f869856c81a346785e38951474b5a4
Parent
5c72725ef58387f…
2 files changed
+9
-1
+7
-2
+9
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -814,11 +814,19 @@ | ||
| 814 | 814 | /* |
| 815 | 815 | ** WEBPAGE: ckout |
| 816 | 816 | ** |
| 817 | 817 | ** Show information about the current checkout. This page only functions |
| 818 | 818 | ** if the web server is run on a loopback interface (in other words, was |
| 819 | -** started using "fossil ui" or similar) from with on open check-out. | |
| 819 | +** started using "fossil ui" or similar) from within an open check-out. | |
| 820 | +** | |
| 821 | +** If the "exbase=PATH" query parameter is provided, then the diff shown | |
| 822 | +** uses the files in PATH as the baseline. This is the same as using | |
| 823 | +** the "--from PATH" argument to the "fossil diff" command-line. In fact, | |
| 824 | +** when using "fossil ui --from PATH", the --from argument becomes the value | |
| 825 | +** of the exbase query parameter for the start page. | |
| 826 | +** | |
| 827 | +** Other query parameters related to diffs are also accepted. | |
| 820 | 828 | */ |
| 821 | 829 | void ckout_page(void){ |
| 822 | 830 | int vid; |
| 823 | 831 | const char *zHome; /* Home directory */ |
| 824 | 832 | int nHome; |
| 825 | 833 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -814,11 +814,19 @@ | |
| 814 | /* |
| 815 | ** WEBPAGE: ckout |
| 816 | ** |
| 817 | ** Show information about the current checkout. This page only functions |
| 818 | ** if the web server is run on a loopback interface (in other words, was |
| 819 | ** started using "fossil ui" or similar) from with on open check-out. |
| 820 | */ |
| 821 | void ckout_page(void){ |
| 822 | int vid; |
| 823 | const char *zHome; /* Home directory */ |
| 824 | int nHome; |
| 825 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -814,11 +814,19 @@ | |
| 814 | /* |
| 815 | ** WEBPAGE: ckout |
| 816 | ** |
| 817 | ** Show information about the current checkout. This page only functions |
| 818 | ** if the web server is run on a loopback interface (in other words, was |
| 819 | ** started using "fossil ui" or similar) from within an open check-out. |
| 820 | ** |
| 821 | ** If the "exbase=PATH" query parameter is provided, then the diff shown |
| 822 | ** uses the files in PATH as the baseline. This is the same as using |
| 823 | ** the "--from PATH" argument to the "fossil diff" command-line. In fact, |
| 824 | ** when using "fossil ui --from PATH", the --from argument becomes the value |
| 825 | ** of the exbase query parameter for the start page. |
| 826 | ** |
| 827 | ** Other query parameters related to diffs are also accepted. |
| 828 | */ |
| 829 | void ckout_page(void){ |
| 830 | int vid; |
| 831 | const char *zHome; /* Home directory */ |
| 832 | int nHome; |
| 833 |
+7
-2
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -1,13 +1,18 @@ | ||
| 1 | 1 | <title>Change Log</title> |
| 2 | 2 | |
| 3 | 3 | <h2 id='v2_26'>Changes for version 2.26 (pending)</h2> |
| 4 | 4 | |
| 5 | + * Enhanced the --from option on "[/help?cmd=diff|fossil diff]" so that | |
| 6 | + it optionally accepts a directory name as its argument, and uses files | |
| 7 | + under that directory as the baseline for the diff. | |
| 5 | 8 | * Added the [/help?cmd=/ckout|/ckout web page] to provide information |
| 6 | 9 | about pending changes in a working check-out |
| 7 | - * The [/help?cmd=ui|fossil ui] command defaults to using the /ckout | |
| 8 | - page as its start page. | |
| 10 | + * The [/help?cmd=ui|fossil ui] command defaults to using the | |
| 11 | + [/help?cmd=/ckout|/ckout page] as its start page. Or, if the | |
| 12 | + "--from PATH" option is present, the default start page becomes | |
| 13 | + "/ckout?exbase=PATH". | |
| 9 | 14 | * Added the [/help?cmd=merge-info|fossil merge-info] command and especially |
| 10 | 15 | the --tk option to that command, to provide analysis of the most recent |
| 11 | 16 | merge or update operation. |
| 12 | 17 | * Issue a warning if a user tries to commit on a check-in where the |
| 13 | 18 | branch has been changed. |
| 14 | 19 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -1,13 +1,18 @@ | |
| 1 | <title>Change Log</title> |
| 2 | |
| 3 | <h2 id='v2_26'>Changes for version 2.26 (pending)</h2> |
| 4 | |
| 5 | * Added the [/help?cmd=/ckout|/ckout web page] to provide information |
| 6 | about pending changes in a working check-out |
| 7 | * The [/help?cmd=ui|fossil ui] command defaults to using the /ckout |
| 8 | page as its start page. |
| 9 | * Added the [/help?cmd=merge-info|fossil merge-info] command and especially |
| 10 | the --tk option to that command, to provide analysis of the most recent |
| 11 | merge or update operation. |
| 12 | * Issue a warning if a user tries to commit on a check-in where the |
| 13 | branch has been changed. |
| 14 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -1,13 +1,18 @@ | |
| 1 | <title>Change Log</title> |
| 2 | |
| 3 | <h2 id='v2_26'>Changes for version 2.26 (pending)</h2> |
| 4 | |
| 5 | * Enhanced the --from option on "[/help?cmd=diff|fossil diff]" so that |
| 6 | it optionally accepts a directory name as its argument, and uses files |
| 7 | under that directory as the baseline for the diff. |
| 8 | * Added the [/help?cmd=/ckout|/ckout web page] to provide information |
| 9 | about pending changes in a working check-out |
| 10 | * The [/help?cmd=ui|fossil ui] command defaults to using the |
| 11 | [/help?cmd=/ckout|/ckout page] as its start page. Or, if the |
| 12 | "--from PATH" option is present, the default start page becomes |
| 13 | "/ckout?exbase=PATH". |
| 14 | * Added the [/help?cmd=merge-info|fossil merge-info] command and especially |
| 15 | the --tk option to that command, to provide analysis of the most recent |
| 16 | merge or update operation. |
| 17 | * Issue a warning if a user tries to commit on a check-in where the |
| 18 | branch has been changed. |
| 19 |