Rebase fork onto latest upstream (russellbanks/Komac) main by pl4nty · Pull Request #25 · devicie/Komac

Tom Plant (pl4nty) · 2026-06-17T04:16:21Z

What

Rebases the devicie fork's 40 custom commits on top of the latest upstream/main (russellbanks/Komac), bringing in 33 new upstream commits (merge-base was 19403b74, new upstream tip 18616f90 "Update GitHub REST API to 2026-03-10").

After the rebase the branch is 40 commits ahead of upstream/main, 0 behind — all upstream changes are incorporated.

Conflicts resolved

Cargo.toml (×2) — kept upstream's newer crate versions (tree-sitter-highlight 0.26.9, sevenz-rust2 0.21.0) while preserving fork additions (tracing-subscriber env-filter feature, serini).
src/github/rest/mod.rs — union of upstream's new modules (compare_commits, error, merge_upstream) and the fork's releases module.
src/analysis/installers/zip.rs — combined imports (bail + CustomType); both are used post-rebase.
src/commands/submit.rs — kept upstream's new manifest_version reset block and its Option-based maybe_versions(...) / get_versions(...).ok() API, layered on top of the fork's prompt_async concurrency change (owned identifier/version clones). Verified against the actual add_version #[builder], get_versions, and prompt_async signatures.

Cargo.lock / verification note

cargo could not be run in this environment because the vendor/inno submodule (referenced commit on devicie/inno) is not fetchable here, so the lockfile could not be regenerated and the build was not compile-verified. Cargo.lock was set to the fork's pre-rebase, internally consistent lockfile (contains serini and the vendored path crates). It is behind on a handful of upstream renovate version bumps (e.g. regex, uuid, zerocopy, nt-time); run cargo build / cargo update in an environment with submodule access to finalize the lockfile before merging.

🤖 Generated with Claude Code

Generated by Claude Code

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

)

Co-authored-by: russellbanks <74878137+russellbanks@users.noreply.github.com>

* Update Rust crate quick-xml to 0.40.1 * Migrate to quick-xml 0.40 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Russell Banks <74878137+russellbanks@users.noreply.github.com>

…nks#1667)

Co-authored-by: russellbanks <74878137+russellbanks@users.noreply.github.com>

Resolves russellbanks#1733

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…#1770) * Update Rust crate windows-native-keyring-store to 1.1.0 * Disable `windows-native-keyring-store` default features --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Russell Banks <74878137+russellbanks@users.noreply.github.com>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…anks#1781)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Autofill `InstallLocation` for WiX installers * Ignore switch parse error --------- Co-authored-by: Russell Banks <74878137+russellbanks@users.noreply.github.com>

* Replace sync method with "Sync fork" API Use GitHub's merge-upstream REST endpoint instead of the GraphQL API for the sync command. This allows for better error messages in some cases. Add an error context to the actual sync invocation. Print the used "sync method" on success. Introduce the GitHubError::Rest variant to distinguish GraphQL from REST errors. Remove the old merge upstream implementation. Note that the --force flag is no longer supported. Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com> * Compare against upstream head commit --------- Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com> Co-authored-by: Russell Banks <74878137+russellbanks@users.noreply.github.com>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…tegies to file Signed-off-by: Tom Plant <tom.plant@devicie.com>

Signed-off-by: Tom Plant <tom.plant@devicie.com>

Workspace is set to use Rust v1.93 even though the module is 1.89 Signed-off-by: Tom Plant <tom.plant@devicie.com>

Inno Setup 6.2 introduced a new PrivilegesRequired setting 'requireadmin' (value 4), which requires administrative privileges and will refuse to run if they cannot be obtained, unlike 'admin' which will prompt for credentials. Previously, reading this value with TryFromBytes failed since the enum only contained values 0-3. The failure was silently swallowed by unwrap_or_default(), returning None instead of the actual value.

…flag In Inno Setup 6.4.x, the decrypt_dll was removed from the wizard section as encryption is now handled via the inline EncryptionHeader. However, the ENCRYPTION_USED flag can still be set in the header flags bitfield. Previously, when ENCRYPTION_USED was set, the parser tried to read decrypt_dll from the wizard section regardless of version, causing UnexpectedEof for Inno 6.4.x installers that do not store decrypt_dll. Also revert the error suppression that converted UnexpectedEof to NotInnoFile, which was masking the root cause.

The non-solid NSIS header detection checked for an exact byte value of 0x80 in the high byte of compressed_header_size (signature.get(3) == Some(&0x80)). This missed valid non-solid installers where the high byte has other bits set in addition to the IS_COMPRESSED_MASK bit (e.g. 0x8D for timi.exe). The correct check is to test the IS_COMPRESSED_MASK bit directly: (compressed_header_size & IS_COMPRESSED_MASK) != 0 Additionally, installers with the BI_EXTERNAL_FILE flag set store their data in an external file and cannot be analysed inline. These are now rejected early with NotNsisFile instead of failing later in header decompression. The map_err suppression on Header::decompress is also removed; genuine decompression errors are now propagated as-is.

