Differences From:

File src/shun.c part of check-in [02a584f7f5] - Add the --private option to the "fossil commit" command. This option creates a private branch which is never pushed. by drh on 2009-08-26 18:25:48. [view]

To:

File src/shun.c part of check-in [7a2c37063a] - merge trunk into creole branch by bob on 2009-09-22 07:49:39. Also file src/shun.c part of check-in [50ab5c33e7] - Layout changes to the "shun" control page. by drh on 2009-08-26 20:24:58. [view]

@@ -96,31 +96,13 @@
     @ shunned.  It will no longer be pushed.
     @ It will be removed from the repository the next time the respository
     @ is rebuilt using the <b>fossil rebuild</b> command-line</font></p>
   }
-  @ <p>The artifacts listed below have been shunned by this repository.
-  @ This means that the artifacts will not be transmitted on a push nor
-  @ recieved on a pull.  These artifacts are banned from the respository.</p>
-  @ <blockquote>
-  db_prepare(&q,
-     "SELECT uuid, EXISTS(SELECT 1 FROM blob WHERE blob.uuid=shun.uuid)"
-     "  FROM shun ORDER BY uuid");
-  while( db_step(&q)==SQLITE_ROW ){
-    const char *zUuid = db_column_text(&q, 0);
-    int stillExists = db_column_int(&q, 1);
-    cnt++;
-    if( stillExists ){
-      @ <b><a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a></b><br>
-    }else{
-      @ <b>%s(zUuid)</b><br>
-    }
-  }
-  if( cnt==0 ){
-    @ <i>no artifacts are shunned on this server</i>
-  }
-  db_finalize(&q);
-  @ </blockquote>
-  @ <hr>
+  @ <p>A shunned artifact will not be pushed nor accepted in a pull and the
+  @ artifact content will be purged from the repository the next time the
+  @ repository is rebuilt.  A list of shunned artifacts can be seen at the
+  @ bottom of this page.</p>
+  @
   @ <a name="addshun"></a>
   @ <p>To shun an artifact, enter its artifact ID (the 40-character SHA1
   @ hash of the artifact) in the
   @ following box and press the "Shun" button.  This will cause the artifact
@@ -158,11 +140,12 @@
   @ <input type="submit" name="sub" value="Accept">
   @ </form>
   @ </blockquote>
   @
-  @ <hr>
-  @ <p>Press the button below to rebuild the respository.  The rebuild
-  @ may take several seconds, so be patient after pressing the button.</p>
+  @ <p>Press the Rebuild button below to rebuild the respository.  The
+  @ content of newly shunned artifacts is not purged until the repository
+  @ is rebuilt.  On larger repositories, the rebuild may take minute or
+  @ two, so be patient after pressing the button.</p>
   @
   @ <blockquote>
   @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
   login_insert_csrf_secret();
@@ -169,8 +152,28 @@
   @ <input type="submit" name="rebuild" value="Rebuild">
   @ </form>
   @ </blockquote>
   @
+  @ <hr><p>Shunned Artifacts:</p>
+  @ <blockquote>
+  db_prepare(&q,
+     "SELECT uuid, EXISTS(SELECT 1 FROM blob WHERE blob.uuid=shun.uuid)"
+     "  FROM shun ORDER BY uuid");
+  while( db_step(&q)==SQLITE_ROW ){
+    const char *zUuid = db_column_text(&q, 0);
+    int stillExists = db_column_int(&q, 1);
+    cnt++;
+    if( stillExists ){
+      @ <b><a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a></b><br>
+    }else{
+      @ <b>%s(zUuid)</b><br>
+    }
+  }
+  if( cnt==0 ){
+    @ <i>no artifacts are shunned on this server</i>
+  }
+  db_finalize(&q);
+  @ </blockquote>
   style_footer();
 }
 
 /*