Diff
Not logged in

Differences From:

File src/manifest.c part of check-in [243e02bfbd] - Improvements to cloning performance. by drh on 2008-05-18 15:51:05. [view]

To:

File src/manifest.c part of check-in [a48474bc75] - Improvements to the shunning algorithm. Add the shun page and an opportunity to shun or unshun artifacts in the artifact viewer. by drh on 2008-05-29 01:58:15. [view]

@@ -824,8 +824,9 @@
       );
     }
   }
   if( m.type==CFTYPE_CLUSTER ){
+    tag_insert("cluster", 1, 0, rid, m.rDate, rid);
     for(i=0; i<m.nCChild; i++){
       int mid;
       mid = uuid_to_rid(m.azCChild[i], 1);
       if( mid>0 ){
@@ -841,18 +842,20 @@
         tid = uuid_to_rid(m.aTag[i].zUuid, 1);
       }else{
         tid = rid;
       }
-      switch( m.aTag[i].zName[0] ){
-        case '+':  type = 1; break;
-        case '*':  type = 2; break;
-        case '-':  type = 0; break;
-        default:
-          fossil_fatal("unknown tag type in manifest: %s", m.aTag);
-          return 0;
-      }
-      tag_insert(&m.aTag[i].zName[1], type, m.aTag[i].zValue,
-                 rid, m.rDate, tid);
+      if( tid ){
+        switch( m.aTag[i].zName[0] ){
+          case '+':  type = 1; break;
+          case '*':  type = 2; break;
+          case '-':  type = 0; break;
+          default:
+            fossil_fatal("unknown tag type in manifest: %s", m.aTag);
+            return 0;
+        }
+        tag_insert(&m.aTag[i].zName[1], type, m.aTag[i].zValue,
+                   rid, m.rDate, tid);
+      }
     }
     if( parentid ){
       tag_propagate_all(parentid);
     }
@@ -877,10 +880,10 @@
     db_multi_exec(
       "REPLACE INTO event(type,mtime,objid,user,comment,"
       "                  bgcolor,brbgcolor,euser,ecomment)"
       "VALUES('w',%.17g,%d,%Q,%Q,"
-      " (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d AND tagtype=1),"
-      "(SELECT value FROM tagxref WHERE tagid=%d AND rid=%d AND tagtype!=1),"
+      "  (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d AND tagtype=1),"
+      "  (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d AND tagtype!=1),"
       "  (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d),"
       "  (SELECT value FROM tagxref WHERE tagid=%d AND rid=%d));",
       m.rDate, rid, m.zUser, zComment,
       TAG_BGCOLOR, rid,