Fossil SCM
Move line separator into format strings for timeline formatting.
Commit
0eed0f130eb353212f2582024d684799e12f464c857063fd59150fce0b8d5b8d
Parent
e755561d7358fb7…
1 file changed
+2
-5
+2
-5
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -3029,13 +3029,10 @@ | ||
| 3029 | 3029 | } |
| 3030 | 3030 | nLine++; /* record another line */ |
| 3031 | 3031 | } |
| 3032 | 3032 | db_reset(&fchngQuery); |
| 3033 | 3033 | } |
| 3034 | - /* Except for "oneline", separate formatted entries by one empty line */ | |
| 3035 | - if( zFormat && fossil_strcmp(zFormat, "%h %c")!=0 ) | |
| 3036 | - fossil_print("\n"); | |
| 3037 | 3034 | nEntry++; /* record another complete entry */ |
| 3038 | 3035 | } |
| 3039 | 3036 | if( rc==SQLITE_DONE ){ |
| 3040 | 3037 | /* Did the underlying query actually have all entries? */ |
| 3041 | 3038 | if( nAbsLimit==0 ){ |
| @@ -3205,13 +3202,13 @@ | ||
| 3205 | 3202 | zFilePattern = find_option("path","p",1); |
| 3206 | 3203 | zFormat = find_option("format","F",1); |
| 3207 | 3204 | if( find_option("oneline",0,0)!= 0 || fossil_strcmp(zFormat,"oneline")==0 ) |
| 3208 | 3205 | zFormat = "%h %c"; |
| 3209 | 3206 | if( find_option("medium",0,0)!= 0 || fossil_strcmp(zFormat,"medium")==0 ) |
| 3210 | - zFormat = "Commit: %h%nDate: %d%nAuthor: %a%nComment: %c"; | |
| 3207 | + zFormat = "Commit: %h%nDate: %d%nAuthor: %a%nComment: %c%n"; | |
| 3211 | 3208 | if( find_option("full",0,0)!= 0 || fossil_strcmp(zFormat,"full")==0 ) |
| 3212 | - zFormat = "Commit: %H%nDate: %d%nAuthor: %a%nComment: %c%nBranch: %b%nTags: %t%nPhase: %p"; | |
| 3209 | + zFormat = "Commit: %H%nDate: %d%nAuthor: %a%nComment: %c%nBranch: %b%nTags: %t%nPhase: %p%n"; | |
| 3213 | 3210 | showSql = find_option("sql",0,0)!=0; |
| 3214 | 3211 | |
| 3215 | 3212 | if( !zLimit ){ |
| 3216 | 3213 | zLimit = find_option("count",0,1); |
| 3217 | 3214 | } |
| 3218 | 3215 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -3029,13 +3029,10 @@ | |
| 3029 | } |
| 3030 | nLine++; /* record another line */ |
| 3031 | } |
| 3032 | db_reset(&fchngQuery); |
| 3033 | } |
| 3034 | /* Except for "oneline", separate formatted entries by one empty line */ |
| 3035 | if( zFormat && fossil_strcmp(zFormat, "%h %c")!=0 ) |
| 3036 | fossil_print("\n"); |
| 3037 | nEntry++; /* record another complete entry */ |
| 3038 | } |
| 3039 | if( rc==SQLITE_DONE ){ |
| 3040 | /* Did the underlying query actually have all entries? */ |
| 3041 | if( nAbsLimit==0 ){ |
| @@ -3205,13 +3202,13 @@ | |
| 3205 | zFilePattern = find_option("path","p",1); |
| 3206 | zFormat = find_option("format","F",1); |
| 3207 | if( find_option("oneline",0,0)!= 0 || fossil_strcmp(zFormat,"oneline")==0 ) |
| 3208 | zFormat = "%h %c"; |
| 3209 | if( find_option("medium",0,0)!= 0 || fossil_strcmp(zFormat,"medium")==0 ) |
| 3210 | zFormat = "Commit: %h%nDate: %d%nAuthor: %a%nComment: %c"; |
| 3211 | if( find_option("full",0,0)!= 0 || fossil_strcmp(zFormat,"full")==0 ) |
| 3212 | zFormat = "Commit: %H%nDate: %d%nAuthor: %a%nComment: %c%nBranch: %b%nTags: %t%nPhase: %p"; |
| 3213 | showSql = find_option("sql",0,0)!=0; |
| 3214 | |
| 3215 | if( !zLimit ){ |
| 3216 | zLimit = find_option("count",0,1); |
| 3217 | } |
| 3218 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -3029,13 +3029,10 @@ | |
| 3029 | } |
| 3030 | nLine++; /* record another line */ |
| 3031 | } |
| 3032 | db_reset(&fchngQuery); |
| 3033 | } |
| 3034 | nEntry++; /* record another complete entry */ |
| 3035 | } |
| 3036 | if( rc==SQLITE_DONE ){ |
| 3037 | /* Did the underlying query actually have all entries? */ |
| 3038 | if( nAbsLimit==0 ){ |
| @@ -3205,13 +3202,13 @@ | |
| 3202 | zFilePattern = find_option("path","p",1); |
| 3203 | zFormat = find_option("format","F",1); |
| 3204 | if( find_option("oneline",0,0)!= 0 || fossil_strcmp(zFormat,"oneline")==0 ) |
| 3205 | zFormat = "%h %c"; |
| 3206 | if( find_option("medium",0,0)!= 0 || fossil_strcmp(zFormat,"medium")==0 ) |
| 3207 | zFormat = "Commit: %h%nDate: %d%nAuthor: %a%nComment: %c%n"; |
| 3208 | if( find_option("full",0,0)!= 0 || fossil_strcmp(zFormat,"full")==0 ) |
| 3209 | zFormat = "Commit: %H%nDate: %d%nAuthor: %a%nComment: %c%nBranch: %b%nTags: %t%nPhase: %p%n"; |
| 3210 | showSql = find_option("sql",0,0)!=0; |
| 3211 | |
| 3212 | if( !zLimit ){ |
| 3213 | zLimit = find_option("count",0,1); |
| 3214 | } |
| 3215 |