Minor cleanup

[?]

Jan 18, 2021, 11:29 AM

I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC

Dependencies

[2] QWD7UE76 push/pull: rename `channel` option
[3] JL4WKA5P Implement the Sanakirja concurrency model in a cross-process way
[4] YAJAXIV5 Unrecording changes atomically
[5] VL7ZYKHB Running hooks through shell on Windows and Unix
[6] KWAGWB73 Adding extra dependencies from the config file
[7] K6GWUOD5 Styling progress bars
[8] 76PCXGML Pushing to, and pulling from the local repository
[9] 367UBQ6K Forwarding SSH stderr, and progress bar for push
[10] 74HX2XZD Cleanup and debugging
[11] ZHABNS3S Canonicalize all paths
[12] Y7YAFMFF Fix path prefix striping on Windows.
[13] VMPAOJS2 Don't output after pushing to a local channel
[14] 5BRU2RRW Cleanup (debugging a crash related to trees/inodes)
[15] I52XSRUH Massive cleanup, and simplification
[16] HMMMKONL Fixing alive vertices
[17] MU5GSJAW Partial push and pull (WARNING: breaks the existing protocol)
[18] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
[19] 5DVRL6MF Hard-unrecord
[20] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[21] VQPAUKBQ channel switch as an alias to reset
[22] 3KRGVQFU Do not update the mtime of unmodified files

Change contents

replacement in pijul/src/config.rs at line 141

[4.91314]→[4.91314:91397](∅→∅)

pub fn get_current_channel<'a>(&'a self, alt: Option<&'a String>) -> &'a str {

[4.91314]

[4.91397]

pub fn get_current_channel<'a>(&'a self, alt: Option<&'a str>) -> &'a str {
replacement in pijul/src/commands/unrecord.rs at line 38

[4.96273]→[4.96273:96356](∅→∅)

let channel_name = repo.config.get_current_channel(self.channel.as_ref());

[4.96273]

[4.96356]

let channel_name = repo.config.get_current_channel(self.channel.as_deref());
replacement in pijul/src/commands/reset.rs at line 41

[4.98372]→[4.98372:98455](∅→∅)

let channel_name = repo.config.get_current_channel(self.channel.as_ref());

[4.98334]

[4.39]

let channel_name = repo.config.get_current_channel(self.channel.as_deref());
replacement in pijul/src/commands/record.rs at line 66

[4.103624]→[4.103624:103721](∅→∅)

txn.open_or_create_channel(repo.config.get_current_channel(self.channel.as_ref()))?;

[4.103624]

[4.103721]

txn.open_or_create_channel(repo.config.get_current_channel(self.channel.as_deref()))?;
replacement in pijul/src/commands/pushpull.rs at line 125

[4.114607]→[2.136:224](∅→∅)

let channel_name = repo.config.get_current_channel(self.from_channel.as_ref());

[4.114607]

[4.114690]

let channel_name = repo
.config
.get_current_channel(self.from_channel.as_deref());
replacement in pijul/src/commands/pushpull.rs at line 281

[4.117701]→[2.225:311](∅→∅)

let channel_name = repo.config.get_current_channel(self.to_channel.as_ref());

[4.117701]

[4.117784]

let channel_name = repo.config.get_current_channel(self.to_channel.as_deref());
replacement in pijul/src/commands/pushpull.rs at line 436

[4.10199]→[4.758:759](∅→∅)

[4.10199]

[4.759]

debug!("to_download: {:?}", to_download.len());
replacement in pijul/src/commands/log.rs at line 34

[4.135090]→[4.135090:135173](∅→∅)

let channel_name = repo.config.get_current_channel(self.channel.as_ref());

[4.135052]

[4.16944]

let channel_name = repo.config.get_current_channel(self.channel.as_deref());
replacement in pijul/src/commands/fork.rs at line 34

[4.168764]→[4.168764:168851](∅→∅)

let channel_name = repo.config.get_current_channel(self.channel.as_ref());

[4.168764]

[4.17285]

let channel_name = repo.config.get_current_channel(self.channel.as_deref());
replacement in pijul/src/commands/diff.rs at line 40

[4.174301]→[4.174301:174398](∅→∅)

txn.open_or_create_channel(repo.config.get_current_channel(self.channel.as_ref()))?;

[4.174301]

[4.174398]

txn.open_or_create_channel(repo.config.get_current_channel(self.channel.as_deref()))?;
replacement in pijul/src/commands/debug.rs at line 25

[4.95]→[4.178214:178297](∅→∅),[4.5818]→[4.178214:178297](∅→∅),[4.256]→[4.178214:178297](∅→∅),[4.178214]→[4.178214:178297](∅→∅)

let channel_name = repo.config.get_current_channel(self.channel.as_ref());

[4.5818]

[4.17729]

let channel_name = repo.config.get_current_channel(self.channel.as_deref());
replacement in pijul/src/commands/credit.rs at line 30

[4.179348]→[4.179348:179431](∅→∅)

let channel_name = repo.config.get_current_channel(self.channel.as_ref());

[4.179348]

[4.18121]

let channel_name = repo.config.get_current_channel(self.channel.as_deref());
replacement in pijul/src/commands/archive.rs at line 86

[3.16572]→[4.192979:193066](∅→∅),[4.9061]→[4.192979:193066](∅→∅),[4.192979]→[4.192979:193066](∅→∅)

let channel_name = repo.config.get_current_channel(self.channel.as_ref());

[3.16572]

[4.193066]

let channel_name = repo.config.get_current_channel(self.channel.as_deref());
replacement in pijul/src/commands/apply.rs at line 30

[4.194967]→[4.194967:195050](∅→∅)

let channel_name = repo.config.get_current_channel(self.channel.as_ref());

[4.194929]

[4.19373]

let channel_name = repo.config.get_current_channel(self.channel.as_deref());