Avoid printing multiple names conflicts more than once

pmeunier

Dec 6, 2021, 11:40 AM

HBUMCAFVS4W5FHWNZR7ITJFEEUCVZ4Q2U4KGWYN7XZGDZ75JMFTQC

Dependencies

• [2] LPM4PBYJ More precise API for working copy in record and output
• [3] RMDMAYRX Adding a root inode (aka supporting submodules)
• [4] I24UEJQL Various post-fire fixes
• [5] XA23FMQM Reset only files that have been modified
• [6] VO5OQW4W Removing anyhow in libpijul
• [7] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
• [8] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [9] 2RXOCWUW Making libpijul deterministic (and getting rid of `rand`)
• [10] FXEDPLRI Resurrecting tests, and type cleanup (no need for Arc<RwLock<…>> anymore)

Change contents

• replacement in libpijul/src/output/output.rs at line 13
  [3.73463]→[3.672295:672334](∅→∅),[3.672295]→[3.672295:672334](∅→∅)
  − use std::collections::hash_map::Entry;
  [3.73463]

  [3.101615]
  + use std::collections::{hash_map::Entry, BTreeSet};
• replacement in libpijul/src/output/output.rs at line 17
  [3.672484]→[3.101636:101668](∅→∅)
  − #[derive(Debug, PartialEq, Eq)]
  [3.672484]

  [3.672501]
  + #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
• replacement in libpijul/src/output/output.rs at line 62
  [3.3573]→[3.73759:73834](∅→∅),[3.73759]→[3.73759:73834](∅→∅)
  − ) -> Result<Vec<Conflict>, OutputError<P::Error, T::GraphError, R::Error>>
  [3.3573]

  [3.73834]
  + ) -> Result<BTreeSet<Conflict>, OutputError<P::Error, T::GraphError, R::Error>>
• replacement in libpijul/src/output/output.rs at line 151
  [3.3604]→[3.75806:75880](∅→∅),[3.75806]→[3.75806:75880](∅→∅)
  − ) -> Result<Vec<Conflict>, OutputError<P::Error, T::TreeError, R::Error>>
  [3.3604]

  [3.75880]
  + ) -> Result<BTreeSet<Conflict>, OutputError<P::Error, T::TreeError, R::Error>>
• replacement in libpijul/src/output/output.rs at line 173
  [3.13191]→[3.13191:13222](∅→∅)
  − conflicts: Vec::new(),
  [3.13191]

  [3.13222]
  + conflicts: BTreeSet::new(),
• replacement in libpijul/src/output/output.rs at line 218
  [3.13998]→[3.13998:14062](∅→∅)
  − state.conflicts.extend(t.join().unwrap()?.into_iter());
  [3.13998]

  [3.14062]
  + for x in t.join().unwrap()?.into_iter() {

  + state.conflicts.insert(x);

  + }
• replacement in libpijul/src/output/output.rs at line 222
  [3.14068]→[3.14068:14112](∅→∅)
  − state.conflicts.extend(o?.into_iter());
  [3.14068]

  [3.14112]
  + for x in o?.into_iter() {

  + state.conflicts.insert(x);

  + }
• replacement in libpijul/src/output/output.rs at line 253
  [3.14945]→[3.14945:14975](∅→∅)
  − conflicts: Vec<Conflict>,
  [3.14945]

  [2.492]
  + conflicts: BTreeSet<Conflict>,
• replacement in libpijul/src/output/output.rs at line 314
  [3.16985]→[3.16985:17051](∅→∅)
  − self.conflicts.push(Conflict::MultipleNames {
  [3.16985]

  [3.17051]
  + self.conflicts.insert(Conflict::MultipleNames {
• replacement in libpijul/src/output/output.rs at line 330
  [3.17597]→[3.17597:17673](∅→∅)
  − self.conflicts.push(Conflict::Name { path: name.clone() });
  [3.17597]

  [3.17673]
  + self.conflicts.insert(Conflict::Name { path: name.clone() });
• replacement in libpijul/src/output/output.rs at line 334
  [3.17780]→[3.17780:17833](∅→∅)
  − self.conflicts.push(Conflict::Name {
  [3.17780]

  [3.17833]
  + self.conflicts.insert(Conflict::Name {
• replacement in libpijul/src/output/output.rs at line 439
  [3.21305]→[3.21305:21364](∅→∅)
  − self.conflicts.push(Conflict::ZombieFile {
  [3.21305]

  [3.21364]
  + self.conflicts.insert(Conflict::ZombieFile {
• replacement in libpijul/src/output/output.rs at line 441
  [3.21408]→[3.21408:21427](∅→∅)
  − })
  [3.21408]

  [3.679059]
  + });