Fossil SCM

Merge stripping end-of-line change from "roy-export" branch

jan.nijtmans 2017-02-22 09:49 UTC jn-export merge
Commit bd65092f33dac9abea0efd9df78072ceda7a8868
Parent cb1fb96f0d9dfe9…
2 files changed +5 -6 +5 -6
~ src/import.c ~ src/import.c
M src/import.c
+5 -6
--- src/import.c
+++ src/import.c
@@ -221,11 +221,11 @@
221221
 blob_appendf(&record, "T +sym-%F%F%F %s", gimport.zTagPre, gg.zTag,
222222
 gimport.zTagSuf, gg.zFrom);
223223
 if( gg.zComment ){
224224
 blob_appendf(&record, " %F", gg.zComment);
225225
 }
226
- blob_appendf(&record, "U %F\n", gg.zUser);
226
+ blob_appendf(&record, "\nU %F\n", gg.zUser);
227227
 md5sum_blob(&record, &cksum);
228228
 blob_appendf(&record, "Z %b\n", &cksum);
229229
 fast_insert_content(&record, 0, 0, 1);
230230
 blob_reset(&cksum);
231231
 }
@@ -608,17 +608,16 @@
608608
 gg.aData = fossil_malloc( gg.nData+1 );
609609
 got = fread(gg.aData, 1, gg.nData, pIn);
610610
 if( got!=gg.nData ){
611611
 fossil_fatal("short read: got %d of %d bytes", got, gg.nData);
612612
 }
613
- /* Strip trailing newline, it's appended to the comment. */
614
- if( gg.aData[got-1] == '\n' )
615
- gg.aData[got-1] = '\0';
616
- else
617
- gg.aData[got] = '\0';
613
+ gg.aData[got] = '\0';
618614
 if( gg.zComment==0 &&
619615
 (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){
616
+ /* Strip trailing newline, it's appended to the comment. */
617
+ if( gg.aData[got-1] == '\n' )
618
+ gg.aData[got-1] = '\0';
620619
 gg.zComment = gg.aData;
621620
 gg.aData = 0;
622621
 gg.nData = 0;
623622
 }
624623
 }
625624
--- src/import.c
+++ src/import.c
@@ -221,11 +221,11 @@
221 blob_appendf(&record, "T +sym-%F%F%F %s", gimport.zTagPre, gg.zTag,
222 gimport.zTagSuf, gg.zFrom);
223 if( gg.zComment ){
224 blob_appendf(&record, " %F", gg.zComment);
225 }
226 blob_appendf(&record, "U %F\n", gg.zUser);
227 md5sum_blob(&record, &cksum);
228 blob_appendf(&record, "Z %b\n", &cksum);
229 fast_insert_content(&record, 0, 0, 1);
230 blob_reset(&cksum);
231 }
@@ -608,17 +608,16 @@
608 gg.aData = fossil_malloc( gg.nData+1 );
609 got = fread(gg.aData, 1, gg.nData, pIn);
610 if( got!=gg.nData ){
611 fossil_fatal("short read: got %d of %d bytes", got, gg.nData);
612 }
613 /* Strip trailing newline, it's appended to the comment. */
614 if( gg.aData[got-1] == '\n' )
615 gg.aData[got-1] = '\0';
616 else
617 gg.aData[got] = '\0';
618 if( gg.zComment==0 &&
619 (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){
 
 
 
620 gg.zComment = gg.aData;
621 gg.aData = 0;
622 gg.nData = 0;
623 }
624 }
625
--- src/import.c
+++ src/import.c
@@ -221,11 +221,11 @@
221 blob_appendf(&record, "T +sym-%F%F%F %s", gimport.zTagPre, gg.zTag,
222 gimport.zTagSuf, gg.zFrom);
223 if( gg.zComment ){
224 blob_appendf(&record, " %F", gg.zComment);
225 }
226 blob_appendf(&record, "\nU %F\n", gg.zUser);
227 md5sum_blob(&record, &cksum);
228 blob_appendf(&record, "Z %b\n", &cksum);
229 fast_insert_content(&record, 0, 0, 1);
230 blob_reset(&cksum);
231 }
@@ -608,17 +608,16 @@
608 gg.aData = fossil_malloc( gg.nData+1 );
609 got = fread(gg.aData, 1, gg.nData, pIn);
610 if( got!=gg.nData ){
611 fossil_fatal("short read: got %d of %d bytes", got, gg.nData);
612 }
613 gg.aData[got] = '\0';
 
 
 
 
614 if( gg.zComment==0 &&
615 (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){
616 /* Strip trailing newline, it's appended to the comment. */
617 if( gg.aData[got-1] == '\n' )
618 gg.aData[got-1] = '\0';
619 gg.zComment = gg.aData;
620 gg.aData = 0;
621 gg.nData = 0;
622 }
623 }
624
M src/import.c
+5 -6
--- src/import.c
+++ src/import.c
@@ -221,11 +221,11 @@
221221
 blob_appendf(&record, "T +sym-%F%F%F %s", gimport.zTagPre, gg.zTag,
222222
 gimport.zTagSuf, gg.zFrom);
