Chasesomero/pijul - Change 7JTKP74VPC3DMOE3TFNGBQ5JPIHYOMELOR5FSSIZJPX22JL4MDJAC

Fixing a conflict

Created by pmeunier on January 30, 2026

7JTKP74VPC3DMOE3TFNGBQ5JPIHYOMELOR5FSSIZJPX22JL4MDJAC

Dependencies

In channels

main

Change contents

Replacement in pijul-remote/src/lib.rs at line 104 [8.52474]

B:BD[7.1130] → [7.1130:1222]

B:BD[7.1222] → [5.24:72]

B:BD[7.1222] → [9.1814:1857]

    let (key, _password) = identity
        .credentials
        .clone()
        .unwrap()
        .decrypt(&identity.name, use_keyring)?;
        .decrypt(config, &identity.name)?;

[7.1130]

[7.1257]

    let (key, _password) =
        identity
            .credentials
            .clone()
            .unwrap()
            .decrypt(config, &identity.name, use_keyring)?;

Replacement in pijul-identity/src/repair.rs at line 42 [10.56]

B:BD[10.3347] → [5.73:151]

BD:BD[10.3347] → [5.73:151]

B:BD[10.3347] → [9.2724:2814]

pub async fn fix_identities(use_keyring: bool) -> Result<(), anyhow::Error> {
pub async fn fix_identities(config: &pijul_config::Config) -> Result<(), anyhow::Error> {

[10.3347]

[6.0]

pub async fn fix_identities(
    config: &pijul_config::Config,
    use_keyring: bool,
) -> Result<(), anyhow::Error> {

Replacement in pijul-identity/src/repair.rs at line 57 [10.56]

B:BD[10.3880] → [5.152:224]

B:BD[10.3880] → [9.2933:3000]

        let extraction_result = Complete::from_old_format(use_keyring);
        let extraction_result = Complete::from_old_format(config);

[10.3880]

[10.3945]

        let extraction_result = Complete::from_old_format(config, use_keyring);

Replacement in pijul-identity/src/repair.rs at line 67 [10.56]

B:BD[10.4220] → [5.225:296]

B:BD[10.4220] → [9.3001:3067]

∅:D[11.69] → [10.4888:4889]

∅:D[5.296] → [10.4888:4889]

∅:D[12.458] → [10.4888:4889]

∅:D[9.3067] → [10.4888:4889]

B:BD[10.4888] → [10.4888:4889]

                old_identity.clone().create(true, use_keyring).await?;
                old_identity.clone().create(config, true).await?;

[10.4220]

[10.4889]

                old_identity
                    .clone()
                    .create(config, true, use_keyring)
                    .await?;

Replacement in pijul-identity/src/repair.rs at line 95 [10.56]

B:BD[10.6256] → [5.297:376]

B:BD[10.6256] → [9.3068:3148]

                        Complete::default()?.create(true, use_keyring).await?;
                        Complete::default(config)?.create(config, true).await?;

[10.6256]

[10.6333]

                        Complete::default(config)?
                            .create(config, true, use_keyring)
                            .await?;

Replacement in pijul-identity/src/repair.rs at line 109 [10.56]

B:BD[10.6618] → [5.377:420]

B:BD[10.6618] → [9.3149:3187]

        identity.valid_keys(use_keyring)?;
        identity.valid_keys(config)?;

[10.6618]

[10.6650]

        identity.valid_keys(config, use_keyring)?;

Replacement in pijul-identity/src/repair.rs at line 117 [10.56]

B:BD[10.6735] → [5.421:498]

B:BD[10.6735] → [9.3188:3277]

    fn valid_keys(&self, use_keyring: bool) -> Result<bool, anyhow::Error> {
    fn valid_keys(&self, config: &pijul_config::Config) -> Result<bool, anyhow::Error> {

[10.6735]

[13.520]

    fn valid_keys(
        &self,
        config: &pijul_config::Config,
        use_keyring: bool,
    ) -> Result<bool, anyhow::Error> {

Replacement in pijul-identity/src/repair.rs at line 123 [10.56]

B:BD[13.563] → [5.499:576]

B:BD[13.563] → [9.3278:3350]

        let decryped_public_key = self.decrypt(use_keyring)?.0.public_key();
        let decryped_public_key = self.decrypt(config)?.0.public_key();

[13.563]

[10.7160]

        let decryped_public_key = self.decrypt(config, use_keyring)?.0.public_key();

Replacement in pijul-identity/src/repair.rs at line 186 [10.56]

B:BD[10.9995] → [5.577:657]

BD:BD[10.9995] → [5.577:657]

B:BD[10.9995] → [9.3437:3529]

    fn from_old_format(use_keyring: bool) -> Result<Self, IdentityParseError> {
    fn from_old_format(config: &pijul_config::Config) -> Result<Self, IdentityParseError> {

[10.9995]

[6.69]

    fn from_old_format(
        config: &pijul_config::Config,
        use_keyring: bool,
    ) -> Result<Self, IdentityParseError> {

Replacement in pijul-identity/src/repair.rs at line 304 [10.56]

B:BD[10.15446] → [5.658:705]

B:BD[10.15446] → [9.4139:4181]

        if identity.valid_keys(use_keyring)? {
        if identity.valid_keys(config)? {

[10.15446]

[10.15482]

        if identity.valid_keys(config, use_keyring)? {

Replacement in pijul-identity/src/load.rs at line 68 [10.22387]

B:BD[10.24577] → [5.706:794]

B:BD[10.24577] → [9.4564:4664]

pub async fn choose_identity_name(use_keyring: bool) -> Result<String, anyhow::Error> {
pub async fn choose_identity_name(config: &pijul_config::Config) -> Result<String, anyhow::Error> {

[10.24577]

[10.24663]

pub async fn choose_identity_name(
    config: &pijul_config::Config,
    use_keyring: bool,
) -> Result<String, anyhow::Error> {

Replacement in pijul-identity/src/load.rs at line 78 [10.22387]

B:BD[10.24848] → [5.795:839]

B:BD[10.24848] → [9.4665:4704]

        fix_identities(use_keyring).await?;
        fix_identities(config).await?;

[10.24848]

[10.24890]

        fix_identities(config, use_keyring).await?;

Insertion in pijul-identity/src/lib.rs at line 105 [10.15627]
[5.879]
[5.879]
```
        config: &pijul_config::Config,
```

Deletion in pijul-identity/src/lib.rs at line 109 [10.15627]

B:BD[13.3255] → [9.5059:5214]

    pub fn decrypt(
        &mut self,
        config: &pijul_config::Config,
        name: &str,
    ) -> Result<(SKey, Option<String>), anyhow::Error> {

Solving an order conflict in pijul-identity/src/lib.rs at line 109 [10.15627]
[5.983]
[13.3348]

Deletion in pijul-identity/src/lib.rs at line 251 [10.15627]

B:BD[13.6972] → [5.1223:1433]

    pub fn decrypt(&self, use_keyring: bool) -> Result<(SKey, Option<String>), anyhow::Error> {
        self.credentials
            .clone()
            .unwrap()
            .decrypt(&self.name, use_keyring)

Insertion in pijul-identity/src/lib.rs at line 254 [10.15627]
[9.6110]
[9.6110]
```
        use_keyring: bool,
```

Replacement in pijul-identity/src/lib.rs at line 260 [10.15627]

B:BD[9.6235] → [9.6235:6276]

            .decrypt(config, &self.name)

[9.6235]

[13.7111]

            .decrypt(config, &self.name, use_keyring)

Replacement in pijul-identity/src/lib.rs at line 263 [10.15627]

B:BD[13.7118] → [5.1434:1578]

B:BD[13.7118] → [9.6277:6428]

    fn change_password(&mut self, use_keyring: bool) -> Result<(), anyhow::Error> {
        let (decryped_key, _) = self.decrypt(use_keyring)?;
    fn change_password(&mut self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {
        let (decryped_key, _) = self.decrypt(config)?;

[13.7118]

[13.7232]

    fn change_password(
        &mut self,
        config: &pijul_config::Config,
        use_keyring: bool,
    ) -> Result<(), anyhow::Error> {
        let (decryped_key, _) = self.decrypt(config, use_keyring)?;

Replacement in pijul-identity/src/create.rs at line 98 [10.28175]

B:BD[13.10379] → [5.1607:1663]

B:BD[13.10379] → [9.6825:6876]

            new_identity.change_password(use_keyring)?;
            new_identity.change_password(config)?;

[13.10379]

[13.10424]

            new_identity.change_password(config, use_keyring)?;

Deletion in pijul-identity/src/create.rs at line 272 [10.28175]

B:BD[10.38529] → [5.1664:1764]

    pub async fn create(&self, link_remote: bool, use_keyring: bool) -> Result<(), anyhow::Error> {

Insertion in pijul-identity/src/create.rs at line 276 [10.28175]
[9.7866]
[9.7866]
```
        use_keyring: bool,
```

Replacement in pijul-identity/src/create.rs at line 279 [10.28175]

B:BD[13.14076] → [5.1765:1858]

B:BD[13.14076] → [9.7904:7992]

        let confirmed_identity = self.prompt_changes(None, link_remote, use_keyring).await?;
        let confirmed_identity = self.prompt_changes(config, None, link_remote).await?;

[13.14076]

[14.1007]

        let confirmed_identity = self
            .prompt_changes(config, None, link_remote, use_keyring)
            .await?;

Replacement in pijul/src/commands/tag.rs at line 119 [15.74]

B:BD[15.2976] → [5.1952:2048]

B:BD[15.2976] → [9.9665:9756]

                let header = header(author.as_deref(), message, timestamp, !no_keyring).await?;
                let header = header(config, author.as_deref(), message, timestamp).await?;

[15.2976]

[16.1031]

                let header =
                    header(config, author.as_deref(), message, timestamp, !no_keyring).await?;

Replacement in pijul/src/commands/tag.rs at line 255 [15.74]

B:BD[17.788] → [5.2073:2189]

        let k =
            pijul_identity::public_key(&pijul_identity::choose_identity_name(use_keyring).await?)?;

[18.13668]

[9.9832]

        let k = pijul_identity::public_key(
            &pijul_identity::choose_identity_name(config, use_keyring).await?,
        )?;

Replacement in pijul/src/commands/tag.rs at line 259 [15.74]

B:BD[9.9845] → [9.9845:9926]

        let identity_name = pijul_identity::choose_identity_name(config).await?;

[9.9845]

[9.9926]

        let identity_name = pijul_identity::choose_identity_name(config, use_keyring).await?;

Replacement in pijul/src/commands/record.rs at line 148 [8.101759]

B:BD[5.2365] → [5.2365:2441]

            &pijul_identity::choose_identity_name(!self.no_keyring).await?,

[5.2365]

[5.2441]

            &pijul_identity::choose_identity_name(config, !self.no_keyring).await?,

Deletion in pijul/src/commands/record.rs at line 150 [8.101759]
B:BD[19.75] → [9.10497:10596]
BD:BD[19.75] → [9.10497:10596]
```
            pijul_identity::Complete::load(&pijul_identity::choose_identity_name(config).await?)?;
```
Solving an order conflict in pijul/src/commands/record.rs at line 150 [8.101759]
[5.2453]
[19.168]

Replacement in pijul/src/commands/record.rs at line 151 [8.101759]

B:BD[19.169] → [5.2454:2517]

B:BD[19.169] → [9.10597:10650]

        let (secret, _) = complete.decrypt(!self.no_keyring)?;
        let (secret, _) = complete.decrypt(config)?;

[19.169]

[20.1910]

        let (secret, _) = complete.decrypt(config, !self.no_keyring)?;

Replacement in pijul/src/commands/record.rs at line 222 [8.101759]

B:BD[19.387] → [5.2518:2609]

B:BD[19.387] → [9.10751:10832]

                .unwrap_or(pijul_identity::choose_identity_name(!self.no_keyring).await?);
                .unwrap_or(pijul_identity::choose_identity_name(config).await?);

[19.387]

[19.462]

                .unwrap_or(pijul_identity::choose_identity_name(config, !self.no_keyring).await?);

Insertion in pijul/src/commands/pushpull.rs at line 312 [8.111631]

[21.8269]

[3.1464]

                    local_config: &mut pijul_config::local::Local,

Deletion in pijul/src/commands/pushpull.rs at line 314 [8.111631]
B:BD[21.8269] → [9.11798:11865]
BD:BD[21.8269] → [9.11798:11865]
```
                    local_config: &mut pijul_config::local::Local,
```
Solving an order conflict in pijul/src/commands/pushpull.rs at line 314 [8.111631]
[3.1505]
[21.8354]

Replacement in pijul/src/commands/identity.rs at line 275 [10.40825]

B:BD[5.3099] → [5.3099:3166]

                    .create(!options.no_link, !options.no_keyring)

[5.3099]

[5.3166]

                    .create(config, !options.no_link, !options.no_keyring)

Deletion in pijul/src/commands/identity.rs at line 277 [10.40825]
B:BD[10.49307] → [9.13749:13815]
```
                identity.create(config, !options.no_link).await?;
```
Solving an order conflict in pijul/src/commands/identity.rs at line 277 [10.40825]
[5.3195]
[7.1971]

Replacement in pijul/src/commands/identity.rs at line 278 [10.40825]

B:BD[7.1972] → [5.3196:3326]

                if let Err(_) =
                    remote::prove(&identity, None, self.no_cert_check, !options.no_keyring).await

[7.1972]

[5.3326]

                if let Err(_) = remote::prove(
                    config,
                    &identity,
                    None,
                    self.no_cert_check,
                    !options.no_keyring,
                )
                .await

Deletion in pijul/src/commands/identity.rs at line 287 [10.40825]

B:BD[7.1972] → [9.13816:13915]

                if let Err(_) = remote::prove(config, &identity, None, self.no_cert_check).await {

Solving an order conflict in pijul/src/commands/identity.rs at line 287 [10.40825]
[5.3344]
[22.4055]

Replacement in pijul/src/commands/identity.rs at line 295 [10.40825]

B:BD[10.49398] → [5.3345:3430]

B:BD[10.49398] → [9.13916:13981]

            SubCommand::Repair { no_keyring } => fix_identities(!no_keyring).await?,
            SubCommand::Repair => fix_identities(config).await?,

[10.49398]

[10.49480]

            SubCommand::Repair { no_keyring } => fix_identities(config, !no_keyring).await?,

Deletion in pijul/src/commands/identity.rs at line 302 [10.40825]

B:BD[5.3496] → [5.3496:3584]

B:BD[10.49589] → [9.13982:14081]

                    &identity_name.unwrap_or(choose_identity_name(!no_keyring).await?);
                let identity_name = &identity_name.unwrap_or(choose_identity_name(config).await?);

Solving an order conflict in pijul/src/commands/identity.rs at line 302 [10.40825]
[5.3496]

Insertion in pijul/src/commands/identity.rs at line 302 [10.40825]

[0.2994]

[7.2656]

                    &identity_name.unwrap_or(choose_identity_name(config, !no_keyring).await?);

Insertion in pijul/src/commands/identity.rs at line 305 [10.40825]
[5.3616]
[5.3616]
```
                    config,
```

Deletion in pijul/src/commands/identity.rs at line 312 [10.40825]

B:BD[7.2726] → [9.14082:14301]

                remote::prove(
                    config,
                    &loaded_identity,
                    server.as_deref(),
                    self.no_cert_check,
                )
                .await?;

Solving an order conflict in pijul/src/commands/identity.rs at line 312 [10.40825]
[5.3809]
[10.49763]

Replacement in pijul/src/commands/identity.rs at line 426 [10.40825]

B:BD[10.54509] → [5.3810:3879]

B:BD[10.54509] → [9.14302:14358]

                    choose_identity_name(!options.no_keyring).await?
                    choose_identity_name(config).await?

[10.54509]

[10.54576]

                    choose_identity_name(config, !options.no_keyring).await?

Insertion in pijul/src/commands/identity.rs at line 448 [10.40825]
[5.3921]
[5.3921]
```
                            config,
```

Deletion in pijul/src/commands/identity.rs at line 453 [10.40825]

B:BD[23.1054] → [9.14388:14487]

                        .prompt_changes(config, Some(old_identity.name.clone()), !options.no_link)

Solving an order conflict in pijul/src/commands/identity.rs at line 453 [10.40825]
[5.4103]
[23.1138]
Insertion in pijul/src/commands/identity.rs at line 466 [10.40825]
[5.4162]
[5.4162]
```
                            config,
```
Deletion in pijul/src/commands/identity.rs at line 473 [10.40825]
B:BD[7.3303] → [9.14488:14586]
BD:BD[7.3303] → [9.14488:14586]
```
                            remote::prove(config, &new_identity, None, self.no_cert_check).await;
```
Solving an order conflict in pijul/src/commands/identity.rs at line 473 [10.40825]
[5.4394]
[7.3393]
Resurrecting zombie bytes in pijul/src/commands/identity.rs at line 498 [10.40825]
B:B[24.176] → [5.4424:4471]
BD:B[24.176] → [5.4424:4471]
```
                let identity = Complete::load(
```

Replacement in pijul/src/commands/identity.rs at line 499 [10.40825]

B:BD[5.4471] → [5.4471:4559]

BD:BD[5.4471] → [5.4471:4559]

                    &identity_name.unwrap_or(choose_identity_name(!no_keyring).await?),

[5.4471]

[5.4559]

                    &identity_name.unwrap_or(choose_identity_name(config, !no_keyring).await?),

Deletion in pijul/src/commands/identity.rs at line 501 [10.40825]
B:BD[12.1375] → [9.14587:14687]
BD:BD[12.1375] → [9.14587:14687]
```
                    Complete::load(&identity_name.unwrap_or(choose_identity_name(config).await?))?;
```
Resurrecting zombie bytes in pijul/src/commands/identity.rs at line 501 [10.40825]
B:B[9.14687] → [6.1954:2021]
BD:B[9.14687] → [6.1954:2021]
∅:∅[6.2021] → [9.14736:14766]
B:B[9.14736] → [9.14736:14766]
BD:B[9.14736] → [9.14736:14766]
```
                let path = pijul_config::global_config_directory()
                    .unwrap()
```
Solving an order conflict in pijul/src/commands/identity.rs at line 501 [10.40825]
[5.4579]
[6.1954]

Insertion in Cargo.lock at line 115 [8.1030385]

[25.3302]


[[package]]
name = "atomic"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340"
dependencies = [
 "bytemuck",
]

Insertion in Cargo.lock at line 286 [8.1030385]

[2.196]

[25.7536]


[[package]]
name = "bytemuck"
version = "1.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"

Insertion in Cargo.lock at line 900 [8.1030385]

[4.1200]

[25.21860]


[[package]]
name = "figment"
version = "0.10.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3"
dependencies = [
 "atomic",
 "serde",
 "toml 0.8.23",
 "uncased",
 "version_check",
]

Insertion in Cargo.lock at line 2251 [8.1030385]
[25.57752]
[25.57752]
```
 "figment",
```
Insertion in Cargo.lock at line 2292 [8.1030385]
[25.58287]
[25.58287]
```
 "figment",
 "libpijul",
```

Insertion in Cargo.lock at line 3506 [8.1030385]

[25.85478]


[[package]]
name = "uncased"
version = "0.9.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697"
dependencies = [
 "version_check",
]

Fixing a conflict

Dependencies

In channels

Change contents

Replacement in pijul-remote/src/lib.rs at line 104 [8.52474]

Replacement in pijul-identity/src/repair.rs at line 42 [10.56]

Replacement in pijul-identity/src/repair.rs at line 57 [10.56]

Replacement in pijul-identity/src/repair.rs at line 67 [10.56]

Replacement in pijul-identity/src/repair.rs at line 95 [10.56]

Replacement in pijul-identity/src/repair.rs at line 109 [10.56]

Replacement in pijul-identity/src/repair.rs at line 117 [10.56]

Replacement in pijul-identity/src/repair.rs at line 123 [10.56]

Replacement in pijul-identity/src/repair.rs at line 186 [10.56]

Replacement in pijul-identity/src/repair.rs at line 304 [10.56]

Replacement in pijul-identity/src/load.rs at line 68 [10.22387]

Replacement in pijul-identity/src/load.rs at line 78 [10.22387]

Insertion in pijul-identity/src/lib.rs at line 105 [10.15627]

Deletion in pijul-identity/src/lib.rs at line 109 [10.15627]

Solving an order conflict in pijul-identity/src/lib.rs at line 109 [10.15627]

Deletion in pijul-identity/src/lib.rs at line 251 [10.15627]

Insertion in pijul-identity/src/lib.rs at line 254 [10.15627]

Replacement in pijul-identity/src/lib.rs at line 260 [10.15627]

Replacement in pijul-identity/src/lib.rs at line 263 [10.15627]

Replacement in pijul-identity/src/create.rs at line 98 [10.28175]

Deletion in pijul-identity/src/create.rs at line 272 [10.28175]

Insertion in pijul-identity/src/create.rs at line 276 [10.28175]

Replacement in pijul-identity/src/create.rs at line 279 [10.28175]

Replacement in pijul/src/commands/tag.rs at line 119 [15.74]

Replacement in pijul/src/commands/tag.rs at line 255 [15.74]

Replacement in pijul/src/commands/tag.rs at line 259 [15.74]

Replacement in pijul/src/commands/record.rs at line 148 [8.101759]

Deletion in pijul/src/commands/record.rs at line 150 [8.101759]

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

Replacement in pijul/src/commands/record.rs at line 151 [8.101759]

Replacement in pijul/src/commands/record.rs at line 222 [8.101759]

Insertion in pijul/src/commands/pushpull.rs at line 312 [8.111631]

Deletion in pijul/src/commands/pushpull.rs at line 314 [8.111631]

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

Replacement in pijul/src/commands/identity.rs at line 275 [10.40825]

Deletion in pijul/src/commands/identity.rs at line 277 [10.40825]

Solving an order conflict in pijul/src/commands/identity.rs at line 277 [10.40825]

Replacement in pijul/src/commands/identity.rs at line 278 [10.40825]

Deletion in pijul/src/commands/identity.rs at line 287 [10.40825]

Solving an order conflict in pijul/src/commands/identity.rs at line 287 [10.40825]

Replacement in pijul/src/commands/identity.rs at line 295 [10.40825]

Deletion in pijul/src/commands/identity.rs at line 302 [10.40825]

Solving an order conflict in pijul/src/commands/identity.rs at line 302 [10.40825]

Insertion in pijul/src/commands/identity.rs at line 302 [10.40825]

Insertion in pijul/src/commands/identity.rs at line 305 [10.40825]

Deletion in pijul/src/commands/identity.rs at line 312 [10.40825]

Solving an order conflict in pijul/src/commands/identity.rs at line 312 [10.40825]

Replacement in pijul/src/commands/identity.rs at line 426 [10.40825]

Insertion in pijul/src/commands/identity.rs at line 448 [10.40825]

Deletion in pijul/src/commands/identity.rs at line 453 [10.40825]

Solving an order conflict in pijul/src/commands/identity.rs at line 453 [10.40825]

Insertion in pijul/src/commands/identity.rs at line 466 [10.40825]

Deletion in pijul/src/commands/identity.rs at line 473 [10.40825]

Solving an order conflict in pijul/src/commands/identity.rs at line 473 [10.40825]

Resurrecting zombie bytes in pijul/src/commands/identity.rs at line 498 [10.40825]

Replacement in pijul/src/commands/identity.rs at line 499 [10.40825]

Deletion in pijul/src/commands/identity.rs at line 501 [10.40825]

Resurrecting zombie bytes in pijul/src/commands/identity.rs at line 501 [10.40825]

Solving an order conflict in pijul/src/commands/identity.rs at line 501 [10.40825]

Insertion in Cargo.lock at line 115 [8.1030385]

Insertion in Cargo.lock at line 286 [8.1030385]

Insertion in Cargo.lock at line 900 [8.1030385]

Insertion in Cargo.lock at line 2251 [8.1030385]

Insertion in Cargo.lock at line 2292 [8.1030385]

Insertion in Cargo.lock at line 3506 [8.1030385]