dblsaiko/pijul - Change Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC

Don't output files if they aren't in the current channel

Created by pmeunier on February 26, 2021

Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/config.rs at line 141 [5.89866]

B:BD[5.91314] → [3.0:80]

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

[5.91314]

[5.91397]

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

Replacement in pijul/src/config.rs at line 143 [5.89866]

B:BD[5.91434] → [5.91434:91463]

            channel.as_ref()

[5.91434]

[5.91463]

            (channel.as_ref(), alt == self.current_channel.as_deref())

Replacement in pijul/src/config.rs at line 145 [5.89866]
B:BD[5.91528] → [5.91528:91557]
```
            channel.as_str()
```
[5.91528]
[5.91557]
```
            (channel.as_str(), true)
```
Replacement in pijul/src/config.rs at line 147 [5.89866]
B:BD[5.91574] → [5.91574:91609]
```
            crate::DEFAULT_CHANNEL
```
[5.91574]
[6.83]
```
            (crate::DEFAULT_CHANNEL, true)
```

Replacement in pijul/src/commands/unrecord.rs at line 37 [5.95630]

B:BD[5.96273] → [3.81:166]

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

[5.96273]

[5.96356]

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

Replacement in pijul/src/commands/unrecord.rs at line 118 [5.95630]
B:BD[5.97582] → [2.0:28]
```
            if self.reset {
```
[5.97582]
[7.1145]
```
            if self.reset && is_current_channel {
```

Replacement in pijul/src/commands/reset.rs at line 41 [5.97650]

B:BD[5.98334] → [3.167:252]

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

[5.98334]

[8.39]

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

Replacement in pijul/src/commands/reset.rs at line 70 [5.97650]

B:BD[5.99627] → [5.99627:99700]

            let current_channel = repo.config.get_current_channel(None);

[5.99627]

[9.538]

            let (current_channel, _) = repo.config.get_current_channel(None);

Replacement in pijul/src/commands/record.rs at line 66 [5.101759]

B:BD[5.103624] → [3.253:352]

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

[5.103624]

[5.103721]

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

Replacement in pijul/src/commands/pushpull.rs at line 124 [5.111631]
B:BD[5.114607] → [3.353:385]
```
        let channel_name = repo
```
[5.114607]
[3.385]
```
        let (channel_name, _) = repo
```

Replacement in pijul/src/commands/pushpull.rs at line 279 [5.111631]

B:BD[5.117701] → [3.470:558]

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

[5.117701]

[5.117784]

        let (channel_name, is_current_channel) =
            repo.config.get_current_channel(self.to_channel.as_deref());

Replacement in pijul/src/commands/pushpull.rs at line 456 [5.111631]

B:BD[10.1543] → [10.1543:1544]

B:BD[10.1544] → [11.256:343]

