hardy7cc/pijul - Change MKDWLE4VR5MFRUNUKCWACK7OHCVHRPZLSW7TWXFJ65CYRZ7QD7FAC

🩹 Reorder imports, solve merge conflicts, post merge cleanup

Created by berkus on June 24, 2025

MKDWLE4VR5MFRUNUKCWACK7OHCVHRPZLSW7TWXFJ65CYRZ7QD7FAC

Dependencies

In channels

main

Change contents

Deletion in pijul/src/commands/tag.rs at line 3 [10.74]
B:BD[10.150] → [30.0:79]
BD:BD[10.150] → [30.0:79]
```
use crate::commands::common_opts::RepoPath;
use crate::commands::load_channel;
```
Deletion in pijul/src/commands/tag.rs at line 4 [10.74]
B:BD[23.130] → [26.1159:1180]
```
use jiff::Timestamp;
```

Insertion in pijul/src/commands/tag.rs at line 5 [10.74]

[30.98]

[10.219]

use jiff::Timestamp;
use log::*;
use crate::commands::common_opts::RepoPath;
use crate::commands::load_channel;

Deletion in pijul/src/commands/tag.rs at line 12 [10.74]
∅:D[30.196] → [13.0:12]
∅:D[14.2427] → [13.0:12]
B:BD[10.332] → [13.0:12]
```
use log::*;
```

Deletion in pijul/src/commands/reset.rs at line 7 [2.97650]

B:BD[24.31] → [25.2389:2470]

∅:D[25.2470] → [22.81:164]

B:BD[22.81] → [22.81:164]

use libpijul::pristine::{ChangeId, ChannelMutTxnT, Position, sanakirja::MutTxn};
use libpijul::{ArcTxn, ChannelRef, ChannelTxnT, DepsTxnT, MutTxnT, TxnT, TxnTExt};

Deletion in pijul/src/commands/reset.rs at line 9 [2.97650]
B:BD[3.1348] → [25.2471:2521]
```
use pijul_interaction::{OUTPUT_MESSAGE, Spinner};
```
Resurrecting zombie bytes in pijul/src/commands/reset.rs at line 9 [2.97650]
B:B[3.1348] → [33.0:79]
BD:B[3.1348] → [33.0:79]
```
use crate::commands::common_opts::RepoPath;
use crate::commands::load_channel;
```

Insertion in pijul/src/commands/reset.rs at line 11 [2.97650]

[33.79]

[21.992]

use libpijul::pristine::{ChangeId, ChannelMutTxnT, Position, sanakirja::MutTxn};
use libpijul::{ArcTxn, ChannelRef, ChannelTxnT, DepsTxnT, MutTxnT, TxnT, TxnTExt};
use pijul_interaction::{OUTPUT_MESSAGE, Spinner};

Insertion in pijul/src/commands/record.rs at line 7 [2.101759]
[7.55]
[26.1353]
```
use clap::Parser;
```
Deletion in pijul/src/commands/record.rs at line 9 [2.101759]
B:BD[2.101821] → [34.0:18]
BD:BD[2.101821] → [34.0:18]
```
use clap::Parser;
```
Solving an order conflict in pijul/src/commands/record.rs at line 9 [2.101759]
[26.1374]
[2.101821]
Deletion in pijul/src/commands/record.rs at line 95 [2.101759]
B:BD[2.103811] → [25.2522:2570]
BD:BD[2.103811] → [25.2522:2570]
```
            let h = if let Some(hash) = amend {
```

Replacement in pijul/src/commands/record.rs at line 98 [2.101759]

