🩹 Reorder imports, solve merge conflicts, post merge cleanup

berkus

Jun 24, 2025, 4:03 PM

MKDWLE4VR5MFRUNUKCWACK7OHCVHRPZLSW7TWXFJ65CYRZ7QD7FAC

Dependencies

[2] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[3] L4JXJHWX pijul/*: reorganize imports and remove extern crate
[4] I52XSRUH Massive cleanup, and simplification
[5] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
[6] XA23FMQM Reset only files that have been modified
[7] OU243LAB Support for staging
[8] YN63NUZO Sanakirja 1.0
[9] I24UEJQL Various post-fire fixes
[10] QL6K2ZM3 Tags
[11] 3H6Q5LDS Fixing a bug with the salt argument in `mv`
[12] GUL4M5FI Cleanup and formatting
[13] DX2FO4HZ Tag CLI cleanup
[14] EUZFFJSO Updating Pijul with the latest changes in Libpijul
[15] IVLLXQ5Z Improved push/pull reporting
[16] OU6JOR3C Add path filtering for log, add json output for log
[17] 6F6AAHK4 Simplifying pijul::commands::log, and fixing Broken Pipe errors
[18] PIQCNEEB Upgrading to Clap 3.0.0-alpha.5
[19] NAUECZW3 Fixing the map between keys and identities
[20] 6ZHY3XTG Updating deprecated methods in clap
[21] ABQDWHNG Migrate from `pijul::repository` to `pijul-repository`
[22] IP4CUEBE reset: Require --force to reset unspecified unrecorded changes
[23] QQS7LII4 Add value hints to arguments
[24] MYB5C3FP Solving conflicts
[25] HJVWPKWV Migrate crates to edition 2024
[26] N26HD5PF Replace `chrono` with `jiff`
[27] 42MFQSMS Require at least one path for file operations
[28] OWJL5HO7 Allow deleting remote by URL and remove default remote if set to deleted remote
[29] 67GIAQEU Handle named remotes in pijul remote and remote delete
[30] Q7LEDPIW Refactor tag command's handling of repo and channel
[31] OSWFAKWM Refactor push/pull commands' handling of repo and channel
[32] 3WADZG36 Refactor file operation commands' handling of repo and channel
[33] Q5PNWJ5W Refactor reset command's handling of repo and channel
[34] DDEUZMXQ Refactor record command's handling of repo and channel
[35] 3FNRS6MW Refactor log command's handling of repo and channel
[36] YV5PVUXV Refactor apply command's handling of repo and channel
[37] YWL2K3P7 Removing the `Direction` argument in pijul::remote::Repository::remote
[38] 2D7P2VKJ Change completions (where the whole progress bar story started)
[39] ZSFJT4SF Allow remotes to have a different push and pull address
[40] KWAGWB73 Adding extra dependencies from the config file
[41] ZHABNS3S Canonicalize all paths
[42] 3OPNBBAU Migrate from `pijul::remote` to `pijul_remote`
[43] 3AMEP2Y5 More convenient interface for channels
[44] 3FTEGCMR add timestamp_validator to tag --timestamp option
[45] MF3WAHBI commands/record: amend current change if unspecified
[46] 2K7JLB4Z No pager on Windows
[47] SLJ3OHD4 unrecord: show list of changes if none were given as arguments
[48] RG4YZPKL file_operations: remove the counter-intuitive --repository options
[49] BPCAJCLT Use RFC2822 date formatting in `log`, `tag`, and `record --timestamp`
[50] GURIBVW6 Fixing the pager
[51] G7HJHNFD Migrate from `pijul_interaction::progress` to `pijul_interaction`
[52] 6ZPDI7QG pull uses None as the base case path when outputing repo
[53] JUYSZJSH Migrate from `pijul::progress` to `pijul_interaction::progress`
[54] GHO6DWPI Refactoring iterators
[55] LGEJSLTY Fixing output (including its uses in reset and pull)
[56] ZDK3GNDB Tag transactions (including a massive refactoring of errors)
[57] Y7YAFMFF Fix path prefix striping on Windows.
[58] X243Z3Y5 Recording only the required metadata (can even be changed later!)
[59] MU5GSJAW Partial push and pull (WARNING: breaks the existing protocol)
[60] 3KRGVQFU Do not update the mtime of unmodified files
[61] AEPEFS7O Write help for each argument
[62] SCUBUHIA Remove `lazy_static` dependency
[63] QYY37T6Y Fixing a panic with reset --dry-run and no input
[64] QAS4VLXU Use `serde_derive` instead of `serde`'s `derive` feature'

Change contents

edit in pijul/src/commands/tag.rs at line 3

[10.150]→[30.0:79](∅→∅),[10.150]→[30.0:79](∅→∅)

use crate::commands::common_opts::RepoPath;
use crate::commands::load_channel;
edit in pijul/src/commands/tag.rs at line 4

[23.130]→[26.1159:1180](∅→∅)

use jiff::Timestamp;
edit in pijul/src/commands/tag.rs at line 5

[30.98]

[10.219]

use jiff::Timestamp;
use log::*;

use crate::commands::common_opts::RepoPath;
use crate::commands::load_channel;
edit in pijul/src/commands/tag.rs at line 12

[30.196]→[13.0:12](∅→∅),[14.2427]→[13.0:12](∅→∅),[10.332]→[13.0:12](∅→∅)

use log::*;
edit in pijul/src/commands/reset.rs at line 7

[24.31]→[25.2389:2470](∅→∅),[25.2470]→[22.81:164](∅→∅),[22.81]→[22.81:164](∅→∅)

use libpijul::pristine::{ChangeId, ChannelMutTxnT, Position, sanakirja::MutTxn};
use libpijul::{ArcTxn, ChannelRef, ChannelTxnT, DepsTxnT, MutTxnT, TxnT, TxnTExt};
edit in pijul/src/commands/reset.rs at line 9

[3.1348]→[25.2471:2521](∅→∅)

use pijul_interaction::{OUTPUT_MESSAGE, Spinner};
resurrect zombie in pijul/src/commands/reset.rs at line 9

[3.1348]→[33.0:79](∅→∅),[3.1348]→[33.0:79](∅→∅)

use crate::commands::common_opts::RepoPath;
use crate::commands::load_channel;
edit in pijul/src/commands/reset.rs at line 11

[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};
edit in pijul/src/commands/record.rs at line 7

[7.55]

[26.1353]

use clap::Parser;
edit in pijul/src/commands/record.rs at line 9

[2.101821]→[34.0:18](∅→∅),[2.101821]→[34.0:18](∅→∅)

use clap::Parser;
resolve order conflict in pijul/src/commands/record.rs at line 9

[26.1374]

[2.101821]
edit in pijul/src/commands/record.rs at line 95

[2.103811]→[25.2522:2570](∅→∅),[2.103811]→[25.2522:2570](∅→∅)

let h = if let Some(hash) = amend {
replacement in pijul/src/commands/record.rs at line 98

[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

[34.1209]→[34.1209:1244](∅→∅)

h?.1 .0.into()

[34.1209]

[34.1244]

h?.1.0.into()
resurrect zombie in pijul/src/commands/pushpull.rs at line 1

[2.111631]→[29.348:444](∅→∅),[2.111631]→[29.348:444](∅→∅)

use std::collections::{BTreeMap, BTreeSet, HashSet};
use std::io;
use std::io::{Stdout, Write};
edit in pijul/src/commands/pushpull.rs at line 6

[3.1696]→[31.0:61](∅→∅)

use super::{get_channel, make_changelist, parse_changelist};
edit in pijul/src/commands/pushpull.rs at line 8

[23.758]

[2.111667]

use log::debug;
use regex::Regex;

use super::{get_channel, make_changelist, parse_changelist};
use crate::commands::common_opts::RepoPath;
edit in pijul/src/commands/pushpull.rs at line 14

[2.111707]→[15.18473:18516](∅→∅)

use libpijul::pristine::sanakirja::MutTxn;
edit in pijul/src/commands/pushpull.rs at line 15

[28.34]

[5.12857]

use libpijul::pristine::sanakirja::MutTxn;
edit in pijul/src/commands/pushpull.rs at line 17

[4.2383]→[3.1743:1759](∅→∅),[5.12874]→[3.1743:1759](∅→∅),[2.111785]→[3.1743:1759](∅→∅)

use log::debug;
edit in pijul/src/commands/pushpull.rs at line 18

[29.497]→[2.111785:111803](∅→∅),[3.1759]→[2.111785:111803](∅→∅),[2.111785]→[2.111785:111803](∅→∅),[2.111803]→[3.1760:1761](∅→∅)

use regex::Regex;
edit in pijul/src/commands/pushpull.rs at line 20

[3.1761]→[31.62:106](∅→∅),[3.1761]→[31.62:106](∅→∅)

use crate::commands::common_opts::RepoPath;
resolve order conflict in pijul/src/commands/pushpull.rs at line 20

[25.2725]

[21.1121]
replacement in pijul/src/commands/pushpull.rs at line 370

[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

[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

[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
);
edit in pijul/src/commands/pushpull.rs at line 517

[2.115196]→[25.2803:2859](∅→∅),[2.115196]→[25.2803:2859](∅→∅)

if c.is_empty() { channel_name } else { c }
edit in pijul/src/commands/log.rs at line 7

[3.2088]→[35.0:85](∅→∅)

use crate::commands::common_opts::RepoAndChannel;
use crate::commands::load_channel;
edit in pijul/src/commands/log.rs at line 8

[5.16943]

[26.1675]

use clap::Parser;
edit in pijul/src/commands/log.rs at line 11

[5.16943]→[35.86:104](∅→∅)

use clap::Parser;
resolve order conflict in pijul/src/commands/log.rs at line 11

[26.1720]
edit in pijul/src/commands/log.rs at line 11

[0.1278]

[2.134430]

use log::*;
use serde::ser::{SerializeSeq, Serializer};
use thiserror::*;

use crate::commands::common_opts::RepoAndChannel;
use crate::commands::load_channel;
edit in pijul/src/commands/log.rs at line 22

[35.138]→[19.230:242](∅→∅),[4.3396]→[19.230:242](∅→∅)

use log::*;
edit in pijul/src/commands/log.rs at line 23

[19.242]→[16.225:269](∅→∅),[21.1757]→[16.225:269](∅→∅),[4.3396]→[16.225:269](∅→∅),[16.291]→[17.94:112](∅→∅)

use serde::ser::{SerializeSeq, Serializer};
use thiserror::*;
edit in pijul/src/commands/file_operations.rs at line 6

[11.31]→[4.4127:4173](∅→∅),[20.268]→[4.4127:4173](∅→∅),[18.1171]→[4.4127:4173](∅→∅),[12.1749]→[4.4127:4173](∅→∅),[23.1813]→[4.4127:4173](∅→∅),[3.2421]→[4.4127:4173](∅→∅)

use libpijul::{MutTxnT, MutTxnTExt, TxnTExt};
edit in pijul/src/commands/file_operations.rs at line 9

[32.44]

[21.1845]

use libpijul::{MutTxnT, MutTxnTExt, TxnTExt};
edit in pijul/src/commands/file_operations.rs at line 208

[2.172507]

[27.60]

#[clap(flatten)]
base: RepoPath,
edit in pijul/src/commands/file_operations.rs at line 212

[2.172507]→[32.372:413](∅→∅),[2.172507]→[32.372:413](∅→∅)

#[clap(flatten)]
base: RepoPath,
resolve order conflict in pijul/src/commands/file_operations.rs at line 212

[27.117]

[2.172572]
edit in pijul/src/commands/apply.rs at line 5

[36.18]

[2.194343]

use log::*;

use crate::commands::common_opts::RepoAndChannel;
use crate::commands::load_channel;
edit in pijul/src/commands/apply.rs at line 12

[9.23475]→[8.14202:14214](∅→∅),[6.617]→[8.14202:14214](∅→∅),[6.617]→[3.3379:3380](∅→∅),[4.6528]→[3.3379:3380](∅→∅),[8.14214]→[3.3379:3380](∅→∅),[2.194442]→[3.3379:3380](∅→∅)

use log::*;
edit in pijul/src/commands/apply.rs at line 13

[3.3380]→[36.19:104](∅→∅),[3.3380]→[36.19:104](∅→∅)

use crate::commands::common_opts::RepoAndChannel;
use crate::commands::load_channel;
resolve order conflict in pijul/src/commands/apply.rs at line 13

[25.6054]

[21.2124]