ilyagr/pijul - Change ATUZBEPEZDUXR55MJQB35GUANAJVO6JENHYXDJBFKETZ6AT4DRIAC

Add hunk paths to log ouput

Created by oknozor on February 6, 2024

ATUZBEPEZDUXR55MJQB35GUANAJVO6JENHYXDJBFKETZ6AT4DRIAC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/log.rs at line 30 [7.134376]
∅:D[6.2987] → [7.134724:134756]
B:BD[7.134724] → [7.134724:134756]
```
    #[clap(long = "hash-only")]
```
[6.2987]
[7.134756]
```
    #[clap(long = "hash-only", conflicts_with = "files")]
```

Insertion in pijul/src/commands/log.rs at line 38 [7.134376]

[7.134881]

[8.1529]

    /// Include files changed in the output
    #[clap(long = "files")]
    files: bool,

Insertion in pijul/src/commands/log.rs at line 86 [7.134376]
[9.1491]
[2.243]
```
        let show_paths = cmd.files;
```
Insertion in pijul/src/commands/log.rs at line 96 [7.134376]
[9.1672]
[9.1672]
```
            show_paths,
```

Insertion in pijul/src/commands/log.rs at line 199 [7.134376]

[10.629]

        #[serde(skip_serializing_if = "Option::is_none")]
        paths: Option<Vec<String>>,

Insertion in pijul/src/commands/log.rs at line 216 [7.134376]
[10.864]
[10.864]
```
                paths,
```

Insertion in pijul/src/commands/log.rs at line 248 [7.134376]

[11.5953]

                if let Some(ref paths) = paths {
                    writeln!(f, "   Files:")?;
                    for path in paths {
                        writeln!(f, "       - {}", path)?;
                    }
                    writeln!(f)?;
                }

Insertion in pijul/src/commands/log.rs at line 285 [7.134376]
[11.7493]
[11.7493]
```
    show_paths: bool,
```

Replacement in pijul/src/commands/log.rs at line 337 [7.134376]

B:BD[3.410] → [3.410:507]

        let mut reverse_log = self.txn.reverse_log(&*self.channel_ref.read(), None)?.peekable();

[3.410]

[3.507]

        let mut reverse_log = self
            .txn
            .reverse_log(&*self.channel_ref.read(), None)?
            .peekable();

Insertion in pijul/src/commands/log.rs at line 393 [7.134376]

[10.2264]

[12.2128]


        let paths = if self.show_paths {
            let files = self.repo.changes.get_changes(&h)?;
            let mut paths: Vec<String> = files
                .into_iter()
                .map(|hunk| hunk.path().to_string())
                .collect();
            paths.dedup();
            Some(paths)
        } else {
            None
        };

Replacement in pijul/src/commands/log.rs at line 473 [7.134376]

B:BD[11.13977] → [4.27:115]

            description: if self.cmd.descriptions { header.description } else { None },

[11.13977]

[11.14022]

            description: if self.cmd.descriptions {
                header.description
            } else {
                None
            },
            paths,

Replacement in pijul/src/commands/log.rs at line 502 [7.134376]

B:BD[5.322] → [5.322:358]

∅:D[5.358] → [12.2380:2450]

B:BD[11.14431] → [12.2380:2450]

            OutputFormat::Json => {
                serde_json::to_writer_pretty(&mut stdout, &log_iter)?

[5.322]

[11.14521]

            OutputFormat::Json => serde_json::to_writer_pretty(&mut stdout, &log_iter)?,
            OutputFormat::Plaintext => {
                log_iter.for_each(|entry| match write!(&mut stdout, "{}", entry) {
                    Ok(_) => Ok(()),
                    Err(e) if e.kind() == std::io::ErrorKind::BrokenPipe => Ok(()),
                    Err(e) => Err(e),
                })?

Deletion in pijul/src/commands/log.rs at line 510 [7.134376]

B:BD[11.14535] → [5.359:465]

∅:D[5.465] → [12.2535:2699]

B:BD[12.2535] → [12.2535:2699]

            OutputFormat::Plaintext => log_iter.for_each(|entry| match write!(&mut stdout, "{}", entry) {
                Ok(_) => Ok(()),
                Err(e) if e.kind() == std::io::ErrorKind::BrokenPipe => Ok(()),
                Err(e) => Err(e),
            })?,