Fossil SCM
Attempting the same merge that aku tried and got empty files with.
Commit
424d47e4532a2dfa414ba5ce3918bd645ea7a7a1
Parent
609e4caf29779af…
11 files changed
+2
-2
+29
-31
+2
-2
+2
+8
-3
+11
-5
+4
-2
Binary file
Binary file
+2
-2
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -196,16 +196,16 @@ | ||
| 196 | 196 | zCmdName = argv[1]; |
| 197 | 197 | } |
| 198 | 198 | rc = name_search(zCmdName, aCommand, count(aCommand), &idx); |
| 199 | 199 | if( rc==1 ){ |
| 200 | 200 | fprintf(stderr,"%s: unknown command: %s\n" |
| 201 | - "%s: use \"commands\" or \"test-commands\" for help\n", | |
| 201 | + "%s: use \"help\" for more information\n", | |
| 202 | 202 | argv[0], zCmdName, argv[0]); |
| 203 | 203 | return 1; |
| 204 | 204 | }else if( rc==2 ){ |
| 205 | 205 | fprintf(stderr,"%s: ambiguous command prefix: %s\n" |
| 206 | - "%s: use \"commands\" or \"test-commands\" for help\n", | |
| 206 | + "%s: use \"help\" for more information\n", | |
| 207 | 207 | argv[0], zCmdName, argv[0]); |
| 208 | 208 | return 1; |
| 209 | 209 | } |
| 210 | 210 | aCommand[idx].xFunc(); |
| 211 | 211 | return 0; |
| 212 | 212 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -196,16 +196,16 @@ | |
| 196 | zCmdName = argv[1]; |
| 197 | } |
| 198 | rc = name_search(zCmdName, aCommand, count(aCommand), &idx); |
| 199 | if( rc==1 ){ |
| 200 | fprintf(stderr,"%s: unknown command: %s\n" |
| 201 | "%s: use \"commands\" or \"test-commands\" for help\n", |
| 202 | argv[0], zCmdName, argv[0]); |
| 203 | return 1; |
| 204 | }else if( rc==2 ){ |
| 205 | fprintf(stderr,"%s: ambiguous command prefix: %s\n" |
| 206 | "%s: use \"commands\" or \"test-commands\" for help\n", |
| 207 | argv[0], zCmdName, argv[0]); |
| 208 | return 1; |
| 209 | } |
| 210 | aCommand[idx].xFunc(); |
| 211 | return 0; |
| 212 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -196,16 +196,16 @@ | |
| 196 | zCmdName = argv[1]; |
| 197 | } |
| 198 | rc = name_search(zCmdName, aCommand, count(aCommand), &idx); |
| 199 | if( rc==1 ){ |
| 200 | fprintf(stderr,"%s: unknown command: %s\n" |
| 201 | "%s: use \"help\" for more information\n", |
| 202 | argv[0], zCmdName, argv[0]); |
| 203 | return 1; |
| 204 | }else if( rc==2 ){ |
| 205 | fprintf(stderr,"%s: ambiguous command prefix: %s\n" |
| 206 | "%s: use \"help\" for more information\n", |
| 207 | argv[0], zCmdName, argv[0]); |
| 208 | return 1; |
| 209 | } |
| 210 | aCommand[idx].xFunc(); |
| 211 | return 0; |
| 212 |
+29
-31
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -88,15 +88,18 @@ | ||
| 88 | 88 | return; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | style_submenu_element("Add", "Add User", "setup_uedit"); |
| 92 | 92 | style_header("User List"); |
| 93 | - @ <table align="left" hspace="10" border="1" cellpadding="10"><tr><td> | |
| 93 | + @ <table border="0" cellpadding="0" cellspacing="25"> | |
| 94 | + @ <tr><td valign="top"> | |
| 95 | + @ <b>Users:</b> | |
| 96 | + @ <table border="1" cellpadding="10"><tr><td> | |
| 94 | 97 | @ <table cellspacing=0 cellpadding=0 border=0> |
| 95 | 98 | @ <tr> |
| 96 | - @ <th align="right">User ID</th> | |
| 97 | - @ <th> Capabilities </th> | |
| 99 | + @ <th align="right">User ID</th><th width="15"></td> | |
| 100 | + @ <th>Capabilities</th><th width="15"></td> | |
| 98 | 101 | @ <th>Contact Info</th> |
| 99 | 102 | @ </tr> |
| 100 | 103 | db_prepare(&s, "SELECT uid, login, cap, info FROM user ORDER BY login"); |
| 101 | 104 | while( db_step(&s)==SQLITE_ROW ){ |
| 102 | 105 | @ <tr> |
| @@ -106,45 +109,39 @@ | ||
| 106 | 109 | } |
| 107 | 110 | @ <nobr>%h(db_column_text(&s,1))</nobr> |
| 108 | 111 | if( g.okAdmin ){ |
| 109 | 112 | @ </a> |
| 110 | 113 | } |
| 111 | - @ </td> | |
| 112 | - @ <td align="center">%s(db_column_text(&s,2))</td> | |
| 114 | + @ </td><td></td> | |
| 115 | + @ <td align="center">%s(db_column_text(&s,2))</td><td></td> | |
| 113 | 116 | @ <td align="left">%s(db_column_text(&s,3))</td> |
| 114 | 117 | @ </tr> |
| 115 | 118 | } |
| 116 | 119 | @ </table></td></tr></table> |
| 117 | - @ <p style="clear:both"> | |
| 120 | + @ <td valign="top"> | |
| 118 | 121 | @ <b>Notes:</b> |
| 119 | 122 | @ <ol> |
| 120 | 123 | @ <li><p>The permission flags are as follows:</p> |
| 121 | - @ <table> | |
| 122 | - @ <tr><td>s</td><td></td><td>Setup: Superuser can do anything</td></tr> | |
| 123 | - @ <tr><td>a</td><td width="10"></td> | |
| 124 | - @ <td>Admin: Create or delete users and ticket report formats</td></tr> | |
| 125 | - @ <tr><td>d</td><td></td> | |
| 126 | - @ <td>Delete: Erase anonymous wiki, tickets, and attachments</td></tr> | |
| 127 | - @ <tr><td>p</td><td></td><td>Password: Change password</td></tr> | |
| 128 | - @ <tr><td>q</td><td></td><td>Query: Create or edit report formats</td></tr> | |
| 129 | - @ <tr><td>i</td><td></td> | |
| 130 | - @ <td>Check-in: Add new code to the repository</td></tr> | |
| 131 | - @ <tr><td>o</td><td></td> | |
| 132 | - @ <td>Check-out: Read code out of the repository</td></tr> | |
| 133 | - @ <tr><td>h</td><td></td> | |
| 134 | - @ <td>History: Access older version of code, tickets, or wiki</td></tr> | |
| 135 | - @ <tr><td>g</td><td></td><td>Clone: Clone the repository</td></tr> | |
| 136 | - @ <tr><td>j</td><td></td><td>Read-Wiki: View wiki pages</td></tr> | |
| 137 | - @ <tr><td>f</td><td></td><td>New-Wiki: Create new wiki pages</td></tr> | |
| 138 | - @ <tr><td>m</td><td></td><td>Append-Wiki: Append to wiki pages</td></tr> | |
| 139 | - @ <tr><td>k</td><td></td><td>Write-Wiki: Modify wiki pages</td></tr> | |
| 140 | - @ <tr><td>r</td><td></td> | |
| 141 | - @ <td>Read-Tkt: View tickets and change histories</td></tr> | |
| 142 | - @ <tr><td>n</td><td></td><td>New-Tkt: Create new tickets</td></tr> | |
| 143 | - @ <tr><td>c</td><td></td><td>Append-Tkt: Append to tickets</td></tr> | |
| 144 | - @ <tr><td>w</td><td></td><td>Write-Tkt: Edit tickets</td></tr> | |
| 145 | - @ </table> | |
| 124 | + @ <ol type="a"> | |
| 125 | + @ <li value="1"><b>Admin</b>: Create and delete users</li> | |
| 126 | + @ <li value="3"><b>Append-Tkt</b>: Append to tickets</li> | |
| 127 | + @ <li value="4"><b>Delete</b>: Delete wiki and tickets</li> | |
| 128 | + @ <li value="6"><b>New-Wiki</b>: Create new wiki pages</li> | |
| 129 | + @ <li value="7"><b>Clone</b>: Clone the repository</li> | |
| 130 | + @ <li value="8"><b>History</b>: View detail repository history</li> | |
| 131 | + @ <li value="9"><b>Check-In</b>: Commit new versions in the repository</li> | |
| 132 | + @ <li value="10"><b>Read-Wiki</b>: View wiki pages</li> | |
| 133 | + @ <li value="11"><b>Write-Wiki</b>: Edit wiki pages</li> | |
| 134 | + @ <li value="13"><b>Append-Wiki</b>: Append to wiki pages</li> | |
| 135 | + @ <li value="14"><b>New-Tkt</b>: Create new tickets</li> | |
| 136 | + @ <li value="15"><b>Check-Out</b>: Check out versions</li> | |
| 137 | + @ <li value="16"><b>Password</b>: Change your own password</li> | |
| 138 | + @ <li value="17"><b>Query</b>: Create new queries against tickets</li> | |
| 139 | + @ <li value="18"><b>Read-Tkt</b>: View tickets</li> | |
| 140 | + @ <li value="19"><b>Setup:</b> Setup and configure this website</li> | |
| 141 | + @ <li value="23"><b>Write-Tkt</b>: Edit tickets</li> | |
| 142 | + @ </ol> | |
| 146 | 143 | @ </p></li> |
| 147 | 144 | @ |
| 148 | 145 | @ <li><p> |
| 149 | 146 | @ Every user, logged in or not, has the privileges of <b>nobody</b>. |
| 150 | 147 | @ Any human can login as <b>anonymous</b> since the password is |
| @@ -151,10 +148,11 @@ | ||
| 151 | 148 | @ clearly displayed on the login page for them to type. The purpose |
| 152 | 149 | @ of requiring anonymous to log in is to prevent access by spiders. |
| 153 | 150 | @ </p></li> |
| 154 | 151 | @ |
| 155 | 152 | @ </ol> |
| 153 | + @ </td></tr></table> | |
| 156 | 154 | style_footer(); |
| 157 | 155 | } |
| 158 | 156 | |
| 159 | 157 | /* |
| 160 | 158 | ** WEBPAGE: /setup_uedit |
| 161 | 159 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -88,15 +88,18 @@ | |
| 88 | return; |
| 89 | } |
| 90 | |
| 91 | style_submenu_element("Add", "Add User", "setup_uedit"); |
| 92 | style_header("User List"); |
| 93 | @ <table align="left" hspace="10" border="1" cellpadding="10"><tr><td> |
| 94 | @ <table cellspacing=0 cellpadding=0 border=0> |
| 95 | @ <tr> |
| 96 | @ <th align="right">User ID</th> |
| 97 | @ <th> Capabilities </th> |
| 98 | @ <th>Contact Info</th> |
| 99 | @ </tr> |
| 100 | db_prepare(&s, "SELECT uid, login, cap, info FROM user ORDER BY login"); |
| 101 | while( db_step(&s)==SQLITE_ROW ){ |
| 102 | @ <tr> |
| @@ -106,45 +109,39 @@ | |
| 106 | } |
| 107 | @ <nobr>%h(db_column_text(&s,1))</nobr> |
| 108 | if( g.okAdmin ){ |
| 109 | @ </a> |
| 110 | } |
| 111 | @ </td> |
| 112 | @ <td align="center">%s(db_column_text(&s,2))</td> |
| 113 | @ <td align="left">%s(db_column_text(&s,3))</td> |
| 114 | @ </tr> |
| 115 | } |
| 116 | @ </table></td></tr></table> |
| 117 | @ <p style="clear:both"> |
| 118 | @ <b>Notes:</b> |
| 119 | @ <ol> |
| 120 | @ <li><p>The permission flags are as follows:</p> |
| 121 | @ <table> |
| 122 | @ <tr><td>s</td><td></td><td>Setup: Superuser can do anything</td></tr> |
| 123 | @ <tr><td>a</td><td width="10"></td> |
| 124 | @ <td>Admin: Create or delete users and ticket report formats</td></tr> |
| 125 | @ <tr><td>d</td><td></td> |
| 126 | @ <td>Delete: Erase anonymous wiki, tickets, and attachments</td></tr> |
| 127 | @ <tr><td>p</td><td></td><td>Password: Change password</td></tr> |
| 128 | @ <tr><td>q</td><td></td><td>Query: Create or edit report formats</td></tr> |
| 129 | @ <tr><td>i</td><td></td> |
| 130 | @ <td>Check-in: Add new code to the repository</td></tr> |
| 131 | @ <tr><td>o</td><td></td> |
| 132 | @ <td>Check-out: Read code out of the repository</td></tr> |
| 133 | @ <tr><td>h</td><td></td> |
| 134 | @ <td>History: Access older version of code, tickets, or wiki</td></tr> |
| 135 | @ <tr><td>g</td><td></td><td>Clone: Clone the repository</td></tr> |
| 136 | @ <tr><td>j</td><td></td><td>Read-Wiki: View wiki pages</td></tr> |
| 137 | @ <tr><td>f</td><td></td><td>New-Wiki: Create new wiki pages</td></tr> |
| 138 | @ <tr><td>m</td><td></td><td>Append-Wiki: Append to wiki pages</td></tr> |
| 139 | @ <tr><td>k</td><td></td><td>Write-Wiki: Modify wiki pages</td></tr> |
| 140 | @ <tr><td>r</td><td></td> |
| 141 | @ <td>Read-Tkt: View tickets and change histories</td></tr> |
| 142 | @ <tr><td>n</td><td></td><td>New-Tkt: Create new tickets</td></tr> |
| 143 | @ <tr><td>c</td><td></td><td>Append-Tkt: Append to tickets</td></tr> |
| 144 | @ <tr><td>w</td><td></td><td>Write-Tkt: Edit tickets</td></tr> |
| 145 | @ </table> |
| 146 | @ </p></li> |
| 147 | @ |
| 148 | @ <li><p> |
| 149 | @ Every user, logged in or not, has the privileges of <b>nobody</b>. |
| 150 | @ Any human can login as <b>anonymous</b> since the password is |
| @@ -151,10 +148,11 @@ | |
| 151 | @ clearly displayed on the login page for them to type. The purpose |
| 152 | @ of requiring anonymous to log in is to prevent access by spiders. |
| 153 | @ </p></li> |
| 154 | @ |
| 155 | @ </ol> |
| 156 | style_footer(); |
| 157 | } |
| 158 | |
| 159 | /* |
| 160 | ** WEBPAGE: /setup_uedit |
| 161 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -88,15 +88,18 @@ | |
| 88 | return; |
| 89 | } |
| 90 | |
| 91 | style_submenu_element("Add", "Add User", "setup_uedit"); |
| 92 | style_header("User List"); |
| 93 | @ <table border="0" cellpadding="0" cellspacing="25"> |
| 94 | @ <tr><td valign="top"> |
| 95 | @ <b>Users:</b> |
| 96 | @ <table border="1" cellpadding="10"><tr><td> |
| 97 | @ <table cellspacing=0 cellpadding=0 border=0> |
| 98 | @ <tr> |
| 99 | @ <th align="right">User ID</th><th width="15"></td> |
| 100 | @ <th>Capabilities</th><th width="15"></td> |
| 101 | @ <th>Contact Info</th> |
| 102 | @ </tr> |
| 103 | db_prepare(&s, "SELECT uid, login, cap, info FROM user ORDER BY login"); |
| 104 | while( db_step(&s)==SQLITE_ROW ){ |
| 105 | @ <tr> |
| @@ -106,45 +109,39 @@ | |
| 109 | } |
| 110 | @ <nobr>%h(db_column_text(&s,1))</nobr> |
| 111 | if( g.okAdmin ){ |
| 112 | @ </a> |
| 113 | } |
| 114 | @ </td><td></td> |
| 115 | @ <td align="center">%s(db_column_text(&s,2))</td><td></td> |
| 116 | @ <td align="left">%s(db_column_text(&s,3))</td> |
| 117 | @ </tr> |
| 118 | } |
| 119 | @ </table></td></tr></table> |
| 120 | @ <td valign="top"> |
| 121 | @ <b>Notes:</b> |
| 122 | @ <ol> |
| 123 | @ <li><p>The permission flags are as follows:</p> |
| 124 | @ <ol type="a"> |
| 125 | @ <li value="1"><b>Admin</b>: Create and delete users</li> |
| 126 | @ <li value="3"><b>Append-Tkt</b>: Append to tickets</li> |
| 127 | @ <li value="4"><b>Delete</b>: Delete wiki and tickets</li> |
| 128 | @ <li value="6"><b>New-Wiki</b>: Create new wiki pages</li> |
| 129 | @ <li value="7"><b>Clone</b>: Clone the repository</li> |
| 130 | @ <li value="8"><b>History</b>: View detail repository history</li> |
| 131 | @ <li value="9"><b>Check-In</b>: Commit new versions in the repository</li> |
| 132 | @ <li value="10"><b>Read-Wiki</b>: View wiki pages</li> |
| 133 | @ <li value="11"><b>Write-Wiki</b>: Edit wiki pages</li> |
| 134 | @ <li value="13"><b>Append-Wiki</b>: Append to wiki pages</li> |
| 135 | @ <li value="14"><b>New-Tkt</b>: Create new tickets</li> |
| 136 | @ <li value="15"><b>Check-Out</b>: Check out versions</li> |
| 137 | @ <li value="16"><b>Password</b>: Change your own password</li> |
| 138 | @ <li value="17"><b>Query</b>: Create new queries against tickets</li> |
| 139 | @ <li value="18"><b>Read-Tkt</b>: View tickets</li> |
| 140 | @ <li value="19"><b>Setup:</b> Setup and configure this website</li> |
| 141 | @ <li value="23"><b>Write-Tkt</b>: Edit tickets</li> |
| 142 | @ </ol> |
| 143 | @ </p></li> |
| 144 | @ |
| 145 | @ <li><p> |
| 146 | @ Every user, logged in or not, has the privileges of <b>nobody</b>. |
| 147 | @ Any human can login as <b>anonymous</b> since the password is |
| @@ -151,10 +148,11 @@ | |
| 148 | @ clearly displayed on the login page for them to type. The purpose |
| 149 | @ of requiring anonymous to log in is to prevent access by spiders. |
| 150 | @ </p></li> |
| 151 | @ |
| 152 | @ </ol> |
| 153 | @ </td></tr></table> |
| 154 | style_footer(); |
| 155 | } |
| 156 | |
| 157 | /* |
| 158 | ** WEBPAGE: /setup_uedit |
| 159 |
+2
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -111,12 +111,12 @@ | ||
| 111 | 111 | style_header("Timeline"); |
| 112 | 112 | if( !g.okHistory && |
| 113 | 113 | db_exists("SELECT 1 FROM user" |
| 114 | 114 | " WHERE login='anonymous'" |
| 115 | 115 | " AND cap LIKE '%%h%%'") ){ |
| 116 | - @ <p><b>Note:</b> You will be able to see much more timeline | |
| 117 | - @ information if <a href="%s(g.zBaseURL)/login">login</a>.</p> | |
| 116 | + @ <p><b>Note:</b> You will be able to access <u>much</u> more | |
| 117 | + @ historical information if <a href="%s(g.zBaseURL)/login">login</a>.</p> | |
| 118 | 118 | } |
| 119 | 119 | zSQL = mprintf( |
| 120 | 120 | "SELECT uuid, datetime(event.mtime,'localtime'), comment, user" |
| 121 | 121 | " FROM event, blob" |
| 122 | 122 | " WHERE event.type='ci' AND blob.rid=event.objid" |
| 123 | 123 | |
| 124 | 124 | ADDED www/concept1.gif |
| 125 | 125 | ADDED www/concept2.gif |
| 126 | 126 | ADDED www/concepts.html |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -111,12 +111,12 @@ | |
| 111 | style_header("Timeline"); |
| 112 | if( !g.okHistory && |
| 113 | db_exists("SELECT 1 FROM user" |
| 114 | " WHERE login='anonymous'" |
| 115 | " AND cap LIKE '%%h%%'") ){ |
| 116 | @ <p><b>Note:</b> You will be able to see much more timeline |
| 117 | @ information if <a href="%s(g.zBaseURL)/login">login</a>.</p> |
| 118 | } |
| 119 | zSQL = mprintf( |
| 120 | "SELECT uuid, datetime(event.mtime,'localtime'), comment, user" |
| 121 | " FROM event, blob" |
| 122 | " WHERE event.type='ci' AND blob.rid=event.objid" |
| 123 | |
| 124 | DDED www/concept1.gif |
| 125 | DDED www/concept2.gif |
| 126 | DDED www/concepts.html |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -111,12 +111,12 @@ | |
| 111 | style_header("Timeline"); |
| 112 | if( !g.okHistory && |
| 113 | db_exists("SELECT 1 FROM user" |
| 114 | " WHERE login='anonymous'" |
| 115 | " AND cap LIKE '%%h%%'") ){ |
| 116 | @ <p><b>Note:</b> You will be able to access <u>much</u> more |
| 117 | @ historical information if <a href="%s(g.zBaseURL)/login">login</a>.</p> |
| 118 | } |
| 119 | zSQL = mprintf( |
| 120 | "SELECT uuid, datetime(event.mtime,'localtime'), comment, user" |
| 121 | " FROM event, blob" |
| 122 | " WHERE event.type='ci' AND blob.rid=event.objid" |
| 123 | |
| 124 | DDED www/concept1.gif |
| 125 | DDED www/concept2.gif |
| 126 | DDED www/concepts.html |
Binary file
Binary file
+2
| --- a/www/concepts.html | ||
| +++ b/www/concepts.html | ||
| @@ -0,0 +1,2 @@ | ||
| 1 | +rebf73078be9779edd6a0156195e610f81c94f9<br> | |
| 2 | +b4104959a67175f02d6b415480be22a23e03ad114b2b57f04e9eeef17dcbriedsuch haseiTcl |
| --- a/www/concepts.html | |
| +++ b/www/concepts.html | |
| @@ -0,0 +1,2 @@ | |
| --- a/www/concepts.html | |
| +++ b/www/concepts.html | |
| @@ -0,0 +1,2 @@ | |
| 1 | rebf73078be9779edd6a0156195e610f81c94f9<br> |
| 2 | b4104959a67175f02d6b415480be22a23e03ad114b2b57f04e9eeef17dcbriedsuch haseiTcl |
+8
-3
| --- www/fileformat.html | ||
| +++ www/fileformat.html | ||
| @@ -7,18 +7,23 @@ | ||
| 7 | 7 | Fossil File Formats |
| 8 | 8 | </h1> |
| 9 | 9 | |
| 10 | 10 | <p> |
| 11 | 11 | The global state of a fossil repository is determined by an unordered |
| 12 | -set of files. Some files used to represent wiki pages, trouble tickets, | |
| 12 | +set of files. Some files are used to represent wiki pages, trouble tickets, | |
| 13 | 13 | and the special "manifest" file has a specific and well-defined format. |
| 14 | -Other files are just the content of the files. Files can be text or | |
| 15 | -binary. | |
| 14 | +Other files are just data. Files can be text or binary. | |
| 16 | 15 | </p> |
| 17 | 16 | |
| 18 | 17 | <p> |
| 19 | 18 | Each file in the repository is named by its SHA1 hash. |
| 19 | +No prefixes or meta information is added to a file before | |
| 20 | +its hash is computed. The name of a file in the repository | |
| 21 | +is exactly the same SHA1 hash that is computed by sha1sum | |
| 22 | +on the file as it exists in your source tree.</p> | |
| 23 | + | |
| 24 | +<p> | |
| 20 | 25 | Some files have a particular format which qualifies them |
| 21 | 26 | as "manifests". A manifest assigns filenames to a subset |
| 22 | 27 | of the files in the repository, in order to provide a |
| 23 | 28 | snapshot of the state of the project at a point in time. |
| 24 | 29 | Each manifest file corresponds to a version or baseline |
| 25 | 30 |
| --- www/fileformat.html | |
| +++ www/fileformat.html | |
| @@ -7,18 +7,23 @@ | |
| 7 | Fossil File Formats |
| 8 | </h1> |
| 9 | |
| 10 | <p> |
| 11 | The global state of a fossil repository is determined by an unordered |
| 12 | set of files. Some files used to represent wiki pages, trouble tickets, |
| 13 | and the special "manifest" file has a specific and well-defined format. |
| 14 | Other files are just the content of the files. Files can be text or |
| 15 | binary. |
| 16 | </p> |
| 17 | |
| 18 | <p> |
| 19 | Each file in the repository is named by its SHA1 hash. |
| 20 | Some files have a particular format which qualifies them |
| 21 | as "manifests". A manifest assigns filenames to a subset |
| 22 | of the files in the repository, in order to provide a |
| 23 | snapshot of the state of the project at a point in time. |
| 24 | Each manifest file corresponds to a version or baseline |
| 25 |
| --- www/fileformat.html | |
| +++ www/fileformat.html | |
| @@ -7,18 +7,23 @@ | |
| 7 | Fossil File Formats |
| 8 | </h1> |
| 9 | |
| 10 | <p> |
| 11 | The global state of a fossil repository is determined by an unordered |
| 12 | set of files. Some files are used to represent wiki pages, trouble tickets, |
| 13 | and the special "manifest" file has a specific and well-defined format. |
| 14 | Other files are just data. Files can be text or binary. |
| 15 | </p> |
| 16 | |
| 17 | <p> |
| 18 | Each file in the repository is named by its SHA1 hash. |
| 19 | No prefixes or meta information is added to a file before |
| 20 | its hash is computed. The name of a file in the repository |
| 21 | is exactly the same SHA1 hash that is computed by sha1sum |
| 22 | on the file as it exists in your source tree.</p> |
| 23 | |
| 24 | <p> |
| 25 | Some files have a particular format which qualifies them |
| 26 | as "manifests". A manifest assigns filenames to a subset |
| 27 | of the files in the repository, in order to provide a |
| 28 | snapshot of the state of the project at a point in time. |
| 29 | Each manifest file corresponds to a version or baseline |
| 30 |
+11
-5
| --- www/index.html | ||
| +++ www/index.html | ||
| @@ -7,13 +7,14 @@ | ||
| 7 | 7 | |
| 8 | 8 | <p> |
| 9 | 9 | This is a preliminary homepage for a new software configuration |
| 10 | 10 | management system called "Fossil". |
| 11 | 11 | The system is |
| 12 | -<a href="http://fossil-scm.hwaci.com/fossil/index">self-hosting</a>. | |
| 12 | +<a href="http://fossil-scm.hwaci.com/fossil/timeline">self-hosting</a> on | |
| 13 | +<a href="http://www.hwaci.com/cgi-bin/fossil/timeline">two separate servers</a>. | |
| 13 | 14 | You can download the lastest sources |
| 14 | -compile it your self using the instructions below. | |
| 15 | +compile it yourself using the instructions below. | |
| 15 | 16 | </p> |
| 16 | 17 | |
| 17 | 18 | <p>Design Goals For Fossil:</p> |
| 18 | 19 | |
| 19 | 20 | <ul> |
| @@ -55,15 +56,19 @@ | ||
| 55 | 56 | </ul> |
| 56 | 57 | |
| 57 | 58 | <p>Objectives Of Fossil:</p> |
| 58 | 59 | |
| 59 | 60 | <ul> |
| 60 | -<li>Fossil should be ridiculously easy to install and operate.</li> | |
| 61 | -<li>With fossil, it should be possible (and easy) to set up a project | |
| 61 | +<li>Fossil should be ridiculously easy to | |
| 62 | +<a href="build.html">install</a> and | |
| 63 | +<a href="quickstart.html">operate</a>.</li> | |
| 64 | +<li>With fossil, it should be possible (and | |
| 65 | +<a href="quickstart.html#serversetup">easy</a>) to set up a project | |
| 62 | 66 | on an inexpensive shared-hosting ISP |
| 63 | 67 | (example: <a href="http://www.he.net/hosting.html">Hurricane Electric</a>) |
| 64 | -that provides nothing more than web space and CGI capability.</li> | |
| 68 | +that provides nothing more than web space and CGI capability. | |
| 69 | +Here is <a href="http://www.hwaci.com/cgi-bin/fossil/timeline">a demo</a>.</li> | |
| 65 | 70 | <li>Fossil should provide in-depth historical and status information about the |
| 66 | 71 | project through a web interface</li> |
| 67 | 72 | <li>The integration of <a href="http://wiki.org/wiki.cgi?WhatIsWiki">Wiki</a> |
| 68 | 73 | and the ability to safely support anonymous check-in are features sometimes |
| 69 | 74 | described as |
| @@ -73,10 +78,11 @@ | ||
| 73 | 78 | </ul> |
| 74 | 79 | |
| 75 | 80 | <p>Other Links:</p> |
| 76 | 81 | |
| 77 | 82 | <ul> |
| 83 | +<li>The <a href="concepts.html">concepts</b> behind fossil</li> | |
| 78 | 84 | <li><a href="build.html">Building And Installing</a></li> |
| 79 | 85 | <li><a href="quickstart.html">Quick Start</a> guide to using fossil |
| 80 | 86 | <li><a href="pop.html">Principals Of Operation</a></li> |
| 81 | 87 | <li>The <a href="selfcheck.html">automatic self-check</a> mechanism |
| 82 | 88 | helps insure project integrity.</li> |
| 83 | 89 |
| --- www/index.html | |
| +++ www/index.html | |
| @@ -7,13 +7,14 @@ | |
| 7 | |
| 8 | <p> |
| 9 | This is a preliminary homepage for a new software configuration |
| 10 | management system called "Fossil". |
| 11 | The system is |
| 12 | <a href="http://fossil-scm.hwaci.com/fossil/index">self-hosting</a>. |
| 13 | You can download the lastest sources |
| 14 | compile it your self using the instructions below. |
| 15 | </p> |
| 16 | |
| 17 | <p>Design Goals For Fossil:</p> |
| 18 | |
| 19 | <ul> |
| @@ -55,15 +56,19 @@ | |
| 55 | </ul> |
| 56 | |
| 57 | <p>Objectives Of Fossil:</p> |
| 58 | |
| 59 | <ul> |
| 60 | <li>Fossil should be ridiculously easy to install and operate.</li> |
| 61 | <li>With fossil, it should be possible (and easy) to set up a project |
| 62 | on an inexpensive shared-hosting ISP |
| 63 | (example: <a href="http://www.he.net/hosting.html">Hurricane Electric</a>) |
| 64 | that provides nothing more than web space and CGI capability.</li> |
| 65 | <li>Fossil should provide in-depth historical and status information about the |
| 66 | project through a web interface</li> |
| 67 | <li>The integration of <a href="http://wiki.org/wiki.cgi?WhatIsWiki">Wiki</a> |
| 68 | and the ability to safely support anonymous check-in are features sometimes |
| 69 | described as |
| @@ -73,10 +78,11 @@ | |
| 73 | </ul> |
| 74 | |
| 75 | <p>Other Links:</p> |
| 76 | |
| 77 | <ul> |
| 78 | <li><a href="build.html">Building And Installing</a></li> |
| 79 | <li><a href="quickstart.html">Quick Start</a> guide to using fossil |
| 80 | <li><a href="pop.html">Principals Of Operation</a></li> |
| 81 | <li>The <a href="selfcheck.html">automatic self-check</a> mechanism |
| 82 | helps insure project integrity.</li> |
| 83 |
| --- www/index.html | |
| +++ www/index.html | |
| @@ -7,13 +7,14 @@ | |
| 7 | |
| 8 | <p> |
| 9 | This is a preliminary homepage for a new software configuration |
| 10 | management system called "Fossil". |
| 11 | The system is |
| 12 | <a href="http://fossil-scm.hwaci.com/fossil/timeline">self-hosting</a> on |
| 13 | <a href="http://www.hwaci.com/cgi-bin/fossil/timeline">two separate servers</a>. |
| 14 | You can download the lastest sources |
| 15 | compile it yourself using the instructions below. |
| 16 | </p> |
| 17 | |
| 18 | <p>Design Goals For Fossil:</p> |
| 19 | |
| 20 | <ul> |
| @@ -55,15 +56,19 @@ | |
| 56 | </ul> |
| 57 | |
| 58 | <p>Objectives Of Fossil:</p> |
| 59 | |
| 60 | <ul> |
| 61 | <li>Fossil should be ridiculously easy to |
| 62 | <a href="build.html">install</a> and |
| 63 | <a href="quickstart.html">operate</a>.</li> |
| 64 | <li>With fossil, it should be possible (and |
| 65 | <a href="quickstart.html#serversetup">easy</a>) to set up a project |
| 66 | on an inexpensive shared-hosting ISP |
| 67 | (example: <a href="http://www.he.net/hosting.html">Hurricane Electric</a>) |
| 68 | that provides nothing more than web space and CGI capability. |
| 69 | Here is <a href="http://www.hwaci.com/cgi-bin/fossil/timeline">a demo</a>.</li> |
| 70 | <li>Fossil should provide in-depth historical and status information about the |
| 71 | project through a web interface</li> |
| 72 | <li>The integration of <a href="http://wiki.org/wiki.cgi?WhatIsWiki">Wiki</a> |
| 73 | and the ability to safely support anonymous check-in are features sometimes |
| 74 | described as |
| @@ -73,10 +78,11 @@ | |
| 78 | </ul> |
| 79 | |
| 80 | <p>Other Links:</p> |
| 81 | |
| 82 | <ul> |
| 83 | <li>The <a href="concepts.html">concepts</b> behind fossil</li> |
| 84 | <li><a href="build.html">Building And Installing</a></li> |
| 85 | <li><a href="quickstart.html">Quick Start</a> guide to using fossil |
| 86 | <li><a href="pop.html">Principals Of Operation</a></li> |
| 87 | <li>The <a href="selfcheck.html">automatic self-check</a> mechanism |
| 88 | helps insure project integrity.</li> |
| 89 |
+4
-2
| --- www/quickstart.html | ||
| +++ www/quickstart.html | ||
| @@ -169,10 +169,11 @@ | ||
| 169 | 169 | <b>commit</b> and possibly also <b>push</b> your changes. Remember |
| 170 | 170 | that nobody else can see your changes until you <b>commit</b> and |
| 171 | 171 | if other are using a different repository you will also need to |
| 172 | 172 | <b>push</b>.</p> |
| 173 | 173 | |
| 174 | +<a name="serversetup"> | |
| 174 | 175 | </blockquote><h2>Setting Up A Server</h2><blockquote> |
| 175 | 176 | |
| 176 | 177 | <p>The easiest way to set up a server is:</p> |
| 177 | 178 | |
| 178 | 179 | <blockquote> |
| @@ -216,13 +217,14 @@ | ||
| 216 | 217 | </blockquote><h2>More Hints</h2><blockquote> |
| 217 | 218 | |
| 218 | 219 | <p>Try these commands:</p> |
| 219 | 220 | |
| 220 | 221 | <blockquote><b> |
| 221 | - fossil command<br> | |
| 222 | - fossil test-command | |
| 222 | + fossil help<br> | |
| 223 | + fossil commands<br> | |
| 224 | + fossil test-commands | |
| 223 | 225 | </b></blockquote> |
| 224 | 226 | |
| 225 | 227 | <p>Explore and have fun!</p> |
| 226 | 228 | |
| 227 | 229 | |
| 228 | 230 | </blockquote></body></html> |
| 229 | 231 |
| --- www/quickstart.html | |
| +++ www/quickstart.html | |
| @@ -169,10 +169,11 @@ | |
| 169 | <b>commit</b> and possibly also <b>push</b> your changes. Remember |
| 170 | that nobody else can see your changes until you <b>commit</b> and |
| 171 | if other are using a different repository you will also need to |
| 172 | <b>push</b>.</p> |
| 173 | |
| 174 | </blockquote><h2>Setting Up A Server</h2><blockquote> |
| 175 | |
| 176 | <p>The easiest way to set up a server is:</p> |
| 177 | |
| 178 | <blockquote> |
| @@ -216,13 +217,14 @@ | |
| 216 | </blockquote><h2>More Hints</h2><blockquote> |
| 217 | |
| 218 | <p>Try these commands:</p> |
| 219 | |
| 220 | <blockquote><b> |
| 221 | fossil command<br> |
| 222 | fossil test-command |
| 223 | </b></blockquote> |
| 224 | |
| 225 | <p>Explore and have fun!</p> |
| 226 | |
| 227 | |
| 228 | </blockquote></body></html> |
| 229 |
| --- www/quickstart.html | |
| +++ www/quickstart.html | |
| @@ -169,10 +169,11 @@ | |
| 169 | <b>commit</b> and possibly also <b>push</b> your changes. Remember |
| 170 | that nobody else can see your changes until you <b>commit</b> and |
| 171 | if other are using a different repository you will also need to |
| 172 | <b>push</b>.</p> |
| 173 | |
| 174 | <a name="serversetup"> |
| 175 | </blockquote><h2>Setting Up A Server</h2><blockquote> |
| 176 | |
| 177 | <p>The easiest way to set up a server is:</p> |
| 178 | |
| 179 | <blockquote> |
| @@ -216,13 +217,14 @@ | |
| 217 | </blockquote><h2>More Hints</h2><blockquote> |
| 218 | |
| 219 | <p>Try these commands:</p> |
| 220 | |
| 221 | <blockquote><b> |
| 222 | fossil help<br> |
| 223 | fossil commands<br> |
| 224 | fossil test-commands |
| 225 | </b></blockquote> |
| 226 | |
| 227 | <p>Explore and have fun!</p> |
| 228 | |
| 229 | |
| 230 | </blockquote></body></html> |
| 231 |