Fossil SCM

Always puts "{...}" around the action of an if() statement when the action is on a separate line. Add column labels on the output of "--numstat".

drh 2025-03-12 14:56 trunk
Commit 7bcd6626bd709b9b15affc3796d6d8d5c0818cc63c0d179a82cd7f0698270b19
Parent 37327906e7ddbe6…
2 files changed +2 -1 +8 -3
~ src/diff.c ~ src/diffcmd.c
M src/diff.c
+2 -1
--- src/diff.c
+++ src/diff.c
@@ -3175,12 +3175,13 @@
31753175
 }
31763176
 g.diffCnt[1] += nIns;
31773177
 g.diffCnt[2] += nDel;
31783178
 if( nIns+nDel ){
31793179
 g.diffCnt[0]++;
3180
- if( !(pCfg->diffFlags & DIFF_BRIEF) )
3180
+ if( !(pCfg->diffFlags & DIFF_BRIEF) ){
31813181
 blob_appendf(pOut, "%10d %10d", nIns, nDel);
3182
+ }
31823183
 }
31833184
 }else if( pCfg->diffFlags & (DIFF_RAW|DIFF_BY_TOKEN) ){
31843185
 const int *R = c.aEdit;
31853186
 unsigned int r;
31863187
 for(r=0; R[r] || R[r+1] || R[r+2]; r += 3){
31873188
--- src/diff.c
+++ src/diff.c
@@ -3175,12 +3175,13 @@
3175 }
3176 g.diffCnt[1] += nIns;
3177 g.diffCnt[2] += nDel;
3178 if( nIns+nDel ){
3179 g.diffCnt[0]++;
3180 if( !(pCfg->diffFlags & DIFF_BRIEF) )
3181 blob_appendf(pOut, "%10d %10d", nIns, nDel);
 
3182 }
3183 }else if( pCfg->diffFlags & (DIFF_RAW|DIFF_BY_TOKEN) ){
3184 const int *R = c.aEdit;
3185 unsigned int r;
3186 for(r=0; R[r] || R[r+1] || R[r+2]; r += 3){
3187
--- src/diff.c
+++ src/diff.c
@@ -3175,12 +3175,13 @@
3175 }
3176 g.diffCnt[1] += nIns;
3177 g.diffCnt[2] += nDel;
3178 if( nIns+nDel ){
3179 g.diffCnt[0]++;
3180 if( !(pCfg->diffFlags & DIFF_BRIEF) ){
3181 blob_appendf(pOut, "%10d %10d", nIns, nDel);
3182 }
3183 }
3184 }else if( pCfg->diffFlags & (DIFF_RAW|DIFF_BY_TOKEN) ){
3185 const int *R = c.aEdit;
3186 unsigned int r;
3187 for(r=0; R[r] || R[r+1] || R[r+2]; r += 3){
3188
M src/diffcmd.c
+8 -3
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -596,12 +596,13 @@
596596
 }else{
597597
 blob_zero(&out);
598598
 text_diff(pFile1, &file2, &out, pCfg);
599599
 if( blob_size(&out) ){
600600
 if( pCfg->diffFlags & DIFF_NUMSTAT ){
601
- if( !(pCfg->diffFlags & DIFF_BRIEF) )
601
+ if( !(pCfg->diffFlags & DIFF_BRIEF) ){
602602
 blob_appendf(pOut, "%s %s\n", blob_str(&out), zName);
603
+ }
603604
 }else{
604605
 diff_print_filenames(zName, zName2, pCfg, pOut);
605606
 blob_appendf(pOut, "%s\n", blob_str(&out));
606607
 }
607608
 }
@@ -703,12 +704,13 @@
703704
 Blob out; /* Diff output text */
704705
705706
 blob_zero(&out);
706707
 text_diff(pFile1, pFile2, &out, pCfg);
707708
 if( pCfg->diffFlags & DIFF_NUMSTAT ){
708
- if( !(pCfg->diffFlags & DIFF_BRIEF) )
709
+ if( !(pCfg->diffFlags & DIFF_BRIEF) ){
709710
 fossil_print("%s %s\n", blob_str(&out), zName);
711
+ }
710712
 }else{
711713
 diff_print_filenames(zName, zName, pCfg, 0);
712714
 fossil_print("%s\n", blob_str(&out));
713715
 }
714716
@@ -1437,11 +1439,14 @@
14371439
 pFileDir[i-2].nName = blob_size(&fname);
14381440
 pFileDir[i-2].nUsed = 0;
14391441
 blob_reset(&fname);
14401442
 }
14411443
 }
