Fossil SCM
For 'timeline --verbose' with some formatting options, display the list of changed files closer to the check-in info block.
Commit
7e63c86e6b4804401571bfd77ff0d45f85da0484a5b2e76c57568f1e7d131404
Parent
593e801bdfaba3b…
1 file changed
+7
-2
+7
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -3116,10 +3116,15 @@ | ||
| 3116 | 3116 | fossil_print(" EDITED %s\n", zFilename); |
| 3117 | 3117 | } |
| 3118 | 3118 | nLine++; /* record another line */ |
| 3119 | 3119 | } |
| 3120 | 3120 | db_reset(&fchngQuery); |
| 3121 | + } | |
| 3122 | + /* With special formatting (except for "oneline") and --verbose, | |
| 3123 | + ** print a newline after the file listing */ | |
| 3124 | + if( zFormat!=0 && (fossil_strcmp(zFormat, "%h %c")!=0) ){ | |
| 3125 | + fossil_print("\n"); | |
| 3121 | 3126 | } |
| 3122 | 3127 | nEntry++; /* record another complete entry */ |
| 3123 | 3128 | } |
| 3124 | 3129 | if( rc==SQLITE_DONE ){ |
| 3125 | 3130 | /* Did the underlying query actually have all entries? */ |
| @@ -3304,14 +3309,14 @@ | ||
| 3304 | 3309 | } |
| 3305 | 3310 | } |
| 3306 | 3311 | if( find_option("oneline",0,0)!= 0 || fossil_strcmp(zFormat,"oneline")==0 ) |
| 3307 | 3312 | zFormat = "%h %c"; |
| 3308 | 3313 | if( find_option("medium",0,0)!= 0 || fossil_strcmp(zFormat,"medium")==0 ) |
| 3309 | - zFormat = "Commit: %h%nDate: %d%nAuthor: %a%nComment: %c%n"; | |
| 3314 | + zFormat = "Commit: %h%nDate: %d%nAuthor: %a%nComment: %c"; | |
| 3310 | 3315 | if( find_option("full",0,0)!= 0 || fossil_strcmp(zFormat,"full")==0 ) |
| 3311 | 3316 | zFormat = "Commit: %H%nDate: %d%nAuthor: %a%nComment: %c%n" |
| 3312 | - "Branch: %b%nTags: %t%nPhase: %p%n"; | |
| 3317 | + "Branch: %b%nTags: %t%nPhase: %p"; | |
| 3313 | 3318 | showSql = find_option("sql",0,0)!=0; |
| 3314 | 3319 | |
| 3315 | 3320 | if( !zLimit ){ |
| 3316 | 3321 | zLimit = find_option("count",0,1); |
| 3317 | 3322 | } |
| 3318 | 3323 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -3116,10 +3116,15 @@ | |
| 3116 | fossil_print(" EDITED %s\n", zFilename); |
| 3117 | } |
| 3118 | nLine++; /* record another line */ |
| 3119 | } |
| 3120 | db_reset(&fchngQuery); |
| 3121 | } |
| 3122 | nEntry++; /* record another complete entry */ |
| 3123 | } |
| 3124 | if( rc==SQLITE_DONE ){ |
| 3125 | /* Did the underlying query actually have all entries? */ |
| @@ -3304,14 +3309,14 @@ | |
| 3304 | } |
| 3305 | } |
| 3306 | if( find_option("oneline",0,0)!= 0 || fossil_strcmp(zFormat,"oneline")==0 ) |
| 3307 | zFormat = "%h %c"; |
| 3308 | if( find_option("medium",0,0)!= 0 || fossil_strcmp(zFormat,"medium")==0 ) |
| 3309 | zFormat = "Commit: %h%nDate: %d%nAuthor: %a%nComment: %c%n"; |
| 3310 | if( find_option("full",0,0)!= 0 || fossil_strcmp(zFormat,"full")==0 ) |
| 3311 | zFormat = "Commit: %H%nDate: %d%nAuthor: %a%nComment: %c%n" |
| 3312 | "Branch: %b%nTags: %t%nPhase: %p%n"; |
| 3313 | showSql = find_option("sql",0,0)!=0; |
| 3314 | |
| 3315 | if( !zLimit ){ |
| 3316 | zLimit = find_option("count",0,1); |
| 3317 | } |
| 3318 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -3116,10 +3116,15 @@ | |
| 3116 | fossil_print(" EDITED %s\n", zFilename); |
| 3117 | } |
| 3118 | nLine++; /* record another line */ |
| 3119 | } |
| 3120 | db_reset(&fchngQuery); |
| 3121 | } |
| 3122 | /* With special formatting (except for "oneline") and --verbose, |
| 3123 | ** print a newline after the file listing */ |
| 3124 | if( zFormat!=0 && (fossil_strcmp(zFormat, "%h %c")!=0) ){ |
| 3125 | fossil_print("\n"); |
| 3126 | } |
| 3127 | nEntry++; /* record another complete entry */ |
| 3128 | } |
| 3129 | if( rc==SQLITE_DONE ){ |
| 3130 | /* Did the underlying query actually have all entries? */ |
| @@ -3304,14 +3309,14 @@ | |
| 3309 | } |
| 3310 | } |
| 3311 | if( find_option("oneline",0,0)!= 0 || fossil_strcmp(zFormat,"oneline")==0 ) |
| 3312 | zFormat = "%h %c"; |
| 3313 | if( find_option("medium",0,0)!= 0 || fossil_strcmp(zFormat,"medium")==0 ) |
| 3314 | zFormat = "Commit: %h%nDate: %d%nAuthor: %a%nComment: %c"; |
| 3315 | if( find_option("full",0,0)!= 0 || fossil_strcmp(zFormat,"full")==0 ) |
| 3316 | zFormat = "Commit: %H%nDate: %d%nAuthor: %a%nComment: %c%n" |
| 3317 | "Branch: %b%nTags: %t%nPhase: %p"; |
| 3318 | showSql = find_option("sql",0,0)!=0; |
| 3319 | |
| 3320 | if( !zLimit ){ |
| 3321 | zLimit = find_option("count",0,1); |
| 3322 | } |
| 3323 |