Diff
Not logged in

Differences From:

File src/timeline.c part of check-in [9a76119307] - Fix a C++-ism in the timeline module. by drh on 2007-09-10 00:48:55. Also file src/timeline.c part of check-in [bbcb6326c9] - Pulled in the navbar and timeline changes. by aku on 2007-09-17 00:58:51. [view]

To:

File src/timeline.c part of check-in [fcabd4774c] - Improvements to the CLI timeline display. When an update fails due to multiple descendents, show all of the descendents in timeline format. by drh on 2007-09-13 03:52:04. Also file src/timeline.c part of check-in [f76192b245] - Pulled the latest CLI, website, and sqlite changes into the importer branch. by aku on 2007-09-17 01:00:32. [view]

@@ -377,9 +377,9 @@
       memcpy(zPrevDate, zDate, 10);
       nLine++;
     }
     if( zCom==0 ) zCom = "";
-    printf("%.5s [%.10s] ", &zDate[11], zUuid);
+    printf("%.8s ", &zDate[11]);
     if( nChild>1 || nParent>1 ){
       int n = 0;
       char zPrefix[50];
       if( nParent>1 ){
@@ -389,11 +389,13 @@
       if( nChild>1 ){
         sqlite3_snprintf(sizeof(zPrefix)-n, &zPrefix[n], "*FORK* ");
         n = strlen(zPrefix);
       }
-      zCom = zFree = sqlite3_mprintf("%s%s", zPrefix, zCom);
+      zFree = sqlite3_mprintf("[%.10s] %s%s", zUuid, zPrefix, zCom);
+    }else{
+      zFree = sqlite3_mprintf("[%.10s] %s", zUuid, zCom);
     }
-    nLine += comment_print(zCom, 19, 79);
+    nLine += comment_print(zFree, 9, 79);
     sqlite3_free(zFree);
   }
 }