Progress bar for push

pmeunier

Jul 22, 2021, 8:58 AM

ISCWVXO6UN37V2QMR75ZWS7H5E7WYZCGR6TX3EDFOFRVCAPMIVUAC

Dependencies

• [2] EUZFFJSO Updating Pijul with the latest changes in Libpijul
• [3] I24UEJQL Various post-fire fixes
• [4] 76PCXGML Pushing to, and pulling from the local repository
• [5] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [6] 367UBQ6K Forwarding SSH stderr, and progress bar for push
• [7] VMPAOJS2 Don't output after pushing to a local channel
• [8] UDHP4ZVB Fixing SSH asynchronicity issues
• [*] KTTKF3RW Locking stderr and the progress bar in SSH
• [*] I52XSRUH Massive cleanup, and simplification
• [*] 5SLOJYHG Fixing the Git feature
• [*] FBXYP7QM Forgot to add remote::http
• [*] Q45QHPO4 Feedback on network stuff

Change contents

• edit in pijul/src/remote/ssh.rs at line 889
  [3.44372]

  [3.44372]
  + pro_n: usize,
• edit in pijul/src/remote/ssh.rs at line 914
  [3.45379]

  [10.780]
  + super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();
• edit in pijul/src/remote/mod.rs at line 489
  [3.65324]

  [3.65324]
  + let pro_n = {

  + let mut pro = PROGRESS.borrow_mut().unwrap();

  + pro.push(crate::progress::Cursor::Bar {

  + i: 0,

  + n: changes.len(),

  + pre: "Uploading changes".into(),

  + })

  + };

  +
• replacement in pijul/src/remote/mod.rs at line 499
  [3.65345]→[3.65345:65529](∅→∅),[3.65529]→[3.687:778](∅→∅)
  − RemoteRepo::Local(ref mut l) => l.upload_changes(local, to_channel, changes),

  − RemoteRepo::Ssh(ref mut s) => s.upload_changes(local, to_channel, changes).await,

  − RemoteRepo::Http(ref h) => h.upload_changes(local, to_channel, changes).await,
  [3.65345]

  [3.2442]
  + RemoteRepo::Local(ref mut l) => l.upload_changes(pro_n, local, to_channel, changes)?,

  + RemoteRepo::Ssh(ref mut s) => {

  + s.upload_changes(pro_n, local, to_channel, changes).await?

  + }

  + RemoteRepo::Http(ref h) => h.upload_changes(pro_n, local, to_channel, changes).await?,
• replacement in pijul/src/remote/mod.rs at line 507
  [3.2665]→[3.10544:10618](∅→∅)
  − local::upload_changes(&store, txn, &mut channel, changes)
  [3.2665]

  [3.2745]
  + local::upload_changes(pro_n, &store, txn, &mut channel, changes)?
• edit in pijul/src/remote/mod.rs at line 511
  [3.66580]

  [3.66580]
  + PROGRESS.join();

  + Ok(())
• edit in pijul/src/remote/local.rs at line 114
  [3.82143]

  [3.82143]
  + pro_n: usize,
• replacement in pijul/src/remote/local.rs at line 139
  [3.1124]→[2.1353:1424](∅→∅)
  − upload_changes(&store, &mut *txn.write(), &channel, changes)?;
  [3.1124]

  [3.1204]
  + upload_changes(pro_n, &store, &mut *txn.write(), &channel, changes)?;
• edit in pijul/src/remote/local.rs at line 219
  [11.1047]

  [3.3885]
  + pro_n: usize,
• edit in pijul/src/remote/local.rs at line 229
  [12.508]

  [3.4175]
  + super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();
• edit in pijul/src/remote/http.rs at line 152
  [3.876]

  [3.876]
  + pro_n: usize,
• edit in pijul/src/remote/http.rs at line 186
  [3.1908]

  [14.1501]
  + super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();