Fixing #798: overwrite check too strict in `pijul apply` when applying a patch adding new files

pmeunier

Apr 27, 2023, 7:14 AM

DFRNZLQ6APMFQUPOPG5BS4RYUBZI32UZVP7T4EKJ7VDGOB3KORCQC

Dependencies

• [2] EUZFFJSO Updating Pijul with the latest changes in Libpijul
• [3] 2D7P2VKJ Change completions (where the whole progress bar story started)
• [4] I24UEJQL Various post-fire fixes
• [5] Y6EVFMTA Don't output files if they aren't in the current channel
• [*] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• replacement in pijul/src/commands/apply.rs at line 129
  [3.3098]→[2.18358:18454](∅→∅)
  − libpijul::fs::find_path(&repo.changes, &*txn_, &*channel.read(), false, i)?
  [3.3098]

  [3.3193]
  + libpijul::fs::find_path(&repo.changes, &*txn_, &*forked.read(), false, i)?
• replacement in pijul/src/commands/apply.rs at line 131
  [3.3211]→[3.3211:3351](∅→∅)
  − touched_files.push(path)

  − } else {

  − touched_files.clear();

  − break;
  [3.3211]

  [3.3351]
  + if !path.is_empty() {

  + touched_files.push(path);

  + continue

  + }
• edit in pijul/src/commands/apply.rs at line 136
  [3.3369]

  [3.3369]
  + touched_files.clear();

  + break;
• edit in pijul/src/commands/apply.rs at line 139
  [3.3383]

  [3.23876]
  + debug!("touched files {:?}", touched_files);