Fossil

Diff
Login

Diff

Differences From Artifact [8f8dafbd7b]:

To Artifact [b6fefdda62]:


211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
211
212
213
214
215
216
217

218
219
220
221
222
223
224







-







      }
      blob_reset(&out);
    }

    /* Release memory resources */
    blob_reset(&file2);
  }else{
    int cnt = 0;
    Blob nameFile1;    /* Name of temporary file to old pFile1 content */
    Blob cmd;          /* Text of command to run */

    if( !fIncludeBinary ){
      Blob file2;
      if( isBin1 ){
        fossil_print("%s",DIFF_CANNOT_COMPUTE_BINARY);
244
245
246
247
248
249
250
251

252
253
254
255
256
257
258
259
260
261
262
243
244
245
246
247
248
249

250




251
252
253
254
255
256
257







-
+
-
-
-
-







        return;
      }
      blob_reset(&file2);
    }

    /* Construct a temporary file to hold pFile1 based on the name of
    ** zFile2 */
    blob_zero(&nameFile1);
    file_tempname(&nameFile1, zFile2);
    do{
      blob_reset(&nameFile1);
      blob_appendf(&nameFile1, "%s~%d", zFile2, cnt++);
    }while( file_access(blob_str(&nameFile1),F_OK)==0 );
    blob_write_to_file(pFile1, blob_str(&nameFile1));

    /* Construct the external diff command */
    blob_zero(&cmd);
    blob_append(&cmd, zDiffCmd, -1);
    if( fSwapDiff ){
      blob_append_escaped_arg(&cmd, zFile2);