B:BD[34.1021] → [34.1021:1069]

                if let Some(ref hash) = amend {

[34.1021]

[34.1069]

                if let Some(hash) = amend {

Replacement in pijul/src/commands/record.rs at line 101 [2.101759]
B:BD[34.1209] → [34.1209:1244]
```
                    h?.1 .0.into()
```
[34.1209]
[34.1244]
```
                    h?.1.0.into()
```
Resurrecting zombie bytes in pijul/src/commands/pushpull.rs at line 1 [2.111631]
B:B[2.111631] → [29.348:444]
BD:B[2.111631] → [29.348:444]
```
use std::collections::{BTreeMap, BTreeSet, HashSet};
use std::io;
use std::io::{Stdout, Write};
```
Deletion in pijul/src/commands/pushpull.rs at line 6 [2.111631]
B:BD[3.1696] → [31.0:61]
```
use super::{get_channel, make_changelist, parse_changelist};
```

Insertion in pijul/src/commands/pushpull.rs at line 8 [2.111631]

[23.758]

[2.111667]

use log::debug;
use regex::Regex;
use super::{get_channel, make_changelist, parse_changelist};
use crate::commands::common_opts::RepoPath;

Deletion in pijul/src/commands/pushpull.rs at line 14 [2.111631]
B:BD[2.111707] → [15.18473:18516]
```
use libpijul::pristine::sanakirja::MutTxn;
```
Insertion in pijul/src/commands/pushpull.rs at line 15 [2.111631]
[28.34]
[5.12857]
```
use libpijul::pristine::sanakirja::MutTxn;
```
Deletion in pijul/src/commands/pushpull.rs at line 17 [2.111631]
∅:D[4.2383] → [3.1743:1759]
∅:D[5.12874] → [3.1743:1759]
B:BD[2.111785] → [3.1743:1759]
```
use log::debug;
```
Deletion in pijul/src/commands/pushpull.rs at line 18 [2.111631]
∅:D[29.497] → [2.111785:111803]
∅:D[3.1759] → [2.111785:111803]
B:BD[2.111785] → [2.111785:111803]
B:BD[2.111803] → [3.1760:1761]
```
use regex::Regex;
```
Deletion in pijul/src/commands/pushpull.rs at line 20 [2.111631]
B:BD[3.1761] → [31.62:106]
BD:BD[3.1761] → [31.62:106]
```
use crate::commands::common_opts::RepoPath;
```
Solving an order conflict in pijul/src/commands/pushpull.rs at line 20 [2.111631]
[25.2725]
[21.1121]

Replacement in pijul/src/commands/pushpull.rs at line 370 [2.111631]

B:BD[29.10857] → [29.10857:10984]

                            bail!("Cannot delete '{}' since there is both a named remote and an ID associated with it", spec);

[29.10857]

[29.10984]

                            bail!(
                                "Cannot delete '{}' since there is both a named remote and an ID associated with it",
                                spec
                            );

Replacement in pijul/src/commands/pushpull.rs at line 377 [2.111631]

B:BD[29.11060] → [29.11060:11181]

                            bail!("Cannot delete '{}' since there are multiple named remotes associated with it", spec);

[29.11060]

[29.11181]

                            bail!(
                                "Cannot delete '{}' since there are multiple named remotes associated with it",
                                spec
                            );

Replacement in pijul/src/commands/pushpull.rs at line 384 [2.111631]

B:BD[29.11252] → [29.11252:11363]

                            bail!("Cannot delete '{}' since there are multiple IDs associated with it", spec);

[29.11252]

[29.11363]

                            bail!(
                                "Cannot delete '{}' since there are multiple IDs associated with it",
                                spec
                            );

Deletion in pijul/src/commands/pushpull.rs at line 517 [2.111631]
B:BD[2.115196] → [25.2803:2859]
BD:BD[2.115196] → [25.2803:2859]
```
            if c.is_empty() { channel_name } else { c }
```

Deletion in pijul/src/commands/log.rs at line 7 [2.134376]

B:BD[3.2088] → [35.0:85]

use crate::commands::common_opts::RepoAndChannel;
use crate::commands::load_channel;

Insertion in pijul/src/commands/log.rs at line 8 [2.134376]
[5.16943]
[26.1675]
```
use clap::Parser;
```
Deletion in pijul/src/commands/log.rs at line 11 [2.134376]
B:BD[5.16943] → [35.86:104]
```
use clap::Parser;
```
Solving an order conflict in pijul/src/commands/log.rs at line 11 [2.134376]
[26.1720]

Insertion in pijul/src/commands/log.rs at line 11 [2.134376]

[0.1278]

[2.134430]

use log::*;
use serde::ser::{SerializeSeq, Serializer};
use thiserror::*;
use crate::commands::common_opts::RepoAndChannel;
use crate::commands::load_channel;

Deletion in pijul/src/commands/log.rs at line 22 [2.134376]
∅:D[35.138] → [19.230:242]
B:BD[4.3396] → [19.230:242]
```
use log::*;
```
Deletion in pijul/src/commands/log.rs at line 23 [2.134376]
∅:D[19.242] → [16.225:269]
∅:D[21.1757] → [16.225:269]
B:BD[4.3396] → [16.225:269]
B:BD[16.291] → [17.94:112]
```
use serde::ser::{SerializeSeq, Serializer};
use thiserror::*;
```
Deletion in pijul/src/commands/file_operations.rs at line 6 [2.169058]
∅:D[11.31] → [4.4127:4173]
∅:D[20.268] → [4.4127:4173]
∅:D[18.1171] → [4.4127:4173]
∅:D[12.1749] → [4.4127:4173]
∅:D[23.1813] → [4.4127:4173]
B:BD[3.2421] → [4.4127:4173]
```
use libpijul::{MutTxnT, MutTxnTExt, TxnTExt};
```
Insertion in pijul/src/commands/file_operations.rs at line 9 [2.169058]
[32.44]
[21.1845]
```
use libpijul::{MutTxnT, MutTxnTExt, TxnTExt};
```
Insertion in pijul/src/commands/file_operations.rs at line 208 [2.169058]
[2.172507]
[27.60]
```
    #[clap(flatten)]
    base: RepoPath,
```
Deletion in pijul/src/commands/file_operations.rs at line 212 [2.169058]
B:BD[2.172507] → [32.372:413]
BD:BD[2.172507] → [32.372:413]
```
    #[clap(flatten)]
    base: RepoPath,
```
Solving an order conflict in pijul/src/commands/file_operations.rs at line 212 [2.169058]
[27.117]
[2.172572]

Insertion in pijul/src/commands/apply.rs at line 5 [2.194289]

[36.18]

[2.194343]

use log::*;
use crate::commands::common_opts::RepoAndChannel;
use crate::commands::load_channel;

Deletion in pijul/src/commands/apply.rs at line 12 [2.194289]
∅:D[9.23475] → [8.14202:14214]
B:BD[6.617] → [8.14202:14214]
∅:D[6.617] → [3.3379:3380]
∅:D[4.6528] → [3.3379:3380]
∅:D[8.14214] → [3.3379:3380]
B:BD[2.194442] → [3.3379:3380]
```
use log::*;
```
Deletion in pijul/src/commands/apply.rs at line 13 [2.194289]
B:BD[3.3380] → [36.19:104]
BD:BD[3.3380] → [36.19:104]
```
use crate::commands::common_opts::RepoAndChannel;
use crate::commands::load_channel;
```
Solving an order conflict in pijul/src/commands/apply.rs at line 13 [2.194289]
[25.6054]
[21.2124]

🩹 Reorder imports, solve merge conflicts, post merge cleanup

Dependencies

In channels

Change contents

Deletion in pijul/src/commands/tag.rs at line 3 [10.74]

Deletion in pijul/src/commands/tag.rs at line 4 [10.74]

Insertion in pijul/src/commands/tag.rs at line 5 [10.74]

Deletion in pijul/src/commands/tag.rs at line 12 [10.74]

Deletion in pijul/src/commands/reset.rs at line 7 [2.97650]

Deletion in pijul/src/commands/reset.rs at line 9 [2.97650]

Resurrecting zombie bytes in pijul/src/commands/reset.rs at line 9 [2.97650]

Insertion in pijul/src/commands/reset.rs at line 11 [2.97650]

Insertion in pijul/src/commands/record.rs at line 7 [2.101759]

Deletion in pijul/src/commands/record.rs at line 9 [2.101759]

Solving an order conflict in pijul/src/commands/record.rs at line 9 [2.101759]

Deletion in pijul/src/commands/record.rs at line 95 [2.101759]

Replacement in pijul/src/commands/record.rs at line 98 [2.101759]

Replacement in pijul/src/commands/record.rs at line 101 [2.101759]

Resurrecting zombie bytes in pijul/src/commands/pushpull.rs at line 1 [2.111631]

Deletion in pijul/src/commands/pushpull.rs at line 6 [2.111631]

Insertion in pijul/src/commands/pushpull.rs at line 8 [2.111631]

Deletion in pijul/src/commands/pushpull.rs at line 14 [2.111631]

Insertion in pijul/src/commands/pushpull.rs at line 15 [2.111631]

Deletion in pijul/src/commands/pushpull.rs at line 17 [2.111631]

Deletion in pijul/src/commands/pushpull.rs at line 18 [2.111631]

Deletion in pijul/src/commands/pushpull.rs at line 20 [2.111631]

Solving an order conflict in pijul/src/commands/pushpull.rs at line 20 [2.111631]

Replacement in pijul/src/commands/pushpull.rs at line 370 [2.111631]

Replacement in pijul/src/commands/pushpull.rs at line 377 [2.111631]

Replacement in pijul/src/commands/pushpull.rs at line 384 [2.111631]

Deletion in pijul/src/commands/pushpull.rs at line 517 [2.111631]

Deletion in pijul/src/commands/log.rs at line 7 [2.134376]

Insertion in pijul/src/commands/log.rs at line 8 [2.134376]

Deletion in pijul/src/commands/log.rs at line 11 [2.134376]

Solving an order conflict in pijul/src/commands/log.rs at line 11 [2.134376]

Insertion in pijul/src/commands/log.rs at line 11 [2.134376]

Deletion in pijul/src/commands/log.rs at line 22 [2.134376]

Deletion in pijul/src/commands/log.rs at line 23 [2.134376]

Deletion in pijul/src/commands/file_operations.rs at line 6 [2.169058]

Insertion in pijul/src/commands/file_operations.rs at line 9 [2.169058]

Insertion in pijul/src/commands/file_operations.rs at line 208 [2.169058]

Deletion in pijul/src/commands/file_operations.rs at line 212 [2.169058]

Solving an order conflict in pijul/src/commands/file_operations.rs at line 212 [2.169058]

Insertion in pijul/src/commands/apply.rs at line 5 [2.194289]

Deletion in pijul/src/commands/apply.rs at line 12 [2.194289]

Deletion in pijul/src/commands/apply.rs at line 13 [2.194289]

Solving an order conflict in pijul/src/commands/apply.rs at line 13 [2.194289]