"Touch" the channel after `pijul diff` if the diff and the prefixes are both empty

pmeunier

Jan 4, 2022, 8:00 AM

RAS4PCNUEODS72Q5LEPVE54AUYWX656ZHTAERRVG2AJ6IHKO4WRAC

Dependencies

• [2] EUZFFJSO Updating Pijul with the latest changes in Libpijul
• [3] EWZ7VHV4 pijul diff: Do not ignore the --untracked option in presence of --short.
• [4] HSEYMLO2 Adding an untracked change iterator
• [5] NWU66ZIP Untracked files when there are no other changes
• [6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [7] I24UEJQL Various post-fire fixes
• [8] I52XSRUH Massive cleanup, and simplification
• [9] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump

Change contents

• replacement in pijul/src/commands/diff.rs at line 106
  [4.175145]→[2.16340:16371](∅→∅),[2.16371]→[4.175145:175171](∅→∅),[4.20353]→[4.175145:175171](∅→∅),[4.175145]→[4.175145:175171](∅→∅)
  − let txn = txn.write();

  − let actions = rec
  [4.175145]

  [4.175171]
  + let mut txn_ = txn.write();

  + let actions: Vec<_> = rec
• replacement in pijul/src/commands/diff.rs at line 110
  [4.175217]→[4.20354:20408](∅→∅)
  − .map(|rec| rec.globalize(&*txn).unwrap())
  [4.175217]

  [4.175261]
  + .map(|rec| rec.globalize(&*txn_).unwrap())
• edit in pijul/src/commands/diff.rs at line 112
  [4.175285]

  [4.20409]
  + let actions_is_empty = actions.is_empty();
• replacement in pijul/src/commands/diff.rs at line 119
  [4.175336]→[4.20588:20607](∅→∅)
  − &*txn,
  [4.175336]

  [4.175354]
  + &*txn_,
• replacement in pijul/src/commands/diff.rs at line 128
  [4.175552]→[4.20631:20679](∅→∅)
  − full_dependencies(&*txn, &channel)?
  [4.175552]

  [4.175598]
  + full_dependencies(&*txn_, &channel)?
• replacement in pijul/src/commands/diff.rs at line 130
  [4.175615]→[2.16403:16477](∅→∅)
  − dependencies(&*txn, &*channel.read(), change.changes.iter())?
  [4.175615]

  [4.175679]
  + dependencies(&*txn_, &*channel.read(), change.changes.iter())?
• replacement in pijul/src/commands/diff.rs at line 228
  [3.79]→[3.79:134](∅→∅)
  − for path in untracked(&repo, &*txn)? {
  [3.79]

  [3.134]
  + for path in untracked(&repo, &*txn_)? {
• replacement in pijul/src/commands/diff.rs at line 233
  [4.2054]→[4.2054:2105](∅→∅)
  − for path in untracked(&repo, &*txn)? {
  [4.2054]

  [4.2105]
  + for path in untracked(&repo, &*txn_)? {
• edit in pijul/src/commands/diff.rs at line 252
  [4.177348]

  [4.177348]
  + if actions_is_empty && self.prefixes.is_empty() {

  + use libpijul::ChannelMutTxnT;

  + txn_.touch_channel(&mut *channel.write(), None);

  + std::mem::drop(txn_);

  + txn.commit()?;

  + }