Fixing conflicts

pmeunier

Feb 7, 2024, 5:15 PM

44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC

Dependencies

• [2] DDJO7X2P Remove dependency on `num_cpus`
• [3] IP4CUEBE reset: Require --force to reset unspecified unrecorded changes
• [4] I24UEJQL Various post-fire fixes
• [5] 5OGOE4VW Store the current channel in the pristine
• [6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [7] EUZFFJSO Updating Pijul with the latest changes in Libpijul

Change contents

• edit in pijul/src/commands/reset.rs at line 115
  [4.7839]→[2.704:769](∅→∅),[4.7839]→[2.704:769](∅→∅)
  − std::thread::available_parallelism()?.get(),
• replacement in pijul/src/commands/reset.rs at line 126
  [4.4079]→[3.256:361](∅→∅)
  − if !self.force && has_unrecorded_changes(txn.clone(), channel.clone(), &repo).unwrap() {
  [4.4079]

  [3.361]
  + if !self.force

  + && has_unrecorded_changes(txn.clone(), channel.clone(), &repo).unwrap()

  + {
• replacement in pijul/src/commands/reset.rs at line 280
  [3.474]→[3.474:662](∅→∅)
  − fn has_unrecorded_changes(txn: ArcTxn<MutTxn<()>>,

  − channel: ChannelRef<MutTxn<()>>,

  − repo: &Repository) -> Result<bool, anyhow::Error> {
  [3.474]

  [3.662]
  + fn has_unrecorded_changes(

  + txn: ArcTxn<MutTxn<()>>,

  + channel: ChannelRef<MutTxn<()>>,

  + repo: &Repository,

  + ) -> Result<bool, anyhow::Error> {
• replacement in pijul/src/commands/reset.rs at line 295
  [3.918]→[3.918:943](∅→∅)
  − num_cpus::get(),
  [3.918]

  [3.943]
  + std::thread::available_parallelism()?.get(),