223223
 if( gg.zComment ){
224224
 blob_appendf(&record, " %F", gg.zComment);
225225
 }
226
- blob_appendf(&record, "U %F\n", gg.zUser);
226
+ blob_appendf(&record, "\nU %F\n", gg.zUser);
227227
 md5sum_blob(&record, &cksum);
228228
 blob_appendf(&record, "Z %b\n", &cksum);
229229
 fast_insert_content(&record, 0, 0, 1);
230230
 blob_reset(&cksum);
231231
 }
@@ -608,17 +608,16 @@
608608
 gg.aData = fossil_malloc( gg.nData+1 );
609609
 got = fread(gg.aData, 1, gg.nData, pIn);
610610
 if( got!=gg.nData ){
611611
 fossil_fatal("short read: got %d of %d bytes", got, gg.nData);
612612
 }
613
- /* Strip trailing newline, it's appended to the comment. */
614
- if( gg.aData[got-1] == '\n' )
615
- gg.aData[got-1] = '\0';
616
- else
617
- gg.aData[got] = '\0';
613
+ gg.aData[got] = '\0';
618614
 if( gg.zComment==0 &&
619615
 (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){
616
+ /* Strip trailing newline, it's appended to the comment. */
617
+ if( gg.aData[got-1] == '\n' )
618
+ gg.aData[got-1] = '\0';
620619
 gg.zComment = gg.aData;
621620
 gg.aData = 0;
622621
 gg.nData = 0;
623622
 }
624623
 }
625624
--- src/import.c
+++ src/import.c
@@ -221,11 +221,11 @@
221 blob_appendf(&record, "T +sym-%F%F%F %s", gimport.zTagPre, gg.zTag,
222 gimport.zTagSuf, gg.zFrom);
223 if( gg.zComment ){
224 blob_appendf(&record, " %F", gg.zComment);
225 }
226 blob_appendf(&record, "U %F\n", gg.zUser);
227 md5sum_blob(&record, &cksum);
228 blob_appendf(&record, "Z %b\n", &cksum);
229 fast_insert_content(&record, 0, 0, 1);
230 blob_reset(&cksum);
231 }
@@ -608,17 +608,16 @@
608 gg.aData = fossil_malloc( gg.nData+1 );
609 got = fread(gg.aData, 1, gg.nData, pIn);
610 if( got!=gg.nData ){
611 fossil_fatal("short read: got %d of %d bytes", got, gg.nData);
612 }
613 /* Strip trailing newline, it's appended to the comment. */
614 if( gg.aData[got-1] == '\n' )
615 gg.aData[got-1] = '\0';
616 else
617 gg.aData[got] = '\0';
618 if( gg.zComment==0 &&
619 (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){
 
 
 
620 gg.zComment = gg.aData;
621 gg.aData = 0;
622 gg.nData = 0;
623 }
624 }
625
--- src/import.c
+++ src/import.c
@@ -221,11 +221,11 @@
221 blob_appendf(&record, "T +sym-%F%F%F %s", gimport.zTagPre, gg.zTag,
222 gimport.zTagSuf, gg.zFrom);
223 if( gg.zComment ){
224 blob_appendf(&record, " %F", gg.zComment);
225 }
226 blob_appendf(&record, "\nU %F\n", gg.zUser);
227 md5sum_blob(&record, &cksum);
228 blob_appendf(&record, "Z %b\n", &cksum);
229 fast_insert_content(&record, 0, 0, 1);
230 blob_reset(&cksum);
231 }
@@ -608,17 +608,16 @@
608 gg.aData = fossil_malloc( gg.nData+1 );
609 got = fread(gg.aData, 1, gg.nData, pIn);
610 if( got!=gg.nData ){
611 fossil_fatal("short read: got %d of %d bytes", got, gg.nData);
612 }
613 gg.aData[got] = '\0';
 
 
 
 
614 if( gg.zComment==0 &&
615 (gg.xFinish==finish_commit || gg.xFinish==finish_tag) ){
616 /* Strip trailing newline, it's appended to the comment. */
617 if( gg.aData[got-1] == '\n' )
618 gg.aData[got-1] = '\0';
619 gg.zComment = gg.aData;
620 gg.aData = 0;
621 gg.nData = 0;
622 }
623 }
624

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button