Fossil

Check-in [f9761abb6a]
Login

Check-in [f9761abb6a]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Minor fix to adapt the `append_diff_javascript()' function and its call points to the new diff logic (already partially done with check-in [1347a1ddb9]).
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: f9761abb6aeb92870dc6e1a2489101c922ced01dab55a06d4d833d6c1ed99d4f
User & Date: florian 2021-09-07 10:42:00.000
Context
2021-09-07
11:40
Bring back the diff command option `-N|--new-file' as an alias for `-v|--verbose' for script compatibility. ... (check-in: 4ef3ba374c user: florian tags: trunk)
10:42
Minor fix to adapt the `append_diff_javascript()' function and its call points to the new diff logic (already partially done with check-in [1347a1ddb9]). ... (check-in: f9761abb6a user: florian tags: trunk)
00:18
Move more diff parameters into the DiffConfig object. ... (check-in: 346de5d122 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/info.c.
︙︙
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450

  }
  @ </p>
}

/*
** Generate javascript to enhance HTML diffs.
*/
void append_diff_javascript(int sideBySide){
  if( !sideBySide ) return;
  builtin_request_js("diff.js");
}

/*
** Construct an appropriate diffFlag for text_diff() based on query
** parameters and the to boolean arguments.
*/








|
|








435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450

  }
  @ </p>
}

/*
** Generate javascript to enhance HTML diffs.
*/
void append_diff_javascript(int diffType){
  if( diffType==0 ) return;
  builtin_request_js("diff.js");
}

/*
** Construct an appropriate diffFlag for text_diff() based on query
** parameters and the to boolean arguments.
*/
︙︙
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356

      }
      pFileFrom = manifest_file_next(pFrom, 0);
      pFileTo = manifest_file_next(pTo, 0);
    }
  }
  manifest_destroy(pFrom);
  manifest_destroy(pTo);
  append_diff_javascript(diffType==2);
  builtin_fossil_js_bundle_or("info-diff",NULL);
  style_finish_page();
}

#if INTERFACE
/*
** Possible return values from object_description()








|








1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356

      }
      pFileFrom = manifest_file_next(pFrom, 0);
      pFileTo = manifest_file_next(pTo, 0);
    }
  }
  manifest_destroy(pFrom);
  manifest_destroy(pTo);
  append_diff_javascript(diffType);
  builtin_fossil_js_bundle_or("info-diff",NULL);
  style_finish_page();
}

#if INTERFACE
/*
** Possible return values from object_description()
︙︙