B:BD[11.343] → [4.735:1002]


        let mut touched_paths: Vec<_> = Vec::new();
        for &i in touched.iter() {
            if let Some((path, _)) =
                libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, *i)?
            {
                touched_paths.push(path)
            } else {
                touched_paths.clear();
                break;

[10.1543]

[4.1002]

        if is_current_channel {
            let mut touched_paths: Vec<_> = Vec::new();
            for &i in touched.iter() {
                if let Some((path, _)) =
                    libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, *i)?
                {
                    touched_paths.push(path)
                } else {
                    touched_paths.clear();
                    break;
                }
            }
            touched_paths.sort();
            let mut last = "";
            for path in touched_paths.iter() {
                if !last.is_empty() && path.starts_with(last) {
                    continue;
                }
                debug!("path = {:?}", path);
                txn.output_repository_no_pending(
                    &mut repo.working_copy,
                    &repo.changes,
                    &mut channel,
                    path,
                    true,
                    None,
                )?;
                last = path

Replacement in pijul/src/commands/pushpull.rs at line 485 [5.111631]

∅:D[4.1016] → [11.469:665]

∅:D[12.12120] → [11.469:665]

B:BD[11.469] → [11.469:665]

        }
        touched_paths.sort();
        let mut last = "";
        for path in touched_paths.iter() {
            if !last.is_empty() && path.starts_with(last) {
                continue;

[4.1016]

[11.665]

            if touched_paths.is_empty() {
                txn.output_repository_no_pending(
                    &mut repo.working_copy,
                    &repo.changes,
                    &mut channel,
                    "",
                    true,
                    None,
                )?;

Deletion in pijul/src/commands/pushpull.rs at line 495 [5.111631]
∅:D[11.679] → [10.1730:1771]
B:BD[10.1730] → [10.1730:1771]
∅:D[10.1771] → [13.10230:10377]
B:BD[13.10230] → [13.10230:10377]
B:BD[13.10377] → [11.680:702]
∅:D[11.702] → [13.10397:10419]
∅:D[10.1822] → [13.10397:10419]
B:BD[13.10397] → [13.10397:10419]
B:BD[13.10419] → [14.445:467]
∅:D[14.467] → [13.10419:10435]
B:BD[13.10419] → [13.10419:10435]
B:BD[13.10435] → [11.703:727]
```
            debug!("path = {:?}", path);
            txn.output_repository_no_pending(
                &mut repo.working_copy,
                &repo.changes,
                &mut channel,
                path,
                true,
                None,
            )?;
            last = path
```

Deletion in pijul/src/commands/pushpull.rs at line 496 [5.111631]

B:BD[13.11136] → [4.1017:1293]

        if touched_paths.is_empty() {
            txn.output_repository_no_pending(
                &mut repo.working_copy,
                &repo.changes,
                &mut channel,
                "",
                true,
                None,
            )?;
        }

Replacement in pijul/src/commands/log.rs at line 34 [5.134376]

B:BD[5.135052] → [3.616:701]

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

[5.135052]

[15.16944]

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

Replacement in pijul/src/commands/fork.rs at line 34 [5.167873]

B:BD[5.168764] → [3.702:791]

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

[5.168764]

[15.17285]

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

Replacement in pijul/src/commands/diff.rs at line 40 [5.173551]

B:BD[5.174301] → [3.792:891]

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

[5.174301]

[5.174398]

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

Replacement in pijul/src/commands/debug.rs at line 25 [5.177758]

B:BD[16.5818] → [3.892:977]

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

[16.5818]

[15.17729]

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

Replacement in pijul/src/commands/credit.rs at line 30 [5.178684]

B:BD[5.179348] → [3.978:1063]

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

[5.179348]

[15.18121]

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

Replacement in pijul/src/commands/change.rs at line 29 [5.189306]

B:BD[5.190246] → [17.0:70]

            let channel_name = repo.config.get_current_channel(None);

[5.190246]

[15.19040]

            let (channel_name, _) = repo.config.get_current_channel(None);

Replacement in pijul/src/commands/archive.rs at line 86 [5.191083]

B:BD[18.16572] → [3.1064:1153]

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

[18.16572]

[5.193066]

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

Replacement in pijul/src/commands/apply.rs at line 31 [5.194289]

B:BD[5.194929] → [3.1154:1239]

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

[5.194929]

[15.19373]

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

Replacement in pijul/src/commands/apply.rs at line 80 [5.194289]

B:BD[14.1107] → [4.1294:1361]

∅:D[4.1361] → [14.1146:1173]

B:BD[14.1146] → [14.1146:1173]

B:BD[14.1173] → [4.1362:1628]

        let mut touched_files = Vec::with_capacity(touched.len());
        for i in touched {
            if let Some((path, _)) =
                libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, i)?
            {
                touched_files.push(path)
            } else {
                touched_files.clear();
                break;

[14.1107]

[4.1628]

        if is_current_channel {
            let mut touched_files = Vec::with_capacity(touched.len());
            for i in touched {
                if let Some((path, _)) =
                    libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, i)?
                {
                    touched_files.push(path)
                } else {
                    touched_files.clear();
                    break;
                }
            }
            for path in touched_files.iter() {
                txn.output_repository_no_pending(
                    &mut repo.working_copy,
                    &repo.changes,
                    &mut channel,
                    &path,
                    true,
                    None,
                )?;
            }
            if !touched_files.is_empty() {
                txn.output_repository_no_pending(
                    &mut repo.working_copy,
                    &repo.changes,
                    &mut channel,
                    "",
                    true,
                    None,
                )?;

Deletion in pijul/src/commands/apply.rs at line 113 [5.194289]

B:BD[4.1652] → [4.1652:1695]

∅:D[4.1695] → [14.1293:1440]

B:BD[14.1293] → [14.1293:1440]

B:BD[14.1467] → [14.1467:1560]

B:BD[14.1560] → [4.1696:1972]

        for path in touched_files.iter() {
            txn.output_repository_no_pending(
                &mut repo.working_copy,
                &repo.changes,
                &mut channel,
                &path,
                true,
                None,
            )?;
        }
        if !touched_files.is_empty() {
            txn.output_repository_no_pending(
                &mut repo.working_copy,
                &repo.changes,
                &mut channel,
                "",
                true,
                None,
            )?;
        }