The NSIS header's language_table_size field is unreliable for old installers: it can be 0 (typefaster.exe) or -1 (quickpar.exe) even when valid language tables are present in the LangTables block. Fix this by computing the size from the block data, matching the approach already used for sections: lang_table_size = lang_block_data.len() / num_tables This uses the actual block data size divided by the number of language table entries reported in the block header, which is always correct. Also removes the now-unnecessary header parameter from primary_language().

… values The FileOpen entry (type 55) stores a file creation disposition value that NSIS passes directly to CreateFile(). NSIS uses values like 0 and 700 that are not valid Win32 OPEN_EXISTING (3) / CREATE_ALWAYS (2) / OPEN_ALWAYS (4) values. Previously, the create_mode field used CreationDisposition which only accepts values 1-5 via TryFromBytes, causing FileOpen entries with non-standard modes to silently become Entry::Invalid. Fix by changing create_mode to I32<LE> (accepts any value) and comparing by integer in the execution logic.

…teger columns

Signed-off-by: Tom Plant <tom.plant@devicie.com>

The vendored `inno` and `msi` git submodules pointed at commits that no longer exist on their remotes, so `git submodule update --init` failed and broke CI checkout. Both crates are available on crates.io at the exact versions the manifest already declares (inno 0.4.2, msi 0.10.0), so the `[patch.crates-io]` overrides and submodules are removed in favour of the published crates. The healthy `winget-types` submodule is left untouched. Reconciling the lockfile to the published crates surfaced several pre-existing issues that the broken submodule checkout had been masking: - inno 0.4.2 has no `PrivilegeLevel::RequireAdmin` variant (that was a fork-only addition); drop the arm so it falls through as before. - msi analysis set the `Installer::switches` field twice (a botched merge of the upstream install-location switch and the custom-switch feature); merge both into a single `InstallerSwitches` builder. - `token.rs` matched a `keyring_core::Entry` as if it were an `Option`. - Remove unused NSIS header imports. - Add `hide_env_values` to the three `GITHUB_TOKEN` args that were missing it so the help-output secrecy test passes. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XmPAQgcCW15dCnnmKSyWWc

Tom Plant (pl4nty) · 2026-06-18T01:37:32Z

Resolved the Cargo.lock / verification blocker noted above.

The vendor/inno and vendor/msi submodules pointed at commits that no longer exist on their remotes (vendor/winget-types is fine), which is what broke CI's git submodule update --init. Both crates are on crates.io at the exact versions the manifest already declares (inno 0.4.2, msi 0.10.0), so I removed those two submodules and their [patch.crates-io] overrides and switched to the published crates. winget-types stays vendored.

Reconciling the lockfile to the published crates exposed a few pre-existing issues the broken checkout had been masking, now fixed:

inno 0.4.2 has no PrivilegeLevel::RequireAdmin (fork-only addition) — dropped the match arm.
MSI analysis set Installer::switches twice (botched merge of upstream install-location + fork custom switches) — merged into one InstallerSwitches builder.
token.rs matched a keyring_core::Entry as an Option.
Added hide_env_values to three GITHUB_TOKEN args that were missing it (fixes the help-secrecy test).

