Check-in [72f05d4c41]
Not logged in

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

Overview
Comment:fix 'f-delta -a' cli option clobbering so that the delta in arg1 actually gets applied to the file in arg2 and the result written to stdout rather than outputting the delta between arg1 and arg2 as we do when no option is passed to 'f-delta'
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 72f05d4c41e735ba67b37a71664d2b1a2cbe6e87
User & Date: mark 2023-11-23 13:07:37
Context
2023-12-08
09:35
Upstream tweak a45c7f0a560a90541967f790c4b5 to adjust diff output slightly. check-in: 9313a01a00 user: stephan tags: trunk
2023-11-23
13:07
fix 'f-delta -a' cli option clobbering so that the delta in arg1 actually gets applied to the file in arg2 and the result written to stdout rather than outputting the delta between arg1 and arg2 as we do when no option is passed to 'f-delta' check-in: 72f05d4c41 user: mark tags: trunk
12:49
fix rejection of zero-length deltas to make delta creation and application consistent with fossil(1) check-in: cd5b50685b user: mark tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to f-apps/f-delta.c.

︙︙
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63

  "Creates or applies fossil-format deltas.",
  "file1 file2\nOR\n--apply delta-file source-file",
  fcli_local_help
  };
  rc = fcli_setup_v2(argc, argv, FCliFlags, &FCliHelp);
  if(rc) goto end;

  doApply = fcli_flag2("a", "apply", NULL);
  if(fcli_has_unused_flags(0)) goto end;
  f1 = fcli_next_arg(1);
  f2 = fcli_next_arg(1);
  if(!f2){
    rc = fcli_err_set(FSL_RC_MISUSE,
                      "Invalid arguments. Try --help.");
    goto end;








<








49
50
51
52
53
54
55

56
57
58
59
60
61
62

  "Creates or applies fossil-format deltas.",
  "file1 file2\nOR\n--apply delta-file source-file",
  fcli_local_help
  };
  rc = fcli_setup_v2(argc, argv, FCliFlags, &FCliHelp);
  if(rc) goto end;


  if(fcli_has_unused_flags(0)) goto end;
  f1 = fcli_next_arg(1);
  f2 = fcli_next_arg(1);
  if(!f2){
    rc = fcli_err_set(FSL_RC_MISUSE,
                      "Invalid arguments. Try --help.");
    goto end;
︙︙