Differences From:

File src/info.c part of check-in [3984b1b2c1] - Make the info web page handle symbolic tags as well as UUIDs. Start trying to make the currently-disabled tagview page more useful. by eric on 2008-08-04 20:46:52. [view]

To:

File src/info.c part of check-in [5fb14b9a0f] - Include non-sym- tags in tagview web page. Also merge mainline into tagview branch. by eric on 2008-08-21 20:59:01. Also file src/info.c part of check-in [8745d0d579] - Merge tagview branch into mainline by eric on 2008-09-06 13:29:29. [view]

@@ -117,9 +117,9 @@
   int cnt = 0;
   db_prepare(&q,
     "SELECT plink.cid, blob.uuid, datetime(plink.mtime, 'localtime'),"
     "       coalesce(event.euser,event.user),"
-    "       coalesce(event.comment,event.ecomment)"
+    "       coalesce(event.ecomment,event.comment)"
     "  FROM plink, blob, event"
     " WHERE plink.pid=%d"
     "   AND blob.rid=plink.cid"
     "   AND event.objid=plink.cid"
@@ -169,9 +169,9 @@
   int cnt = 0;
   db_prepare(&q,
     "SELECT plink.pid, blob.uuid, datetime(event.mtime, 'localtime'),"
     "       coalesce(event.euser,event.user),"
-    "       coalesce(event.comment,event.ecomment)"
+    "       coalesce(event.ecomment,event.comment)"
     "  FROM plink, blob, event"
     " WHERE plink.cid=%d"
     "   AND blob.rid=plink.pid"
     "   AND event.objid=plink.pid"
@@ -355,8 +355,10 @@
       @ <tr><th>Comment:</th><td>%w(zComment)</td></tr>
     }
     @ </td></tr>
     if( g.okHistory ){
+      char *zShortUuid = mprintf("%.10s", zUuid);
+      const char *zProjName = db_get("project-name", "unnamed");
       @ <tr><th>Timelines:</th><td>
       @    <a href="%s(g.zBaseURL)/timeline?p=%d(rid)">ancestors</a>
       @    | <a href="%s(g.zBaseURL)/timeline?d=%d(rid)">descendants</a>
       @    | <a href="%s(g.zBaseURL)/timeline?d=%d(rid)&p=%d(rid)">both</a>
@@ -363,15 +365,17 @@
       @ </td></tr>
       @ <tr><th>Commands:</th>
       @   <td>
       @     <a href="%s(g.zBaseURL)/vdiff/%d(rid)">diff</a>
-      @     | <a href="%s(g.zBaseURL)/zip/%s(zUuid).zip">ZIP archive</a>
+      @     | <a href="%s(g.zBaseURL)/zip/%s(zProjName)-%s(zShortUuid).zip?uuid=%s(zUuid)">
+      @         ZIP archive</a>
       @     | <a href="%s(g.zBaseURL)/artifact/%d(rid)">manifest</a>
       if( g.okWrite ){
         @     | <a href="%s(g.zBaseURL)/vedit?r=%d(rid)">edit</a>
       }
       @   </td>
       @ </tr>
+      free(zShortUuid);
     }
     @ </table></p>
   }else{
     style_header("Baseline Information");
@@ -656,9 +660,9 @@
   int cnt = 0;
   int nWiki = 0;
   db_prepare(&q,
     "SELECT filename.name, datetime(event.mtime), substr(a.uuid,1,10),"
-    "       coalesce(event.comment,event.ecomment),"
+    "       coalesce(event.ecomment,event.comment),"
     "       coalesce(event.euser,event.user),"
     "       b.uuid"
     "  FROM mlink, filename, event, blob a, blob b"
     " WHERE filename.fnid=mlink.fnid"