Avoid using "t" to distinguish tags and changes in the editor

pmeunier

Jan 5, 2022, 7:04 PM

IPU65ECUBBYBCAFUAOFZVL25IVBWEMHBZ6Q5XXLYTD5FZT6HNQOAC

Dependencies

• [2] DO2Y5TY5 Tag synchronisation
• [3] 3OW3YNZX Dependencies completion in push and pull, updated after stabilisation of remote caches
• [4] M5FK3ABT Complete dependencies when pushing and pulling
• [5] I24UEJQL Various post-fire fixes
• [6] BE7GUCI2 Completing dependencies only with changes the remote does not have
• [7] BBKV6VMN Fixing push/pull messages, and do not reverse the changes to download/upload
• [8] 44BN7FWS Do not output files introduced by patches that were not applied during a push
• [9] MU5GSJAW Partial push and pull (WARNING: breaks the existing protocol)
• [10] 7HOBLRD4 Fixing remote push/pull
• [11] EUZFFJSO Updating Pijul with the latest changes in Libpijul
• [12] IVLLXQ5Z Improved push/pull reporting
• [13] SLJ3OHD4 unrecord: show list of changes if none were given as arguments
• [*] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [*] SGXOEWHU Adding a patched chardetng (temporarily)

Change contents

• replacement in pijul/src/commands/unrecord.rs at line 78
  [3.3620]→[3.3620:3695](∅→∅)
  − for h in parse_changelist(&edit::edit_bytes(&o[..])?).iter() {
  [3.3620]

  [2.26279]
  + for h in parse_changelist(&edit::edit_bytes(&o[..])?, &hashes_).iter() {
• replacement in pijul/src/commands/pushpull.rs at line 304
  [3.88]→[3.88:158](∅→∅)
  − let d = parse_changelist(&edit::edit_bytes(&o[..])?);
  [3.88]

  [3.16]
  + let d = parse_changelist(&edit::edit_bytes(&o[..])?, &to_upload);
• replacement in pijul/src/commands/pushpull.rs at line 456
  [3.71]→[3.496:566](∅→∅),[3.496]→[3.496:566](∅→∅)
  − let d = parse_changelist(&edit::edit_bytes(&o[..])?);
  [3.71]

  [3.91]
  + let d = parse_changelist(&edit::edit_bytes(&o[..])?, &to_download);
• edit in pijul/src/commands/mod.rs at line 176
  [3.3638]

  [3.3638]
  + use ::log::*;

  + debug!("make_changelist {:?}", p);
• replacement in pijul/src/commands/mod.rs at line 196
  [2.36186]→[2.36186:36248](∅→∅)
  − writeln!(v, "t{}\n", p.to_base32()).unwrap();
  [2.36186]

  [2.36248]
  + writeln!(v, "{}\n", p.to_base32()).unwrap();
• replacement in pijul/src/commands/mod.rs at line 231
  [3.4940]→[2.36504:36562](∅→∅)
  − fn parse_changelist(o: &[u8]) -> Vec<crate::remote::CS> {
  [3.4940]

  [3.4995]
  + fn parse_changelist(o: &[u8], states: &[CS]) -> Vec<crate::remote::CS> {
• edit in pijul/src/commands/mod.rs at line 233
  [3.5021]

  [3.5021]
  + let states: std::collections::HashSet<&CS> = states.iter().collect();
• replacement in pijul/src/commands/mod.rs at line 242
  [2.36767]→[2.36767:37025](∅→∅)
  − if l.starts_with("t") {

  − libpijul::Merkle::from_base32(&l.as_bytes()[1..]).map(crate::remote::CS::State)

  − } else {

  − libpijul::Hash::from_base32(l.as_bytes()).map(crate::remote::CS::Change)
  [2.36767]

  [2.37025]
  + let h_ = libpijul::Hash::from_base32(l.as_bytes()).map(crate::remote::CS::Change);

  + if let Some(h) = h_ {

  + if states.contains(&h) {

  + return h_;

  + }
• edit in pijul/src/commands/mod.rs at line 248
  [2.37043]

  [2.37043]
  + libpijul::Merkle::from_base32(&l.as_bytes()[..]).map(crate::remote::CS::State)
• edit in libpijul/src/record.rs at line 1476
  [15.517710]

  [15.517710]
  +

  + debug!("alive = {:#?}", alive);
• edit in libpijul/src/chardetng/mod.rs at line 3007
  [16.131390]

  [16.131390]
  + debug!("score = {:?} {:?}", i, score);