Fossil SCM
Added support for a user defined diff command, which if set (fossil config diff-command), is run by default. The user can give a -i flag to run the internal diff command regardless of user defined diff command setting. Removed command tkdiff, no longer needed. Made the config remove message a bit more clear, when removing a config setting, it states it has been removed instead of telling you it's undefined.
Commit
c82fb617751103296e041d5839b9a7408cebda83
Parent
5cd959742854ddf…
3 files changed
+5
-1
+71
-4
M
src/db.c
No diff available
+5
-1
| --- a/src/diffcmd.c | ||
| +++ b/src/diffcmd.c | ||
| @@ -27,4 +27,8 @@ | ||
| 27 | 27 | unknown file: %s", zFile); |
| 28 | 28 | } ?-r REVISIONconfig diff-command=diff |
| 29 | 29 | ** |
| 30 | -** %fofossil conf | |
| 30 | +** %fossil config gdiff-command=tkdiff | |
| 31 | +** %fconfig gdiff-command=config gdiff-command=meld | |
| 32 | +** %fossil config gdiff-command=xxdiff | |
| 33 | +** %fcontent_get_historicalunified5, &out loballobalint i, internalDiff; | |
| 34 | + cha |
| --- a/src/diffcmd.c | |
| +++ b/src/diffcmd.c | |
| @@ -27,4 +27,8 @@ | |
| 27 | unknown file: %s", zFile); |
| 28 | } ?-r REVISIONconfig diff-command=diff |
| 29 | ** |
| 30 | ** %fofossil conf |
| --- a/src/diffcmd.c | |
| +++ b/src/diffcmd.c | |
| @@ -27,4 +27,8 @@ | |
| 27 | unknown file: %s", zFile); |
| 28 | } ?-r REVISIONconfig diff-command=diff |
| 29 | ** |
| 30 | ** %fossil config gdiff-command=tkdiff |
| 31 | ** %fconfig gdiff-command=config gdiff-command=meld |
| 32 | ** %fossil config gdiff-command=xxdiff |
| 33 | ** %fcontent_get_historicalunified5, &out loballobalint i, internalDiff; |
| 34 | cha |
M
todo.txt
+71
-4
| --- a/todo.txt | ||
| +++ b/todo.txt | ||
| @@ -22,7 +22,7 @@ | ||
| 22 | 22 | |
| 23 | 23 | * Bug: pull is ending prematurely out what is going wrong. |
| 24 | 24 | |
| 25 | - * Bug: Make sure merge and other ¿ to the user as it should | |
| 25 | + * Bug: Make sure merge and other ¿ to the user as it should. | |
| 26 | 26 | |
| 27 | 27 | * The ipaddr field of the rcvfrom table is not being set. This |
| 28 | 28 | field should be the IP address from which information is received |
| @@ -52,6 +52,73 @@ | ||
| 52 | 52 | |
| 53 | 53 | * Ticketing interface (expand this bullet) |
| 54 | 54 | |
| 55 | - + Create new tickets as fil Allow | |
| 56 | - configuration options to replace tkdiff with some other | |
| 57 | - visual differ of the u eskiloD@YV,2f1ve8; | |
| 55 | + + Create new tickets as files in the file hierarchy | |
| 56 | + + Append remarks to a ticket | |
| 57 | + + Add attachments to a ticket | |
| 58 | + + Change attributes of a ticket | |
| 59 | + + Delete tickets that are no longer current. (The old | |
| 60 | + content is still accessible, the ticket is just not in | |
| 61 | + the current check-out.) | |
| 62 | + + Server setup to define the allowed attributes and | |
| 63 | + attribute values for tickets | |
| 64 | + + Permanently remove malicious edits and/or attachments | |
| 65 | + such as wiki-spam or warez. (Content is no longer accessible.) | |
| 66 | + + View a history of all changes to a ticket | |
| 67 | + + Generate reports over all tickets | |
| 68 | + + Generate reports over all tickets as they existed for | |
| 69 | + a chosen point in time and space. | |
| 70 | + + Do full text search against the text in any single ticket or | |
| 71 | + across the current versions of all tickets, or across all current | |
| 72 | + and historical versions of all tickets. | |
| 73 | + | |
| 74 | + * Wiki interface (expand this bullet) | |
| 75 | + | |
| 76 | + + Create new wiki pages | |
| 77 | + + Designate a single wiki page as the home page for the www interface | |
| 78 | + + Designate wiki pages as read-only, append-only, or read/write. | |
| 79 | + + Append comments to a wiki page | |
| 80 | + + Add attachments (such as GIF images) to a wiki page | |
| 81 | + + Change the content of a wiki page | |
| 82 | + + Delete obsolete wiki pages. (Old content is still accessible, | |
| 83 | + the page is just not on the current list of pages.) | |
| 84 | + + Permanently remove malicious edits and/or attachments | |
| 85 | + such as wiki-spam or warez. (Old content is no longer accessible.) | |
| 86 | + + Add nofollow on external links added by unprivileged | |
| 87 | + users when the link is less than N hours old. | |
| 88 | + + Show the complete history of a single wiki page | |
| 89 | + + Provide the ability to diff two versions of a wiki page | |
| 90 | + + Show a listing of all wiki pages, both current and deleted | |
| 91 | + + Do a full-text search against current versions of all wiki pages | |
| 92 | + + Do a full-text search against all historical versions of a single | |
| 93 | + wiki page | |
| 94 | + + Do a full-text search against all historical versions of all | |
| 95 | + wiki pages | |
| 96 | + | |
| 97 | + * Full-text search against check-in comments and diffs of each | |
| 98 | + check-in. | |
| 99 | + | |
| 100 | + * Add a "revert" command that will undo all changes to a file | |
| 101 | + or files in the current check-out - restoring the files back | |
| 102 | + to their original check-out state. | |
| 103 | + | |
| 104 | + * Add an "annotate" command in both the cli and the www interface | |
| 105 | + that will show line-by-line the most recent changes to every line | |
| 106 | + in the file. | |
| 107 | + | |
| 108 | + * Browse the file hierarchy, similar to the "Browse" feature in | |
| 109 | + CVSTrac. | |
| 110 | + | |
| 111 | + * Add the ability to override check-in comments. It is not possible | |
| 112 | + to change the comment in the check-in itself due to the cryptographic | |
| 113 | + hash. But you can add a new record to the repository that overloads | |
| 114 | + a check-in comment with a new comment. Comment changes should be | |
| 115 | + GPG clearsigned at the very least. Comment changes only apply if | |
| 116 | + the user who made the change has the right permissions. | |
| 117 | + | |
| 118 | + * Make the interface to fossil look pretty and be customizable so | |
| 119 | + that other people will be attracted to it, will take over maintenance | |
| 120 | + of it, and we can eventually move on to other things. | |
| 121 | + | |
| 122 | + This has begun, but I wonder if we need to use a templating system for | |
| 123 | + full customization. If the CSS is done correctly, you can change 99.9% | |
| 124 | + of everything. See: http://www.csszengarden.com/ |
| --- a/todo.txt | |
| +++ b/todo.txt | |
| @@ -22,7 +22,7 @@ | |
| 22 | |
| 23 | * Bug: pull is ending prematurely out what is going wrong. |
| 24 | |
| 25 | * Bug: Make sure merge and other ¿ to the user as it should |
| 26 | |
| 27 | * The ipaddr field of the rcvfrom table is not being set. This |
| 28 | field should be the IP address from which information is received |
| @@ -52,6 +52,73 @@ | |
| 52 | |
| 53 | * Ticketing interface (expand this bullet) |
| 54 | |
| 55 | + Create new tickets as fil Allow |
| 56 | configuration options to replace tkdiff with some other |
| 57 | visual differ of the u eskiloD@YV,2f1ve8; |
| --- a/todo.txt | |
| +++ b/todo.txt | |
| @@ -22,7 +22,7 @@ | |
| 22 | |
| 23 | * Bug: pull is ending prematurely out what is going wrong. |
| 24 | |
| 25 | * Bug: Make sure merge and other ¿ to the user as it should. |
| 26 | |
| 27 | * The ipaddr field of the rcvfrom table is not being set. This |
| 28 | field should be the IP address from which information is received |
| @@ -52,6 +52,73 @@ | |
| 52 | |
| 53 | * Ticketing interface (expand this bullet) |
| 54 | |
| 55 | + Create new tickets as files in the file hierarchy |
| 56 | + Append remarks to a ticket |
| 57 | + Add attachments to a ticket |
| 58 | + Change attributes of a ticket |
| 59 | + Delete tickets that are no longer current. (The old |
| 60 | content is still accessible, the ticket is just not in |
| 61 | the current check-out.) |
| 62 | + Server setup to define the allowed attributes and |
| 63 | attribute values for tickets |
| 64 | + Permanently remove malicious edits and/or attachments |
| 65 | such as wiki-spam or warez. (Content is no longer accessible.) |
| 66 | + View a history of all changes to a ticket |
| 67 | + Generate reports over all tickets |
| 68 | + Generate reports over all tickets as they existed for |
| 69 | a chosen point in time and space. |
| 70 | + Do full text search against the text in any single ticket or |
| 71 | across the current versions of all tickets, or across all current |
| 72 | and historical versions of all tickets. |
| 73 | |
| 74 | * Wiki interface (expand this bullet) |
| 75 | |
| 76 | + Create new wiki pages |
| 77 | + Designate a single wiki page as the home page for the www interface |
| 78 | + Designate wiki pages as read-only, append-only, or read/write. |
| 79 | + Append comments to a wiki page |
| 80 | + Add attachments (such as GIF images) to a wiki page |
| 81 | + Change the content of a wiki page |
| 82 | + Delete obsolete wiki pages. (Old content is still accessible, |
| 83 | the page is just not on the current list of pages.) |
| 84 | + Permanently remove malicious edits and/or attachments |
| 85 | such as wiki-spam or warez. (Old content is no longer accessible.) |
| 86 | + Add nofollow on external links added by unprivileged |
| 87 | users when the link is less than N hours old. |
| 88 | + Show the complete history of a single wiki page |
| 89 | + Provide the ability to diff two versions of a wiki page |
| 90 | + Show a listing of all wiki pages, both current and deleted |
| 91 | + Do a full-text search against current versions of all wiki pages |
| 92 | + Do a full-text search against all historical versions of a single |
| 93 | wiki page |
| 94 | + Do a full-text search against all historical versions of all |
| 95 | wiki pages |
| 96 | |
| 97 | * Full-text search against check-in comments and diffs of each |
| 98 | check-in. |
| 99 | |
| 100 | * Add a "revert" command that will undo all changes to a file |
| 101 | or files in the current check-out - restoring the files back |
| 102 | to their original check-out state. |
| 103 | |
| 104 | * Add an "annotate" command in both the cli and the www interface |
| 105 | that will show line-by-line the most recent changes to every line |
| 106 | in the file. |
| 107 | |
| 108 | * Browse the file hierarchy, similar to the "Browse" feature in |
| 109 | CVSTrac. |
| 110 | |
| 111 | * Add the ability to override check-in comments. It is not possible |
| 112 | to change the comment in the check-in itself due to the cryptographic |
| 113 | hash. But you can add a new record to the repository that overloads |
| 114 | a check-in comment with a new comment. Comment changes should be |
| 115 | GPG clearsigned at the very least. Comment changes only apply if |
| 116 | the user who made the change has the right permissions. |
| 117 | |
| 118 | * Make the interface to fossil look pretty and be customizable so |
| 119 | that other people will be attracted to it, will take over maintenance |
| 120 | of it, and we can eventually move on to other things. |
| 121 | |
| 122 | This has begun, but I wonder if we need to use a templating system for |
| 123 | full customization. If the CSS is done correctly, you can change 99.9% |
| 124 | of everything. See: http://www.csszengarden.com/ |