Removing the `--tag` option to push and pull

pmeunier

Jan 7, 2022, 6:44 PM

FKUPWOP77RXI4UFSUYFN25ZOEAOK5MFC2ZBJJZXHQ7AEQSL5RSMQC

Dependencies

• [2] TCFJMFFE Using state_from_prefix and hash_from_prefix on remotes to complete (or find) hashes and states
• [3] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [4] AEPEFS7O Write help for each argument
• [5] VO5OQW4W Removing anyhow in libpijul
• [6] YD7QFAD7 Simplifying pijul::remote::PushDelta
• [7] 6ZPDI7QG pull uses None as the base case path when outputing repo
• [8] 5HF7C67M push/pull: fixed "changes" arguments
• [9] EUZFFJSO Updating Pijul with the latest changes in Libpijul
• [10] 3OW3YNZX Dependencies completion in push and pull, updated after stabilisation of remote caches
• [11] 4H2XTVJ2 Fix some mistakes in the docs
• [12] 5MRZLKBH Changing the type of the tags db, to make it identical to remote tags
• [13] Y6EVFMTA Don't output files if they aren't in the current channel
• [14] DO2Y5TY5 Tag synchronisation
• [15] IVLLXQ5Z Improved push/pull reporting
• [16] ILZ44DEY simplify outputting with no touched paths

Change contents

• edit in pijul/src/remote/mod.rs at line 603
  [2.23]→[3.10406:10428](∅→∅),[3.11077]→[3.10406:10428](∅→∅)
  − is_tag: bool,
• replacement in pijul/src/remote/mod.rs at line 698
  [2.57]→[2.57:254](∅→∅),[2.254]→[2.254:376](∅→∅)
  − if is_tag {

  − Ok(CS::State(

  − txn.state_from_prefix(&remote_ref.lock().states, h)?.0,

  − ))

  − } else {

  − Ok(CS::Change(txn.hash_from_prefix_remote(&remote_ref, h)?))
  [2.57]

  [2.376]
  + {

  + if let Ok(t) = txn.state_from_prefix(&remote_ref.lock().states, h) {

  + return Ok(CS::State(t.0));

  + }
• edit in pijul/src/remote/mod.rs at line 703
  [2.402]

  [3.12735]
  + Ok(CS::Change(txn.hash_from_prefix_remote(&remote_ref, h)?))
• replacement in pijul/src/remote/mod.rs at line 705
  [3.12764]→[2.403:605](∅→∅)
  − if is_tag {

  − Ok(CS::State(

  − txn.state_from_prefix(&current_channel.read().states, h)?.0,

  − ))
  [3.12764]

  [2.605]
  + if let Ok(t) = txn.state_from_prefix(&current_channel.read().states, h) {

  + Ok(CS::State(t.0))
• edit in pijul/src/commands/pushpull.rs at line 94
  [3.113523]→[3.27022:27112](∅→∅)
  − /// Push tags instead of regular changes.

  − #[clap(long = "tag")]

  − is_tag: bool,
• edit in pijul/src/commands/pushpull.rs at line 150
  [3.19337]→[3.27204:27226](∅→∅)
  − is_tag: bool,
• edit in pijul/src/commands/pushpull.rs at line 160
  [2.759]→[3.27227:27251](∅→∅),[3.19645]→[3.27227:27251](∅→∅)
  − is_tag,
• replacement in pijul/src/commands/pushpull.rs at line 230
  [3.20360]→[3.27252:27436](∅→∅)
  − .to_upload(

  − &mut *txn.write(),

  − &mut channel,

  − &repo,

  − &mut remote,

  − self.is_tag,

  − )
  [3.20360]

  [3.7019]
  + .to_upload(&mut *txn.write(), &mut channel, &repo, &mut remote)
• edit in pijul/src/commands/pushpull.rs at line 334
  [3.20987]→[3.28421:28443](∅→∅)
  − is_tag: bool,
• edit in pijul/src/commands/pushpull.rs at line 349
  [2.782]→[3.28444:28468](∅→∅),[3.21407]→[3.28444:28468](∅→∅)
  − is_tag,
• replacement in pijul/src/commands/pushpull.rs at line 415
  [3.22017]→[3.28469:28659](∅→∅)
  − .to_download(

  − &mut *txn.write(),

  − &mut channel,

  − &mut repo,

  − &mut remote,

  − self.is_tag,

  − )
  [3.22017]

  [3.9431]
  + .to_download(&mut *txn.write(), &mut channel, &mut repo, &mut remote)
• replacement in pijul/src/commands/pushpull.rs at line 535
  [3.1301]→[3.30456:30514](∅→∅)
  − if touched_paths.is_empty() && !self.is_tag {
  [3.1301]

  [3.42]
  + if touched_paths.is_empty() {
• replacement in libpijul/src/change.rs at line 1528
  [3.873911]→[2.1058:1223](∅→∅)
  − let mut r = std::fs::File::open(file).map_err(|err| if let Some(h) = hash {

  − ChangeError::IoHash {

  − err,

  − hash: *h,
  [3.873911]

  [2.1223]
  + let mut r = std::fs::File::open(file).map_err(|err| {

  + if let Some(h) = hash {

  + ChangeError::IoHash { err, hash: *h }

  + } else {

  + ChangeError::Io(err)
• edit in libpijul/src/change.rs at line 1534
  [2.1237]→[2.1237:1287](∅→∅)
  − } else {

  − ChangeError::Io(err)