Fossil SCM

Fix incorrect xReplace method in the --tcl formatter.

drh 2021-09-04 16:22 diff-color-enhancements
Commit 2e583d2a2ca36c15ab996cf10b00152bdd36e7dc3960a287d3177a9a032a340c
1 file changed +1 -1
+1 -1
--- src/diff.c
+++ src/diff.c
@@ -1216,11 +1216,11 @@
12161216
blob_append(p->pOut, "DEL ", -1);
12171217
blob_append_tcl_literal(p->pOut, pLine->z, pLine->n);
12181218
blob_append_char(p->pOut, '\n');
12191219
}
12201220
static void dftclReplace(DiffBuilder *p, const DLine *pX, const DLine *pY){
1221
- blob_append(p->pOut, "EDIT ", -1);
1221
+ blob_append(p->pOut, "EDIT \"\" ", -1);
12221222
blob_append_tcl_literal(p->pOut, pX->z, pX->n);
12231223
blob_append_char(p->pOut, ' ');
12241224
blob_append_tcl_literal(p->pOut, pY->z, pY->n);
12251225
blob_append_char(p->pOut, '\n');
12261226
}
12271227
--- src/diff.c
+++ src/diff.c
@@ -1216,11 +1216,11 @@
1216 blob_append(p->pOut, "DEL ", -1);
1217 blob_append_tcl_literal(p->pOut, pLine->z, pLine->n);
1218 blob_append_char(p->pOut, '\n');
1219 }
1220 static void dftclReplace(DiffBuilder *p, const DLine *pX, const DLine *pY){
1221 blob_append(p->pOut, "EDIT ", -1);
1222 blob_append_tcl_literal(p->pOut, pX->z, pX->n);
1223 blob_append_char(p->pOut, ' ');
1224 blob_append_tcl_literal(p->pOut, pY->z, pY->n);
1225 blob_append_char(p->pOut, '\n');
1226 }
1227
--- src/diff.c
+++ src/diff.c
@@ -1216,11 +1216,11 @@
1216 blob_append(p->pOut, "DEL ", -1);
1217 blob_append_tcl_literal(p->pOut, pLine->z, pLine->n);
1218 blob_append_char(p->pOut, '\n');
1219 }
1220 static void dftclReplace(DiffBuilder *p, const DLine *pX, const DLine *pY){
1221 blob_append(p->pOut, "EDIT \"\" ", -1);
1222 blob_append_tcl_literal(p->pOut, pX->z, pX->n);
1223 blob_append_char(p->pOut, ' ');
1224 blob_append_tcl_literal(p->pOut, pY->z, pY->n);
1225 blob_append_char(p->pOut, '\n');
1226 }
1227

Keyboard Shortcuts

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