1442
- if ( zCheckin!=0 ){
1444
+ if( DCfg.diffFlags & DIFF_NUMSTAT ){
1445
+ fossil_print("%10s %10s\n", "INSERTED", "DELETED");
1446
+ }
1447
+ if( zCheckin!=0 ){
14431448
 int ridTo = name_to_typed_rid(zCheckin, "ci");
14441449
 zTo = zCheckin;
14451450
 zFrom = db_text(0,
14461451
 "SELECT uuid FROM blob, plink"
14471452
 " WHERE plink.cid=%d AND plink.isprim AND plink.pid=blob.rid",
14481453
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -596,12 +596,13 @@
596 }else{
597 blob_zero(&out);
598 text_diff(pFile1, &file2, &out, pCfg);
599 if( blob_size(&out) ){
600 if( pCfg->diffFlags & DIFF_NUMSTAT ){
601 if( !(pCfg->diffFlags & DIFF_BRIEF) )
602 blob_appendf(pOut, "%s %s\n", blob_str(&out), zName);
 
603 }else{
604 diff_print_filenames(zName, zName2, pCfg, pOut);
605 blob_appendf(pOut, "%s\n", blob_str(&out));
606 }
607 }
@@ -703,12 +704,13 @@
703 Blob out; /* Diff output text */
704
705 blob_zero(&out);
706 text_diff(pFile1, pFile2, &out, pCfg);
707 if( pCfg->diffFlags & DIFF_NUMSTAT ){
708 if( !(pCfg->diffFlags & DIFF_BRIEF) )
709 fossil_print("%s %s\n", blob_str(&out), zName);
 
710 }else{
711 diff_print_filenames(zName, zName, pCfg, 0);
712 fossil_print("%s\n", blob_str(&out));
713 }
714
@@ -1437,11 +1439,14 @@
1437 pFileDir[i-2].nName = blob_size(&fname);
1438 pFileDir[i-2].nUsed = 0;
1439 blob_reset(&fname);
1440 }
1441 }
1442 if ( zCheckin!=0 ){
 
 
 
1443 int ridTo = name_to_typed_rid(zCheckin, "ci");
1444 zTo = zCheckin;
1445 zFrom = db_text(0,
1446 "SELECT uuid FROM blob, plink"
1447 " WHERE plink.cid=%d AND plink.isprim AND plink.pid=blob.rid",
1448
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -596,12 +596,13 @@
596 }else{
597 blob_zero(&out);
598 text_diff(pFile1, &file2, &out, pCfg);
599 if( blob_size(&out) ){
600 if( pCfg->diffFlags & DIFF_NUMSTAT ){
601 if( !(pCfg->diffFlags & DIFF_BRIEF) ){
602 blob_appendf(pOut, "%s %s\n", blob_str(&out), zName);
603 }
604 }else{
605 diff_print_filenames(zName, zName2, pCfg, pOut);
606 blob_appendf(pOut, "%s\n", blob_str(&out));
607 }
608 }
@@ -703,12 +704,13 @@
704 Blob out; /* Diff output text */
705
706 blob_zero(&out);
707 text_diff(pFile1, pFile2, &out, pCfg);
708 if( pCfg->diffFlags & DIFF_NUMSTAT ){
709 if( !(pCfg->diffFlags & DIFF_BRIEF) ){
710 fossil_print("%s %s\n", blob_str(&out), zName);
711 }
712 }else{
713 diff_print_filenames(zName, zName, pCfg, 0);
714 fossil_print("%s\n", blob_str(&out));
715 }
716
@@ -1437,11 +1439,14 @@
1439 pFileDir[i-2].nName = blob_size(&fname);
1440 pFileDir[i-2].nUsed = 0;
1441 blob_reset(&fname);
1442 }
1443 }
1444 if( DCfg.diffFlags & DIFF_NUMSTAT ){
1445 fossil_print("%10s %10s\n", "INSERTED", "DELETED");
1446 }
1447 if( zCheckin!=0 ){
1448 int ridTo = name_to_typed_rid(zCheckin, "ci");
1449 zTo = zCheckin;
1450 zFrom = db_text(0,
1451 "SELECT uuid FROM blob, plink"
1452 " WHERE plink.cid=%d AND plink.isprim AND plink.pid=blob.rid",
1453

Keyboard Shortcuts

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