Fossil SCM
Merge in documentation updates.
Commit
75ea5ac672d7b31738078158800831d948c56312
Parent
f0359882c9b5adf…
12 files changed
+1
-3
+1
-1
+2
+8
-2
+2
+1
-1
+2
+27
-13
+2
-2
+7
-2
+14
-1
+10
-6
+1
-3
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -507,13 +507,11 @@ | ||
| 507 | 507 | ** |
| 508 | 508 | ** This command does NOT rename or move the files on disk. This command merely |
| 509 | 509 | ** records the fact that filenames have changed so that appropriate notations |
| 510 | 510 | ** can be made at the next commit/checkin. |
| 511 | 511 | ** |
| 512 | -** | |
| 513 | -** SUMMARY: fossil mv|rename OLDNAME NEWNAME | |
| 514 | -** or: fossil mv|rename OLDNAME... DIR | |
| 512 | +** See also: changes, status | |
| 515 | 513 | */ |
| 516 | 514 | void mv_cmd(void){ |
| 517 | 515 | int i; |
| 518 | 516 | int vid; |
| 519 | 517 | char *zDest; |
| 520 | 518 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -507,13 +507,11 @@ | |
| 507 | ** |
| 508 | ** This command does NOT rename or move the files on disk. This command merely |
| 509 | ** records the fact that filenames have changed so that appropriate notations |
| 510 | ** can be made at the next commit/checkin. |
| 511 | ** |
| 512 | ** |
| 513 | ** SUMMARY: fossil mv|rename OLDNAME NEWNAME |
| 514 | ** or: fossil mv|rename OLDNAME... DIR |
| 515 | */ |
| 516 | void mv_cmd(void){ |
| 517 | int i; |
| 518 | int vid; |
| 519 | char *zDest; |
| 520 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -507,13 +507,11 @@ | |
| 507 | ** |
| 508 | ** This command does NOT rename or move the files on disk. This command merely |
| 509 | ** records the fact that filenames have changed so that appropriate notations |
| 510 | ** can be made at the next commit/checkin. |
| 511 | ** |
| 512 | ** See also: changes, status |
| 513 | */ |
| 514 | void mv_cmd(void){ |
| 515 | int i; |
| 516 | int vid; |
| 517 | char *zDest; |
| 518 |
+1
-1
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -784,11 +784,11 @@ | ||
| 784 | 784 | ** the remote repository at URL. |
| 785 | 785 | ** |
| 786 | 786 | ** Options: |
| 787 | 787 | ** -R|--repository FILE Extract info from repository FILE |
| 788 | 788 | ** |
| 789 | -** See also: set | |
| 789 | +** See also: settings, unset | |
| 790 | 790 | */ |
| 791 | 791 | void configuration_cmd(void){ |
| 792 | 792 | int n; |
| 793 | 793 | const char *zMethod; |
| 794 | 794 | if( g.argc<3 ){ |
| 795 | 795 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -784,11 +784,11 @@ | |
| 784 | ** the remote repository at URL. |
| 785 | ** |
| 786 | ** Options: |
| 787 | ** -R|--repository FILE Extract info from repository FILE |
| 788 | ** |
| 789 | ** See also: set |
| 790 | */ |
| 791 | void configuration_cmd(void){ |
| 792 | int n; |
| 793 | const char *zMethod; |
| 794 | if( g.argc<3 ){ |
| 795 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -784,11 +784,11 @@ | |
| 784 | ** the remote repository at URL. |
| 785 | ** |
| 786 | ** Options: |
| 787 | ** -R|--repository FILE Extract info from repository FILE |
| 788 | ** |
| 789 | ** See also: settings, unset |
| 790 | */ |
| 791 | void configuration_cmd(void){ |
| 792 | int n; |
| 793 | const char *zMethod; |
| 794 | if( g.argc<3 ){ |
| 795 |
+2
| --- src/content.c | ||
| +++ src/content.c | ||
| @@ -313,10 +313,12 @@ | ||
| 313 | 313 | ** standard output, or if the optional 4th argument is given, in |
| 314 | 314 | ** the named output file. |
| 315 | 315 | ** |
| 316 | 316 | ** Options: |
| 317 | 317 | ** -R|--repository FILE Extract artifacts from repository FILE |
| 318 | +** | |
| 319 | +** See also: finfo | |
| 318 | 320 | */ |
| 319 | 321 | void artifact_cmd(void){ |
| 320 | 322 | int rid; |
| 321 | 323 | Blob content; |
| 322 | 324 | const char *zFile; |
| 323 | 325 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -313,10 +313,12 @@ | |
| 313 | ** standard output, or if the optional 4th argument is given, in |
| 314 | ** the named output file. |
| 315 | ** |
| 316 | ** Options: |
| 317 | ** -R|--repository FILE Extract artifacts from repository FILE |
| 318 | */ |
| 319 | void artifact_cmd(void){ |
| 320 | int rid; |
| 321 | Blob content; |
| 322 | const char *zFile; |
| 323 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -313,10 +313,12 @@ | |
| 313 | ** standard output, or if the optional 4th argument is given, in |
| 314 | ** the named output file. |
| 315 | ** |
| 316 | ** Options: |
| 317 | ** -R|--repository FILE Extract artifacts from repository FILE |
| 318 | ** |
| 319 | ** See also: finfo |
| 320 | */ |
| 321 | void artifact_cmd(void){ |
| 322 | int rid; |
| 323 | Blob content; |
| 324 | const char *zFile; |
| 325 |
M
src/db.c
+8
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1877,12 +1877,12 @@ | ||
| 1877 | 1877 | |
| 1878 | 1878 | /* |
| 1879 | 1879 | ** COMMAND: settings |
| 1880 | 1880 | ** COMMAND: unset* |
| 1881 | 1881 | ** |
| 1882 | -** %fossil settings ?PROPERTY? ?VALUE? ?-global? | |
| 1883 | -** %fossil unset PROPERTY ?-global? | |
| 1882 | +** %fossil settings ?PROPERTY? ?VALUE? ?OPTIONS? | |
| 1883 | +** %fossil unset PROPERTY ?OPTIONS? | |
| 1884 | 1884 | ** |
| 1885 | 1885 | ** The "settings" command with no arguments lists all properties and their |
| 1886 | 1886 | ** values. With just a property name it shows the value of that property. |
| 1887 | 1887 | ** With a value argument it changes the property for the current repository. |
| 1888 | 1888 | ** |
| @@ -2032,10 +2032,16 @@ | ||
| 2032 | 2032 | ** |
| 2033 | 2033 | ** web-browser A shell command used to launch your preferred |
| 2034 | 2034 | ** web browser when given a URL as an argument. |
| 2035 | 2035 | ** Defaults to "start" on windows, "open" on Mac, |
| 2036 | 2036 | ** and "firefox" on Unix. |
| 2037 | +** | |
| 2038 | +** Options: | |
| 2039 | +** --global set or unset the given property globally instead of | |
| 2040 | +** setting or unsetting it for the open repository only. | |
| 2041 | +** | |
| 2042 | +** See also: configuration | |
| 2037 | 2043 | */ |
| 2038 | 2044 | void setting_cmd(void){ |
| 2039 | 2045 | int i; |
| 2040 | 2046 | int globalFlag = find_option("global","g",0)!=0; |
| 2041 | 2047 | int unsetFlag = g.argv[1][0]=='u'; |
| 2042 | 2048 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1877,12 +1877,12 @@ | |
| 1877 | |
| 1878 | /* |
| 1879 | ** COMMAND: settings |
| 1880 | ** COMMAND: unset* |
| 1881 | ** |
| 1882 | ** %fossil settings ?PROPERTY? ?VALUE? ?-global? |
| 1883 | ** %fossil unset PROPERTY ?-global? |
| 1884 | ** |
| 1885 | ** The "settings" command with no arguments lists all properties and their |
| 1886 | ** values. With just a property name it shows the value of that property. |
| 1887 | ** With a value argument it changes the property for the current repository. |
| 1888 | ** |
| @@ -2032,10 +2032,16 @@ | |
| 2032 | ** |
| 2033 | ** web-browser A shell command used to launch your preferred |
| 2034 | ** web browser when given a URL as an argument. |
| 2035 | ** Defaults to "start" on windows, "open" on Mac, |
| 2036 | ** and "firefox" on Unix. |
| 2037 | */ |
| 2038 | void setting_cmd(void){ |
| 2039 | int i; |
| 2040 | int globalFlag = find_option("global","g",0)!=0; |
| 2041 | int unsetFlag = g.argv[1][0]=='u'; |
| 2042 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1877,12 +1877,12 @@ | |
| 1877 | |
| 1878 | /* |
| 1879 | ** COMMAND: settings |
| 1880 | ** COMMAND: unset* |
| 1881 | ** |
| 1882 | ** %fossil settings ?PROPERTY? ?VALUE? ?OPTIONS? |
| 1883 | ** %fossil unset PROPERTY ?OPTIONS? |
| 1884 | ** |
| 1885 | ** The "settings" command with no arguments lists all properties and their |
| 1886 | ** values. With just a property name it shows the value of that property. |
| 1887 | ** With a value argument it changes the property for the current repository. |
| 1888 | ** |
| @@ -2032,10 +2032,16 @@ | |
| 2032 | ** |
| 2033 | ** web-browser A shell command used to launch your preferred |
| 2034 | ** web browser when given a URL as an argument. |
| 2035 | ** Defaults to "start" on windows, "open" on Mac, |
| 2036 | ** and "firefox" on Unix. |
| 2037 | ** |
| 2038 | ** Options: |
| 2039 | ** --global set or unset the given property globally instead of |
| 2040 | ** setting or unsetting it for the open repository only. |
| 2041 | ** |
| 2042 | ** See also: configuration |
| 2043 | */ |
| 2044 | void setting_cmd(void){ |
| 2045 | int i; |
| 2046 | int globalFlag = find_option("global","g",0)!=0; |
| 2047 | int unsetFlag = g.argv[1][0]=='u'; |
| 2048 |
+2
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -1705,10 +1705,12 @@ | ||
| 1705 | 1705 | ** |
| 1706 | 1706 | ** Options: |
| 1707 | 1707 | ** --limit N Only look backwards in time by N versions |
| 1708 | 1708 | ** --log List all versions analyzed |
| 1709 | 1709 | ** --filevers Show file version numbers rather than check-in versions |
| 1710 | +** | |
| 1711 | +** See also: info, finfo, timeline | |
| 1710 | 1712 | */ |
| 1711 | 1713 | void annotate_cmd(void){ |
| 1712 | 1714 | int fnid; /* Filename ID */ |
| 1713 | 1715 | int fid; /* File instance ID */ |
| 1714 | 1716 | int mid; /* Manifest where file was checked in */ |
| 1715 | 1717 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -1705,10 +1705,12 @@ | |
| 1705 | ** |
| 1706 | ** Options: |
| 1707 | ** --limit N Only look backwards in time by N versions |
| 1708 | ** --log List all versions analyzed |
| 1709 | ** --filevers Show file version numbers rather than check-in versions |
| 1710 | */ |
| 1711 | void annotate_cmd(void){ |
| 1712 | int fnid; /* Filename ID */ |
| 1713 | int fid; /* File instance ID */ |
| 1714 | int mid; /* Manifest where file was checked in */ |
| 1715 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -1705,10 +1705,12 @@ | |
| 1705 | ** |
| 1706 | ** Options: |
| 1707 | ** --limit N Only look backwards in time by N versions |
| 1708 | ** --log List all versions analyzed |
| 1709 | ** --filevers Show file version numbers rather than check-in versions |
| 1710 | ** |
| 1711 | ** See also: info, finfo, timeline |
| 1712 | */ |
| 1713 | void annotate_cmd(void){ |
| 1714 | int fnid; /* Filename ID */ |
| 1715 | int fid; /* File instance ID */ |
| 1716 | int mid; /* Manifest where file was checked in */ |
| 1717 |
+1
-1
| --- src/finfo.c | ||
| +++ src/finfo.c | ||
| @@ -50,11 +50,11 @@ | ||
| 50 | 50 | ** to stdout (only in print mode) |
| 51 | 51 | ** -s select status mode (print a status indicator for FILE) |
| 52 | 52 | ** --case-sensitive B Enable or disable case-sensitive filenames. B is a |
| 53 | 53 | ** boolean: "yes", "no", "true", "false", etc. |
| 54 | 54 | ** |
| 55 | -** See also: descendants, info, leaves | |
| 55 | +** See also: artifact, descendants, info, leaves | |
| 56 | 56 | */ |
| 57 | 57 | void finfo_cmd(void){ |
| 58 | 58 | capture_case_sensitive_option(); |
| 59 | 59 | db_must_be_within_tree(); |
| 60 | 60 | if (find_option("status","s",0)) { |
| 61 | 61 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -50,11 +50,11 @@ | |
| 50 | ** to stdout (only in print mode) |
| 51 | ** -s select status mode (print a status indicator for FILE) |
| 52 | ** --case-sensitive B Enable or disable case-sensitive filenames. B is a |
| 53 | ** boolean: "yes", "no", "true", "false", etc. |
| 54 | ** |
| 55 | ** See also: descendants, info, leaves |
| 56 | */ |
| 57 | void finfo_cmd(void){ |
| 58 | capture_case_sensitive_option(); |
| 59 | db_must_be_within_tree(); |
| 60 | if (find_option("status","s",0)) { |
| 61 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -50,11 +50,11 @@ | |
| 50 | ** to stdout (only in print mode) |
| 51 | ** -s select status mode (print a status indicator for FILE) |
| 52 | ** --case-sensitive B Enable or disable case-sensitive filenames. B is a |
| 53 | ** boolean: "yes", "no", "true", "false", etc. |
| 54 | ** |
| 55 | ** See also: artifact, descendants, info, leaves |
| 56 | */ |
| 57 | void finfo_cmd(void){ |
| 58 | capture_case_sensitive_option(); |
| 59 | db_must_be_within_tree(); |
| 60 | if (find_option("status","s",0)) { |
| 61 |
+2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -139,10 +139,12 @@ | ||
| 139 | 139 | ** file in a checkout. |
| 140 | 140 | ** |
| 141 | 141 | ** Options: |
| 142 | 142 | ** |
| 143 | 143 | ** -R|--repository FILE Extract info from repository FILE |
| 144 | +** | |
| 145 | +** See also: annotate, artifact, finfo, timeline | |
| 144 | 146 | */ |
| 145 | 147 | void info_cmd(void){ |
| 146 | 148 | i64 fsize; |
| 147 | 149 | if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){ |
| 148 | 150 | db_open_config(0); |
| 149 | 151 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -139,10 +139,12 @@ | |
| 139 | ** file in a checkout. |
| 140 | ** |
| 141 | ** Options: |
| 142 | ** |
| 143 | ** -R|--repository FILE Extract info from repository FILE |
| 144 | */ |
| 145 | void info_cmd(void){ |
| 146 | i64 fsize; |
| 147 | if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){ |
| 148 | db_open_config(0); |
| 149 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -139,10 +139,12 @@ | |
| 139 | ** file in a checkout. |
| 140 | ** |
| 141 | ** Options: |
| 142 | ** |
| 143 | ** -R|--repository FILE Extract info from repository FILE |
| 144 | ** |
| 145 | ** See also: annotate, artifact, finfo, timeline |
| 146 | */ |
| 147 | void info_cmd(void){ |
| 148 | i64 fsize; |
| 149 | if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){ |
| 150 | db_open_config(0); |
| 151 |
+27
-13
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -1367,10 +1367,12 @@ | ||
| 1367 | 1367 | ** repository: /home/somebody/project.db |
| 1368 | 1368 | ** |
| 1369 | 1369 | ** The second line defines the name of the repository. After locating |
| 1370 | 1370 | ** the repository, fossil will generate a webpage on stdout based on |
| 1371 | 1371 | ** the values of standard CGI environment variables. |
| 1372 | +** | |
| 1373 | +** See also: http, server, winsrv | |
| 1372 | 1374 | */ |
| 1373 | 1375 | void cmd_cgi(void){ |
| 1374 | 1376 | const char *zFile; |
| 1375 | 1377 | const char *zNotFound = 0; |
| 1376 | 1378 | char **azRedirect = 0; /* List of repositories to redirect to */ |
| @@ -1540,11 +1542,11 @@ | ||
| 1540 | 1542 | ** |
| 1541 | 1543 | ** The argv==6 form is used by the win32 server only. |
| 1542 | 1544 | ** |
| 1543 | 1545 | ** COMMAND: http* |
| 1544 | 1546 | ** |
| 1545 | -** Usage: %fossil http REPOSITORY [--notfound URL] [--host HOSTNAME] [--https] | |
| 1547 | +** Usage: %fossil http REPOSITORY ?OPTIONS? | |
| 1546 | 1548 | ** |
| 1547 | 1549 | ** Handle a single HTTP request appearing on stdin. The resulting webpage |
| 1548 | 1550 | ** is delivered on stdout. This method is used to launch an HTTP request |
| 1549 | 1551 | ** handler from inetd, for example. The argument is the name of the |
| 1550 | 1552 | ** repository. |
| @@ -1555,20 +1557,25 @@ | ||
| 1555 | 1557 | ** not select a valid repository and the --notfound option is available, |
| 1556 | 1558 | ** then the server redirects (HTTP code 302) to the URL of --notfound. |
| 1557 | 1559 | ** |
| 1558 | 1560 | ** The --host option can be used to specify the hostname for the server. |
| 1559 | 1561 | ** The --https option indicates that the request came from HTTPS rather |
| 1560 | -** than HTTP. | |
| 1561 | -** | |
| 1562 | -** Other options: | |
| 1563 | -** | |
| 1564 | -** --localauth Password signin is not required if this is true and | |
| 1565 | -** the input comes from 127.0.0.1 and the "localauth" | |
| 1566 | -** setting is not disabled. | |
| 1567 | -** | |
| 1568 | -** --nossl SSL connections are not available so do not | |
| 1569 | -** redirect from http: to https:. | |
| 1562 | +** than HTTP. If --nossl is given, then SSL connections will not be available, | |
| 1563 | +** thus also no redirecting from http: to https: will take place. | |
| 1564 | +** | |
| 1565 | +** If the --localauth option is given, then automatic login is performed | |
| 1566 | +** for requests coming from localhost, if the "localauth" setting is not | |
| 1567 | +** enabled. | |
| 1568 | +** | |
| 1569 | +** Options: | |
| 1570 | +** --localauth enable automatic login for local connections | |
| 1571 | +** --host NAME specify hostname of the server | |
| 1572 | +** --https signal a request coming in via https | |
| 1573 | +** --nossl signal that no SSL connections are available | |
| 1574 | +** --notfound URL use URL as "HTTP 404, object not found" page. | |
| 1575 | +** | |
| 1576 | +** See also: cgi, server, winsrv | |
| 1570 | 1577 | */ |
| 1571 | 1578 | void cmd_http(void){ |
| 1572 | 1579 | const char *zIpAddr; |
| 1573 | 1580 | const char *zNotFound; |
| 1574 | 1581 | const char *zHost; |
| @@ -1644,12 +1651,12 @@ | ||
| 1644 | 1651 | |
| 1645 | 1652 | /* |
| 1646 | 1653 | ** COMMAND: server* |
| 1647 | 1654 | ** COMMAND: ui |
| 1648 | 1655 | ** |
| 1649 | -** Usage: %fossil server ?-P|--port TCPPORT? ?REPOSITORY? | |
| 1650 | -** Or: %fossil ui ?-P|--port TCPPORT? ?REPOSITORY? | |
| 1656 | +** Usage: %fossil server ?OPTIONS? ?REPOSITORY? | |
| 1657 | +** Or: %fossil ui ?OPTIONS? ?REPOSITORY? | |
| 1651 | 1658 | ** |
| 1652 | 1659 | ** Open a socket and begin listening and responding to HTTP requests on |
| 1653 | 1660 | ** TCP port 8080, or on any other TCP port defined by the -P or |
| 1654 | 1661 | ** --port option. The optional argument is the name of the repository. |
| 1655 | 1662 | ** The repository argument may be omitted if the working directory is |
| @@ -1667,10 +1674,17 @@ | ||
| 1667 | 1674 | ** By default, the "ui" command provides full administrative access without |
| 1668 | 1675 | ** having to log in. This can be disabled by setting turning off the |
| 1669 | 1676 | ** "localauth" setting. Automatic login for the "server" command is available |
| 1670 | 1677 | ** if the --localauth option is present and the "localauth" setting is off |
| 1671 | 1678 | ** and the connection is from localhost. |
| 1679 | +** | |
| 1680 | +** Options: | |
| 1681 | +** --localauth enable automatic login for requests from localhost | |
| 1682 | +** -P|--port TCPPORT listen to request on port TCPPORT | |
| 1683 | +** --th-trace trace TH1 execution (for debugging purposes) | |
| 1684 | +** | |
| 1685 | +** See also: cgi, http, winsrv | |
| 1672 | 1686 | */ |
| 1673 | 1687 | void cmd_webserver(void){ |
| 1674 | 1688 | int iPort, mxPort; /* Range of TCP ports allowed */ |
| 1675 | 1689 | const char *zPort; /* Value of the --port option */ |
| 1676 | 1690 | char *zBrowser; /* Name of web browser program */ |
| 1677 | 1691 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1367,10 +1367,12 @@ | |
| 1367 | ** repository: /home/somebody/project.db |
| 1368 | ** |
| 1369 | ** The second line defines the name of the repository. After locating |
| 1370 | ** the repository, fossil will generate a webpage on stdout based on |
| 1371 | ** the values of standard CGI environment variables. |
| 1372 | */ |
| 1373 | void cmd_cgi(void){ |
| 1374 | const char *zFile; |
| 1375 | const char *zNotFound = 0; |
| 1376 | char **azRedirect = 0; /* List of repositories to redirect to */ |
| @@ -1540,11 +1542,11 @@ | |
| 1540 | ** |
| 1541 | ** The argv==6 form is used by the win32 server only. |
| 1542 | ** |
| 1543 | ** COMMAND: http* |
| 1544 | ** |
| 1545 | ** Usage: %fossil http REPOSITORY [--notfound URL] [--host HOSTNAME] [--https] |
| 1546 | ** |
| 1547 | ** Handle a single HTTP request appearing on stdin. The resulting webpage |
| 1548 | ** is delivered on stdout. This method is used to launch an HTTP request |
| 1549 | ** handler from inetd, for example. The argument is the name of the |
| 1550 | ** repository. |
| @@ -1555,20 +1557,25 @@ | |
| 1555 | ** not select a valid repository and the --notfound option is available, |
| 1556 | ** then the server redirects (HTTP code 302) to the URL of --notfound. |
| 1557 | ** |
| 1558 | ** The --host option can be used to specify the hostname for the server. |
| 1559 | ** The --https option indicates that the request came from HTTPS rather |
| 1560 | ** than HTTP. |
| 1561 | ** |
| 1562 | ** Other options: |
| 1563 | ** |
| 1564 | ** --localauth Password signin is not required if this is true and |
| 1565 | ** the input comes from 127.0.0.1 and the "localauth" |
| 1566 | ** setting is not disabled. |
| 1567 | ** |
| 1568 | ** --nossl SSL connections are not available so do not |
| 1569 | ** redirect from http: to https:. |
| 1570 | */ |
| 1571 | void cmd_http(void){ |
| 1572 | const char *zIpAddr; |
| 1573 | const char *zNotFound; |
| 1574 | const char *zHost; |
| @@ -1644,12 +1651,12 @@ | |
| 1644 | |
| 1645 | /* |
| 1646 | ** COMMAND: server* |
| 1647 | ** COMMAND: ui |
| 1648 | ** |
| 1649 | ** Usage: %fossil server ?-P|--port TCPPORT? ?REPOSITORY? |
| 1650 | ** Or: %fossil ui ?-P|--port TCPPORT? ?REPOSITORY? |
| 1651 | ** |
| 1652 | ** Open a socket and begin listening and responding to HTTP requests on |
| 1653 | ** TCP port 8080, or on any other TCP port defined by the -P or |
| 1654 | ** --port option. The optional argument is the name of the repository. |
| 1655 | ** The repository argument may be omitted if the working directory is |
| @@ -1667,10 +1674,17 @@ | |
| 1667 | ** By default, the "ui" command provides full administrative access without |
| 1668 | ** having to log in. This can be disabled by setting turning off the |
| 1669 | ** "localauth" setting. Automatic login for the "server" command is available |
| 1670 | ** if the --localauth option is present and the "localauth" setting is off |
| 1671 | ** and the connection is from localhost. |
| 1672 | */ |
| 1673 | void cmd_webserver(void){ |
| 1674 | int iPort, mxPort; /* Range of TCP ports allowed */ |
| 1675 | const char *zPort; /* Value of the --port option */ |
| 1676 | char *zBrowser; /* Name of web browser program */ |
| 1677 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1367,10 +1367,12 @@ | |
| 1367 | ** repository: /home/somebody/project.db |
| 1368 | ** |
| 1369 | ** The second line defines the name of the repository. After locating |
| 1370 | ** the repository, fossil will generate a webpage on stdout based on |
| 1371 | ** the values of standard CGI environment variables. |
| 1372 | ** |
| 1373 | ** See also: http, server, winsrv |
| 1374 | */ |
| 1375 | void cmd_cgi(void){ |
| 1376 | const char *zFile; |
| 1377 | const char *zNotFound = 0; |
| 1378 | char **azRedirect = 0; /* List of repositories to redirect to */ |
| @@ -1540,11 +1542,11 @@ | |
| 1542 | ** |
| 1543 | ** The argv==6 form is used by the win32 server only. |
| 1544 | ** |
| 1545 | ** COMMAND: http* |
| 1546 | ** |
| 1547 | ** Usage: %fossil http REPOSITORY ?OPTIONS? |
| 1548 | ** |
| 1549 | ** Handle a single HTTP request appearing on stdin. The resulting webpage |
| 1550 | ** is delivered on stdout. This method is used to launch an HTTP request |
| 1551 | ** handler from inetd, for example. The argument is the name of the |
| 1552 | ** repository. |
| @@ -1555,20 +1557,25 @@ | |
| 1557 | ** not select a valid repository and the --notfound option is available, |
| 1558 | ** then the server redirects (HTTP code 302) to the URL of --notfound. |
| 1559 | ** |
| 1560 | ** The --host option can be used to specify the hostname for the server. |
| 1561 | ** The --https option indicates that the request came from HTTPS rather |
| 1562 | ** than HTTP. If --nossl is given, then SSL connections will not be available, |
| 1563 | ** thus also no redirecting from http: to https: will take place. |
| 1564 | ** |
| 1565 | ** If the --localauth option is given, then automatic login is performed |
| 1566 | ** for requests coming from localhost, if the "localauth" setting is not |
| 1567 | ** enabled. |
| 1568 | ** |
| 1569 | ** Options: |
| 1570 | ** --localauth enable automatic login for local connections |
| 1571 | ** --host NAME specify hostname of the server |
| 1572 | ** --https signal a request coming in via https |
| 1573 | ** --nossl signal that no SSL connections are available |
| 1574 | ** --notfound URL use URL as "HTTP 404, object not found" page. |
| 1575 | ** |
| 1576 | ** See also: cgi, server, winsrv |
| 1577 | */ |
| 1578 | void cmd_http(void){ |
| 1579 | const char *zIpAddr; |
| 1580 | const char *zNotFound; |
| 1581 | const char *zHost; |
| @@ -1644,12 +1651,12 @@ | |
| 1651 | |
| 1652 | /* |
| 1653 | ** COMMAND: server* |
| 1654 | ** COMMAND: ui |
| 1655 | ** |
| 1656 | ** Usage: %fossil server ?OPTIONS? ?REPOSITORY? |
| 1657 | ** Or: %fossil ui ?OPTIONS? ?REPOSITORY? |
| 1658 | ** |
| 1659 | ** Open a socket and begin listening and responding to HTTP requests on |
| 1660 | ** TCP port 8080, or on any other TCP port defined by the -P or |
| 1661 | ** --port option. The optional argument is the name of the repository. |
| 1662 | ** The repository argument may be omitted if the working directory is |
| @@ -1667,10 +1674,17 @@ | |
| 1674 | ** By default, the "ui" command provides full administrative access without |
| 1675 | ** having to log in. This can be disabled by setting turning off the |
| 1676 | ** "localauth" setting. Automatic login for the "server" command is available |
| 1677 | ** if the --localauth option is present and the "localauth" setting is off |
| 1678 | ** and the connection is from localhost. |
| 1679 | ** |
| 1680 | ** Options: |
| 1681 | ** --localauth enable automatic login for requests from localhost |
| 1682 | ** -P|--port TCPPORT listen to request on port TCPPORT |
| 1683 | ** --th-trace trace TH1 execution (for debugging purposes) |
| 1684 | ** |
| 1685 | ** See also: cgi, http, winsrv |
| 1686 | */ |
| 1687 | void cmd_webserver(void){ |
| 1688 | int iPort, mxPort; /* Range of TCP ports allowed */ |
| 1689 | const char *zPort; /* Value of the --port option */ |
| 1690 | char *zBrowser; /* Name of web browser program */ |
| 1691 |
+2
-2
| --- src/rebuild.c | ||
| +++ src/rebuild.c | ||
| @@ -732,12 +732,12 @@ | ||
| 732 | 732 | ** is added, then private branches, concealed email addresses, IP |
| 733 | 733 | ** addresses of correspondents, and similar privacy-sensitive fields |
| 734 | 734 | ** are also purged. If the --private option is used, then only private |
| 735 | 735 | ** branches are removed and all other information is left intact. |
| 736 | 736 | ** |
| 737 | -** This command permanently deletes the scrubbed information. The effects | |
| 738 | -** of this command are irreversible. Use with caution. | |
| 737 | +** This command permanently deletes the scrubbed information. THE EFFECTS | |
| 738 | +** OF THIS COMMAND ARE IRREVERSIBLE. USE WITH CAUTION! | |
| 739 | 739 | ** |
| 740 | 740 | ** The user is prompted to confirm the scrub unless the --force option |
| 741 | 741 | ** is used. |
| 742 | 742 | ** |
| 743 | 743 | ** Options: |
| 744 | 744 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -732,12 +732,12 @@ | |
| 732 | ** is added, then private branches, concealed email addresses, IP |
| 733 | ** addresses of correspondents, and similar privacy-sensitive fields |
| 734 | ** are also purged. If the --private option is used, then only private |
| 735 | ** branches are removed and all other information is left intact. |
| 736 | ** |
| 737 | ** This command permanently deletes the scrubbed information. The effects |
| 738 | ** of this command are irreversible. Use with caution. |
| 739 | ** |
| 740 | ** The user is prompted to confirm the scrub unless the --force option |
| 741 | ** is used. |
| 742 | ** |
| 743 | ** Options: |
| 744 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -732,12 +732,12 @@ | |
| 732 | ** is added, then private branches, concealed email addresses, IP |
| 733 | ** addresses of correspondents, and similar privacy-sensitive fields |
| 734 | ** are also purged. If the --private option is used, then only private |
| 735 | ** branches are removed and all other information is left intact. |
| 736 | ** |
| 737 | ** This command permanently deletes the scrubbed information. THE EFFECTS |
| 738 | ** OF THIS COMMAND ARE IRREVERSIBLE. USE WITH CAUTION! |
| 739 | ** |
| 740 | ** The user is prompted to confirm the scrub unless the --force option |
| 741 | ** is used. |
| 742 | ** |
| 743 | ** Options: |
| 744 |
+7
-2
| --- src/undo.c | ||
| +++ src/undo.c | ||
| @@ -350,12 +350,12 @@ | ||
| 350 | 350 | |
| 351 | 351 | /* |
| 352 | 352 | ** COMMAND: undo |
| 353 | 353 | ** COMMAND: redo* |
| 354 | 354 | ** |
| 355 | -** Usage: %fossil undo ?--explain? ?FILENAME...? | |
| 356 | -** or: %fossil redo ?--explain? ?FILENAME...? | |
| 355 | +** Usage: %fossil undo ?OPTIONS? ?FILENAME...? | |
| 356 | +** or: %fossil redo ?OPTIONS? ?FILENAME...? | |
| 357 | 357 | ** |
| 358 | 358 | ** Undo the changes to the working checkout caused by the most recent |
| 359 | 359 | ** of the following operations: |
| 360 | 360 | ** |
| 361 | 361 | ** (1) fossil update (5) fossil stash apply |
| @@ -371,10 +371,15 @@ | ||
| 371 | 371 | ** the undo or redo command explains what actions the undo or redo would |
| 372 | 372 | ** have done had the --explain been omitted. |
| 373 | 373 | ** |
| 374 | 374 | ** A single level of undo/redo is supported. The undo/redo stack |
| 375 | 375 | ** is cleared by the commit and checkout commands. |
| 376 | +** | |
| 377 | +** Options: | |
| 378 | +** --explain do not make changes but show what would be done | |
| 379 | +** | |
| 380 | +** See also: commit, status | |
| 376 | 381 | */ |
| 377 | 382 | void undo_cmd(void){ |
| 378 | 383 | int isRedo = g.argv[1][0]=='r'; |
| 379 | 384 | int undo_available; |
| 380 | 385 | int explainFlag = find_option("explain", 0, 0)!=0; |
| 381 | 386 |
| --- src/undo.c | |
| +++ src/undo.c | |
| @@ -350,12 +350,12 @@ | |
| 350 | |
| 351 | /* |
| 352 | ** COMMAND: undo |
| 353 | ** COMMAND: redo* |
| 354 | ** |
| 355 | ** Usage: %fossil undo ?--explain? ?FILENAME...? |
| 356 | ** or: %fossil redo ?--explain? ?FILENAME...? |
| 357 | ** |
| 358 | ** Undo the changes to the working checkout caused by the most recent |
| 359 | ** of the following operations: |
| 360 | ** |
| 361 | ** (1) fossil update (5) fossil stash apply |
| @@ -371,10 +371,15 @@ | |
| 371 | ** the undo or redo command explains what actions the undo or redo would |
| 372 | ** have done had the --explain been omitted. |
| 373 | ** |
| 374 | ** A single level of undo/redo is supported. The undo/redo stack |
| 375 | ** is cleared by the commit and checkout commands. |
| 376 | */ |
| 377 | void undo_cmd(void){ |
| 378 | int isRedo = g.argv[1][0]=='r'; |
| 379 | int undo_available; |
| 380 | int explainFlag = find_option("explain", 0, 0)!=0; |
| 381 |
| --- src/undo.c | |
| +++ src/undo.c | |
| @@ -350,12 +350,12 @@ | |
| 350 | |
| 351 | /* |
| 352 | ** COMMAND: undo |
| 353 | ** COMMAND: redo* |
| 354 | ** |
| 355 | ** Usage: %fossil undo ?OPTIONS? ?FILENAME...? |
| 356 | ** or: %fossil redo ?OPTIONS? ?FILENAME...? |
| 357 | ** |
| 358 | ** Undo the changes to the working checkout caused by the most recent |
| 359 | ** of the following operations: |
| 360 | ** |
| 361 | ** (1) fossil update (5) fossil stash apply |
| @@ -371,10 +371,15 @@ | |
| 371 | ** the undo or redo command explains what actions the undo or redo would |
| 372 | ** have done had the --explain been omitted. |
| 373 | ** |
| 374 | ** A single level of undo/redo is supported. The undo/redo stack |
| 375 | ** is cleared by the commit and checkout commands. |
| 376 | ** |
| 377 | ** Options: |
| 378 | ** --explain do not make changes but show what would be done |
| 379 | ** |
| 380 | ** See also: commit, status |
| 381 | */ |
| 382 | void undo_cmd(void){ |
| 383 | int isRedo = g.argv[1][0]=='r'; |
| 384 | int undo_available; |
| 385 | int explainFlag = find_option("explain", 0, 0)!=0; |
| 386 |
+14
-1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -60,11 +60,11 @@ | ||
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /* |
| 63 | 63 | ** COMMAND: update |
| 64 | 64 | ** |
| 65 | -** Usage: %fossil update ?VERSION? ?FILES...? | |
| 65 | +** Usage: %fossil update ?OPTIONS? ?VERSION? ?FILES...? | |
| 66 | 66 | ** |
| 67 | 67 | ** Change the version of the current checkout to VERSION. Any uncommitted |
| 68 | 68 | ** changes are retained and applied to the new checkout. |
| 69 | 69 | ** |
| 70 | 70 | ** The VERSION argument can be a specific version or tag or branch name. |
| @@ -83,10 +83,18 @@ | ||
| 83 | 83 | ** prints out what would have happened but does not actually make any |
| 84 | 84 | ** changes to the current checkout or the repository. |
| 85 | 85 | ** |
| 86 | 86 | ** The -v or --verbose option prints status information about unchanged |
| 87 | 87 | ** files in addition to those file that actually do change. |
| 88 | +** | |
| 89 | +** Options: | |
| 90 | +** --debug print debug information on stdout | |
| 91 | +** --latest acceptable in place of VERSION, update to latest version | |
| 92 | +** -n|--nochange do not perform changes but show what would be done | |
| 93 | +** -v|--verbose print status information about all files | |
| 94 | +** | |
| 95 | +** See also: revert | |
| 88 | 96 | */ |
| 89 | 97 | void update_cmd(void){ |
| 90 | 98 | int vid; /* Current version */ |
| 91 | 99 | int tid=0; /* Target version - version we are changing to */ |
| 92 | 100 | Stmt q; |
| @@ -615,10 +623,15 @@ | ||
| 615 | 623 | ** |
| 616 | 624 | ** Revert all files if no file name is provided. |
| 617 | 625 | ** |
| 618 | 626 | ** If a file is reverted accidently, it can be restored using |
| 619 | 627 | ** the "fossil undo" command. |
| 628 | +** | |
| 629 | +** Options: | |
| 630 | +** -r REVISION revert given FILE(s) back to given REVISION | |
| 631 | +** | |
| 632 | +** See also: redo, undo, update | |
| 620 | 633 | */ |
| 621 | 634 | void revert_cmd(void){ |
| 622 | 635 | const char *zFile; |
| 623 | 636 | const char *zRevision; |
| 624 | 637 | Blob record; |
| 625 | 638 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -60,11 +60,11 @@ | |
| 60 | } |
| 61 | |
| 62 | /* |
| 63 | ** COMMAND: update |
| 64 | ** |
| 65 | ** Usage: %fossil update ?VERSION? ?FILES...? |
| 66 | ** |
| 67 | ** Change the version of the current checkout to VERSION. Any uncommitted |
| 68 | ** changes are retained and applied to the new checkout. |
| 69 | ** |
| 70 | ** The VERSION argument can be a specific version or tag or branch name. |
| @@ -83,10 +83,18 @@ | |
| 83 | ** prints out what would have happened but does not actually make any |
| 84 | ** changes to the current checkout or the repository. |
| 85 | ** |
| 86 | ** The -v or --verbose option prints status information about unchanged |
| 87 | ** files in addition to those file that actually do change. |
| 88 | */ |
| 89 | void update_cmd(void){ |
| 90 | int vid; /* Current version */ |
| 91 | int tid=0; /* Target version - version we are changing to */ |
| 92 | Stmt q; |
| @@ -615,10 +623,15 @@ | |
| 615 | ** |
| 616 | ** Revert all files if no file name is provided. |
| 617 | ** |
| 618 | ** If a file is reverted accidently, it can be restored using |
| 619 | ** the "fossil undo" command. |
| 620 | */ |
| 621 | void revert_cmd(void){ |
| 622 | const char *zFile; |
| 623 | const char *zRevision; |
| 624 | Blob record; |
| 625 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -60,11 +60,11 @@ | |
| 60 | } |
| 61 | |
| 62 | /* |
| 63 | ** COMMAND: update |
| 64 | ** |
| 65 | ** Usage: %fossil update ?OPTIONS? ?VERSION? ?FILES...? |
| 66 | ** |
| 67 | ** Change the version of the current checkout to VERSION. Any uncommitted |
| 68 | ** changes are retained and applied to the new checkout. |
| 69 | ** |
| 70 | ** The VERSION argument can be a specific version or tag or branch name. |
| @@ -83,10 +83,18 @@ | |
| 83 | ** prints out what would have happened but does not actually make any |
| 84 | ** changes to the current checkout or the repository. |
| 85 | ** |
| 86 | ** The -v or --verbose option prints status information about unchanged |
| 87 | ** files in addition to those file that actually do change. |
| 88 | ** |
| 89 | ** Options: |
| 90 | ** --debug print debug information on stdout |
| 91 | ** --latest acceptable in place of VERSION, update to latest version |
| 92 | ** -n|--nochange do not perform changes but show what would be done |
| 93 | ** -v|--verbose print status information about all files |
| 94 | ** |
| 95 | ** See also: revert |
| 96 | */ |
| 97 | void update_cmd(void){ |
| 98 | int vid; /* Current version */ |
| 99 | int tid=0; /* Target version - version we are changing to */ |
| 100 | Stmt q; |
| @@ -615,10 +623,15 @@ | |
| 623 | ** |
| 624 | ** Revert all files if no file name is provided. |
| 625 | ** |
| 626 | ** If a file is reverted accidently, it can be restored using |
| 627 | ** the "fossil undo" command. |
| 628 | ** |
| 629 | ** Options: |
| 630 | ** -r REVISION revert given FILE(s) back to given REVISION |
| 631 | ** |
| 632 | ** See also: redo, undo, update |
| 633 | */ |
| 634 | void revert_cmd(void){ |
| 635 | const char *zFile; |
| 636 | const char *zRevision; |
| 637 | Blob record; |
| 638 |
+10
-6
| --- www/build.wiki | ||
| +++ www/build.wiki | ||
| @@ -1,13 +1,15 @@ | ||
| 1 | 1 | <title>Building and Installing Fossil</title> |
| 2 | 2 | |
| 3 | 3 | <h2>0.0 Using A Pre-compiled Binary</h2> |
| 4 | 4 | |
| 5 | -<p>You can skip all of the following by downloading | |
| 6 | -a <a href="http://www.fossil-scm.org/download.html">pre-compiled binary</a> | |
| 7 | -appropriate for your platform and putting that self-contained binary | |
| 8 | -someplace on your $PATH. | |
| 5 | +<p>Released versions of fossil come with | |
| 6 | +<a href="http://www.fossil-scm.org/download.html">pre-compiled binaries and | |
| 7 | +a source archive</a> for that release. You can thus skip the following if you | |
| 8 | +want to run or build a release version of fossil. Just download | |
| 9 | +the appropriate package from the <a href="http://www.fossil-scm.org/download.html">downloads page</a> | |
| 10 | +and put it on your $PATH. | |
| 9 | 11 | To uninstall, simply delete the binary. |
| 10 | 12 | To upgrade from an older release, just overwrite the older binary with |
| 11 | 13 | the newer one.</p> |
| 12 | 14 | |
| 13 | 15 | <h2>0.1 Executive Summary</h2> |
| @@ -24,12 +26,14 @@ | ||
| 24 | 26 | <p><hr> |
| 25 | 27 | |
| 26 | 28 | <h2>1.0 Obtaining The Source Code</h2> |
| 27 | 29 | |
| 28 | 30 | <p>Fossil is self-hosting, so you can obtain a ZIP archive containing |
| 29 | -a snapshot of the latest version directly from fossil's own fossil | |
| 30 | -repository. Follow these steps:</p> | |
| 31 | +a snapshot of the <em>latest</em> version directly from fossil's own fossil | |
| 32 | +repository. Additionally, source archives of <em>released</em> versions of | |
| 33 | +fossil are available from the <a href="http://www.fossil-scm.org/download.html">downloads page</a>. | |
| 34 | +To obtain a development version of fossil, follow these steps:</p> | |
| 31 | 35 | |
| 32 | 36 | <ol> |
| 33 | 37 | <li><p>Point your web browser at |
| 34 | 38 | <a href="http://www.fossil-scm.org/"> |
| 35 | 39 | http://www.fossil-scm.org/</a>. Click on the "Login" menu button.</p></li> |
| 36 | 40 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -1,13 +1,15 @@ | |
| 1 | <title>Building and Installing Fossil</title> |
| 2 | |
| 3 | <h2>0.0 Using A Pre-compiled Binary</h2> |
| 4 | |
| 5 | <p>You can skip all of the following by downloading |
| 6 | a <a href="http://www.fossil-scm.org/download.html">pre-compiled binary</a> |
| 7 | appropriate for your platform and putting that self-contained binary |
| 8 | someplace on your $PATH. |
| 9 | To uninstall, simply delete the binary. |
| 10 | To upgrade from an older release, just overwrite the older binary with |
| 11 | the newer one.</p> |
| 12 | |
| 13 | <h2>0.1 Executive Summary</h2> |
| @@ -24,12 +26,14 @@ | |
| 24 | <p><hr> |
| 25 | |
| 26 | <h2>1.0 Obtaining The Source Code</h2> |
| 27 | |
| 28 | <p>Fossil is self-hosting, so you can obtain a ZIP archive containing |
| 29 | a snapshot of the latest version directly from fossil's own fossil |
| 30 | repository. Follow these steps:</p> |
| 31 | |
| 32 | <ol> |
| 33 | <li><p>Point your web browser at |
| 34 | <a href="http://www.fossil-scm.org/"> |
| 35 | http://www.fossil-scm.org/</a>. Click on the "Login" menu button.</p></li> |
| 36 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -1,13 +1,15 @@ | |
| 1 | <title>Building and Installing Fossil</title> |
| 2 | |
| 3 | <h2>0.0 Using A Pre-compiled Binary</h2> |
| 4 | |
| 5 | <p>Released versions of fossil come with |
| 6 | <a href="http://www.fossil-scm.org/download.html">pre-compiled binaries and |
| 7 | a source archive</a> for that release. You can thus skip the following if you |
| 8 | want to run or build a release version of fossil. Just download |
| 9 | the appropriate package from the <a href="http://www.fossil-scm.org/download.html">downloads page</a> |
| 10 | and put it on your $PATH. |
| 11 | To uninstall, simply delete the binary. |
| 12 | To upgrade from an older release, just overwrite the older binary with |
| 13 | the newer one.</p> |
| 14 | |
| 15 | <h2>0.1 Executive Summary</h2> |
| @@ -24,12 +26,14 @@ | |
| 26 | <p><hr> |
| 27 | |
| 28 | <h2>1.0 Obtaining The Source Code</h2> |
| 29 | |
| 30 | <p>Fossil is self-hosting, so you can obtain a ZIP archive containing |
| 31 | a snapshot of the <em>latest</em> version directly from fossil's own fossil |
| 32 | repository. Additionally, source archives of <em>released</em> versions of |
| 33 | fossil are available from the <a href="http://www.fossil-scm.org/download.html">downloads page</a>. |
| 34 | To obtain a development version of fossil, follow these steps:</p> |
| 35 | |
| 36 | <ol> |
| 37 | <li><p>Point your web browser at |
| 38 | <a href="http://www.fossil-scm.org/"> |
| 39 | http://www.fossil-scm.org/</a>. Click on the "Login" menu button.</p></li> |
| 40 |