Fossil SCM
Update the change log. Improved documentation of reverse annotations.
Commit
1f378f9e31f084bf18afa1faffb08ab83fc6394fdc657dfd72fb1fa866643177
Parent
c91b810620ad1a8…
2 files changed
+20
-4
+7
-4
+20
-4
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2361,10 +2361,18 @@ | ||
| 2361 | 2361 | ** |
| 2362 | 2362 | ** Show the most recent change to each line of a text file. /annotate shows |
| 2363 | 2363 | ** the date of the changes and the check-in hash (with a link to the |
| 2364 | 2364 | ** check-in). /blame and /praise also show the user who made the check-in. |
| 2365 | 2365 | ** |
| 2366 | +** Reverse Annotations: Normally, these web pages look at versions of | |
| 2367 | +** FILENAME moving backwards in time back toward the root check-in. However, | |
| 2368 | +** However, if the origin= query parameter is used to specify some future | |
| 2369 | +** check-in (example: "origin=trunk") then these pages show changes moving | |
| 2370 | +** towards that alternative origin. Hence, using "origin=trunk" on an | |
| 2371 | +** historical version of the file shows the first time each line in the | |
| 2372 | +** file was been changed in subsequent check-ins. | |
| 2373 | +** | |
| 2366 | 2374 | ** Query parameters: |
| 2367 | 2375 | ** |
| 2368 | 2376 | ** checkin=ID The check-in at which to start the annotation |
| 2369 | 2377 | ** filename=FILENAME The filename. |
| 2370 | 2378 | ** filevers=BOOLEAN Show file versions rather than check-in versions |
| @@ -2534,11 +2542,20 @@ | ||
| 2534 | 2542 | ** |
| 2535 | 2543 | ** Output the text of a file with markings to show when each line of the file |
| 2536 | 2544 | ** was last modified. The version currently checked out is shown by default. |
| 2537 | 2545 | ** Other versions may be specified using the -r option. The "annotate" command |
| 2538 | 2546 | ** shows line numbers and omits the username. The "blame" and "praise" commands |
| 2539 | -** show the user who made each check-in and omits the line numbers. | |
| 2547 | +** show the user who made each check-in. | |
| 2548 | +** | |
| 2549 | +** Reverse Annotations: Normally, these commands look at versions of | |
| 2550 | +** FILENAME moving backwards in time back toward the root check-in, and | |
| 2551 | +** thus the output shows the most recent change to each line. However, | |
| 2552 | +** if the -o|--origin option is used to specify some future check-in | |
| 2553 | +** (example: "-o trunk") then these commands show changes moving towards | |
| 2554 | +** that alternative origin. Thus using "-o trunk" on an historical version | |
| 2555 | +** of the file shows the first time each line in the file was been changed | |
| 2556 | +** by subsequent check-ins. | |
| 2540 | 2557 | ** |
| 2541 | 2558 | ** Options: |
| 2542 | 2559 | ** --filevers Show file version numbers rather than |
| 2543 | 2560 | ** check-in versions |
| 2544 | 2561 | ** -r|--revision VERSION The specific check-in containing the file |
| @@ -2546,13 +2563,12 @@ | ||
| 2546 | 2563 | ** -n|--limit LIMIT Limit the amount of analysis: |
| 2547 | 2564 | ** N Up to N versions |
| 2548 | 2565 | ** Xs As much as possible in X seconds |
| 2549 | 2566 | ** none No limit |
| 2550 | 2567 | ** -o|--origin VERSION The origin check-in. By default this is the |
| 2551 | -** root of the repository which is normally | |
| 2552 | -** what you want. Set to "trunk" or similar for | |
| 2553 | -** a reverse annotation. | |
| 2568 | +** root of the repository. Set to "trunk" or | |
| 2569 | +** similar for a reverse annotation. | |
| 2554 | 2570 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 2555 | 2571 | ** -Z|--ignore-trailing-space Ignore whitespace at line end |
| 2556 | 2572 | ** |
| 2557 | 2573 | ** See also: info, finfo, timeline |
| 2558 | 2574 | */ |
| 2559 | 2575 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2361,10 +2361,18 @@ | |
| 2361 | ** |
| 2362 | ** Show the most recent change to each line of a text file. /annotate shows |
| 2363 | ** the date of the changes and the check-in hash (with a link to the |
| 2364 | ** check-in). /blame and /praise also show the user who made the check-in. |
| 2365 | ** |
| 2366 | ** Query parameters: |
| 2367 | ** |
| 2368 | ** checkin=ID The check-in at which to start the annotation |
| 2369 | ** filename=FILENAME The filename. |
| 2370 | ** filevers=BOOLEAN Show file versions rather than check-in versions |
| @@ -2534,11 +2542,20 @@ | |
| 2534 | ** |
| 2535 | ** Output the text of a file with markings to show when each line of the file |
| 2536 | ** was last modified. The version currently checked out is shown by default. |
| 2537 | ** Other versions may be specified using the -r option. The "annotate" command |
| 2538 | ** shows line numbers and omits the username. The "blame" and "praise" commands |
| 2539 | ** show the user who made each check-in and omits the line numbers. |
| 2540 | ** |
| 2541 | ** Options: |
| 2542 | ** --filevers Show file version numbers rather than |
| 2543 | ** check-in versions |
| 2544 | ** -r|--revision VERSION The specific check-in containing the file |
| @@ -2546,13 +2563,12 @@ | |
| 2546 | ** -n|--limit LIMIT Limit the amount of analysis: |
| 2547 | ** N Up to N versions |
| 2548 | ** Xs As much as possible in X seconds |
| 2549 | ** none No limit |
| 2550 | ** -o|--origin VERSION The origin check-in. By default this is the |
| 2551 | ** root of the repository which is normally |
| 2552 | ** what you want. Set to "trunk" or similar for |
| 2553 | ** a reverse annotation. |
| 2554 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 2555 | ** -Z|--ignore-trailing-space Ignore whitespace at line end |
| 2556 | ** |
| 2557 | ** See also: info, finfo, timeline |
| 2558 | */ |
| 2559 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2361,10 +2361,18 @@ | |
| 2361 | ** |
| 2362 | ** Show the most recent change to each line of a text file. /annotate shows |
| 2363 | ** the date of the changes and the check-in hash (with a link to the |
| 2364 | ** check-in). /blame and /praise also show the user who made the check-in. |
| 2365 | ** |
| 2366 | ** Reverse Annotations: Normally, these web pages look at versions of |
| 2367 | ** FILENAME moving backwards in time back toward the root check-in. However, |
| 2368 | ** However, if the origin= query parameter is used to specify some future |
| 2369 | ** check-in (example: "origin=trunk") then these pages show changes moving |
| 2370 | ** towards that alternative origin. Hence, using "origin=trunk" on an |
| 2371 | ** historical version of the file shows the first time each line in the |
| 2372 | ** file was been changed in subsequent check-ins. |
| 2373 | ** |
| 2374 | ** Query parameters: |
| 2375 | ** |
| 2376 | ** checkin=ID The check-in at which to start the annotation |
| 2377 | ** filename=FILENAME The filename. |
| 2378 | ** filevers=BOOLEAN Show file versions rather than check-in versions |
| @@ -2534,11 +2542,20 @@ | |
| 2542 | ** |
| 2543 | ** Output the text of a file with markings to show when each line of the file |
| 2544 | ** was last modified. The version currently checked out is shown by default. |
| 2545 | ** Other versions may be specified using the -r option. The "annotate" command |
| 2546 | ** shows line numbers and omits the username. The "blame" and "praise" commands |
| 2547 | ** show the user who made each check-in. |
| 2548 | ** |
| 2549 | ** Reverse Annotations: Normally, these commands look at versions of |
| 2550 | ** FILENAME moving backwards in time back toward the root check-in, and |
| 2551 | ** thus the output shows the most recent change to each line. However, |
| 2552 | ** if the -o|--origin option is used to specify some future check-in |
| 2553 | ** (example: "-o trunk") then these commands show changes moving towards |
| 2554 | ** that alternative origin. Thus using "-o trunk" on an historical version |
| 2555 | ** of the file shows the first time each line in the file was been changed |
| 2556 | ** by subsequent check-ins. |
| 2557 | ** |
| 2558 | ** Options: |
| 2559 | ** --filevers Show file version numbers rather than |
| 2560 | ** check-in versions |
| 2561 | ** -r|--revision VERSION The specific check-in containing the file |
| @@ -2546,13 +2563,12 @@ | |
| 2563 | ** -n|--limit LIMIT Limit the amount of analysis: |
| 2564 | ** N Up to N versions |
| 2565 | ** Xs As much as possible in X seconds |
| 2566 | ** none No limit |
| 2567 | ** -o|--origin VERSION The origin check-in. By default this is the |
| 2568 | ** root of the repository. Set to "trunk" or |
| 2569 | ** similar for a reverse annotation. |
| 2570 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 2571 | ** -Z|--ignore-trailing-space Ignore whitespace at line end |
| 2572 | ** |
| 2573 | ** See also: info, finfo, timeline |
| 2574 | */ |
| 2575 |
+7
-4
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -1,22 +1,25 @@ | ||
| 1 | 1 | <title>Change Log</title> |
| 2 | 2 | |
| 3 | 3 | <a name='v2_4'></a> |
| 4 | 4 | <h2>Changes for Version 2.4 (TBD)</h2> |
| 5 | 5 | |
| 6 | - * Add tech note search capability. | |
| 7 | - * Add the -r|--revision option to the annotate command. | |
| 6 | + * Add tech-note search capability. | |
| 7 | + * Add the -r|--revision and -o|--origin options to the | |
| 8 | + [/help?cmd=annotate|annotate] command. | |
| 9 | + * Add the origin= query parameter to the [/help?cmd=/annotate|/annotate] | |
| 10 | + webpage. | |
| 8 | 11 | * Support for URL Aliases added. URL Aliases allow an administrator |
| 9 | 12 | to define their own URLs on the web interface that are rewritten to |
| 10 | 13 | built-in URLs with specific parameters. |
| 11 | 14 | * Provide separate on-line help screens for each setting. |
| 12 | 15 | * Back out support for the --no-dir-symlinks option |
| 13 | 16 | * Remove support from the legacy configuration sync protocol. The only |
| 14 | 17 | way now to do a configuration push or pull is to use the new protocol that |
| 15 | 18 | was added in 2011. |
| 16 | - * Add the from= and to= query parameters to /fdiff in order to get | |
| 17 | - a diff of two files in the same check-in. | |
| 19 | + * Add the from= and to= query parameters to [/help?cmd=/fdiff|/fdiff] | |
| 20 | + in order to get a diff of two files in the same check-in. | |
| 18 | 21 | * Fix the "ssh://" protocol to prevent an attack whereby the attacker convinces |
| 19 | 22 | a victim to run a "clone" with a dodgy URL and thereby gains access to their |
| 20 | 23 | system. |
| 21 | 24 | * Provide a checkbox that will temporarily disable all ad-units. |
| 22 | 25 | * Improvements to the [/help?cmd=/stat|/stat] page |
| 23 | 26 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -1,22 +1,25 @@ | |
| 1 | <title>Change Log</title> |
| 2 | |
| 3 | <a name='v2_4'></a> |
| 4 | <h2>Changes for Version 2.4 (TBD)</h2> |
| 5 | |
| 6 | * Add tech note search capability. |
| 7 | * Add the -r|--revision option to the annotate command. |
| 8 | * Support for URL Aliases added. URL Aliases allow an administrator |
| 9 | to define their own URLs on the web interface that are rewritten to |
| 10 | built-in URLs with specific parameters. |
| 11 | * Provide separate on-line help screens for each setting. |
| 12 | * Back out support for the --no-dir-symlinks option |
| 13 | * Remove support from the legacy configuration sync protocol. The only |
| 14 | way now to do a configuration push or pull is to use the new protocol that |
| 15 | was added in 2011. |
| 16 | * Add the from= and to= query parameters to /fdiff in order to get |
| 17 | a diff of two files in the same check-in. |
| 18 | * Fix the "ssh://" protocol to prevent an attack whereby the attacker convinces |
| 19 | a victim to run a "clone" with a dodgy URL and thereby gains access to their |
| 20 | system. |
| 21 | * Provide a checkbox that will temporarily disable all ad-units. |
| 22 | * Improvements to the [/help?cmd=/stat|/stat] page |
| 23 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -1,22 +1,25 @@ | |
| 1 | <title>Change Log</title> |
| 2 | |
| 3 | <a name='v2_4'></a> |
| 4 | <h2>Changes for Version 2.4 (TBD)</h2> |
| 5 | |
| 6 | * Add tech-note search capability. |
| 7 | * Add the -r|--revision and -o|--origin options to the |
| 8 | [/help?cmd=annotate|annotate] command. |
| 9 | * Add the origin= query parameter to the [/help?cmd=/annotate|/annotate] |
| 10 | webpage. |
| 11 | * Support for URL Aliases added. URL Aliases allow an administrator |
| 12 | to define their own URLs on the web interface that are rewritten to |
| 13 | built-in URLs with specific parameters. |
| 14 | * Provide separate on-line help screens for each setting. |
| 15 | * Back out support for the --no-dir-symlinks option |
| 16 | * Remove support from the legacy configuration sync protocol. The only |
| 17 | way now to do a configuration push or pull is to use the new protocol that |
| 18 | was added in 2011. |
| 19 | * Add the from= and to= query parameters to [/help?cmd=/fdiff|/fdiff] |
| 20 | in order to get a diff of two files in the same check-in. |
| 21 | * Fix the "ssh://" protocol to prevent an attack whereby the attacker convinces |
| 22 | a victim to run a "clone" with a dodgy URL and thereby gains access to their |
| 23 | system. |
| 24 | * Provide a checkbox that will temporarily disable all ad-units. |
| 25 | * Improvements to the [/help?cmd=/stat|/stat] page |
| 26 |