Verified locally on rust 1.95 (the crate's MSRV): cargo check, cargo clippy, and cargo test (159 passed) all pass.

Note: the only loss vs the fork is inno's WIP Inno Setup 7.0 support bump, which isn't on crates.io. Flag if that's needed and I'll look at restoring it some other way.

Generated by Claude Code

With the submodule checkout fixed, CI's clippy job (which runs with `RUSTFLAGS=-D warnings`) could finally run and flagged seven pre-existing lints. None are behavioural changes: - `collapsible_if` in `prompts` and `html_page` -> let-chains (already used elsewhere in the crate; MSRV 1.95 supports them). - `redundant_closure` in `sourceforge` -> pass the fn directly. - `unnecessary_map_or` in `vanity_url` -> `Option::is_none_or`. - `ptr_arg` in `submit_option` -> take `&mut [_]` (callers coerce, and `Editor::new` already takes a slice). - `large_enum_variant` in `ExeType` -> box the 464-byte `InstallShield` variant. - `too_many_arguments` on `AutoUpdate::run_entry` -> `#[allow]`. Verified with `RUSTFLAGS=-D warnings cargo clippy` on rust 1.96 (matching CI) and `cargo check` on the 1.95 MSRV; both clean. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XmPAQgcCW15dCnnmKSyWWc

renovate Bot and others added 30 commits May 15, 2026 06:29

Update Rust crate sevenz-rust2 to 0.21.0 (russellbanks#1764)

504f336

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Map Inno auto constants based on PrivilegesRequired (russellbanks#1751

cb5ca8a

)

Update Inno Setup Dependency Installer script (russellbanks#1657)

d8ba7b7

Co-authored-by: russellbanks <74878137+russellbanks@users.noreply.github.com>

Remove html-escape

d30630b

Include executable path with portable command alias prompt (russellba…

3ba5110

…nks#1667)

Update GitHub GraphQL schema monthly

533d7eb

Update GitHub GraphQL Schema (russellbanks#1660)

b9a1363

Co-authored-by: russellbanks <74878137+russellbanks@users.noreply.github.com>

Fix missing field @FilePath on Burn installer

61f0ae9

Resolves russellbanks#1733

Fix new package PR title prefix for komac submit (russellbanks#1767)

8f42085

Resolve clippy lints

d756cb4

Update Rust crate tree-sitter-highlight to 0.26.9 (russellbanks#1766)

0d5aefe

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update Rust crate nt-time to 0.15.0 (russellbanks#1645)

5b354fc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update Rust crate serde_json to 1.0.150 (russellbanks#1769)

cd81c1e

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update Rust crate reqwest to 0.13.4 (russellbanks#1771)

891bcd3

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update Rust crate uuid to 1.23.2 (russellbanks#1776)

bfbb8bf

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update Rust crate compact_str to 0.9.1 (russellbanks#1772)

d10fabc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update Rust crate memchr to 2.8.1 (russellbanks#1773)

0f78479

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update Rust crate zerocopy to 0.8.50 (russellbanks#1774)

89a1b7e

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Lock file maintenance (russellbanks#1689)

e7f094c

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Bump locale file manifest version when using komac submit (russellb…

02eceb9

…anks#1781)

Update Rust crate bitflags to 2.12.1 (russellbanks#1777)

f996b8f

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update Rust crate chrono to 0.4.45 (russellbanks#1783)

5b13ed4

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update Rust crate serde_with to 3.21.0 (russellbanks#1784)

135f3f0

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Autofill InstallLocation for WiX installers (russellbanks#1782)

18f1330

* Autofill `InstallLocation` for WiX installers * Ignore switch parse error --------- Co-authored-by: Russell Banks <74878137+russellbanks@users.noreply.github.com>

Update Rust crate ratatui to 0.30.1 (russellbanks#1786)

295ac61

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update Rust crate bitflags to 2.13.0 (russellbanks#1787)

c3874ed

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update Rust crate regex to 1.12.4 (russellbanks#1790)

3a5c082

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Tom Plant (pl4nty) and others added 28 commits June 17, 2026 03:27

feat: auto-update disable vanity, support common channels, cache stra…

cf006f9

…tegies to file Signed-off-by: Tom Plant <tom.plant@devicie.com>

Skip zips that don't contain exes

177c21d

Signed-off-by: Tom Plant <tom.plant@devicie.com>

Use the lowest-level exe in the zip

be31d6e

Signed-off-by: Tom Plant <tom.plant@devicie.com>

Only use prereleases on main if no standard release existed

b57fcb3

Signed-off-by: Tom Plant <tom.plant@devicie.com>

Cleanup for rebasing

863219a

Signed-off-by: Tom Plant <tom.plant@devicie.com>

squash: feat/update-prompt-for-release-notes

85b261c

squash: feat/new-from-files

7a624bc

squash: feat/arch-fallback-from-filename

092dbd5

squash: feat/analyse-installshield-squashed

0a32118

Suppress prompts when CI=true

94da4ab

Signed-off-by: Tom Plant <tom.plant@devicie.com>

Detect locale publisher from ARP publisher

ef822ea

Signed-off-by: Tom Plant <tom.plant@devicie.com>

Disable inno vendoring

11178c1

Workspace is set to use Rust v1.93 even though the module is 1.89 Signed-off-by: Tom Plant <tom.plant@devicie.com>

squash: feat/analyse-qt

324b3ee

squash: feat/analyse-7zsfx

5673733

Fix panic on quoted strings in Burn install conditions

749f7b8

Fix panic on bare number tokens in Burn install conditions

bcd6e31

Fix missing field error when @filepath is absent in Burn manifest

685f809

Fix divide by zero panic in NSIS IntOp entry

8c02120

Fix panic when NSIS delete operation removes current directory node

1ee14a1

Fix invalid field size error when parsing MSI files with zero-size in…

95e5395

…teger columns

Improve autoupdate concurrency

66e151c

Signed-off-by: Tom Plant <tom.plant@devicie.com>

back to winget-extras

3966823

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebase fork onto latest upstream (russellbanks/Komac) main#25

Rebase fork onto latest upstream (russellbanks/Komac) main#25
Tom Plant (pl4nty) wants to merge 75 commits into
mainfrom
claude/nifty-bohr-g27cxz

Tom Plant (pl4nty) commented Jun 17, 2026

Uh oh!

Tom Plant (pl4nty) commented Jun 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

Tom Plant (pl4nty) commented Jun 17, 2026

What

Conflicts resolved

Cargo.lock / verification note

Uh oh!

Tom Plant (pl4nty) commented Jun 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants