Fossil SCM
Layout changes to the "shun" control page.
Commit
50ab5c33e77781f1a600e4a59cd462c3c27975e3
Parent
d6b8b5ba7370b39…
1 file changed
+30
-27
+30
-27
| --- src/shun.c | ||
| +++ src/shun.c | ||
| @@ -95,33 +95,15 @@ | ||
| 95 | 95 | @ <a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a> has been |
| 96 | 96 | @ shunned. It will no longer be pushed. |
| 97 | 97 | @ It will be removed from the repository the next time the respository |
| 98 | 98 | @ is rebuilt using the <b>fossil rebuild</b> command-line</font></p> |
| 99 | 99 | } |
| 100 | - @ <p>The artifacts listed below have been shunned by this repository. | |
| 101 | - @ This means that the artifacts will not be transmitted on a push nor | |
| 102 | - @ recieved on a pull. These artifacts are banned from the respository.</p> | |
| 103 | - @ <blockquote> | |
| 104 | - db_prepare(&q, | |
| 105 | - "SELECT uuid, EXISTS(SELECT 1 FROM blob WHERE blob.uuid=shun.uuid)" | |
| 106 | - " FROM shun ORDER BY uuid"); | |
| 107 | - while( db_step(&q)==SQLITE_ROW ){ | |
| 108 | - const char *zUuid = db_column_text(&q, 0); | |
| 109 | - int stillExists = db_column_int(&q, 1); | |
| 110 | - cnt++; | |
| 111 | - if( stillExists ){ | |
| 112 | - @ <b><a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a></b><br> | |
| 113 | - }else{ | |
| 114 | - @ <b>%s(zUuid)</b><br> | |
| 115 | - } | |
| 116 | - } | |
| 117 | - if( cnt==0 ){ | |
| 118 | - @ <i>no artifacts are shunned on this server</i> | |
| 119 | - } | |
| 120 | - db_finalize(&q); | |
| 121 | - @ </blockquote> | |
| 122 | - @ <hr> | |
| 100 | + @ <p>A shunned artifact will not be pushed nor accepted in a pull and the | |
| 101 | + @ artifact content will be purged from the repository the next time the | |
| 102 | + @ repository is rebuilt. A list of shunned artifacts can be seen at the | |
| 103 | + @ bottom of this page.</p> | |
| 104 | + @ | |
| 123 | 105 | @ <a name="addshun"></a> |
| 124 | 106 | @ <p>To shun an artifact, enter its artifact ID (the 40-character SHA1 |
| 125 | 107 | @ hash of the artifact) in the |
| 126 | 108 | @ following box and press the "Shun" button. This will cause the artifact |
| 127 | 109 | @ to be removed from the repository and will prevent the artifact from being |
| @@ -157,21 +139,42 @@ | ||
| 157 | 139 | @ <input type="text" name="uuid" size="50"> |
| 158 | 140 | @ <input type="submit" name="sub" value="Accept"> |
| 159 | 141 | @ </form> |
| 160 | 142 | @ </blockquote> |
| 161 | 143 | @ |
| 162 | - @ <hr> | |
| 163 | - @ <p>Press the button below to rebuild the respository. The rebuild | |
| 164 | - @ may take several seconds, so be patient after pressing the button.</p> | |
| 144 | + @ <p>Press the Rebuild button below to rebuild the respository. The | |
| 145 | + @ content of newly shunned artifacts is not purged until the repository | |
| 146 | + @ is rebuilt. On larger repositories, the rebuild may take minute or | |
| 147 | + @ two, so be patient after pressing the button.</p> | |
| 165 | 148 | @ |
| 166 | 149 | @ <blockquote> |
| 167 | 150 | @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)"> |
| 168 | 151 | login_insert_csrf_secret(); |
| 169 | 152 | @ <input type="submit" name="rebuild" value="Rebuild"> |
| 170 | 153 | @ </form> |
| 171 | 154 | @ </blockquote> |
| 172 | - @ | |
| 155 | + @ | |
| 156 | + @ <hr><p>Shunned Artifacts:</p> | |
| 157 | + @ <blockquote> | |
| 158 | + db_prepare(&q, | |
| 159 | + "SELECT uuid, EXISTS(SELECT 1 FROM blob WHERE blob.uuid=shun.uuid)" | |
| 160 | + " FROM shun ORDER BY uuid"); | |
| 161 | + while( db_step(&q)==SQLITE_ROW ){ | |
| 162 | + const char *zUuid = db_column_text(&q, 0); | |
| 163 | + int stillExists = db_column_int(&q, 1); | |
| 164 | + cnt++; | |
| 165 | + if( stillExists ){ | |
| 166 | + @ <b><a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a></b><br> | |
| 167 | + }else{ | |
| 168 | + @ <b>%s(zUuid)</b><br> | |
| 169 | + } | |
| 170 | + } | |
| 171 | + if( cnt==0 ){ | |
| 172 | + @ <i>no artifacts are shunned on this server</i> | |
| 173 | + } | |
| 174 | + db_finalize(&q); | |
| 175 | + @ </blockquote> | |
| 173 | 176 | style_footer(); |
| 174 | 177 | } |
| 175 | 178 | |
| 176 | 179 | /* |
| 177 | 180 | ** Remove from the BLOB table all artifacts that are in the SHUN table. |
| 178 | 181 |
| --- src/shun.c | |
| +++ src/shun.c | |
| @@ -95,33 +95,15 @@ | |
| 95 | @ <a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a> has been |
| 96 | @ shunned. It will no longer be pushed. |
| 97 | @ It will be removed from the repository the next time the respository |
| 98 | @ is rebuilt using the <b>fossil rebuild</b> command-line</font></p> |
| 99 | } |
| 100 | @ <p>The artifacts listed below have been shunned by this repository. |
| 101 | @ This means that the artifacts will not be transmitted on a push nor |
| 102 | @ recieved on a pull. These artifacts are banned from the respository.</p> |
| 103 | @ <blockquote> |
| 104 | db_prepare(&q, |
| 105 | "SELECT uuid, EXISTS(SELECT 1 FROM blob WHERE blob.uuid=shun.uuid)" |
| 106 | " FROM shun ORDER BY uuid"); |
| 107 | while( db_step(&q)==SQLITE_ROW ){ |
| 108 | const char *zUuid = db_column_text(&q, 0); |
| 109 | int stillExists = db_column_int(&q, 1); |
| 110 | cnt++; |
| 111 | if( stillExists ){ |
| 112 | @ <b><a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a></b><br> |
| 113 | }else{ |
| 114 | @ <b>%s(zUuid)</b><br> |
| 115 | } |
| 116 | } |
| 117 | if( cnt==0 ){ |
| 118 | @ <i>no artifacts are shunned on this server</i> |
| 119 | } |
| 120 | db_finalize(&q); |
| 121 | @ </blockquote> |
| 122 | @ <hr> |
| 123 | @ <a name="addshun"></a> |
| 124 | @ <p>To shun an artifact, enter its artifact ID (the 40-character SHA1 |
| 125 | @ hash of the artifact) in the |
| 126 | @ following box and press the "Shun" button. This will cause the artifact |
| 127 | @ to be removed from the repository and will prevent the artifact from being |
| @@ -157,21 +139,42 @@ | |
| 157 | @ <input type="text" name="uuid" size="50"> |
| 158 | @ <input type="submit" name="sub" value="Accept"> |
| 159 | @ </form> |
| 160 | @ </blockquote> |
| 161 | @ |
| 162 | @ <hr> |
| 163 | @ <p>Press the button below to rebuild the respository. The rebuild |
| 164 | @ may take several seconds, so be patient after pressing the button.</p> |
| 165 | @ |
| 166 | @ <blockquote> |
| 167 | @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)"> |
| 168 | login_insert_csrf_secret(); |
| 169 | @ <input type="submit" name="rebuild" value="Rebuild"> |
| 170 | @ </form> |
| 171 | @ </blockquote> |
| 172 | @ |
| 173 | style_footer(); |
| 174 | } |
| 175 | |
| 176 | /* |
| 177 | ** Remove from the BLOB table all artifacts that are in the SHUN table. |
| 178 |
| --- src/shun.c | |
| +++ src/shun.c | |
| @@ -95,33 +95,15 @@ | |
| 95 | @ <a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a> has been |
| 96 | @ shunned. It will no longer be pushed. |
| 97 | @ It will be removed from the repository the next time the respository |
| 98 | @ is rebuilt using the <b>fossil rebuild</b> command-line</font></p> |
| 99 | } |
| 100 | @ <p>A shunned artifact will not be pushed nor accepted in a pull and the |
| 101 | @ artifact content will be purged from the repository the next time the |
| 102 | @ repository is rebuilt. A list of shunned artifacts can be seen at the |
| 103 | @ bottom of this page.</p> |
| 104 | @ |
| 105 | @ <a name="addshun"></a> |
| 106 | @ <p>To shun an artifact, enter its artifact ID (the 40-character SHA1 |
| 107 | @ hash of the artifact) in the |
| 108 | @ following box and press the "Shun" button. This will cause the artifact |
| 109 | @ to be removed from the repository and will prevent the artifact from being |
| @@ -157,21 +139,42 @@ | |
| 139 | @ <input type="text" name="uuid" size="50"> |
| 140 | @ <input type="submit" name="sub" value="Accept"> |
| 141 | @ </form> |
| 142 | @ </blockquote> |
| 143 | @ |
| 144 | @ <p>Press the Rebuild button below to rebuild the respository. The |
| 145 | @ content of newly shunned artifacts is not purged until the repository |
| 146 | @ is rebuilt. On larger repositories, the rebuild may take minute or |
| 147 | @ two, so be patient after pressing the button.</p> |
| 148 | @ |
| 149 | @ <blockquote> |
| 150 | @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)"> |
| 151 | login_insert_csrf_secret(); |
| 152 | @ <input type="submit" name="rebuild" value="Rebuild"> |
| 153 | @ </form> |
| 154 | @ </blockquote> |
| 155 | @ |
| 156 | @ <hr><p>Shunned Artifacts:</p> |
| 157 | @ <blockquote> |
| 158 | db_prepare(&q, |
| 159 | "SELECT uuid, EXISTS(SELECT 1 FROM blob WHERE blob.uuid=shun.uuid)" |
| 160 | " FROM shun ORDER BY uuid"); |
| 161 | while( db_step(&q)==SQLITE_ROW ){ |
| 162 | const char *zUuid = db_column_text(&q, 0); |
| 163 | int stillExists = db_column_int(&q, 1); |
| 164 | cnt++; |
| 165 | if( stillExists ){ |
| 166 | @ <b><a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a></b><br> |
| 167 | }else{ |
| 168 | @ <b>%s(zUuid)</b><br> |
| 169 | } |
| 170 | } |
| 171 | if( cnt==0 ){ |
| 172 | @ <i>no artifacts are shunned on this server</i> |
| 173 | } |
| 174 | db_finalize(&q); |
| 175 | @ </blockquote> |
| 176 | style_footer(); |
| 177 | } |
| 178 | |
| 179 | /* |
| 180 | ** Remove from the BLOB table all artifacts that are in the SHUN table. |
| 181 |